diff --git a/.gitignore b/.gitignore
index f7a5435..39127f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
+# 忽略提交文件
 /unpackage
-node_modules/
\ No newline at end of file
+node_modules/
+.vscode/
+.hbuilderx/
\ No newline at end of file
diff --git a/common/js/api.js b/common/js/api.js
index 7438067..54d83de 100644
--- a/common/js/api.js
+++ b/common/js/api.js
@@ -8,9 +8,18 @@ export default {
 	loginapplogin(data) { //APP登录(登录即注册)
 		return uni.api.post("/login/app/login", data);
 	},
+	productqueryShop(data) { //通过桌码获取店铺信息
+		return uni.api.get("/product/queryShop", data);
+	},
 	productqueryProduct(data) { //获取商品信息
 		return uni.api.post("/product/queryProduct", data, false);
 	},
+	cartAdd(data) { //添加到购物车
+		return uni.api.post("/product/addCart", data);
+	},
+	cleanCart(data) { //清空购物车
+		return uni.api.post("/product/cleanCart", data);
+	},
 	// 下单详情
 	getproductorderConfirm(data) {
 		return uni.api.get("/product/orderConfirm", data);
@@ -52,7 +61,7 @@ export default {
 		return uni.api.get("/groupOrderInfo/list", data);
 	},
 	orderorderInfo(data) { //订单回显
-		return uni.api.get("/order/orderInfo", data);
+		return uni.api.get("/order/orderInfo", data ,false);
 	},
 	groupOrderInfoDetail(data) { //订单回显
 		return uni.api.get("/groupOrderInfo/get", data);
diff --git a/components/cwx-keyboard/cwx-keyboard.vue b/components/cwx-keyboard/cwx-keyboard.vue
index 5bae9ee..2af5b11 100644
--- a/components/cwx-keyboard/cwx-keyboard.vue
+++ b/components/cwx-keyboard/cwx-keyboard.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class='keyboard' @click.stop='_handleKeyPress'>
+	<view class='keyboard' :style="{position: pos}" @click.stop='_handleKeyPress'>
 		<view class='key-row'>
 			<view class='key-cell cell_b' data-num='1'>1</view>
 			<view class='key-cell cell_b' data-num='2'>2</view>
@@ -46,7 +46,11 @@
 			},
 			btnColor: {
 				default: 'green',
-			}
+			},
+			pos: {
+				default: 'fixed',
+				type: String
+			},
 		},
 		data() {
 			return {
@@ -83,6 +87,7 @@
 				//不同按键处理逻辑
 				// -1 代表无效按键，直接返回
 				if (num == -1) return false;
+				
 				switch (String(num)) {
 					//小数点
 					case '.':
@@ -136,9 +141,8 @@
 
 			//处理数字
 			_handleNumberKey(num) {
-				if (this.money.length == 6) {
-					return
-				}
+				
+				
 				let S = this.money;
 				//如果有小数点且小数点位数不小于2
 				// if (S.indexOf('.') > -1 && S.substring(S.indexOf('.') + 1).length < 2)
@@ -153,6 +157,12 @@
 				// 		this.money = S + num;
 				// 	}
 				// }
+				console.log(this.money)
+				console.log(this.money,this.money.length)
+				if (this.money.length == 6) {
+					this.$emit('confirmEvent', this.money); //提交参数
+					return
+				}
 			},
 
 			//提交
@@ -178,7 +188,7 @@
 	}
 </script>
 
-<style lang="less" scoped>
+<style lang="scss" scoped>
 	.cell_b {
 		border-right: 1px solid #DBDBDB;
 		border-bottom: 1px solid #DBDBDB;
diff --git a/components/navseat.vue b/components/navseat.vue
index 850b636..d218c4b 100644
--- a/components/navseat.vue
+++ b/components/navseat.vue
@@ -58,21 +58,25 @@
 				type: Boolean,
 				default: false
 			},
-			titleshow: {//标题是否显示
+			titleshow: { //标题是否显示
 				type: Boolean,
 				default: false
 			},
-			heightshow: {//是否要占位高度
+			heightshow: { //是否要占位高度
 				type: Boolean,
 				default: false
 			},
-			iconshow: {//返回键是否显示
+			iconshow: { //返回键是否显示
 				type: Boolean,
 				default: true
 			},
-			iconcolor:{//返回键颜色
+			iconcolor: { //返回键颜色
 				type: String,
 				default: '#000'
+			},
+			navigateBacknavtitle: {
+				type: Boolean,
+				default: false
 			}
 		},
 		computed: {
@@ -95,7 +99,11 @@
 				})
 			},
 			clicknavigateBack() {
-				uni.navigateBack()
+				if (this.navigateBacknavtitle) {
+					this.$emit('navigateBacknav')
+				} else {
+					uni.navigateBack()
+				}
 			}
 		}
 
diff --git a/components/payPassword.vue b/components/payPassword.vue
index 69ae612..37531ca 100644
--- a/components/payPassword.vue
+++ b/components/payPassword.vue
@@ -134,7 +134,7 @@
 		width: 100%;
 		height: 100%;
 		background-color: #FFFFFF;
-		z-index: 999;
+		z-index: 9999;
 	}
 
 	.pay-title {
diff --git a/components/payPasswordtwo.vue b/components/payPasswordtwo.vue
new file mode 100644
index 0000000..8eb5a54
--- /dev/null
+++ b/components/payPasswordtwo.vue
@@ -0,0 +1,119 @@
+<template>
+	<view class="content">
+		<view style="margin-bottom: 128rpx;">
+			<view class="contenttext flex-center">
+				<text>￥</text>
+				<text>{{payAmount}}</text>
+			</view>
+			<view class="contentbox flex-between">
+				<view class="contentboxitem flex-colum">
+					<text v-show="consumeFee.length >= 1">●</text>
+				</view>
+				<view class="contentboxitem flex-colum">
+					<text v-show="consumeFee.length >= 2">●</text>
+				</view>
+				<view class="contentboxitem flex-colum">
+					<text v-show="consumeFee.length >= 3">●</text>
+				</view>
+				<view class="contentboxitem flex-colum">
+					<text v-show="consumeFee.length >= 4">●</text>
+				</view>
+				<view class="contentboxitem flex-colum">
+					<text v-show="consumeFee.length >= 5">●</text>
+				</view>
+				<view class="contentboxitem flex-colum">
+					<text v-show="consumeFee.length >= 6">●</text>
+				</view>
+			</view>
+		</view>
+		
+		<cwx-keyboard ref="keyboard" :pos="'inherit'" @confirmEvent="confirmEvent"
+			:money.sync="consumeFee"></cwx-keyboard>
+	</view>
+</template>
+<script>
+	import cwxKeyboard from '@/components/cwx-keyboard/cwx-keyboard';
+	export default {
+		components: {
+			cwxKeyboard
+		},
+		props: {
+			payAmount: {
+				default: 0,
+				type: Number
+			},
+		},
+		data() {
+			return {
+				isPwd: uni.cache.get('userInfo').isPwd,
+				consumeFee: '', //第一遍
+				money: ''
+			};
+		},
+		onLoad() {
+			console.log(uni.cache.get('userInfo').isPwd)
+			
+		},
+		watch: {
+			consumeFee(newVal, oldVal) {
+			
+			}
+		},
+		methods: {
+			confirmEvent(val) {
+				
+				// uni.showModal({
+				//     title: '温馨提示',
+				//     content: '输入密码是 = ' + JSON.stringify(this.passwordArr)
+				// })
+				
+				// 判断是否等于6
+				if (val.length === 6) {
+					this.$emit('accountPayevent', val)
+					this.money = "";
+				}
+				this.$forceUpdate();
+			},
+		
+			
+		}
+	};
+</script>
+
+<style lang="scss">
+	.content {
+		height: 100%;
+		background: #FFFFFF;
+
+		.contenttext {
+			padding: 48rpx 0;
+			font-family: Source Han Sans CN, Source Han Sans CN;
+			font-weight: 500;
+			font-size: 40rpx;
+			color: #333333;
+			text:nth-child(1){
+				font-weight: bold;
+				font-size: 48rpx;
+				color: #333333;
+			}
+			text:nth-child(2){
+				font-weight: bold;
+				font-size: 60rpx;
+				color: #333333;
+			}
+		}
+
+		.contentbox {
+			margin-top: 48rpx;
+			padding: 0 56rpx;
+
+			.contentboxitem {
+				width: 88rpx;
+				height: 88rpx;
+				background: #FFFFFF;
+				border-radius: 8rpx 8rpx 8rpx 8rpx;
+				border: 2rpx solid #999999;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/framework/11-api.js b/framework/11-api.js
index c90a6a9..489545c 100644
--- a/framework/11-api.js
+++ b/framework/11-api.js
@@ -102,17 +102,21 @@ async function request(options) {
 		let res = await uni.pro.request(options);
 		// #endif
 		if (res.code != 0) {
+			console.log(options)
 			if (res.code == -4) {
-				uni.showToast({
-					title: '',
-					// title: res.message || res.msg,
-					icon: "none",
-					success: () => {
-						setTimeout(res => {
-							store.dispatch("loginEvent"); //获取shapid
-						}, 1000)
-					}
-				})
+				// uni.showToast({
+				// 	title: '',
+				// 	// title: res.message || res.msg,
+				// 	icon: "none",
+				// 	success: () => {
+				// 		setTimeout(res => {
+				// 			store.dispatch("loginEvent"); //获取shapid
+				// 		}, 1000)
+				// 	}
+				// })
+				setTimeout(res => {
+					store.dispatch("loginEvent"); //获取shapid
+				}, 1000)
 			} else if (res.code == 482) {
 				let nowTime = new Date() / 1000 | 0
 				let offset = parseInt(res.data.message) - parseInt(nowTime);
diff --git a/node_modules/.bin/sass b/node_modules/.bin/sass
index 96be2d6..dde8400 100644
--- a/node_modules/.bin/sass
+++ b/node_modules/.bin/sass
@@ -2,16 +2,15 @@
 basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
 
 case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+    *CYGWIN*|*MINGW*|*MSYS*)
+        if command -v cygpath > /dev/null 2>&1; then
+            basedir=`cygpath -w "$basedir"`
+        fi
+    ;;
 esac
 
-if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="$basedir/C:/Users/Administrator/Documents/HBuilderProjects/cashier_weapp/node_modules/.store/sass@1.69.5/node_modules"
-else
-  export NODE_PATH="$NODE_PATH:$basedir/C:/Users/Administrator/Documents/HBuilderProjects/cashier_weapp/node_modules/.store/sass@1.69.5/node_modules"
-fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../.store/sass@1.69.5/node_modules/sass/sass.js" "$@"
-else
-  exec node  "$basedir/../.store/sass@1.69.5/node_modules/sass/sass.js" "$@"
+  exec "$basedir/node"  "$basedir/../sass/sass.js" "$@"
+else 
+  exec node  "$basedir/../sass/sass.js" "$@"
 fi
diff --git a/node_modules/.bin/sass.CMD b/node_modules/.bin/sass.CMD
index 8bbbd94..0cf95f6 100644
--- a/node_modules/.bin/sass.CMD
+++ b/node_modules/.bin/sass.CMD
@@ -1,12 +1,17 @@
-@SETLOCAL
-@IF NOT DEFINED NODE_PATH (
-  @SET "NODE_PATH=%~dp0\C:\Users\Administrator\Documents\HBuilderProjects\cashier_weapp\node_modules\.store\sass@1.69.5\node_modules"
+@ECHO off
+GOTO start
+:find_dp0
+SET dp0=%~dp0
+EXIT /b
+:start
+SETLOCAL
+CALL :find_dp0
+
+IF EXIST "%dp0%\node.exe" (
+  SET "_prog=%dp0%\node.exe"
 ) ELSE (
-  @SET "NODE_PATH=%NODE_PATH%;%~dp0\C:\Users\Administrator\Documents\HBuilderProjects\cashier_weapp\node_modules\.store\sass@1.69.5\node_modules"
-)
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\.store\sass@1.69.5\node_modules\sass\sass.js" %*
-) ELSE (
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\.store\sass@1.69.5\node_modules\sass\sass.js" %*
+  SET "_prog=node"
+  SET PATHEXT=%PATHEXT:;.JS;=;%
 )
+
+endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\..\sass\sass.js" %*
diff --git a/node_modules/.bin/sass.ps1 b/node_modules/.bin/sass.ps1
index 7da4069..715ffd5 100644
--- a/node_modules/.bin/sass.ps1
+++ b/node_modules/.bin/sass.ps1
@@ -2,40 +2,27 @@
 $basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
 
 $exe=""
-$pathsep=":"
-$env_node_path=$env:NODE_PATH
-$new_node_path="$basedir\C:\Users\Administrator\Documents\HBuilderProjects\cashier_weapp\node_modules\.store\sass@1.69.5\node_modules"
 if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
   # Fix case when both the Windows and Linux builds of Node
   # are installed in the same directory
   $exe=".exe"
-  $pathsep=";"
-} else {
-  $new_node_path="$basedir/C:/Users/Administrator/Documents/HBuilderProjects/cashier_weapp/node_modules/.store/sass@1.69.5/node_modules"
 }
-if ([string]::IsNullOrEmpty($env_node_path)) {
-  $env:NODE_PATH=$new_node_path
-} else {
-  $env:NODE_PATH="$env_node_path$pathsep$new_node_path"
-}
-
 $ret=0
 if (Test-Path "$basedir/node$exe") {
   # Support pipeline input
   if ($MyInvocation.ExpectingInput) {
-    $input | & "$basedir/node$exe"  "$basedir/../.store/sass@1.69.5/node_modules/sass/sass.js" $args
+    $input | & "$basedir/node$exe"  "$basedir/../sass/sass.js" $args
   } else {
-    & "$basedir/node$exe"  "$basedir/../.store/sass@1.69.5/node_modules/sass/sass.js" $args
+    & "$basedir/node$exe"  "$basedir/../sass/sass.js" $args
   }
   $ret=$LASTEXITCODE
 } else {
   # Support pipeline input
   if ($MyInvocation.ExpectingInput) {
-    $input | & "node$exe"  "$basedir/../.store/sass@1.69.5/node_modules/sass/sass.js" $args
+    $input | & "node$exe"  "$basedir/../sass/sass.js" $args
   } else {
-    & "node$exe"  "$basedir/../.store/sass@1.69.5/node_modules/sass/sass.js" $args
+    & "node$exe"  "$basedir/../sass/sass.js" $args
   }
   $ret=$LASTEXITCODE
 }
-$env:NODE_PATH=$env_node_path
 exit $ret
diff --git a/node_modules/lodash/package.json b/node_modules/lodash/package.json
index e237f61..b35fd95 100644
--- a/node_modules/lodash/package.json
+++ b/node_modules/lodash/package.json
@@ -13,10 +13,5 @@
     "John-David Dalton <john.david.dalton@gmail.com>",
     "Mathias Bynens <mathias@qiwi.be>"
   ],
-  "scripts": {
-    "test": "echo \"See https://travis-ci.org/lodash-archive/lodash-cli for testing details.\""
-  },
-  "__npminstall_done": true,
-  "_from": "lodash@4.17.21",
-  "_resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz"
+  "scripts": { "test": "echo \"See https://travis-ci.org/lodash-archive/lodash-cli for testing details.\"" }
 }
diff --git a/node_modules/sass-loader/README.md b/node_modules/sass-loader/README.md
index f34f16e..225be48 100644
--- a/node_modules/sass-loader/README.md
+++ b/node_modules/sass-loader/README.md
@@ -418,7 +418,7 @@ module.exports = {
           {
             loader: "sass-loader",
             options: {
-              sassOptions: (loaderContext) => {
+              sassOptions: (content, loaderContext) => {
                 // More information about available properties https://webpack.js.org/api/loaders/
                 const { resourcePath, rootContext } = loaderContext;
                 const relativePath = path.relative(rootContext, resourcePath);
@@ -677,14 +677,10 @@ Type:
 type warnRuleAsWarning = boolean;
 ```
 
-Default: `false`
+Default: `true`
 
 Treats the `@warn` rule as a webpack warning.
 
-> **Note**
->
-> It will be `true` by default in the next major release.
-
 **style.scss**
 
 ```scss
diff --git a/node_modules/sass-loader/dist/index.js b/node_modules/sass-loader/dist/index.js
index 443fc87..e7bb57a 100644
--- a/node_modules/sass-loader/dist/index.js
+++ b/node_modules/sass-loader/dist/index.js
@@ -96,5 +96,4 @@ async function loader(content) {
   }
   callback(null, result.css.toString(), map);
 }
-var _default = loader;
-exports.default = _default;
\ No newline at end of file
+var _default = exports.default = loader;
\ No newline at end of file
diff --git a/node_modules/sass-loader/dist/utils.js b/node_modules/sass-loader/dist/utils.js
index 6649e85..0f262e5 100644
--- a/node_modules/sass-loader/dist/utils.js
+++ b/node_modules/sass-loader/dist/utils.js
@@ -113,7 +113,7 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
   if (!sassOptions.logger) {
     const needEmitWarning = loaderOptions.warnRuleAsWarning !== false;
     const logger = loaderContext.getLogger("sass-loader");
-    const formatSpan = span => `${span.url || "-"}:${span.start.line}:${span.start.column}: `;
+    const formatSpan = span => `Warning on line ${span.start.line}, column ${span.start.column} of ${span.url || "-"}:${span.start.line}:${span.start.column}:\n`;
     const formatDebugSpan = span => `[debug:${span.start.line}:${span.start.column}] `;
     sassOptions.logger = {
       debug(message, loggerOptions) {
@@ -129,11 +129,14 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
         if (loggerOptions.deprecation) {
           builtMessage += "Deprecation ";
         }
-        if (loggerOptions.span && !loggerOptions.stack) {
-          builtMessage = formatSpan(loggerOptions.span);
+        if (loggerOptions.span) {
+          builtMessage += formatSpan(loggerOptions.span);
         }
         builtMessage += message;
-        if (loggerOptions.stack) {
+        if (loggerOptions.span && loggerOptions.span.context) {
+          builtMessage += `\n\n${loggerOptions.span.start.line} | ${loggerOptions.span.context}`;
+        }
+        if (loggerOptions.stack && loggerOptions.stack !== "null") {
           builtMessage += `\n\n${loggerOptions.stack}`;
         }
         if (needEmitWarning) {
@@ -227,6 +230,11 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
 
     // Allow passing custom importers to `sass`/`node-sass`. Accepts `Function` or an array of `Function`s.
     sassOptions.importer = sassOptions.importer ? proxyCustomImporters(Array.isArray(sassOptions.importer) ? sassOptions.importer.slice() : [sassOptions.importer], loaderContext) : [];
+
+    // Regression on the `sass-embedded` side
+    if (loaderOptions.webpackImporter === false && sassOptions.importer.length === 0) {
+      sassOptions.importer = undefined;
+    }
     sassOptions.includePaths = [].concat(process.cwd()).concat(
     // We use `includePaths` in context for resolver, so it should be always absolute
     (sassOptions.includePaths ? sassOptions.includePaths.slice() : []).map(includePath => _path.default.isAbsolute(includePath) ? includePath : _path.default.join(process.cwd(), includePath))).concat(process.env.SASS_PATH ? process.env.SASS_PATH.split(process.platform === "win32" ? ";" : ":") : []);
diff --git a/node_modules/sass-loader/node_modules/.bin/sass b/node_modules/sass-loader/node_modules/.bin/sass
deleted file mode 100644
index eb879d8..0000000
--- a/node_modules/sass-loader/node_modules/.bin/sass
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="$basedir/C:/Users/Administrator/Documents/HBuilderProjects/cashier_weapp/node_modules/.store/sass@1.69.5/node_modules"
-else
-  export NODE_PATH="$NODE_PATH:$basedir/C:/Users/Administrator/Documents/HBuilderProjects/cashier_weapp/node_modules/.store/sass@1.69.5/node_modules"
-fi
-if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../../sass@1.69.5/node_modules/sass/sass.js" "$@"
-else
-  exec node  "$basedir/../../../../../sass@1.69.5/node_modules/sass/sass.js" "$@"
-fi
diff --git a/node_modules/sass-loader/node_modules/.bin/sass.CMD b/node_modules/sass-loader/node_modules/.bin/sass.CMD
deleted file mode 100644
index bf002ac..0000000
--- a/node_modules/sass-loader/node_modules/.bin/sass.CMD
+++ /dev/null
@@ -1,12 +0,0 @@
-@SETLOCAL
-@IF NOT DEFINED NODE_PATH (
-  @SET "NODE_PATH=%~dp0\C:\Users\Administrator\Documents\HBuilderProjects\cashier_weapp\node_modules\.store\sass@1.69.5\node_modules"
-) ELSE (
-  @SET "NODE_PATH=%NODE_PATH%;%~dp0\C:\Users\Administrator\Documents\HBuilderProjects\cashier_weapp\node_modules\.store\sass@1.69.5\node_modules"
-)
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\..\..\..\..\sass@1.69.5\node_modules\sass\sass.js" %*
-) ELSE (
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\..\..\..\..\sass@1.69.5\node_modules\sass\sass.js" %*
-)
diff --git a/node_modules/sass-loader/node_modules/.bin/sass.ps1 b/node_modules/sass-loader/node_modules/.bin/sass.ps1
deleted file mode 100644
index 9d3f10e..0000000
--- a/node_modules/sass-loader/node_modules/.bin/sass.ps1
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env pwsh
-$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
-
-$exe=""
-$pathsep=":"
-$env_node_path=$env:NODE_PATH
-$new_node_path="$basedir\C:\Users\Administrator\Documents\HBuilderProjects\cashier_weapp\node_modules\.store\sass@1.69.5\node_modules"
-if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
-  # Fix case when both the Windows and Linux builds of Node
-  # are installed in the same directory
-  $exe=".exe"
-  $pathsep=";"
-} else {
-  $new_node_path="$basedir/C:/Users/Administrator/Documents/HBuilderProjects/cashier_weapp/node_modules/.store/sass@1.69.5/node_modules"
-}
-if ([string]::IsNullOrEmpty($env_node_path)) {
-  $env:NODE_PATH=$new_node_path
-} else {
-  $env:NODE_PATH="$env_node_path$pathsep$new_node_path"
-}
-
-$ret=0
-if (Test-Path "$basedir/node$exe") {
-  # Support pipeline input
-  if ($MyInvocation.ExpectingInput) {
-    $input | & "$basedir/node$exe"  "$basedir/../../../../../sass@1.69.5/node_modules/sass/sass.js" $args
-  } else {
-    & "$basedir/node$exe"  "$basedir/../../../../../sass@1.69.5/node_modules/sass/sass.js" $args
-  }
-  $ret=$LASTEXITCODE
-} else {
-  # Support pipeline input
-  if ($MyInvocation.ExpectingInput) {
-    $input | & "node$exe"  "$basedir/../../../../../sass@1.69.5/node_modules/sass/sass.js" $args
-  } else {
-    & "node$exe"  "$basedir/../../../../../sass@1.69.5/node_modules/sass/sass.js" $args
-  }
-  $ret=$LASTEXITCODE
-}
-$env:NODE_PATH=$env_node_path
-exit $ret
diff --git a/node_modules/sass-loader/package.json b/node_modules/sass-loader/package.json
index 5eb1b85..6ba9ce1 100644
--- a/node_modules/sass-loader/package.json
+++ b/node_modules/sass-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sass-loader",
-  "version": "13.3.2",
+  "version": "13.3.3",
   "description": "Sass loader for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/sass-loader",
@@ -66,52 +66,48 @@
     "neo-async": "^2.6.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.21.5",
-    "@babel/core": "^7.21.5",
-    "@babel/preset-env": "^7.21.5",
-    "@commitlint/cli": "^17.6.1",
-    "@commitlint/config-conventional": "^17.6.1",
+    "@babel/cli": "^7.22.9",
+    "@babel/core": "^7.22.9",
+    "@babel/preset-env": "^7.22.9",
+    "@commitlint/cli": "^17.6.7",
+    "@commitlint/config-conventional": "^17.6.7",
     "@webpack-contrib/eslint-config-webpack": "^3.0.0",
-    "babel-jest": "^29.5.0",
+    "babel-jest": "^29.6.2",
     "bootstrap-sass": "^3.4.1",
     "bootstrap-v4": "npm:bootstrap@^4.5.3",
     "bootstrap-v5": "npm:bootstrap@^5.0.1",
     "cross-env": "^7.0.3",
-    "cspell": "^6.31.1",
-    "css-loader": "^6.7.3",
+    "cspell": "^6.31.2",
+    "css-loader": "^6.8.1",
     "del": "^6.1.1",
     "del-cli": "^4.0.1",
-    "enhanced-resolve": "^5.13.0",
-    "eslint": "^8.39.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-import": "^2.27.5",
-    "fibers": "^5.0.3",
+    "enhanced-resolve": "^5.15.0",
+    "eslint": "^8.46.0",
+    "eslint-config-prettier": "^8.9.0",
+    "eslint-plugin-import": "^2.28.0",
     "file-loader": "^6.2.0",
     "foundation-sites": "^6.7.5",
     "husky": "^8.0.3",
-    "jest": "^29.5.0",
-    "jest-environment-node-single-context": "^29.0.0",
-    "lint-staged": "^13.2.2",
+    "jest": "^29.6.2",
+    "jest-environment-node-single-context": "^29.1.0",
+    "lint-staged": "^13.2.3",
     "material-components-web": "^9.0.0",
     "memfs": "^3.5.1",
     "node-sass": "^8.0.0",
     "node-sass-glob-importer": "^5.3.2",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.8",
-    "sass": "^1.62.1",
-    "sass-embedded": "^1.62.0",
-    "semver": "^7.5.0",
+    "sass": "^1.64.2",
+    "sass-embedded": "^1.64.2",
+    "semver": "^7.5.4",
     "standard-version": "^9.3.1",
-    "style-loader": "^3.3.2",
-    "webpack": "^5.81.0"
+    "style-loader": "^3.3.3",
+    "webpack": "^5.88.2"
   },
   "keywords": [
     "sass",
     "libsass",
     "webpack",
     "loader"
-  ],
-  "__npminstall_done": true,
-  "_from": "sass-loader@13.3.2",
-  "_resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-13.3.2.tgz"
+  ]
 }
diff --git a/node_modules/sass/LICENSE b/node_modules/sass/LICENSE
index 33e1701..4ddaee7 100644
--- a/node_modules/sass/LICENSE
+++ b/node_modules/sass/LICENSE
@@ -87,6 +87,39 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+--------------------------------------------------------------------------------
+
+_macros and macros license:
+
+Copyright 2024, the Dart project authors.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
 --------------------------------------------------------------------------------
 
 analyzer, protobuf and protoc_plugin license:
@@ -615,6 +648,32 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+--------------------------------------------------------------------------------
+
+dart_mappable and type_plus license:
+
+MIT License
+
+Copyright (c) 2021 Kilian Schulte
+
+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 the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
 --------------------------------------------------------------------------------
 
 ffi and package_config license:
@@ -973,6 +1032,39 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+--------------------------------------------------------------------------------
+
+native_stack_traces license:
+
+Copyright 2020, the Dart project authors.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
 --------------------------------------------------------------------------------
 
 native_synchronization license:
@@ -1118,32 +1210,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
---------------------------------------------------------------------------------
-
-pointycastle license:
-
-
-Copyright (c) 2000 - 2019 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
-
-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
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
 --------------------------------------------------------------------------------
 
 pub_api_client license:
@@ -1570,6 +1636,71 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+--------------------------------------------------------------------------------
+
+web license:
+
+Copyright 2023, the Dart project authors.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+--------------------------------------------------------------------------------
+
+web_socket license:
+
+Copyright 2024, the Dart project authors. 
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
 --------------------------------------------------------------------------------
 
 yaml license:
diff --git a/node_modules/sass/package.json b/node_modules/sass/package.json
index dcca7ce..307d9fc 100644
--- a/node_modules/sass/package.json
+++ b/node_modules/sass/package.json
@@ -1,51 +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": ">=14.0.0"
-  },
-  "dependencies": {
-    "chokidar": ">=3.0.0 <4.0.0",
-    "immutable": "^4.0.0",
-    "source-map-js": ">=0.6.2 <2.0.0"
-  },
-  "keywords": [
-    "style",
-    "scss",
-    "sass",
-    "preprocessor",
-    "css"
-  ],
-  "types": "types/index.d.ts",
-  "exports": {
-    "types": "./types/index.d.ts",
-    "node": {
-      "require": "./sass.node.js",
-      "default": "./sass.node.mjs"
-    },
-    "default": {
-      "require": "./sass.default.cjs",
-      "default": "./sass.default.js"
-    }
-  },
-  "version": "1.69.5",
-  "bin": {
-    "sass": "sass.js"
-  },
-  "main": "sass.node.js",
-  "__npminstall_done": true,
-  "_from": "sass@1.69.5",
-  "_resolved": "https://registry.npmmirror.com/sass/-/sass-1.69.5.tgz"
-}
+{"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":">=14.0.0"},"dependencies":{"chokidar":">=3.0.0 <4.0.0","immutable":"^4.0.0","source-map-js":">=0.6.2 <2.0.0"},"keywords":["style","scss","sass","preprocessor","css"],"types":"types/index.d.ts","exports":{"types":"./types/index.d.ts","node":{"require":"./sass.node.js","default":"./sass.node.mjs"},"default":{"require":"./sass.default.cjs","default":"./sass.default.js"}},"version":"1.77.8","bin":{"sass":"sass.js"},"main":"sass.node.js"}
\ No newline at end of file
diff --git a/node_modules/sass/sass.dart.js b/node_modules/sass/sass.dart.js
index 48e8522..6e932c3 100644
--- a/node_modules/sass/sass.dart.js
+++ b/node_modules/sass/sass.dart.js
@@ -26,7 +26,8 @@ self.scheduleImmediate = typeof setImmediate !== "undefined"
 
 // CommonJS globals.
 if (typeof require !== "undefined") {
-  }
+  self.require = require;
+}
 self.exports = _cliPkgExportParam || _cliPkgExports;
 
 // Node.js specific exports, check to see if they exist & or polyfilled
@@ -125,9 +126,10 @@ self.immutable = _cliPkgRequires.immutable;
 self.chokidar = _cliPkgRequires.chokidar;
 self.readline = _cliPkgRequires.readline;
 self.fs = _cliPkgRequires.fs;
+self.nodeModule = _cliPkgRequires.nodeModule;
 self.stream = _cliPkgRequires.stream;
 self.util = _cliPkgRequires.util;
-// Generated by dart2js (NullSafetyMode.sound, trust primitives, omit checks, lax runtime type, csp, deferred-serialization, intern-composite-values), the Dart to JavaScript compiler version: 3.1.5.
+// Generated by dart2js (NullSafetyMode.sound, trust primitives, omit checks, lax runtime type, csp, intern-composite-values), the Dart to JavaScript compiler version: 3.4.4.
 // The code supports the following hooks:
 // dartPrint(message):
 //    if this function is defined it is called instead of the Dart [print]
@@ -146,6 +148,14 @@ self.util = _cliPkgRequires.util;
 //    this uri being loaded. The loadPriority argument is the priority the
 //    library should be loaded with as specified in the code via the
 //    load-priority annotation (0: normal, 1: high).
+// dartDeferredLibraryMultiLoader(uris, successCallback, errorCallback, loadId, loadPriority):
+//    if this function is defined, it will be called when a deferred library
+//    is loaded. It should load and eval the javascript of every URI in `uris`,
+//    and call successCallback. If it fails to do so, it should call
+//    errorCallback with an error. The loadId argument is the deferred import
+//    that resulted in this uri being loaded. The loadPriority argument is the
+//    priority the library should be loaded with as specified in the code via
+//    the load-priority annotation (0: normal, 1: high).
 //
 // dartCallInstrumentation(id, qualifiedName):
 //    if this function is defined, it will be called at each entry of a
@@ -163,8 +173,9 @@ self.util = _cliPkgRequires.util;
     var keys = Object.keys(from);
     for (var i = 0; i < keys.length; i++) {
       var key = keys[i];
-      if (!to.hasOwnProperty(key))
+      if (!to.hasOwnProperty(key)) {
         to[key] = from[key];
+      }
     }
   }
   function mixinPropertiesEasy(from, to) {
@@ -203,8 +214,9 @@ self.util = _cliPkgRequires.util;
     }
   }
   function inheritMany(sup, classes) {
-    for (var i = 0; i < classes.length; i++)
+    for (var i = 0; i < classes.length; i++) {
       inherit(classes[i], sup);
+    }
   }
   function mixinEasy(cls, mixin) {
     mixinPropertiesEasy(mixin.prototype, cls.prototype);
@@ -214,37 +226,13 @@ self.util = _cliPkgRequires.util;
     mixinPropertiesHard(mixin.prototype, cls.prototype);
     cls.prototype.constructor = cls;
   }
-  function lazyOld(holder, name, getterName, initializer) {
-    var uninitializedSentinel = holder;
-    holder[name] = uninitializedSentinel;
-    holder[getterName] = function() {
-      holder[getterName] = function() {
-        A.throwCyclicInit(name);
-      };
-      var result;
-      var sentinelInProgress = initializer;
-      try {
-        if (holder[name] === uninitializedSentinel) {
-          result = holder[name] = sentinelInProgress;
-          result = holder[name] = initializer();
-        } else
-          result = holder[name];
-      } finally {
-        if (result === sentinelInProgress)
-          holder[name] = null;
-        holder[getterName] = function() {
-          return this[name];
-        };
-      }
-      return result;
-    };
-  }
   function lazy(holder, name, getterName, initializer) {
     var uninitializedSentinel = holder;
     holder[name] = uninitializedSentinel;
     holder[getterName] = function() {
-      if (holder[name] === uninitializedSentinel)
+      if (holder[name] === uninitializedSentinel) {
         holder[name] = initializer();
+      }
       holder[getterName] = function() {
         return this[name];
       };
@@ -257,8 +245,9 @@ self.util = _cliPkgRequires.util;
     holder[getterName] = function() {
       if (holder[name] === uninitializedSentinel) {
         var value = initializer();
-        if (holder[name] !== uninitializedSentinel)
+        if (holder[name] !== uninitializedSentinel) {
           A.throwLateFieldADI(name);
+        }
         holder[name] = value;
       }
       var finalValue = holder[name];
@@ -281,8 +270,9 @@ self.util = _cliPkgRequires.util;
     return properties;
   }
   function convertAllToFastObject(arrayOfObjects) {
-    for (var i = 0; i < arrayOfObjects.length; ++i)
+    for (var i = 0; i < arrayOfObjects.length; ++i) {
       convertToFastObject(arrayOfObjects[i]);
+    }
   }
   var functionCounter = 0;
   function instanceTearOffGetter(isIntercepted, parameters) {
@@ -307,8 +297,9 @@ self.util = _cliPkgRequires.util;
   }
   var typesOffset = 0;
   function tearOffParameters(container, isStatic, isIntercepted, requiredParameterCount, optionalParameterDefaultValues, callNames, funsOrNames, funType, applyIndex, needsDirectAccess) {
-    if (typeof funType == "number")
+    if (typeof funType == "number") {
       funType += typesOffset;
+    }
     return {co: container, iS: isStatic, iI: isIntercepted, rC: requiredParameterCount, dV: optionalParameterDefaultValues, cs: callNames, fs: funsOrNames, fT: funType, aI: applyIndex || 0, nDA: needsDirectAccess};
   }
   function installStaticTearOff(holder, getterName, requiredParameterCount, optionalParameterDefaultValues, callNames, funsOrNames, funType, applyIndex) {
@@ -359,13 +350,919 @@ self.util = _cliPkgRequires.util;
           return installStaticTearOff(container, getterName, requiredParameterCount, optionalParameterDefaultValues, callNames, [name], funType, applyIndex);
         };
       };
-    return {inherit: inherit, inheritMany: inheritMany, mixin: mixinEasy, mixinHard: mixinHard, installStaticTearOff: installStaticTearOff, installInstanceTearOff: installInstanceTearOff, _instance_0u: mkInstance(0, 0, null, ["call$0"], 0), _instance_1u: mkInstance(0, 1, null, ["call$1"], 0), _instance_2u: mkInstance(0, 2, null, ["call$2"], 0), _instance_0i: mkInstance(1, 0, null, ["call$0"], 0), _instance_1i: mkInstance(1, 1, null, ["call$1"], 0), _instance_2i: mkInstance(1, 2, null, ["call$2"], 0), _static_0: mkStatic(0, null, ["call$0"], 0), _static_1: mkStatic(1, null, ["call$1"], 0), _static_2: mkStatic(2, null, ["call$2"], 0), makeConstList: makeConstList, lazy: lazy, lazyFinal: lazyFinal, lazyOld: lazyOld, updateHolder: updateHolder, convertToFastObject: convertToFastObject, updateTypes: updateTypes, setOrUpdateInterceptorsByTag: setOrUpdateInterceptorsByTag, setOrUpdateLeafTags: setOrUpdateLeafTags};
+    return {inherit: inherit, inheritMany: inheritMany, mixin: mixinEasy, mixinHard: mixinHard, installStaticTearOff: installStaticTearOff, installInstanceTearOff: installInstanceTearOff, _instance_0u: mkInstance(0, 0, null, ["call$0"], 0), _instance_1u: mkInstance(0, 1, null, ["call$1"], 0), _instance_2u: mkInstance(0, 2, null, ["call$2"], 0), _instance_0i: mkInstance(1, 0, null, ["call$0"], 0), _instance_1i: mkInstance(1, 1, null, ["call$1"], 0), _instance_2i: mkInstance(1, 2, null, ["call$2"], 0), _static_0: mkStatic(0, null, ["call$0"], 0), _static_1: mkStatic(1, null, ["call$1"], 0), _static_2: mkStatic(2, null, ["call$2"], 0), makeConstList: makeConstList, lazy: lazy, lazyFinal: lazyFinal, updateHolder: updateHolder, convertToFastObject: convertToFastObject, updateTypes: updateTypes, setOrUpdateInterceptorsByTag: setOrUpdateInterceptorsByTag, setOrUpdateLeafTags: setOrUpdateLeafTags};
   }();
   function initializeDeferredHunk(hunk) {
     typesOffset = init.types.length;
     hunk(hunkHelpers, init, holders, $);
   }
-  var A = {JS_CONST: function JS_CONST() {
+  var J = {
+    makeDispatchRecord(interceptor, proto, extension, indexability) {
+      return {i: interceptor, p: proto, e: extension, x: indexability};
+    },
+    getNativeInterceptor(object) {
+      var proto, objectProto, $constructor, interceptor, t1,
+        record = object[init.dispatchPropertyName];
+      if (record == null)
+        if ($.initNativeDispatchFlag == null) {
+          A.initNativeDispatch();
+          record = object[init.dispatchPropertyName];
+        }
+      if (record != null) {
+        proto = record.p;
+        if (false === proto)
+          return record.i;
+        if (true === proto)
+          return object;
+        objectProto = Object.getPrototypeOf(object);
+        if (proto === objectProto)
+          return record.i;
+        if (record.e === objectProto)
+          throw A.wrapException(A.UnimplementedError$("Return interceptor for " + A.S(proto(object, record))));
+      }
+      $constructor = object.constructor;
+      if ($constructor == null)
+        interceptor = null;
+      else {
+        t1 = $._JS_INTEROP_INTERCEPTOR_TAG;
+        if (t1 == null)
+          t1 = $._JS_INTEROP_INTERCEPTOR_TAG = init.getIsolateTag("_$dart_js");
+        interceptor = $constructor[t1];
+      }
+      if (interceptor != null)
+        return interceptor;
+      interceptor = A.lookupAndCacheInterceptor(object);
+      if (interceptor != null)
+        return interceptor;
+      if (typeof object == "function")
+        return B.JavaScriptFunction_methods;
+      proto = Object.getPrototypeOf(object);
+      if (proto == null)
+        return B.PlainJavaScriptObject_methods;
+      if (proto === Object.prototype)
+        return B.PlainJavaScriptObject_methods;
+      if (typeof $constructor == "function") {
+        t1 = $._JS_INTEROP_INTERCEPTOR_TAG;
+        if (t1 == null)
+          t1 = $._JS_INTEROP_INTERCEPTOR_TAG = init.getIsolateTag("_$dart_js");
+        Object.defineProperty($constructor, t1, {value: B.UnknownJavaScriptObject_methods, enumerable: false, writable: true, configurable: true});
+        return B.UnknownJavaScriptObject_methods;
+      }
+      return B.UnknownJavaScriptObject_methods;
+    },
+    JSArray_JSArray$fixed($length, $E) {
+      if ($length < 0 || $length > 4294967295)
+        throw A.wrapException(A.RangeError$range($length, 0, 4294967295, "length", null));
+      return J.JSArray_JSArray$markFixed(new Array($length), $E);
+    },
+    JSArray_JSArray$allocateFixed($length, $E) {
+      if ($length > 4294967295)
+        throw A.wrapException(A.RangeError$range($length, 0, 4294967295, "length", null));
+      return J.JSArray_JSArray$markFixed(new Array($length), $E);
+    },
+    JSArray_JSArray$growable($length, $E) {
+      if ($length < 0)
+        throw A.wrapException(A.ArgumentError$("Length must be a non-negative integer: " + $length, null));
+      return A._setArrayType(new Array($length), $E._eval$1("JSArray<0>"));
+    },
+    JSArray_JSArray$allocateGrowable($length, $E) {
+      if ($length < 0)
+        throw A.wrapException(A.ArgumentError$("Length must be a non-negative integer: " + $length, null));
+      return A._setArrayType(new Array($length), $E._eval$1("JSArray<0>"));
+    },
+    JSArray_JSArray$markFixed(allocation, $E) {
+      return J.JSArray_markFixedList(A._setArrayType(allocation, $E._eval$1("JSArray<0>")));
+    },
+    JSArray_markFixedList(list) {
+      list.fixed$length = Array;
+      return list;
+    },
+    JSArray_markUnmodifiableList(list) {
+      list.fixed$length = Array;
+      list.immutable$list = Array;
+      return list;
+    },
+    JSArray__compareAny(a, b) {
+      return J.compareTo$1$ns(a, b);
+    },
+    JSString__isWhitespace(codeUnit) {
+      if (codeUnit < 256)
+        switch (codeUnit) {
+          case 9:
+          case 10:
+          case 11:
+          case 12:
+          case 13:
+          case 32:
+          case 133:
+          case 160:
+            return true;
+          default:
+            return false;
+        }
+      switch (codeUnit) {
+        case 5760:
+        case 8192:
+        case 8193:
+        case 8194:
+        case 8195:
+        case 8196:
+        case 8197:
+        case 8198:
+        case 8199:
+        case 8200:
+        case 8201:
+        case 8202:
+        case 8232:
+        case 8233:
+        case 8239:
+        case 8287:
+        case 12288:
+        case 65279:
+          return true;
+        default:
+          return false;
+      }
+    },
+    JSString__skipLeadingWhitespace(string, index) {
+      var t1, codeUnit;
+      for (t1 = string.length; index < t1;) {
+        codeUnit = string.charCodeAt(index);
+        if (codeUnit !== 32 && codeUnit !== 13 && !J.JSString__isWhitespace(codeUnit))
+          break;
+        ++index;
+      }
+      return index;
+    },
+    JSString__skipTrailingWhitespace(string, index) {
+      var index0, codeUnit;
+      for (; index > 0; index = index0) {
+        index0 = index - 1;
+        codeUnit = string.charCodeAt(index0);
+        if (codeUnit !== 32 && codeUnit !== 13 && !J.JSString__isWhitespace(codeUnit))
+          break;
+      }
+      return index;
+    },
+    getInterceptor$(receiver) {
+      if (typeof receiver == "number") {
+        if (Math.floor(receiver) == receiver)
+          return J.JSInt.prototype;
+        return J.JSNumNotInt.prototype;
+      }
+      if (typeof receiver == "string")
+        return J.JSString.prototype;
+      if (receiver == null)
+        return J.JSNull.prototype;
+      if (typeof receiver == "boolean")
+        return J.JSBool.prototype;
+      if (Array.isArray(receiver))
+        return J.JSArray.prototype;
+      if (typeof receiver != "object") {
+        if (typeof receiver == "function")
+          return J.JavaScriptFunction.prototype;
+        if (typeof receiver == "symbol")
+          return J.JavaScriptSymbol.prototype;
+        if (typeof receiver == "bigint")
+          return J.JavaScriptBigInt.prototype;
+        return receiver;
+      }
+      if (receiver instanceof A.Object)
+        return receiver;
+      return J.getNativeInterceptor(receiver);
+    },
+    getInterceptor$ansx(receiver) {
+      if (typeof receiver == "number")
+        return J.JSNumber.prototype;
+      if (typeof receiver == "string")
+        return J.JSString.prototype;
+      if (receiver == null)
+        return receiver;
+      if (Array.isArray(receiver))
+        return J.JSArray.prototype;
+      if (typeof receiver != "object") {
+        if (typeof receiver == "function")
+          return J.JavaScriptFunction.prototype;
+        if (typeof receiver == "symbol")
+          return J.JavaScriptSymbol.prototype;
+        if (typeof receiver == "bigint")
+          return J.JavaScriptBigInt.prototype;
+        return receiver;
+      }
+      if (receiver instanceof A.Object)
+        return receiver;
+      return J.getNativeInterceptor(receiver);
+    },
+    getInterceptor$asx(receiver) {
+      if (typeof receiver == "string")
+        return J.JSString.prototype;
+      if (receiver == null)
+        return receiver;
+      if (Array.isArray(receiver))
+        return J.JSArray.prototype;
+      if (typeof receiver != "object") {
+        if (typeof receiver == "function")
+          return J.JavaScriptFunction.prototype;
+        if (typeof receiver == "symbol")
+          return J.JavaScriptSymbol.prototype;
+        if (typeof receiver == "bigint")
+          return J.JavaScriptBigInt.prototype;
+        return receiver;
+      }
+      if (receiver instanceof A.Object)
+        return receiver;
+      return J.getNativeInterceptor(receiver);
+    },
+    getInterceptor$ax(receiver) {
+      if (receiver == null)
+        return receiver;
+      if (Array.isArray(receiver))
+        return J.JSArray.prototype;
+      if (typeof receiver != "object") {
+        if (typeof receiver == "function")
+          return J.JavaScriptFunction.prototype;
+        if (typeof receiver == "symbol")
+          return J.JavaScriptSymbol.prototype;
+        if (typeof receiver == "bigint")
+          return J.JavaScriptBigInt.prototype;
+        return receiver;
+      }
+      if (receiver instanceof A.Object)
+        return receiver;
+      return J.getNativeInterceptor(receiver);
+    },
+    getInterceptor$in(receiver) {
+      if (typeof receiver == "number") {
+        if (Math.floor(receiver) == receiver)
+          return J.JSInt.prototype;
+        return J.JSNumNotInt.prototype;
+      }
+      if (receiver == null)
+        return receiver;
+      if (!(receiver instanceof A.Object))
+        return J.UnknownJavaScriptObject.prototype;
+      return receiver;
+    },
+    getInterceptor$n(receiver) {
+      if (typeof receiver == "number")
+        return J.JSNumber.prototype;
+      if (receiver == null)
+        return receiver;
+      if (!(receiver instanceof A.Object))
+        return J.UnknownJavaScriptObject.prototype;
+      return receiver;
+    },
+    getInterceptor$ns(receiver) {
+      if (typeof receiver == "number")
+        return J.JSNumber.prototype;
+      if (typeof receiver == "string")
+        return J.JSString.prototype;
+      if (receiver == null)
+        return receiver;
+      if (!(receiver instanceof A.Object))
+        return J.UnknownJavaScriptObject.prototype;
+      return receiver;
+    },
+    getInterceptor$s(receiver) {
+      if (typeof receiver == "string")
+        return J.JSString.prototype;
+      if (receiver == null)
+        return receiver;
+      if (!(receiver instanceof A.Object))
+        return J.UnknownJavaScriptObject.prototype;
+      return receiver;
+    },
+    getInterceptor$x(receiver) {
+      if (receiver == null)
+        return receiver;
+      if (typeof receiver != "object") {
+        if (typeof receiver == "function")
+          return J.JavaScriptFunction.prototype;
+        if (typeof receiver == "symbol")
+          return J.JavaScriptSymbol.prototype;
+        if (typeof receiver == "bigint")
+          return J.JavaScriptBigInt.prototype;
+        return receiver;
+      }
+      if (receiver instanceof A.Object)
+        return receiver;
+      return J.getNativeInterceptor(receiver);
+    },
+    getInterceptor$z(receiver) {
+      if (receiver == null)
+        return receiver;
+      if (!(receiver instanceof A.Object))
+        return J.UnknownJavaScriptObject.prototype;
+      return receiver;
+    },
+    set$AsyncCompiler$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$AsyncCompiler(receiver, value);
+    },
+    set$CalculationInterpolation$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$CalculationInterpolation(receiver, value);
+    },
+    set$CalculationOperation$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$CalculationOperation(receiver, value);
+    },
+    set$Compiler$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$Compiler(receiver, value);
+    },
+    set$Exception$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$Exception(receiver, value);
+    },
+    set$FALSE$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$FALSE(receiver, value);
+    },
+    set$Logger$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$Logger(receiver, value);
+    },
+    set$NULL$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$NULL(receiver, value);
+    },
+    set$NodePackageImporter$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$NodePackageImporter(receiver, value);
+    },
+    set$SassArgumentList$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$SassArgumentList(receiver, value);
+    },
+    set$SassBoolean$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$SassBoolean(receiver, value);
+    },
+    set$SassCalculation$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$SassCalculation(receiver, value);
+    },
+    set$SassColor$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$SassColor(receiver, value);
+    },
+    set$SassFunction$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$SassFunction(receiver, value);
+    },
+    set$SassList$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$SassList(receiver, value);
+    },
+    set$SassMap$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$SassMap(receiver, value);
+    },
+    set$SassMixin$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$SassMixin(receiver, value);
+    },
+    set$SassNumber$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$SassNumber(receiver, value);
+    },
+    set$SassString$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$SassString(receiver, value);
+    },
+    set$TRUE$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$TRUE(receiver, value);
+    },
+    set$Value$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$Value(receiver, value);
+    },
+    set$Version$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$Version(receiver, value);
+    },
+    set$cli_pkg_main_0_$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$cli_pkg_main_0_(receiver, value);
+    },
+    set$compile$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$compile(receiver, value);
+    },
+    set$compileAsync$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$compileAsync(receiver, value);
+    },
+    set$compileString$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$compileString(receiver, value);
+    },
+    set$compileStringAsync$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$compileStringAsync(receiver, value);
+    },
+    set$context$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$context(receiver, value);
+    },
+    set$dartValue$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$dartValue(receiver, value);
+    },
+    set$deprecations$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$deprecations(receiver, value);
+    },
+    set$exitCode$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$exitCode(receiver, value);
+    },
+    set$info$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$info(receiver, value);
+    },
+    set$initAsyncCompiler$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$initAsyncCompiler(receiver, value);
+    },
+    set$initCompiler$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$initCompiler(receiver, value);
+    },
+    set$length$asx(receiver, value) {
+      return J.getInterceptor$asx(receiver).set$length(receiver, value);
+    },
+    set$render$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$render(receiver, value);
+    },
+    set$renderSync$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$renderSync(receiver, value);
+    },
+    set$sassFalse$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$sassFalse(receiver, value);
+    },
+    set$sassNull$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$sassNull(receiver, value);
+    },
+    set$sassTrue$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$sassTrue(receiver, value);
+    },
+    set$types$x(receiver, value) {
+      return J.getInterceptor$x(receiver).set$types(receiver, value);
+    },
+    get$$prototype$x(receiver) {
+      return J.getInterceptor$x(receiver).get$$prototype(receiver);
+    },
+    get$_dartException$x(receiver) {
+      return J.getInterceptor$x(receiver).get$_dartException(receiver);
+    },
+    get$alertAscii$x(receiver) {
+      return J.getInterceptor$x(receiver).get$alertAscii(receiver);
+    },
+    get$alertColor$x(receiver) {
+      return J.getInterceptor$x(receiver).get$alertColor(receiver);
+    },
+    get$argv$x(receiver) {
+      return J.getInterceptor$x(receiver).get$argv(receiver);
+    },
+    get$blue$x(receiver) {
+      return J.getInterceptor$x(receiver).get$blue(receiver);
+    },
+    get$brackets$x(receiver) {
+      return J.getInterceptor$x(receiver).get$brackets(receiver);
+    },
+    get$charset$x(receiver) {
+      return J.getInterceptor$x(receiver).get$charset(receiver);
+    },
+    get$code$x(receiver) {
+      return J.getInterceptor$x(receiver).get$code(receiver);
+    },
+    get$current$x(receiver) {
+      return J.getInterceptor$x(receiver).get$current(receiver);
+    },
+    get$dartValue$x(receiver) {
+      return J.getInterceptor$x(receiver).get$dartValue(receiver);
+    },
+    get$debug$x(receiver) {
+      return J.getInterceptor$x(receiver).get$debug(receiver);
+    },
+    get$denominatorUnits$x(receiver) {
+      return J.getInterceptor$x(receiver).get$denominatorUnits(receiver);
+    },
+    get$end$z(receiver) {
+      return J.getInterceptor$z(receiver).get$end(receiver);
+    },
+    get$env$x(receiver) {
+      return J.getInterceptor$x(receiver).get$env(receiver);
+    },
+    get$exitCode$x(receiver) {
+      return J.getInterceptor$x(receiver).get$exitCode(receiver);
+    },
+    get$fatalDeprecations$x(receiver) {
+      return J.getInterceptor$x(receiver).get$fatalDeprecations(receiver);
+    },
+    get$fiber$x(receiver) {
+      return J.getInterceptor$x(receiver).get$fiber(receiver);
+    },
+    get$file$x(receiver) {
+      return J.getInterceptor$x(receiver).get$file(receiver);
+    },
+    get$filename$x(receiver) {
+      return J.getInterceptor$x(receiver).get$filename(receiver);
+    },
+    get$first$ax(receiver) {
+      return J.getInterceptor$ax(receiver).get$first(receiver);
+    },
+    get$functions$x(receiver) {
+      return J.getInterceptor$x(receiver).get$functions(receiver);
+    },
+    get$futureDeprecations$x(receiver) {
+      return J.getInterceptor$x(receiver).get$futureDeprecations(receiver);
+    },
+    get$green$x(receiver) {
+      return J.getInterceptor$x(receiver).get$green(receiver);
+    },
+    get$hashCode$(receiver) {
+      return J.getInterceptor$(receiver).get$hashCode(receiver);
+    },
+    get$id$x(receiver) {
+      return J.getInterceptor$x(receiver).get$id(receiver);
+    },
+    get$importer$x(receiver) {
+      return J.getInterceptor$x(receiver).get$importer(receiver);
+    },
+    get$importers$x(receiver) {
+      return J.getInterceptor$x(receiver).get$importers(receiver);
+    },
+    get$isEmpty$asx(receiver) {
+      return J.getInterceptor$asx(receiver).get$isEmpty(receiver);
+    },
+    get$isNotEmpty$asx(receiver) {
+      return J.getInterceptor$asx(receiver).get$isNotEmpty(receiver);
+    },
+    get$isTTY$x(receiver) {
+      return J.getInterceptor$x(receiver).get$isTTY(receiver);
+    },
+    get$iterator$ax(receiver) {
+      return J.getInterceptor$ax(receiver).get$iterator(receiver);
+    },
+    get$keys$z(receiver) {
+      return J.getInterceptor$z(receiver).get$keys(receiver);
+    },
+    get$last$ax(receiver) {
+      return J.getInterceptor$ax(receiver).get$last(receiver);
+    },
+    get$length$asx(receiver) {
+      return J.getInterceptor$asx(receiver).get$length(receiver);
+    },
+    get$loadPaths$x(receiver) {
+      return J.getInterceptor$x(receiver).get$loadPaths(receiver);
+    },
+    get$logger$x(receiver) {
+      return J.getInterceptor$x(receiver).get$logger(receiver);
+    },
+    get$message$x(receiver) {
+      return J.getInterceptor$x(receiver).get$message(receiver);
+    },
+    get$mtime$x(receiver) {
+      return J.getInterceptor$x(receiver).get$mtime(receiver);
+    },
+    get$name$x(receiver) {
+      return J.getInterceptor$x(receiver).get$name(receiver);
+    },
+    get$numeratorUnits$x(receiver) {
+      return J.getInterceptor$x(receiver).get$numeratorUnits(receiver);
+    },
+    get$options$x(receiver) {
+      return J.getInterceptor$x(receiver).get$options(receiver);
+    },
+    get$parent$z(receiver) {
+      return J.getInterceptor$z(receiver).get$parent(receiver);
+    },
+    get$path$x(receiver) {
+      return J.getInterceptor$x(receiver).get$path(receiver);
+    },
+    get$platform$x(receiver) {
+      return J.getInterceptor$x(receiver).get$platform(receiver);
+    },
+    get$quietDeps$x(receiver) {
+      return J.getInterceptor$x(receiver).get$quietDeps(receiver);
+    },
+    get$quotes$x(receiver) {
+      return J.getInterceptor$x(receiver).get$quotes(receiver);
+    },
+    get$red$x(receiver) {
+      return J.getInterceptor$x(receiver).get$red(receiver);
+    },
+    get$release$x(receiver) {
+      return J.getInterceptor$x(receiver).get$release(receiver);
+    },
+    get$reversed$ax(receiver) {
+      return J.getInterceptor$ax(receiver).get$reversed(receiver);
+    },
+    get$runtimeType$(receiver) {
+      return J.getInterceptor$(receiver).get$runtimeType(receiver);
+    },
+    get$separator$x(receiver) {
+      return J.getInterceptor$x(receiver).get$separator(receiver);
+    },
+    get$sign$in(receiver) {
+      if (typeof receiver === "number")
+        return receiver > 0 ? 1 : receiver < 0 ? -1 : receiver;
+      return J.getInterceptor$in(receiver).get$sign(receiver);
+    },
+    get$silenceDeprecations$x(receiver) {
+      return J.getInterceptor$x(receiver).get$silenceDeprecations(receiver);
+    },
+    get$single$ax(receiver) {
+      return J.getInterceptor$ax(receiver).get$single(receiver);
+    },
+    get$sourceMap$x(receiver) {
+      return J.getInterceptor$x(receiver).get$sourceMap(receiver);
+    },
+    get$sourceMapIncludeSources$x(receiver) {
+      return J.getInterceptor$x(receiver).get$sourceMapIncludeSources(receiver);
+    },
+    get$span$z(receiver) {
+      return J.getInterceptor$z(receiver).get$span(receiver);
+    },
+    get$stderr$x(receiver) {
+      return J.getInterceptor$x(receiver).get$stderr(receiver);
+    },
+    get$stdout$x(receiver) {
+      return J.getInterceptor$x(receiver).get$stdout(receiver);
+    },
+    get$style$x(receiver) {
+      return J.getInterceptor$x(receiver).get$style(receiver);
+    },
+    get$syntax$x(receiver) {
+      return J.getInterceptor$x(receiver).get$syntax(receiver);
+    },
+    get$trace$z(receiver) {
+      return J.getInterceptor$z(receiver).get$trace(receiver);
+    },
+    get$url$x(receiver) {
+      return J.getInterceptor$x(receiver).get$url(receiver);
+    },
+    get$verbose$x(receiver) {
+      return J.getInterceptor$x(receiver).get$verbose(receiver);
+    },
+    get$warn$x(receiver) {
+      return J.getInterceptor$x(receiver).get$warn(receiver);
+    },
+    $add$ansx(receiver, a0) {
+      if (typeof receiver == "number" && typeof a0 == "number")
+        return receiver + a0;
+      return J.getInterceptor$ansx(receiver).$add(receiver, a0);
+    },
+    $eq$(receiver, a0) {
+      if (receiver == null)
+        return a0 == null;
+      if (typeof receiver != "object")
+        return a0 != null && receiver === a0;
+      return J.getInterceptor$(receiver).$eq(receiver, a0);
+    },
+    $index$asx(receiver, a0) {
+      if (typeof a0 === "number")
+        if (Array.isArray(receiver) || typeof receiver == "string" || A.isJsIndexable(receiver, receiver[init.dispatchPropertyName]))
+          if (a0 >>> 0 === a0 && a0 < receiver.length)
+            return receiver[a0];
+      return J.getInterceptor$asx(receiver).$index(receiver, a0);
+    },
+    $indexSet$ax(receiver, a0, a1) {
+      if (typeof a0 === "number")
+        if ((Array.isArray(receiver) || A.isJsIndexable(receiver, receiver[init.dispatchPropertyName])) && !receiver.immutable$list && a0 >>> 0 === a0 && a0 < receiver.length)
+          return receiver[a0] = a1;
+      return J.getInterceptor$ax(receiver).$indexSet(receiver, a0, a1);
+    },
+    $set$2$x(receiver, a0, a1) {
+      return J.getInterceptor$x(receiver).$set$2(receiver, a0, a1);
+    },
+    add$1$ax(receiver, a0) {
+      return J.getInterceptor$ax(receiver).add$1(receiver, a0);
+    },
+    addAll$1$ax(receiver, a0) {
+      return J.getInterceptor$ax(receiver).addAll$1(receiver, a0);
+    },
+    allMatches$1$s(receiver, a0) {
+      return J.getInterceptor$s(receiver).allMatches$1(receiver, a0);
+    },
+    allMatches$2$s(receiver, a0, a1) {
+      return J.getInterceptor$s(receiver).allMatches$2(receiver, a0, a1);
+    },
+    any$1$ax(receiver, a0) {
+      return J.getInterceptor$ax(receiver).any$1(receiver, a0);
+    },
+    apply$2$x(receiver, a0, a1) {
+      return J.getInterceptor$x(receiver).apply$2(receiver, a0, a1);
+    },
+    asImmutable$0$x(receiver) {
+      return J.getInterceptor$x(receiver).asImmutable$0(receiver);
+    },
+    asMutable$0$x(receiver) {
+      return J.getInterceptor$x(receiver).asMutable$0(receiver);
+    },
+    canonicalize$4$baseImporter$baseUrl$forImport$x(receiver, a0, a1, a2, a3) {
+      return J.getInterceptor$x(receiver).canonicalize$4$baseImporter$baseUrl$forImport(receiver, a0, a1, a2, a3);
+    },
+    cast$1$0$ax(receiver, $T1) {
+      return J.getInterceptor$ax(receiver).cast$1$0(receiver, $T1);
+    },
+    close$0$x(receiver) {
+      return J.getInterceptor$x(receiver).close$0(receiver);
+    },
+    codeUnitAt$1$s(receiver, a0) {
+      return J.getInterceptor$s(receiver).codeUnitAt$1(receiver, a0);
+    },
+    compareTo$1$ns(receiver, a0) {
+      return J.getInterceptor$ns(receiver).compareTo$1(receiver, a0);
+    },
+    contains$1$asx(receiver, a0) {
+      return J.getInterceptor$asx(receiver).contains$1(receiver, a0);
+    },
+    createInterface$1$x(receiver, a0) {
+      return J.getInterceptor$x(receiver).createInterface$1(receiver, a0);
+    },
+    createRequire$1$x(receiver, a0) {
+      return J.getInterceptor$x(receiver).createRequire$1(receiver, a0);
+    },
+    elementAt$1$ax(receiver, a0) {
+      return J.getInterceptor$ax(receiver).elementAt$1(receiver, a0);
+    },
+    endsWith$1$s(receiver, a0) {
+      return J.getInterceptor$s(receiver).endsWith$1(receiver, a0);
+    },
+    error$1$x(receiver, a0) {
+      return J.getInterceptor$x(receiver).error$1(receiver, a0);
+    },
+    every$1$ax(receiver, a0) {
+      return J.getInterceptor$ax(receiver).every$1(receiver, a0);
+    },
+    existsSync$1$x(receiver, a0) {
+      return J.getInterceptor$x(receiver).existsSync$1(receiver, a0);
+    },
+    expand$1$1$ax(receiver, a0, $T1) {
+      return J.getInterceptor$ax(receiver).expand$1$1(receiver, a0, $T1);
+    },
+    fillRange$3$ax(receiver, a0, a1, a2) {
+      return J.getInterceptor$ax(receiver).fillRange$3(receiver, a0, a1, a2);
+    },
+    fold$2$ax(receiver, a0, a1) {
+      return J.getInterceptor$ax(receiver).fold$2(receiver, a0, a1);
+    },
+    forEach$1$ax(receiver, a0) {
+      return J.getInterceptor$ax(receiver).forEach$1(receiver, a0);
+    },
+    getRange$2$ax(receiver, a0, a1) {
+      return J.getInterceptor$ax(receiver).getRange$2(receiver, a0, a1);
+    },
+    getTime$0$x(receiver) {
+      return J.getInterceptor$x(receiver).getTime$0(receiver);
+    },
+    isDirectory$0$x(receiver) {
+      return J.getInterceptor$x(receiver).isDirectory$0(receiver);
+    },
+    isFile$0$x(receiver) {
+      return J.getInterceptor$x(receiver).isFile$0(receiver);
+    },
+    join$1$ax(receiver, a0) {
+      return J.getInterceptor$ax(receiver).join$1(receiver, a0);
+    },
+    listen$1$z(receiver, a0) {
+      return J.getInterceptor$z(receiver).listen$1(receiver, a0);
+    },
+    log$1$x(receiver, a0) {
+      return J.getInterceptor$x(receiver).log$1(receiver, a0);
+    },
+    map$1$1$ax(receiver, a0, $T1) {
+      return J.getInterceptor$ax(receiver).map$1$1(receiver, a0, $T1);
+    },
+    matchAsPrefix$2$s(receiver, a0, a1) {
+      return J.getInterceptor$s(receiver).matchAsPrefix$2(receiver, a0, a1);
+    },
+    mkdirSync$1$x(receiver, a0) {
+      return J.getInterceptor$x(receiver).mkdirSync$1(receiver, a0);
+    },
+    noSuchMethod$1$(receiver, a0) {
+      return J.getInterceptor$(receiver).noSuchMethod$1(receiver, a0);
+    },
+    on$2$x(receiver, a0, a1) {
+      return J.getInterceptor$x(receiver).on$2(receiver, a0, a1);
+    },
+    readFileSync$2$x(receiver, a0, a1) {
+      return J.getInterceptor$x(receiver).readFileSync$2(receiver, a0, a1);
+    },
+    readdirSync$1$x(receiver, a0) {
+      return J.getInterceptor$x(receiver).readdirSync$1(receiver, a0);
+    },
+    remove$1$z(receiver, a0) {
+      return J.getInterceptor$z(receiver).remove$1(receiver, a0);
+    },
+    removeRange$2$ax(receiver, a0, a1) {
+      return J.getInterceptor$ax(receiver).removeRange$2(receiver, a0, a1);
+    },
+    replaceFirst$2$s(receiver, a0, a1) {
+      return J.getInterceptor$s(receiver).replaceFirst$2(receiver, a0, a1);
+    },
+    resolve$1$x(receiver, a0) {
+      return J.getInterceptor$x(receiver).resolve$1(receiver, a0);
+    },
+    run$0$x(receiver) {
+      return J.getInterceptor$x(receiver).run$0(receiver);
+    },
+    run$1$x(receiver, a0) {
+      return J.getInterceptor$x(receiver).run$1(receiver, a0);
+    },
+    setRange$4$ax(receiver, a0, a1, a2, a3) {
+      return J.getInterceptor$ax(receiver).setRange$4(receiver, a0, a1, a2, a3);
+    },
+    skip$1$ax(receiver, a0) {
+      return J.getInterceptor$ax(receiver).skip$1(receiver, a0);
+    },
+    sort$1$ax(receiver, a0) {
+      return J.getInterceptor$ax(receiver).sort$1(receiver, a0);
+    },
+    startsWith$1$s(receiver, a0) {
+      return J.getInterceptor$s(receiver).startsWith$1(receiver, a0);
+    },
+    statSync$1$x(receiver, a0) {
+      return J.getInterceptor$x(receiver).statSync$1(receiver, a0);
+    },
+    sublist$1$ax(receiver, a0) {
+      return J.getInterceptor$ax(receiver).sublist$1(receiver, a0);
+    },
+    substring$1$s(receiver, a0) {
+      return J.getInterceptor$s(receiver).substring$1(receiver, a0);
+    },
+    substring$2$s(receiver, a0, a1) {
+      return J.getInterceptor$s(receiver).substring$2(receiver, a0, a1);
+    },
+    take$1$ax(receiver, a0) {
+      return J.getInterceptor$ax(receiver).take$1(receiver, a0);
+    },
+    then$1$1$x(receiver, a0, $T1) {
+      return J.getInterceptor$x(receiver).then$1$1(receiver, a0, $T1);
+    },
+    then$1$2$onError$x(receiver, a0, a1, $T1) {
+      return J.getInterceptor$x(receiver).then$1$2$onError(receiver, a0, a1, $T1);
+    },
+    then$2$x(receiver, a0, a1) {
+      return J.getInterceptor$x(receiver).then$2(receiver, a0, a1);
+    },
+    toArray$0$x(receiver) {
+      return J.getInterceptor$x(receiver).toArray$0(receiver);
+    },
+    toList$0$ax(receiver) {
+      return J.getInterceptor$ax(receiver).toList$0(receiver);
+    },
+    toList$1$growable$ax(receiver, a0) {
+      return J.getInterceptor$ax(receiver).toList$1$growable(receiver, a0);
+    },
+    toRadixString$1$n(receiver, a0) {
+      return J.getInterceptor$n(receiver).toRadixString$1(receiver, a0);
+    },
+    toSet$0$ax(receiver) {
+      return J.getInterceptor$ax(receiver).toSet$0(receiver);
+    },
+    toString$0$(receiver) {
+      return J.getInterceptor$(receiver).toString$0(receiver);
+    },
+    toString$1$color$(receiver, a0) {
+      return J.getInterceptor$(receiver).toString$1$color(receiver, a0);
+    },
+    trim$0$s(receiver) {
+      return J.getInterceptor$s(receiver).trim$0(receiver);
+    },
+    unlinkSync$1$x(receiver, a0) {
+      return J.getInterceptor$x(receiver).unlinkSync$1(receiver, a0);
+    },
+    watch$2$x(receiver, a0, a1) {
+      return J.getInterceptor$x(receiver).watch$2(receiver, a0, a1);
+    },
+    where$1$ax(receiver, a0) {
+      return J.getInterceptor$ax(receiver).where$1(receiver, a0);
+    },
+    write$1$x(receiver, a0) {
+      return J.getInterceptor$x(receiver).write$1(receiver, a0);
+    },
+    writeFileSync$2$x(receiver, a0, a1) {
+      return J.getInterceptor$x(receiver).writeFileSync$2(receiver, a0, a1);
+    },
+    yield$0$x(receiver) {
+      return J.getInterceptor$x(receiver).yield$0(receiver);
+    },
+    Interceptor: function Interceptor() {
+    },
+    JSBool: function JSBool() {
+    },
+    JSNull: function JSNull() {
+    },
+    JavaScriptObject: function JavaScriptObject() {
+    },
+    LegacyJavaScriptObject: function LegacyJavaScriptObject() {
+    },
+    PlainJavaScriptObject: function PlainJavaScriptObject() {
+    },
+    UnknownJavaScriptObject: function UnknownJavaScriptObject() {
+    },
+    JavaScriptFunction: function JavaScriptFunction() {
+    },
+    JavaScriptBigInt: function JavaScriptBigInt() {
+    },
+    JavaScriptSymbol: function JavaScriptSymbol() {
+    },
+    JSArray: function JSArray(t0) {
+      this.$ti = t0;
+    },
+    JSUnmodifiableArray: function JSUnmodifiableArray(t0) {
+      this.$ti = t0;
+    },
+    ArrayIterator: function ArrayIterator(t0, t1, t2) {
+      var _ = this;
+      _._iterable = t0;
+      _._length = t1;
+      _._index = 0;
+      _._current = null;
+      _.$ti = t2;
+    },
+    JSNumber: function JSNumber() {
+    },
+    JSInt: function JSInt() {
+    },
+    JSNumNotInt: function JSNumNotInt() {
+    },
+    JSString: function JSString() {
+    }
+  },
+  A = {JS_CONST: function JS_CONST() {
     },
     CastIterable_CastIterable(source, $S, $T) {
       if ($S._eval$1("EfficientLengthIterable<0>")._is(source))
@@ -375,6 +1272,9 @@ self.util = _cliPkgRequires.util;
     LateError$localNI(localName) {
       return new A.LateError("Local '" + localName + "' has not been initialized.");
     },
+    ReachabilityError$(_message) {
+      return new A.ReachabilityError(_message);
+    },
     hexDigitValue(char) {
       var letter,
         digit = char ^ 48;
@@ -452,9 +1352,6 @@ self.util = _cliPkgRequires.util;
     IterableElementError_tooFew() {
       return new A.StateError("Too few elements");
     },
-    Sort_sort(a, compare) {
-      A.Sort__doSort(a, 0, J.get$length$asx(a) - 1, compare);
-    },
     Sort__doSort(a, left, right, compare) {
       if (right - left <= 32)
         A.Sort__insertionSort(a, left, right, compare);
@@ -477,7 +1374,7 @@ self.util = _cliPkgRequires.util;
       }
     },
     Sort__dualPivotQuicksort(a, left, right, compare) {
-      var t0, less, great, k, ak, comp, great0, less0, pivots_are_equal, t2,
+      var t0, less, great, pivots_are_equal, k, ak, comp, great0, less0, t2,
         sixth = B.JSInt_methods._tdivFast$1(right - left + 1, 6),
         index1 = left + sixth,
         index5 = right - sixth,
@@ -542,7 +1439,8 @@ self.util = _cliPkgRequires.util;
       t1.$indexSet(a, index4, t1.$index(a, right));
       less = left + 1;
       great = right - 1;
-      if (J.$eq$(compare.call$2(el2, el4), 0)) {
+      pivots_are_equal = J.$eq$(compare.call$2(el2, el4), 0);
+      if (pivots_are_equal)
         for (k = less; k <= great; ++k) {
           ak = t1.$index(a, k);
           comp = compare.call$2(ak, el2);
@@ -579,8 +1477,7 @@ self.util = _cliPkgRequires.util;
               }
             }
         }
-        pivots_are_equal = true;
-      } else {
+      else
         for (k = less; k <= great; ++k) {
           ak = t1.$index(a, k);
           if (compare.call$2(ak, el2) < 0) {
@@ -612,8 +1509,6 @@ self.util = _cliPkgRequires.util;
                 break;
               }
         }
-        pivots_are_equal = false;
-      }
       t2 = less - 1;
       t1.$indexSet(a, left, t1.$index(a, t2));
       t1.$indexSet(a, t2, el2);
@@ -707,6 +1602,9 @@ self.util = _cliPkgRequires.util;
     LateError: function LateError(t0) {
       this._message = t0;
     },
+    ReachabilityError: function ReachabilityError(t0) {
+      this._message = t0;
+    },
     CodeUnits: function CodeUnits(t0) {
       this._string = t0;
     },
@@ -721,16 +1619,17 @@ self.util = _cliPkgRequires.util;
     SubListIterable: function SubListIterable(t0, t1, t2, t3) {
       var _ = this;
       _.__internal$_iterable = t0;
-      _.__internal$_start = t1;
+      _._start = t1;
       _._endOrLength = t2;
       _.$ti = t3;
     },
-    ListIterator: function ListIterator(t0, t1) {
+    ListIterator: function ListIterator(t0, t1, t2) {
       var _ = this;
       _.__internal$_iterable = t0;
       _.__internal$_length = t1;
       _.__internal$_index = 0;
       _.__internal$_current = null;
+      _.$ti = t2;
     },
     MappedIterable: function MappedIterable(t0, t1, t2) {
       this.__internal$_iterable = t0;
@@ -742,10 +1641,12 @@ self.util = _cliPkgRequires.util;
       this._f = t1;
       this.$ti = t2;
     },
-    MappedIterator: function MappedIterator(t0, t1) {
-      this.__internal$_current = null;
-      this._iterator = t0;
-      this._f = t1;
+    MappedIterator: function MappedIterator(t0, t1, t2) {
+      var _ = this;
+      _.__internal$_current = null;
+      _._iterator = t0;
+      _._f = t1;
+      _.$ti = t2;
     },
     MappedListIterable: function MappedListIterable(t0, t1, t2) {
       this._source = t0;
@@ -766,12 +1667,13 @@ self.util = _cliPkgRequires.util;
       this._f = t1;
       this.$ti = t2;
     },
-    ExpandIterator: function ExpandIterator(t0, t1, t2) {
+    ExpandIterator: function ExpandIterator(t0, t1, t2, t3) {
       var _ = this;
       _._iterator = t0;
       _._f = t1;
       _._currentExpansion = t2;
       _.__internal$_current = null;
+      _.$ti = t3;
     },
     TakeIterable: function TakeIterable(t0, t1, t2) {
       this.__internal$_iterable = t0;
@@ -783,9 +1685,10 @@ self.util = _cliPkgRequires.util;
       this._takeCount = t1;
       this.$ti = t2;
     },
-    TakeIterator: function TakeIterator(t0, t1) {
+    TakeIterator: function TakeIterator(t0, t1, t2) {
       this._iterator = t0;
       this._remaining = t1;
+      this.$ti = t2;
     },
     SkipIterable: function SkipIterable(t0, t1, t2) {
       this.__internal$_iterable = t0;
@@ -1084,7 +1987,7 @@ self.util = _cliPkgRequires.util;
     },
     Primitives_lazyAsJsDate(receiver) {
       if (receiver.date === void 0)
-        receiver.date = new Date(receiver._core$_value);
+        receiver.date = new Date(receiver._value);
       return receiver.date;
     },
     Primitives_getYear(receiver) {
@@ -1225,6 +2128,12 @@ self.util = _cliPkgRequires.util;
         return jsFunction.apply($function, $arguments);
       }
     },
+    Primitives_extractStackTrace(error) {
+      var jsError = error.$thrownJsError;
+      if (jsError == null)
+        return null;
+      return A.getTraceFromException(jsError);
+    },
     diagnoseIndexError(indexable, index) {
       var $length, _s5_ = "index";
       if (!A._isInt(index))
@@ -1331,7 +2240,7 @@ self.util = _cliPkgRequires.util;
       return error;
     },
     _unwrapNonDartException(ex) {
-      var message, number, ieErrorCode, t1, nsme, notClosure, nullCall, nullLiteralCall, undefCall, undefLiteralCall, nullProperty, undefProperty, undefLiteralProperty, match, _null = null;
+      var message, number, ieErrorCode, nsme, notClosure, nullCall, nullLiteralCall, undefCall, undefLiteralCall, nullProperty, undefProperty, undefLiteralProperty, match;
       if (!("message" in ex))
         return ex;
       message = ex.message;
@@ -1341,11 +2250,11 @@ self.util = _cliPkgRequires.util;
         if ((B.JSInt_methods._shrOtherPositive$1(number, 16) & 8191) === 10)
           switch (ieErrorCode) {
             case 438:
-              return A.saveStackTrace(ex, A.JsNoSuchMethodError$(A.S(message) + " (Error " + ieErrorCode + ")", _null));
+              return A.saveStackTrace(ex, A.JsNoSuchMethodError$(A.S(message) + " (Error " + ieErrorCode + ")", null));
             case 445:
             case 5007:
-              t1 = A.S(message);
-              return A.saveStackTrace(ex, new A.NullError(t1 + " (Error " + ieErrorCode + ")", _null));
+              A.S(message);
+              return A.saveStackTrace(ex, new A.NullError());
           }
       }
       if (ex instanceof TypeError) {
@@ -1367,40 +2276,8 @@ self.util = _cliPkgRequires.util;
           if (match != null) {
             match.method = "call";
             return A.saveStackTrace(ex, A.JsNoSuchMethodError$(message, match));
-          } else {
-            match = nullCall.matchTypeError$1(message);
-            if (match == null) {
-              match = nullLiteralCall.matchTypeError$1(message);
-              if (match == null) {
-                match = undefCall.matchTypeError$1(message);
-                if (match == null) {
-                  match = undefLiteralCall.matchTypeError$1(message);
-                  if (match == null) {
-                    match = nullProperty.matchTypeError$1(message);
-                    if (match == null) {
-                      match = nullLiteralCall.matchTypeError$1(message);
-                      if (match == null) {
-                        match = undefProperty.matchTypeError$1(message);
-                        if (match == null) {
-                          match = undefLiteralProperty.matchTypeError$1(message);
-                          t1 = match != null;
-                        } else
-                          t1 = true;
-                      } else
-                        t1 = true;
-                    } else
-                      t1 = true;
-                  } else
-                    t1 = true;
-                } else
-                  t1 = true;
-              } else
-                t1 = true;
-            } else
-              t1 = true;
-            if (t1)
-              return A.saveStackTrace(ex, new A.NullError(message, match == null ? _null : match.method));
-          }
+          } else if (nullCall.matchTypeError$1(message) != null || nullLiteralCall.matchTypeError$1(message) != null || undefCall.matchTypeError$1(message) != null || undefLiteralCall.matchTypeError$1(message) != null || nullProperty.matchTypeError$1(message) != null || nullLiteralCall.matchTypeError$1(message) != null || undefProperty.matchTypeError$1(message) != null || undefLiteralProperty.matchTypeError$1(message) != null)
+            return A.saveStackTrace(ex, new A.NullError());
         }
         return A.saveStackTrace(ex, new A.UnknownJsTypeError(typeof message == "string" ? message : ""));
       }
@@ -1414,7 +2291,7 @@ self.util = _cliPkgRequires.util;
           }
           return null;
         }(ex);
-        return A.saveStackTrace(ex, new A.ArgumentError(false, _null, _null, typeof message == "string" ? message.replace(/^RangeError:\s*/, "") : message));
+        return A.saveStackTrace(ex, new A.ArgumentError(false, null, null, typeof message == "string" ? message.replace(/^RangeError:\s*/, "") : message));
       }
       if (typeof InternalError == "function" && ex instanceof InternalError)
         if (typeof message == "string" && message === "too much recursion")
@@ -1430,7 +2307,10 @@ self.util = _cliPkgRequires.util;
       trace = exception.$cachedTrace;
       if (trace != null)
         return trace;
-      return exception.$cachedTrace = new A._StackTrace(exception);
+      trace = new A._StackTrace(exception);
+      if (typeof exception === "object")
+        exception.$cachedTrace = trace;
+      return trace;
     },
     objectHashCode(object) {
       if (object == null)
@@ -1447,7 +2327,7 @@ self.util = _cliPkgRequires.util;
       if (key instanceof A._Record)
         return key.get$hashCode(key);
       if (key instanceof A.Symbol)
-        return key.get$hashCode(key);
+        return key.get$hashCode(0);
       return A.objectHashCode(key);
     },
     fillLiteralMap(keyValuePairs, result) {
@@ -1467,7 +2347,7 @@ self.util = _cliPkgRequires.util;
         result.add$1(0, values[index]);
       return result;
     },
-    invokeClosure(closure, numberOfArguments, arg1, arg2, arg3, arg4) {
+    _invokeClosure(closure, numberOfArguments, arg1, arg2, arg3, arg4) {
       switch (numberOfArguments) {
         case 0:
           return closure.call$0();
@@ -1489,13 +2369,38 @@ self.util = _cliPkgRequires.util;
       $function = closure.$identity;
       if (!!$function)
         return $function;
-      $function = function(closure, arity, invoke) {
+      $function = A.convertDartClosureToJSUncached(closure, arity);
+      closure.$identity = $function;
+      return $function;
+    },
+    convertDartClosureToJSUncached(closure, arity) {
+      var entry;
+      switch (arity) {
+        case 0:
+          entry = closure.call$0;
+          break;
+        case 1:
+          entry = closure.call$1;
+          break;
+        case 2:
+          entry = closure.call$2;
+          break;
+        case 3:
+          entry = closure.call$3;
+          break;
+        case 4:
+          entry = closure.call$4;
+          break;
+        default:
+          entry = null;
+      }
+      if (entry != null)
+        return entry.bind(closure);
+      return function(closure, arity, invoke) {
         return function(a1, a2, a3, a4) {
           return invoke(closure, arity, a1, a2, a3, a4);
         };
-      }(closure, arity, A.invokeClosure);
-      closure.$identity = $function;
-      return $function;
+      }(closure, arity, A._invokeClosure);
     },
     Closure_fromTearOff(parameters) {
       var $prototype, $constructor, t2, trampoline, applyTrampoline, i, stub, stub0, stubName, stubCallName,
@@ -1513,14 +2418,11 @@ self.util = _cliPkgRequires.util;
       t1.toString;
       $prototype = isStatic ? Object.create(new A.StaticClosure().constructor.prototype) : Object.create(new A.BoundClosure(null, null).constructor.prototype);
       $prototype.$initialize = $prototype.constructor;
-      if (isStatic)
-        $constructor = function static_tear_off() {
-          this.$initialize();
-        };
-      else
-        $constructor = function tear_off(a, b) {
-          this.$initialize(a, b);
-        };
+      $constructor = isStatic ? function static_tear_off() {
+        this.$initialize();
+      } : function tear_off(a, b) {
+        this.$initialize(a, b);
+      };
       $prototype.constructor = $constructor;
       $constructor.prototype = $prototype;
       $prototype.$_name = $name;
@@ -1618,12 +2520,9 @@ self.util = _cliPkgRequires.util;
       }
     },
     Closure_forwardCallTo(stubName, $function, isIntercepted, needsDirectAccess) {
-      var arity, t1;
       if (isIntercepted)
         return A.Closure_forwardInterceptedCallTo(stubName, $function, needsDirectAccess);
-      arity = $function.length;
-      t1 = A.Closure_cspForwardCall(arity, needsDirectAccess, stubName, $function);
-      return t1;
+      return A.Closure_cspForwardCall($function.length, needsDirectAccess, stubName, $function);
     },
     Closure_cspForwardInterceptedCall(arity, needsDirectAccess, stubName, $function) {
       var getReceiver = A.BoundClosure_receiverOf,
@@ -1718,7 +2617,7 @@ self.util = _cliPkgRequires.util;
     },
     LinkedHashMapKeyIterator$(_map, _modifications) {
       var t1 = new A.LinkedHashMapKeyIterator(_map, _modifications);
-      t1._cell = _map._first;
+      t1.__js_helper$_cell = _map.__js_helper$_first;
       return t1;
     },
     defineProperty(obj, property, value) {
@@ -1904,10 +2803,8 @@ self.util = _cliPkgRequires.util;
       else if (other instanceof A.JSSyntaxRegExp) {
         t1 = B.JSString_methods.substring$1(receiver, startIndex);
         return other._nativeRegExp.test(t1);
-      } else {
-        t1 = J.allMatches$1$s(other, B.JSString_methods.substring$1(receiver, startIndex));
-        return !t1.get$isEmpty(t1);
-      }
+      } else
+        return !J.allMatches$1$s(other, B.JSString_methods.substring$1(receiver, startIndex)).get$isEmpty(0);
     },
     escapeReplacement(replacement) {
       if (replacement.indexOf("$", 0) >= 0)
@@ -1918,7 +2815,7 @@ self.util = _cliPkgRequires.util;
       var match = regexp._execGlobal$2(receiver, startIndex);
       if (match == null)
         return receiver;
-      return A.stringReplaceRangeUnchecked(receiver, match._match.index, match.get$end(match), replacement);
+      return A.stringReplaceRangeUnchecked(receiver, match._match.index, match.get$end(0), replacement);
     },
     quoteStringForRegExp(string) {
       if (/[[\]{}()*+?.\\^$|]/.test(string))
@@ -1983,6 +2880,9 @@ self.util = _cliPkgRequires.util;
     stringReplaceRangeUnchecked(receiver, start, end, replacement) {
       return receiver.substring(0, start) + replacement + receiver.substring(end);
     },
+    _Record_1: function _Record_1(t0) {
+      this._0 = t0;
+    },
     _Record_2: function _Record_2(t0, t1) {
       this._0 = t0;
       this._1 = t1;
@@ -2008,6 +2908,11 @@ self.util = _cliPkgRequires.util;
       this._1 = t1;
       this._2 = t2;
     },
+    _Record_3_forImport: function _Record_3_forImport(t0, t1, t2) {
+      this._0 = t0;
+      this._1 = t1;
+      this._2 = t2;
+    },
     _Record_3_importer_isDependency: function _Record_3_importer_isDependency(t0, t1, t2) {
       this._0 = t0;
       this._1 = t1;
@@ -2018,12 +2923,6 @@ self.util = _cliPkgRequires.util;
       this._1 = t1;
       this._2 = t2;
     },
-    _Record_4: function _Record_4(t0) {
-      this._values = t0;
-    },
-    _Record_4_baseImporter_baseUrl_forImport: function _Record_4_baseImporter_baseUrl_forImport(t0) {
-      this._values = t0;
-    },
     _Record_5_named_namedNodes_positional_positionalNodes_separator: function _Record_5_named_namedNodes_positional_positionalNodes_separator(t0) {
       this._values = t0;
     },
@@ -2042,12 +2941,13 @@ self.util = _cliPkgRequires.util;
       this._elements = t0;
       this.$ti = t1;
     },
-    _KeysOrValuesOrElementsIterator: function _KeysOrValuesOrElementsIterator(t0, t1) {
+    _KeysOrValuesOrElementsIterator: function _KeysOrValuesOrElementsIterator(t0, t1, t2) {
       var _ = this;
       _._elements = t0;
       _.__js_helper$_length = t1;
       _.__js_helper$_index = 0;
       _.__js_helper$_current = null;
+      _.$ti = t2;
     },
     ConstantSet: function ConstantSet() {
     },
@@ -2088,9 +2988,7 @@ self.util = _cliPkgRequires.util;
       _._method = t4;
       _._receiver = t5;
     },
-    NullError: function NullError(t0, t1) {
-      this.__js_helper$_message = t0;
-      this._method = t1;
+    NullError: function NullError() {
     },
     JsNoSuchMethodError: function JsNoSuchMethodError(t0, t1, t2) {
       this.__js_helper$_message = t0;
@@ -2136,8 +3034,8 @@ self.util = _cliPkgRequires.util;
     JsLinkedHashMap: function JsLinkedHashMap(t0) {
       var _ = this;
       _.__js_helper$_length = 0;
-      _._last = _._first = _.__js_helper$_rest = _._nums = _._strings = null;
-      _._modifications = 0;
+      _.__js_helper$_last = _.__js_helper$_first = _.__js_helper$_rest = _.__js_helper$_nums = _.__js_helper$_strings = null;
+      _.__js_helper$_modifications = 0;
       _.$ti = t0;
     },
     JsLinkedHashMap_values_closure: function JsLinkedHashMap_values_closure(t0) {
@@ -2150,7 +3048,7 @@ self.util = _cliPkgRequires.util;
       var _ = this;
       _.hashMapCellKey = t0;
       _.hashMapCellValue = t1;
-      _._previous = _._next = null;
+      _.__js_helper$_previous = _.__js_helper$_next = null;
     },
     LinkedHashMapKeyIterable: function LinkedHashMapKeyIterable(t0, t1) {
       this.__js_helper$_map = t0;
@@ -2159,21 +3057,21 @@ self.util = _cliPkgRequires.util;
     LinkedHashMapKeyIterator: function LinkedHashMapKeyIterator(t0, t1) {
       var _ = this;
       _.__js_helper$_map = t0;
-      _._modifications = t1;
-      _.__js_helper$_current = _._cell = null;
+      _.__js_helper$_modifications = t1;
+      _.__js_helper$_current = _.__js_helper$_cell = null;
     },
     JsIdentityLinkedHashMap: function JsIdentityLinkedHashMap(t0) {
       var _ = this;
       _.__js_helper$_length = 0;
-      _._last = _._first = _.__js_helper$_rest = _._nums = _._strings = null;
-      _._modifications = 0;
+      _.__js_helper$_last = _.__js_helper$_first = _.__js_helper$_rest = _.__js_helper$_nums = _.__js_helper$_strings = null;
+      _.__js_helper$_modifications = 0;
       _.$ti = t0;
     },
     JsConstantLinkedHashMap: function JsConstantLinkedHashMap(t0) {
       var _ = this;
       _.__js_helper$_length = 0;
-      _._last = _._first = _.__js_helper$_rest = _._nums = _._strings = null;
-      _._modifications = 0;
+      _.__js_helper$_last = _.__js_helper$_first = _.__js_helper$_rest = _.__js_helper$_nums = _.__js_helper$_strings = null;
+      _.__js_helper$_modifications = 0;
       _.$ti = t0;
     },
     initHooks_closure: function initHooks_closure(t0) {
@@ -2189,6 +3087,8 @@ self.util = _cliPkgRequires.util;
     },
     _Record2: function _Record2() {
     },
+    _Record1: function _Record1() {
+    },
     _Record3: function _Record3() {
     },
     _RecordN: function _RecordN() {
@@ -2205,7 +3105,7 @@ self.util = _cliPkgRequires.util;
     _AllMatchesIterable: function _AllMatchesIterable(t0, t1, t2) {
       this._re = t0;
       this.__js_helper$_string = t1;
-      this._start = t2;
+      this.__js_helper$_start = t2;
     },
     _AllMatchesIterator: function _AllMatchesIterator(t0, t1, t2) {
       var _ = this;
@@ -2243,24 +3143,11 @@ self.util = _cliPkgRequires.util;
       A.throwExpressionWithWrapper(new A.LateError("Field '' has been assigned during initialization."), new Error());
     },
     _Cell$() {
-      var t1 = new A._Cell("");
-      return t1._value = t1;
+      var t1 = new A._Cell();
+      return t1.__late_helper$_value = t1;
     },
-    _Cell$named(_name) {
-      var t1 = new A._Cell(_name);
-      return t1._value = t1;
-    },
-    _InitializedCell$(_initializer) {
-      var t1 = new A._InitializedCell(_initializer);
-      return t1._value = t1;
-    },
-    _Cell: function _Cell(t0) {
-      this.__late_helper$_name = t0;
-      this._value = null;
-    },
-    _InitializedCell: function _InitializedCell(t0) {
-      this._value = null;
-      this._initializer = t0;
+    _Cell: function _Cell() {
+      this.__late_helper$_value = null;
     },
     _ensureNativeList(list) {
       return list;
@@ -2268,6 +3155,9 @@ self.util = _cliPkgRequires.util;
     NativeInt8List__create1(arg) {
       return new Int8Array(arg);
     },
+    NativeUint8List_NativeUint8List($length) {
+      return new Uint8Array($length);
+    },
     _checkValidIndex(index, list, $length) {
       if (index >>> 0 !== index || index >= $length)
         throw A.wrapException(A.diagnoseIndexError(list, index));
@@ -2370,7 +3260,7 @@ self.util = _cliPkgRequires.util;
       return rti;
     },
     _substitute(universe, rti, typeArguments, depth) {
-      var baseType, substitutedBaseType, interfaceTypeArguments, substitutedInterfaceTypeArguments, base, substitutedBase, $arguments, substitutedArguments, returnType, substitutedReturnType, functionParameters, substitutedFunctionParameters, bounds, substitutedBounds, index, argument,
+      var baseType, substitutedBaseType, interfaceTypeArguments, substitutedInterfaceTypeArguments, base, substitutedBase, $arguments, substitutedArguments, t1, fields, substitutedFields, returnType, substitutedReturnType, functionParameters, substitutedFunctionParameters, bounds, substitutedBounds, index, argument,
         kind = rti._kind;
       switch (kind) {
         case 5:
@@ -2411,6 +3301,13 @@ self.util = _cliPkgRequires.util;
           if (substitutedBase === base && substitutedArguments === $arguments)
             return rti;
           return A._Universe__lookupBindingRti(universe, substitutedBase, substitutedArguments);
+        case 11:
+          t1 = rti._primary;
+          fields = rti._rest;
+          substitutedFields = A._substituteArray(universe, fields, typeArguments, depth);
+          if (substitutedFields === fields)
+            return rti;
+          return A._Universe__lookupRecordRti(universe, t1, substitutedFields);
         case 12:
           returnType = rti._primary;
           substitutedReturnType = A._substitute(universe, returnType, typeArguments, depth);
@@ -2489,13 +3386,11 @@ self.util = _cliPkgRequires.util;
       return target;
     },
     closureFunctionType(closure) {
-      var t1,
-        signature = closure.$signature;
+      var signature = closure.$signature;
       if (signature != null) {
         if (typeof signature == "number")
           return A.getTypeFromTypesTable(signature);
-        t1 = closure.$signature();
-        return t1;
+        return closure.$signature();
       }
       return null;
     },
@@ -2602,14 +3497,11 @@ self.util = _cliPkgRequires.util;
       return A.createRuntimeType(A._Universe_eval(init.typeUniverse, recipe, false));
     },
     _installSpecializedIsTest(object) {
-      var t1, unstarred, isFn, $name, predicate, testRti = this;
+      var t1, unstarred, unstarredKind, isFn, $name, predicate, testRti = this;
       if (testRti === type$.Object)
         return A._finishIsFn(testRti, object, A._isObject);
-      if (!A.isStrongTopType(testRti))
-        if (!(testRti === type$.legacy_Object))
-          t1 = false;
-        else
-          t1 = true;
+      if (!A.isSoundTopType(testRti))
+        t1 = testRti === type$.legacy_Object;
       else
         t1 = true;
       if (t1)
@@ -2620,8 +3512,8 @@ self.util = _cliPkgRequires.util;
       if (t1 === 1)
         return A._finishIsFn(testRti, object, A._isNever);
       unstarred = t1 === 6 ? testRti._primary : testRti;
-      t1 = unstarred._kind;
-      if (t1 === 8)
+      unstarredKind = unstarred._kind;
+      if (unstarredKind === 8)
         return A._finishIsFn(testRti, object, A._isFutureOr);
       if (unstarred === type$.int)
         isFn = A._isInt;
@@ -2633,15 +3525,15 @@ self.util = _cliPkgRequires.util;
         isFn = unstarred === type$.bool ? A._isBool : null;
       if (isFn != null)
         return A._finishIsFn(testRti, object, isFn);
-      if (t1 === 9) {
+      if (unstarredKind === 9) {
         $name = unstarred._primary;
-        if (unstarred._rest.every(A.isTopType)) {
+        if (unstarred._rest.every(A.isDefinitelyTopType)) {
           testRti._specializedTestResource = "$is" + $name;
           if ($name === "List")
             return A._finishIsFn(testRti, object, A._isListTestViaProperty);
           return A._finishIsFn(testRti, object, A._isTestViaProperty);
         }
-      } else if (t1 === 11) {
+      } else if (unstarredKind === 11) {
         predicate = A.createRecordTypePredicate(unstarred._primary, unstarred._rest);
         return A._finishIsFn(testRti, object, predicate == null ? A._isNever : predicate);
       }
@@ -2654,11 +3546,8 @@ self.util = _cliPkgRequires.util;
     _installSpecializedAsCheck(object) {
       var t1, testRti = this,
         asFn = A._generalAsCheckImplementation;
-      if (!A.isStrongTopType(testRti))
-        if (!(testRti === type$.legacy_Object))
-          t1 = false;
-        else
-          t1 = true;
+      if (!A.isSoundTopType(testRti))
+        t1 = testRti === type$.legacy_Object;
       else
         t1 = true;
       if (t1)
@@ -2676,7 +3565,7 @@ self.util = _cliPkgRequires.util;
     _nullIs(testRti) {
       var t1,
         kind = testRti._kind;
-      if (!A.isStrongTopType(testRti))
+      if (!A.isSoundTopType(testRti))
         if (!(testRti === type$.legacy_Object))
           if (!(testRti === type$.legacy_Never))
             if (kind !== 7)
@@ -2698,7 +3587,7 @@ self.util = _cliPkgRequires.util;
       var testRti = this;
       if (object == null)
         return A._nullIs(testRti);
-      return A._isSubtype(init.typeUniverse, A.instanceOrFunctionType(object, testRti), null, testRti, null);
+      return A.isSubtype(init.typeUniverse, A.instanceOrFunctionType(object, testRti), testRti);
     },
     _generalNullableIsTestImplementation(object) {
       if (object == null)
@@ -2728,10 +3617,9 @@ self.util = _cliPkgRequires.util;
       return !!J.getInterceptor$(object)[tag];
     },
     _generalAsCheckImplementation(object) {
-      var t1, testRti = this;
+      var testRti = this;
       if (object == null) {
-        t1 = A.isNullable(testRti);
-        if (t1)
+        if (A.isNullable(testRti))
           return object;
       } else if (testRti._is(object))
         return object;
@@ -2935,10 +3823,7 @@ self.util = _cliPkgRequires.util;
           boundRti = bounds[i];
           kind = boundRti._kind;
           if (!(kind === 2 || kind === 3 || kind === 4 || kind === 5 || boundRti === t1))
-            if (!(boundRti === t2))
-              t3 = false;
-            else
-              t3 = true;
+            t3 = boundRti === t2;
           else
             t3 = true;
           if (!t3)
@@ -2983,7 +3868,7 @@ self.util = _cliPkgRequires.util;
       return typeParametersText + "(" + argumentsText + ") => " + returnTypeText;
     },
     _rtiToString(rti, genericContext) {
-      var s, questionArgument, argumentKind, $name, $arguments, t1,
+      var questionArgument, s, argumentKind, $name, $arguments, t1,
         kind = rti._kind;
       if (kind === 5)
         return "erased";
@@ -2995,10 +3880,8 @@ self.util = _cliPkgRequires.util;
         return "Never";
       if (kind === 4)
         return "any";
-      if (kind === 6) {
-        s = A._rtiToString(rti._primary, genericContext);
-        return s;
-      }
+      if (kind === 6)
+        return A._rtiToString(rti._primary, genericContext);
       if (kind === 7) {
         questionArgument = rti._primary;
         s = A._rtiToString(questionArgument, genericContext);
@@ -3126,7 +4009,7 @@ self.util = _cliPkgRequires.util;
       var baseKind, t1, rti;
       if (normalize) {
         baseKind = baseType._kind;
-        if (!A.isStrongTopType(baseType))
+        if (!A.isSoundTopType(baseType))
           t1 = baseType === type$.Null || baseType === type$.JSNull || baseKind === 7 || baseKind === 6;
         else
           t1 = true;
@@ -3153,7 +4036,7 @@ self.util = _cliPkgRequires.util;
       var baseKind, t1, starArgument, rti;
       if (normalize) {
         baseKind = baseType._kind;
-        if (!A.isStrongTopType(baseType))
+        if (!A.isSoundTopType(baseType))
           if (!(baseType === type$.Null || baseType === type$.JSNull))
             if (baseKind !== 7)
               t1 = baseKind === 8 && A.isNullable(baseType._primary);
@@ -3192,17 +4075,10 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     _Universe__createFutureOrRti(universe, baseType, key, normalize) {
-      var t1, t2, rti;
+      var t1, rti;
       if (normalize) {
         t1 = baseType._kind;
-        if (!A.isStrongTopType(baseType))
-          if (!(baseType === type$.legacy_Object))
-            t2 = false;
-          else
-            t2 = true;
-        else
-          t2 = true;
-        if (t2 || baseType === type$.Object)
+        if (A.isSoundTopType(baseType) || baseType === type$.Object || baseType === type$.legacy_Object)
           return baseType;
         else if (t1 === 1)
           return A._Universe__lookupInterfaceRti(universe, "Future", [baseType]);
@@ -3649,15 +4525,28 @@ self.util = _cliPkgRequires.util;
         return typeArguments[index - 1];
       throw A.wrapException(A.AssertionError$("Bad index " + index + " for " + environment.toString$0(0)));
     },
-    _isSubtype(universe, s, sEnv, t, tEnv) {
+    isSubtype(universe, s, t) {
+      var result,
+        sCache = s._isSubtypeCache;
+      if (sCache == null)
+        sCache = s._isSubtypeCache = new Map();
+      result = sCache.get(t);
+      if (result == null) {
+        result = A._isSubtype(universe, s, null, t, null, false) ? 1 : 0;
+        sCache.set(t, result);
+      }
+      if (0 === result)
+        return false;
+      if (1 === result)
+        return true;
+      return true;
+    },
+    _isSubtype(universe, s, sEnv, t, tEnv, isLegacy) {
       var t1, sKind, leftTypeVariable, tKind, t2, sBounds, tBounds, sLength, i, sBound, tBound;
       if (s === t)
         return true;
-      if (!A.isStrongTopType(t))
-        if (!(t === type$.legacy_Object))
-          t1 = false;
-        else
-          t1 = true;
+      if (!A.isSoundTopType(t))
+        t1 = t === type$.legacy_Object;
       else
         t1 = true;
       if (t1)
@@ -3665,55 +4554,52 @@ self.util = _cliPkgRequires.util;
       sKind = s._kind;
       if (sKind === 4)
         return true;
-      if (A.isStrongTopType(s))
+      if (A.isSoundTopType(s))
         return false;
-      if (s._kind !== 1)
-        t1 = false;
-      else
-        t1 = true;
-      if (t1)
+      t1 = s._kind;
+      if (t1 === 1)
         return true;
       leftTypeVariable = sKind === 14;
       if (leftTypeVariable)
-        if (A._isSubtype(universe, sEnv[s._primary], sEnv, t, tEnv))
+        if (A._isSubtype(universe, sEnv[s._primary], sEnv, t, tEnv, false))
           return true;
       tKind = t._kind;
       t1 = s === type$.Null || s === type$.JSNull;
       if (t1) {
         if (tKind === 8)
-          return A._isSubtype(universe, s, sEnv, t._primary, tEnv);
+          return A._isSubtype(universe, s, sEnv, t._primary, tEnv, false);
         return t === type$.Null || t === type$.JSNull || tKind === 7 || tKind === 6;
       }
       if (t === type$.Object) {
         if (sKind === 8)
-          return A._isSubtype(universe, s._primary, sEnv, t, tEnv);
+          return A._isSubtype(universe, s._primary, sEnv, t, tEnv, false);
         if (sKind === 6)
-          return A._isSubtype(universe, s._primary, sEnv, t, tEnv);
+          return A._isSubtype(universe, s._primary, sEnv, t, tEnv, false);
         return sKind !== 7;
       }
       if (sKind === 6)
-        return A._isSubtype(universe, s._primary, sEnv, t, tEnv);
+        return A._isSubtype(universe, s._primary, sEnv, t, tEnv, false);
       if (tKind === 6) {
         t1 = A.Rti__getQuestionFromStar(universe, t);
-        return A._isSubtype(universe, s, sEnv, t1, tEnv);
+        return A._isSubtype(universe, s, sEnv, t1, tEnv, false);
       }
       if (sKind === 8) {
-        if (!A._isSubtype(universe, s._primary, sEnv, t, tEnv))
+        if (!A._isSubtype(universe, s._primary, sEnv, t, tEnv, false))
           return false;
-        return A._isSubtype(universe, A.Rti__getFutureFromFutureOr(universe, s), sEnv, t, tEnv);
+        return A._isSubtype(universe, A.Rti__getFutureFromFutureOr(universe, s), sEnv, t, tEnv, false);
       }
       if (sKind === 7) {
-        t1 = A._isSubtype(universe, type$.Null, sEnv, t, tEnv);
-        return t1 && A._isSubtype(universe, s._primary, sEnv, t, tEnv);
+        t1 = A._isSubtype(universe, type$.Null, sEnv, t, tEnv, false);
+        return t1 && A._isSubtype(universe, s._primary, sEnv, t, tEnv, false);
       }
       if (tKind === 8) {
-        if (A._isSubtype(universe, s, sEnv, t._primary, tEnv))
+        if (A._isSubtype(universe, s, sEnv, t._primary, tEnv, false))
           return true;
-        return A._isSubtype(universe, s, sEnv, A.Rti__getFutureFromFutureOr(universe, t), tEnv);
+        return A._isSubtype(universe, s, sEnv, A.Rti__getFutureFromFutureOr(universe, t), tEnv, false);
       }
       if (tKind === 7) {
-        t1 = A._isSubtype(universe, s, sEnv, type$.Null, tEnv);
-        return t1 || A._isSubtype(universe, s, sEnv, t._primary, tEnv);
+        t1 = A._isSubtype(universe, s, sEnv, type$.Null, tEnv, false);
+        return t1 || A._isSubtype(universe, s, sEnv, t._primary, tEnv, false);
       }
       if (leftTypeVariable)
         return false;
@@ -3738,30 +4624,30 @@ self.util = _cliPkgRequires.util;
         for (i = 0; i < sLength; ++i) {
           sBound = sBounds[i];
           tBound = tBounds[i];
-          if (!A._isSubtype(universe, sBound, sEnv, tBound, tEnv) || !A._isSubtype(universe, tBound, tEnv, sBound, sEnv))
+          if (!A._isSubtype(universe, sBound, sEnv, tBound, tEnv, false) || !A._isSubtype(universe, tBound, tEnv, sBound, sEnv, false))
             return false;
         }
-        return A._isFunctionSubtype(universe, s._primary, sEnv, t._primary, tEnv);
+        return A._isFunctionSubtype(universe, s._primary, sEnv, t._primary, tEnv, false);
       }
       if (tKind === 12) {
         if (s === type$.JavaScriptFunction)
           return true;
         if (t1)
           return false;
-        return A._isFunctionSubtype(universe, s, sEnv, t, tEnv);
+        return A._isFunctionSubtype(universe, s, sEnv, t, tEnv, false);
       }
       if (sKind === 9) {
         if (tKind !== 9)
           return false;
-        return A._isInterfaceSubtype(universe, s, sEnv, t, tEnv);
+        return A._isInterfaceSubtype(universe, s, sEnv, t, tEnv, false);
       }
       if (t2 && tKind === 11)
-        return A._isRecordSubtype(universe, s, sEnv, t, tEnv);
+        return A._isRecordSubtype(universe, s, sEnv, t, tEnv, false);
       return false;
     },
-    _isFunctionSubtype(universe, s, sEnv, t, tEnv) {
+    _isFunctionSubtype(universe, s, sEnv, t, tEnv, isLegacy) {
       var sParameters, tParameters, sRequiredPositional, tRequiredPositional, sRequiredPositionalLength, tRequiredPositionalLength, requiredPositionalDelta, sOptionalPositional, tOptionalPositional, sOptionalPositionalLength, tOptionalPositionalLength, i, t1, sNamed, tNamed, sNamedLength, tNamedLength, sIndex, tIndex, tName, sName, sIsRequired;
-      if (!A._isSubtype(universe, s._primary, sEnv, t._primary, tEnv))
+      if (!A._isSubtype(universe, s._primary, sEnv, t._primary, tEnv, false))
         return false;
       sParameters = s._rest;
       tParameters = t._rest;
@@ -3780,17 +4666,17 @@ self.util = _cliPkgRequires.util;
         return false;
       for (i = 0; i < sRequiredPositionalLength; ++i) {
         t1 = sRequiredPositional[i];
-        if (!A._isSubtype(universe, tRequiredPositional[i], tEnv, t1, sEnv))
+        if (!A._isSubtype(universe, tRequiredPositional[i], tEnv, t1, sEnv, false))
           return false;
       }
       for (i = 0; i < requiredPositionalDelta; ++i) {
         t1 = sOptionalPositional[i];
-        if (!A._isSubtype(universe, tRequiredPositional[sRequiredPositionalLength + i], tEnv, t1, sEnv))
+        if (!A._isSubtype(universe, tRequiredPositional[sRequiredPositionalLength + i], tEnv, t1, sEnv, false))
           return false;
       }
       for (i = 0; i < tOptionalPositionalLength; ++i) {
         t1 = sOptionalPositional[requiredPositionalDelta + i];
-        if (!A._isSubtype(universe, tOptionalPositional[i], tEnv, t1, sEnv))
+        if (!A._isSubtype(universe, tOptionalPositional[i], tEnv, t1, sEnv, false))
           return false;
       }
       sNamed = sParameters._named;
@@ -3816,7 +4702,7 @@ self.util = _cliPkgRequires.util;
           if (sIsRequired && !t1)
             return false;
           t1 = sNamed[sIndex - 1];
-          if (!A._isSubtype(universe, tNamed[tIndex + 2], tEnv, t1, sEnv))
+          if (!A._isSubtype(universe, tNamed[tIndex + 2], tEnv, t1, sEnv, false))
             return false;
           break;
         }
@@ -3828,8 +4714,8 @@ self.util = _cliPkgRequires.util;
       }
       return true;
     },
-    _isInterfaceSubtype(universe, s, sEnv, t, tEnv) {
-      var rule, recipes, $length, supertypeArgs, i, t1, t2,
+    _isInterfaceSubtype(universe, s, sEnv, t, tEnv, isLegacy) {
+      var rule, recipes, $length, supertypeArgs, i,
         sName = s._primary,
         tName = t._primary;
       for (; sName !== tName;) {
@@ -3847,24 +4733,19 @@ self.util = _cliPkgRequires.util;
         supertypeArgs = $length > 0 ? new Array($length) : init.typeUniverse.sEA;
         for (i = 0; i < $length; ++i)
           supertypeArgs[i] = A._Universe_evalInEnvironment(universe, s, recipes[i]);
-        return A._areArgumentsSubtypes(universe, supertypeArgs, null, sEnv, t._rest, tEnv);
+        return A._areArgumentsSubtypes(universe, supertypeArgs, null, sEnv, t._rest, tEnv, false);
       }
-      t1 = s._rest;
-      t2 = t._rest;
-      return A._areArgumentsSubtypes(universe, t1, null, sEnv, t2, tEnv);
+      return A._areArgumentsSubtypes(universe, s._rest, null, sEnv, t._rest, tEnv, false);
     },
-    _areArgumentsSubtypes(universe, sArgs, sVariances, sEnv, tArgs, tEnv) {
-      var i, t1, t2,
+    _areArgumentsSubtypes(universe, sArgs, sVariances, sEnv, tArgs, tEnv, isLegacy) {
+      var i,
         $length = sArgs.length;
-      for (i = 0; i < $length; ++i) {
-        t1 = sArgs[i];
-        t2 = tArgs[i];
-        if (!A._isSubtype(universe, t1, sEnv, t2, tEnv))
+      for (i = 0; i < $length; ++i)
+        if (!A._isSubtype(universe, sArgs[i], sEnv, tArgs[i], tEnv, false))
           return false;
-      }
       return true;
     },
-    _isRecordSubtype(universe, s, sEnv, t, tEnv) {
+    _isRecordSubtype(universe, s, sEnv, t, tEnv, isLegacy) {
       var i,
         sFields = s._rest,
         tFields = t._rest,
@@ -3874,7 +4755,7 @@ self.util = _cliPkgRequires.util;
       if (s._primary !== t._primary)
         return false;
       for (i = 0; i < sCount; ++i)
-        if (!A._isSubtype(universe, sFields[i], sEnv, tFields[i], tEnv))
+        if (!A._isSubtype(universe, sFields[i], sEnv, tFields[i], tEnv, false))
           return false;
       return true;
     },
@@ -3882,7 +4763,7 @@ self.util = _cliPkgRequires.util;
       var t1,
         kind = t._kind;
       if (!(t === type$.Null || t === type$.JSNull))
-        if (!A.isStrongTopType(t))
+        if (!A.isSoundTopType(t))
           if (kind !== 7)
             if (!(kind === 6 && A.isNullable(t._primary)))
               t1 = kind === 8 && A.isNullable(t._primary);
@@ -3896,18 +4777,15 @@ self.util = _cliPkgRequires.util;
         t1 = true;
       return t1;
     },
-    isTopType(t) {
+    isDefinitelyTopType(t) {
       var t1;
-      if (!A.isStrongTopType(t))
-        if (!(t === type$.legacy_Object))
-          t1 = false;
-        else
-          t1 = true;
+      if (!A.isSoundTopType(t))
+        t1 = t === type$.legacy_Object;
       else
         t1 = true;
       return t1;
     },
-    isStrongTopType(t) {
+    isSoundTopType(t) {
       var kind = t._kind;
       return kind === 2 || kind === 3 || kind === 4 || kind === 5 || t === type$.nullable_Object;
     },
@@ -3927,7 +4805,7 @@ self.util = _cliPkgRequires.util;
       var _ = this;
       _._as = t0;
       _._is = t1;
-      _._cachedRuntimeType = _._specializedTestResource = _._precomputed1 = null;
+      _._cachedRuntimeType = _._specializedTestResource = _._isSubtypeCache = _._precomputed1 = null;
       _._kind = 0;
       _._canonicalRecipe = _._bindCache = _._evalCache = _._rest = _._primary = null;
     },
@@ -4017,7 +4895,7 @@ self.util = _cliPkgRequires.util;
     _wrapJsFunctionForAsync($function) {
       var $protected = function(fn, ERROR) {
         return function(errorCode, result) {
-          while (true)
+          while (true) {
             try {
               fn(errorCode, result);
               break;
@@ -4025,6 +4903,7 @@ self.util = _cliPkgRequires.util;
               result = error;
               errorCode = ERROR;
             }
+          }
         };
       }($function, 1);
       return $.Zone__current.registerBinaryCallback$3$1(new A._wrapJsFunctionForAsync_closure($protected), type$.void, type$.int, type$.dynamic);
@@ -4043,7 +4922,7 @@ self.util = _cliPkgRequires.util;
         if (stackTrace != null)
           return stackTrace;
       }
-      return B._StringStackTrace_3uE;
+      return B._StringStackTrace_uwd;
     },
     Future_Future$value(value, $T) {
       var t1;
@@ -4070,18 +4949,17 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     Future_wait(futures, eagerError, $T) {
-      var error, stackTrace, handleError, future, pos, e, st, t1, t2, exception, _box_0 = {}, cleanUp = null,
+      var handleError, future, pos, e, st, t1, t2, exception, _box_0 = {}, cleanUp = null,
         _future = new A._Future($.Zone__current, $T._eval$1("_Future<List<0>>"));
       _box_0.values = null;
       _box_0.remaining = 0;
-      error = A._Cell$named("error");
-      stackTrace = A._Cell$named("stackTrace");
-      handleError = new A.Future_wait_handleError(_box_0, cleanUp, eagerError, _future, error, stackTrace);
+      _box_0.stackTrace = _box_0.error = null;
+      handleError = new A.Future_wait_handleError(_box_0, cleanUp, eagerError, _future);
       try {
         for (t1 = J.get$iterator$ax(futures), t2 = type$.Null; t1.moveNext$0();) {
           future = t1.get$current(t1);
           pos = _box_0.remaining;
-          J.then$1$2$onError$x(future, new A.Future_wait_closure(_box_0, pos, _future, cleanUp, eagerError, error, stackTrace, $T), handleError, t2);
+          J.then$1$2$onError$x(future, new A.Future_wait_closure(_box_0, pos, _future, $T, cleanUp, eagerError), handleError, t2);
           ++_box_0.remaining;
         }
         t1 = _box_0.remaining;
@@ -4097,8 +4975,8 @@ self.util = _cliPkgRequires.util;
         if (_box_0.remaining === 0 || eagerError)
           return A.Future_Future$error(e, st, $T._eval$1("List<0>"));
         else {
-          error._value = e;
-          stackTrace._value = st;
+          _box_0.error = e;
+          _box_0.stackTrace = st;
         }
       }
       return _future;
@@ -4109,10 +4987,18 @@ self.util = _cliPkgRequires.util;
       t1._resultOrListeners = value;
       return t1;
     },
+    _Future$value(value, $T) {
+      var t1 = new A._Future($.Zone__current, $T._eval$1("_Future<0>"));
+      t1._state = 8;
+      t1._resultOrListeners = value;
+      return t1;
+    },
     _Future__chainCoreFutureSync(source, target) {
       var t1, listeners;
       for (; t1 = source._state, (t1 & 4) !== 0;)
         source = source._resultOrListeners;
+      t1 |= target._state & 1;
+      source._state = t1;
       if ((t1 & 24) !== 0) {
         listeners = target._removeListeners$0();
         target._cloneResult$1(source);
@@ -4347,10 +5233,11 @@ self.util = _cliPkgRequires.util;
     _ControllerSubscription$(_controller, onData, onError, onDone, cancelOnError, $T) {
       var t1 = $.Zone__current,
         t2 = cancelOnError ? 1 : 0,
-        t3 = A._BufferingStreamSubscription__registerDataHandler(t1, onData, $T),
-        t4 = A._BufferingStreamSubscription__registerErrorHandler(t1, onError),
-        t5 = onDone == null ? A.async___nullDoneHandler$closure() : onDone;
-      return new A._ControllerSubscription(_controller, t3, t4, t1.registerCallback$1$1(t5, type$.void), t1, t2, $T._eval$1("_ControllerSubscription<0>"));
+        t3 = onError != null ? 32 : 0,
+        t4 = A._BufferingStreamSubscription__registerDataHandler(t1, onData, $T),
+        t5 = A._BufferingStreamSubscription__registerErrorHandler(t1, onError),
+        t6 = onDone == null ? A.async___nullDoneHandler$closure() : onDone;
+      return new A._ControllerSubscription(_controller, t4, t5, t1.registerCallback$1$1(t6, type$.void), t1, t2 | t3, $T._eval$1("_ControllerSubscription<0>"));
     },
     _AddStreamState_makeErrorHandler(controller) {
       return new A._AddStreamState_makeErrorHandler_closure(controller);
@@ -4470,7 +5357,7 @@ self.util = _cliPkgRequires.util;
       var valueMap, t1, handleUncaughtError;
       $.printToZone = A.async___printToZone$closure();
       if (specification == null)
-        specification = B._ZoneSpecification_ALf;
+        specification = B._ZoneSpecification_48t;
       if (zoneValues == null)
         valueMap = zone.get$_async$_map();
       else {
@@ -4547,25 +5434,21 @@ self.util = _cliPkgRequires.util;
       this.error = t0;
       this.stackTrace = t1;
     },
-    Future_wait_handleError: function Future_wait_handleError(t0, t1, t2, t3, t4, t5) {
+    Future_wait_handleError: function Future_wait_handleError(t0, t1, t2, t3) {
       var _ = this;
       _._box_0 = t0;
       _.cleanUp = t1;
       _.eagerError = t2;
       _._future = t3;
-      _.error = t4;
-      _.stackTrace = t5;
     },
-    Future_wait_closure: function Future_wait_closure(t0, t1, t2, t3, t4, t5, t6, t7) {
+    Future_wait_closure: function Future_wait_closure(t0, t1, t2, t3, t4, t5) {
       var _ = this;
       _._box_0 = t0;
       _.pos = t1;
       _._future = t2;
-      _.cleanUp = t3;
-      _.eagerError = t4;
-      _.error = t5;
-      _.stackTrace = t6;
-      _.T = t7;
+      _.T = t3;
+      _.cleanUp = t4;
+      _.eagerError = t5;
     },
     _Completer: function _Completer() {
     },
@@ -4720,7 +5603,7 @@ self.util = _cliPkgRequires.util;
       this.$this = t0;
     },
     _StreamControllerAddStreamState: function _StreamControllerAddStreamState(t0, t1, t2) {
-      this.varData = t0;
+      this._varData = t0;
       this.addStreamFuture = t1;
       this.addSubscription = t2;
     },
@@ -4927,9 +5810,9 @@ self.util = _cliPkgRequires.util;
       delete table["<non-identifier-key>"];
       return table;
     },
-    _LinkedHashSetIterator$(_set, _modifications) {
-      var t1 = new A._LinkedHashSetIterator(_set, _modifications);
-      t1._collection$_cell = _set._collection$_first;
+    _LinkedHashSetIterator$(_set, _modifications, $E) {
+      var t1 = new A._LinkedHashSetIterator(_set, _modifications, $E._eval$1("_LinkedHashSetIterator<0>"));
+      t1._cell = _set._first;
       return t1;
     },
     UnmodifiableListView$(source, $E) {
@@ -5019,8 +5902,8 @@ self.util = _cliPkgRequires.util;
           return number;
       }
     },
-    _ListQueueIterator$(queue) {
-      return new A._ListQueueIterator(queue, queue._tail, queue._modificationCount, queue._head);
+    _ListQueueIterator$(queue, $E) {
+      return new A._ListQueueIterator(queue, queue._tail, queue._modificationCount, queue._head, $E._eval$1("_ListQueueIterator<0>"));
     },
     _UnmodifiableSetMixin__throwUnmodifiable() {
       throw A.wrapException(A.UnsupportedError$("Cannot change an unmodifiable set"));
@@ -5028,7 +5911,7 @@ self.util = _cliPkgRequires.util;
     _HashMap: function _HashMap(t0) {
       var _ = this;
       _._collection$_length = 0;
-      _._collection$_keys = _._collection$_rest = _._collection$_nums = _._collection$_strings = null;
+      _._collection$_keys = _._collection$_rest = _._nums = _._strings = null;
       _.$ti = t0;
     },
     _HashMap_values_closure: function _HashMap_values_closure(t0) {
@@ -5040,19 +5923,20 @@ self.util = _cliPkgRequires.util;
     _IdentityHashMap: function _IdentityHashMap(t0) {
       var _ = this;
       _._collection$_length = 0;
-      _._collection$_keys = _._collection$_rest = _._collection$_nums = _._collection$_strings = null;
+      _._collection$_keys = _._collection$_rest = _._nums = _._strings = null;
       _.$ti = t0;
     },
     _HashMapKeyIterable: function _HashMapKeyIterable(t0, t1) {
       this._map = t0;
       this.$ti = t1;
     },
-    _HashMapKeyIterator: function _HashMapKeyIterator(t0, t1) {
+    _HashMapKeyIterator: function _HashMapKeyIterator(t0, t1, t2) {
       var _ = this;
       _._map = t0;
       _._collection$_keys = t1;
       _._offset = 0;
       _._collection$_current = null;
+      _.$ti = t2;
     },
     _LinkedCustomHashMap: function _LinkedCustomHashMap(t0, t1, t2, t3) {
       var _ = this;
@@ -5060,8 +5944,8 @@ self.util = _cliPkgRequires.util;
       _._hashCode = t1;
       _._validKey = t2;
       _.__js_helper$_length = 0;
-      _._last = _._first = _.__js_helper$_rest = _._nums = _._strings = null;
-      _._modifications = 0;
+      _.__js_helper$_last = _.__js_helper$_first = _.__js_helper$_rest = _.__js_helper$_nums = _.__js_helper$_strings = null;
+      _.__js_helper$_modifications = 0;
       _.$ti = t3;
     },
     _LinkedCustomHashMap_closure: function _LinkedCustomHashMap_closure(t0) {
@@ -5070,26 +5954,27 @@ self.util = _cliPkgRequires.util;
     _LinkedHashSet: function _LinkedHashSet(t0) {
       var _ = this;
       _._collection$_length = 0;
-      _._collection$_last = _._collection$_first = _._collection$_rest = _._collection$_nums = _._collection$_strings = null;
-      _._collection$_modifications = 0;
+      _._last = _._first = _._collection$_rest = _._nums = _._strings = null;
+      _._modifications = 0;
       _.$ti = t0;
     },
     _LinkedIdentityHashSet: function _LinkedIdentityHashSet(t0) {
       var _ = this;
       _._collection$_length = 0;
-      _._collection$_last = _._collection$_first = _._collection$_rest = _._collection$_nums = _._collection$_strings = null;
-      _._collection$_modifications = 0;
+      _._last = _._first = _._collection$_rest = _._nums = _._strings = null;
+      _._modifications = 0;
       _.$ti = t0;
     },
     _LinkedHashSetCell: function _LinkedHashSetCell(t0) {
       this._element = t0;
-      this._collection$_previous = this._collection$_next = null;
+      this._previous = this._next = null;
     },
-    _LinkedHashSetIterator: function _LinkedHashSetIterator(t0, t1) {
+    _LinkedHashSetIterator: function _LinkedHashSetIterator(t0, t1, t2) {
       var _ = this;
       _._set = t0;
-      _._collection$_modifications = t1;
-      _._collection$_current = _._collection$_cell = null;
+      _._modifications = t1;
+      _._collection$_current = _._cell = null;
+      _.$ti = t2;
     },
     UnmodifiableListView: function UnmodifiableListView(t0, t1) {
       this._collection$_source = t0;
@@ -5125,10 +6010,12 @@ self.util = _cliPkgRequires.util;
       this._map = t0;
       this.$ti = t1;
     },
-    _MapBaseValueIterator: function _MapBaseValueIterator(t0, t1) {
-      this._collection$_keys = t0;
-      this._map = t1;
-      this._collection$_current = null;
+    _MapBaseValueIterator: function _MapBaseValueIterator(t0, t1, t2) {
+      var _ = this;
+      _._collection$_keys = t0;
+      _._map = t1;
+      _._collection$_current = null;
+      _.$ti = t2;
     },
     _UnmodifiableMapMixin: function _UnmodifiableMapMixin() {
     },
@@ -5144,13 +6031,14 @@ self.util = _cliPkgRequires.util;
       _._modificationCount = _._tail = _._head = 0;
       _.$ti = t1;
     },
-    _ListQueueIterator: function _ListQueueIterator(t0, t1, t2, t3) {
+    _ListQueueIterator: function _ListQueueIterator(t0, t1, t2, t3, t4) {
       var _ = this;
       _._queue = t0;
       _._collection$_end = t1;
       _._modificationCount = t2;
       _._collection$_position = t3;
       _._collection$_current = null;
+      _.$ti = t4;
     },
     SetBase: function SetBase() {
     },
@@ -5166,30 +6054,54 @@ self.util = _cliPkgRequires.util;
     },
     _UnmodifiableSetView_SetBase__UnmodifiableSetMixin: function _UnmodifiableSetView_SetBase__UnmodifiableSetMixin() {
     },
-    Utf8Decoder__convertIntercepted(allowMalformed, codeUnits, start, end) {
-      var casted, result;
-      if (codeUnits instanceof Uint8Array) {
-        casted = codeUnits;
-        end = casted.length;
-        if (end - start < 15)
-          return null;
-        result = A.Utf8Decoder__convertInterceptedUint8List(allowMalformed, casted, start, end);
-        if (result != null && allowMalformed)
-          if (result.indexOf("\ufffd") >= 0)
-            return null;
-        return result;
+    _parseJson(source, reviver) {
+      var e, exception, t1, parsed = null;
+      try {
+        parsed = JSON.parse(source);
+      } catch (exception) {
+        e = A.unwrapException(exception);
+        t1 = A.FormatException$(String(e), null, null);
+        throw A.wrapException(t1);
       }
-      return null;
+      t1 = A._convertJsonToDartLazy(parsed);
+      return t1;
     },
-    Utf8Decoder__convertInterceptedUint8List(allowMalformed, codeUnits, start, end) {
-      var decoder = allowMalformed ? $.$get$Utf8Decoder__decoderNonfatal() : $.$get$Utf8Decoder__decoder();
+    _convertJsonToDartLazy(object) {
+      var i;
+      if (object == null)
+        return null;
+      if (typeof object != "object")
+        return object;
+      if (!Array.isArray(object))
+        return new A._JsonMap(object, Object.create(null));
+      for (i = 0; i < object.length; ++i)
+        object[i] = A._convertJsonToDartLazy(object[i]);
+      return object;
+    },
+    _Utf8Decoder__makeNativeUint8List(codeUnits, start, end) {
+      var bytes, t1, i, b,
+        $length = end - start;
+      if ($length <= 4096)
+        bytes = $.$get$_Utf8Decoder__reusableBuffer();
+      else
+        bytes = new Uint8Array($length);
+      for (t1 = J.getInterceptor$asx(codeUnits), i = 0; i < $length; ++i) {
+        b = t1.$index(codeUnits, start + i);
+        if ((b & 255) !== b)
+          b = 255;
+        bytes[i] = b;
+      }
+      return bytes;
+    },
+    _Utf8Decoder__convertInterceptedUint8List(allowMalformed, codeUnits, start, end) {
+      var decoder = allowMalformed ? $.$get$_Utf8Decoder__decoderNonfatal() : $.$get$_Utf8Decoder__decoder();
       if (decoder == null)
         return null;
       if (0 === start && end === codeUnits.length)
-        return A.Utf8Decoder__useTextDecoder(decoder, codeUnits);
-      return A.Utf8Decoder__useTextDecoder(decoder, codeUnits.subarray(start, A.RangeError_checkValidRange(start, end, codeUnits.length)));
+        return A._Utf8Decoder__useTextDecoder(decoder, codeUnits);
+      return A._Utf8Decoder__useTextDecoder(decoder, codeUnits.subarray(start, end));
     },
-    Utf8Decoder__useTextDecoder(decoder, codeUnits) {
+    _Utf8Decoder__useTextDecoder(decoder, codeUnits) {
       var t1, exception;
       try {
         t1 = decoder.decode(codeUnits);
@@ -5292,19 +6204,23 @@ self.util = _cliPkgRequires.util;
           return "";
       }
     },
-    _Utf8Decoder__makeUint8List(codeUnits, start, end) {
-      var t1, i, b,
-        $length = end - start,
-        bytes = new Uint8Array($length);
-      for (t1 = J.getInterceptor$asx(codeUnits), i = 0; i < $length; ++i) {
-        b = t1.$index(codeUnits, start + i);
-        bytes[i] = (b & 4294967040) >>> 0 !== 0 ? 255 : b;
-      }
-      return bytes;
+    _JsonMap: function _JsonMap(t0, t1) {
+      this._original = t0;
+      this._processed = t1;
+      this._data = null;
     },
-    Utf8Decoder__decoder_closure: function Utf8Decoder__decoder_closure() {
+    _JsonMap_values_closure: function _JsonMap_values_closure(t0) {
+      this.$this = t0;
     },
-    Utf8Decoder__decoderNonfatal_closure: function Utf8Decoder__decoderNonfatal_closure() {
+    _JsonMap_addAll_closure: function _JsonMap_addAll_closure(t0) {
+      this.$this = t0;
+    },
+    _JsonMapKeyIterable: function _JsonMapKeyIterable(t0) {
+      this._convert$_parent = t0;
+    },
+    _Utf8Decoder__decoder_closure: function _Utf8Decoder__decoder_closure() {
+    },
+    _Utf8Decoder__decoderNonfatal_closure: function _Utf8Decoder__decoderNonfatal_closure() {
     },
     AsciiCodec: function AsciiCodec() {
     },
@@ -5348,6 +6264,9 @@ self.util = _cliPkgRequires.util;
     JsonEncoder: function JsonEncoder(t0) {
       this._toEncodable = t0;
     },
+    JsonDecoder: function JsonDecoder(t0) {
+      this._reviver = t0;
+    },
     _JsonStringifier: function _JsonStringifier() {
     },
     _JsonStringifier_writeMap_closure: function _JsonStringifier_writeMap_closure(t0, t1) {
@@ -5460,42 +6379,40 @@ self.util = _cliPkgRequires.util;
       return J.JSArray_markUnmodifiableList(A.List_List$from(elements, false, $E));
     },
     String_String$fromCharCodes(charCodes, start, end) {
-      var array, len;
+      var t1, t2, maxLength, array, len;
+      A.RangeError_checkNotNegative(start, "start");
+      t1 = end == null;
+      t2 = !t1;
+      if (t2) {
+        maxLength = end - start;
+        if (maxLength < 0)
+          throw A.wrapException(A.RangeError$range(end, start, null, "end", null));
+        if (maxLength === 0)
+          return "";
+      }
       if (Array.isArray(charCodes)) {
         array = charCodes;
         len = array.length;
-        end = A.RangeError_checkValidRange(start, end, len);
+        if (t1)
+          end = len;
         return A.Primitives_stringFromCharCodes(start > 0 || end < len ? array.slice(start, end) : array);
       }
       if (type$.NativeUint8List._is(charCodes))
-        return A.Primitives_stringFromNativeUint8List(charCodes, start, A.RangeError_checkValidRange(start, end, charCodes.length));
-      return A.String__stringFromIterable(charCodes, start, end);
+        return A.String__stringFromUint8List(charCodes, start, end);
+      if (t2)
+        charCodes = J.take$1$ax(charCodes, end);
+      if (start > 0)
+        charCodes = J.skip$1$ax(charCodes, start);
+      return A.Primitives_stringFromCharCodes(A.List_List$of(charCodes, true, type$.int));
     },
     String_String$fromCharCode(charCode) {
       return A.Primitives_stringFromCharCode(charCode);
     },
-    String__stringFromIterable(charCodes, start, end) {
-      var t1, it, i, list, _null = null;
-      if (start < 0)
-        throw A.wrapException(A.RangeError$range(start, 0, J.get$length$asx(charCodes), _null, _null));
-      t1 = end == null;
-      if (!t1 && end < start)
-        throw A.wrapException(A.RangeError$range(end, start, J.get$length$asx(charCodes), _null, _null));
-      it = J.get$iterator$ax(charCodes);
-      for (i = 0; i < start; ++i)
-        if (!it.moveNext$0())
-          throw A.wrapException(A.RangeError$range(start, 0, i, _null, _null));
-      list = [];
-      if (t1)
-        for (; it.moveNext$0();)
-          list.push(it.get$current(it));
-      else
-        for (i = start; i < end; ++i) {
-          if (!it.moveNext$0())
-            throw A.wrapException(A.RangeError$range(end, start, i, _null, _null));
-          list.push(it.get$current(it));
-        }
-      return A.Primitives_stringFromCharCodes(list);
+    String__stringFromUint8List(charCodes, start, endOrNull) {
+      var len = charCodes.length;
+      if (start >= len)
+        return "";
+      return A.Primitives_stringFromNativeUint8List(charCodes, start, endOrNull == null || endOrNull > len ? len : endOrNull);
     },
     RegExp_RegExp(source, multiLine) {
       return new A.JSSyntaxRegExp(source, A.JSSyntaxRegExp_makeNative(source, multiLine, true, false, false, false));
@@ -5544,7 +6461,7 @@ self.util = _cliPkgRequires.util;
         t1 = false;
       if (t1)
         return text;
-      bytes = encoding.get$encoder().convert$1(text);
+      bytes = B.C_Utf8Encoder.convert$1(text);
       for (t1 = bytes.length, i = 0, t2 = ""; i < t1; ++i) {
         byte = bytes[i];
         if (byte < 128 && (canonicalTable[byte >>> 4] & 1 << (byte & 15)) !== 0)
@@ -5555,15 +6472,7 @@ self.util = _cliPkgRequires.util;
       return t2.charCodeAt(0) == 0 ? t2 : t2;
     },
     StackTrace_current() {
-      var stackTrace, exception;
-      if ($.$get$_hasErrorStackProperty())
-        return A.getTraceFromException(new Error());
-      try {
-        throw A.wrapException("");
-      } catch (exception) {
-        stackTrace = A.getTraceFromException(exception);
-        return stackTrace;
-      }
+      return A.getTraceFromException(new Error());
     },
     DateTime__fourDigits(n) {
       var absN = Math.abs(n),
@@ -5837,7 +6746,7 @@ self.util = _cliPkgRequires.util;
       A.UriData__writeUri(mimeType, encodingName, null, buffer, indices);
       indices.push(buffer._contents.length);
       buffer._contents += ",";
-      A.UriData__uriEncodeBytes(B.List_oFp, encoding.encode$1($content), buffer);
+      A.UriData__uriEncodeBytes(B.List_42A, encoding.encode$1($content), buffer);
       t1 = buffer._contents;
       return new A.UriData(t1.charCodeAt(0) == 0 ? t1 : t1, indices, null).get$uri();
     },
@@ -5905,63 +6814,60 @@ self.util = _cliPkgRequires.util;
                 t2 = queryStart > pathStart + 2 && B.JSString_methods.startsWith$2(uri, "/..", queryStart - 3);
               else
                 t2 = true;
-              if (t2) {
+              if (t2)
                 scheme = _null;
-                isSimple = false;
-              } else {
-                if (schemeEnd === 4)
-                  if (B.JSString_methods.startsWith$2(uri, "file", 0)) {
-                    if (hostStart <= 0) {
-                      if (!B.JSString_methods.startsWith$2(uri, "/", pathStart)) {
-                        schemeAuth = "file:///";
-                        delta = 3;
-                      } else {
-                        schemeAuth = "file://";
-                        delta = 2;
-                      }
-                      uri = schemeAuth + B.JSString_methods.substring$2(uri, pathStart, end);
-                      schemeEnd -= 0;
-                      t1 = delta - 0;
-                      queryStart += t1;
-                      fragmentStart += t1;
-                      end = uri.length;
-                      hostStart = 7;
-                      portStart = 7;
-                      pathStart = 7;
-                    } else if (pathStart === queryStart) {
-                      ++fragmentStart;
-                      queryStart0 = queryStart + 1;
-                      uri = B.JSString_methods.replaceRange$3(uri, pathStart, queryStart, "/");
-                      ++end;
-                      queryStart = queryStart0;
+              else if (schemeEnd === 4)
+                if (B.JSString_methods.startsWith$2(uri, "file", 0)) {
+                  if (hostStart <= 0) {
+                    if (!B.JSString_methods.startsWith$2(uri, "/", pathStart)) {
+                      schemeAuth = "file:///";
+                      delta = 3;
+                    } else {
+                      schemeAuth = "file://";
+                      delta = 2;
                     }
-                    scheme = "file";
-                  } else if (B.JSString_methods.startsWith$2(uri, "http", 0)) {
-                    if (t1 && portStart + 3 === pathStart && B.JSString_methods.startsWith$2(uri, "80", portStart + 1)) {
-                      fragmentStart -= 3;
-                      pathStart0 = pathStart - 3;
-                      queryStart -= 3;
-                      uri = B.JSString_methods.replaceRange$3(uri, portStart, pathStart, "");
-                      end -= 3;
-                      pathStart = pathStart0;
-                    }
-                    scheme = "http";
-                  } else
-                    scheme = _null;
-                else if (schemeEnd === 5 && B.JSString_methods.startsWith$2(uri, "https", 0)) {
-                  if (t1 && portStart + 4 === pathStart && B.JSString_methods.startsWith$2(uri, "443", portStart + 1)) {
-                    fragmentStart -= 4;
-                    pathStart0 = pathStart - 4;
-                    queryStart -= 4;
+                    uri = schemeAuth + B.JSString_methods.substring$2(uri, pathStart, end);
+                    schemeEnd -= 0;
+                    t1 = delta - 0;
+                    queryStart += t1;
+                    fragmentStart += t1;
+                    end = uri.length;
+                    hostStart = 7;
+                    portStart = 7;
+                    pathStart = 7;
+                  } else if (pathStart === queryStart) {
+                    ++fragmentStart;
+                    queryStart0 = queryStart + 1;
+                    uri = B.JSString_methods.replaceRange$3(uri, pathStart, queryStart, "/");
+                    ++end;
+                    queryStart = queryStart0;
+                  }
+                  scheme = "file";
+                } else if (B.JSString_methods.startsWith$2(uri, "http", 0)) {
+                  if (t1 && portStart + 3 === pathStart && B.JSString_methods.startsWith$2(uri, "80", portStart + 1)) {
+                    fragmentStart -= 3;
+                    pathStart0 = pathStart - 3;
+                    queryStart -= 3;
                     uri = B.JSString_methods.replaceRange$3(uri, portStart, pathStart, "");
                     end -= 3;
                     pathStart = pathStart0;
                   }
-                  scheme = "https";
+                  scheme = "http";
                 } else
                   scheme = _null;
-                isSimple = true;
-              }
+              else if (schemeEnd === 5 && B.JSString_methods.startsWith$2(uri, "https", 0)) {
+                if (t1 && portStart + 4 === pathStart && B.JSString_methods.startsWith$2(uri, "443", portStart + 1)) {
+                  fragmentStart -= 4;
+                  pathStart0 = pathStart - 4;
+                  queryStart -= 4;
+                  uri = B.JSString_methods.replaceRange$3(uri, portStart, pathStart, "");
+                  end -= 3;
+                  pathStart = pathStart0;
+                }
+                scheme = "https";
+              } else
+                scheme = _null;
+              isSimple = !t2;
             }
           }
         }
@@ -6159,16 +7065,15 @@ self.util = _cliPkgRequires.util;
       }
     },
     _Uri__checkWindowsPathReservedCharacters(segments, argumentError, firstSegment) {
-      var t1, t2, t3, t4, t5, _null = null;
-      for (t1 = A.SubListIterable$(segments, firstSegment, _null, A._arrayInstanceType(segments)._precomputed1), t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      var t1, t2, t3, t4;
+      for (t1 = A.SubListIterable$(segments, firstSegment, null, A._arrayInstanceType(segments)._precomputed1), t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListIterable.E>")), t2 = t2._eval$1("ListIterable.E"); t1.moveNext$0();) {
         t3 = t1.__internal$_current;
         if (t3 == null)
           t3 = t2._as(t3);
         t4 = A.RegExp_RegExp('["*/:<>?\\\\|]', false);
-        t5 = t3.length;
         if (A.stringContainsUnchecked(t3, t4, 0))
           if (argumentError)
-            throw A.wrapException(A.ArgumentError$("Illegal character in path", _null));
+            throw A.wrapException(A.ArgumentError$("Illegal character in path", null));
           else
             throw A.wrapException(A.UnsupportedError$("Illegal character in path: " + t3));
       }
@@ -6301,7 +7206,7 @@ self.util = _cliPkgRequires.util;
           index += 3;
           sectionStart = index;
           isNormalized = true;
-        } else if (char < 127 && (B.List_M1A[char >>> 4] & 1 << (char & 15)) !== 0) {
+        } else if (char < 127 && (B.List_piR[char >>> 4] & 1 << (char & 15)) !== 0) {
           if (isNormalized && 65 <= char && 90 >= char) {
             if (buffer == null)
               buffer = new A.StringBuffer("");
@@ -6329,15 +7234,18 @@ self.util = _cliPkgRequires.util;
           } else
             t1 = buffer;
           t1._contents += slice;
-          t1._contents += A._Uri__escapeChar(char);
+          t2 = A._Uri__escapeChar(char);
+          t1._contents += t2;
           index += sourceLength;
           sectionStart = index;
         }
       }
       if (buffer == null)
         return B.JSString_methods.substring$2(host, start, end);
-      if (sectionStart < end)
-        buffer._contents += B.JSString_methods.substring$2(host, sectionStart, end);
+      if (sectionStart < end) {
+        slice = B.JSString_methods.substring$2(host, sectionStart, end);
+        buffer._contents += slice;
+      }
       t1 = buffer._contents;
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     },
@@ -6355,7 +7263,9 @@ self.util = _cliPkgRequires.util;
           if (buffer == null)
             buffer = new A.StringBuffer("");
           slice = B.JSString_methods.substring$2(host, sectionStart, index);
-          t2 = buffer._contents += !isNormalized ? slice.toLowerCase() : slice;
+          if (!isNormalized)
+            slice = slice.toLowerCase();
+          t2 = buffer._contents += slice;
           if (t1) {
             replacement = B.JSString_methods.substring$2(host, index, index + 3);
             sourceLength = 3;
@@ -6368,7 +7278,7 @@ self.util = _cliPkgRequires.util;
           index += sourceLength;
           sectionStart = index;
           isNormalized = true;
-        } else if (char < 127 && (B.List_ejq[char >>> 4] & 1 << (char & 15)) !== 0) {
+        } else if (char < 127 && (B.List_4AN[char >>> 4] & 1 << (char & 15)) !== 0) {
           if (isNormalized && 65 <= char && 90 >= char) {
             if (buffer == null)
               buffer = new A.StringBuffer("");
@@ -6379,7 +7289,7 @@ self.util = _cliPkgRequires.util;
             isNormalized = false;
           }
           ++index;
-        } else if (char <= 93 && (B.List_YmH[char >>> 4] & 1 << (char & 15)) !== 0)
+        } else if (char <= 93 && (B.List_VOY[char >>> 4] & 1 << (char & 15)) !== 0)
           A._Uri__fail(host, index, "Invalid character");
         else {
           if ((char & 64512) === 55296 && index + 1 < end) {
@@ -6400,7 +7310,8 @@ self.util = _cliPkgRequires.util;
           } else
             t1 = buffer;
           t1._contents += slice;
-          t1._contents += A._Uri__escapeChar(char);
+          t2 = A._Uri__escapeChar(char);
+          t1._contents += t2;
           index += sourceLength;
           sectionStart = index;
         }
@@ -6409,7 +7320,9 @@ self.util = _cliPkgRequires.util;
         return B.JSString_methods.substring$2(host, start, end);
       if (sectionStart < end) {
         slice = B.JSString_methods.substring$2(host, sectionStart, end);
-        buffer._contents += !isNormalized ? slice.toLowerCase() : slice;
+        if (!isNormalized)
+          slice = slice.toLowerCase();
+        buffer._contents += slice;
       }
       t1 = buffer._contents;
       return t1.charCodeAt(0) == 0 ? t1 : t1;
@@ -6422,7 +7335,7 @@ self.util = _cliPkgRequires.util;
         A._Uri__fail(scheme, start, "Scheme not starting with alphabetic character");
       for (i = start, containsUpperCase = false; i < end; ++i) {
         codeUnit = scheme.charCodeAt(i);
-        if (!(codeUnit < 128 && (B.List_MMm[codeUnit >>> 4] & 1 << (codeUnit & 15)) !== 0))
+        if (!(codeUnit < 128 && (B.List_GVy[codeUnit >>> 4] & 1 << (codeUnit & 15)) !== 0))
           A._Uri__fail(scheme, i, "Illegal scheme character");
         if (65 <= codeUnit && codeUnit <= 90)
           containsUpperCase = true;
@@ -6444,7 +7357,7 @@ self.util = _cliPkgRequires.util;
     _Uri__makeUserInfo(userInfo, start, end) {
       if (userInfo == null)
         return "";
-      return A._Uri__normalizeOrSubstring(userInfo, start, end, B.List_OL3, false, false);
+      return A._Uri__normalizeOrSubstring(userInfo, start, end, B.List_2jN, false, false);
     },
     _Uri__makePath(path, start, end, pathSegments, scheme, hasAuthority) {
       var result,
@@ -6457,7 +7370,7 @@ self.util = _cliPkgRequires.util;
       } else if (pathSegments != null)
         throw A.wrapException(A.ArgumentError$("Both path and pathSegments specified", null));
       else
-        result = A._Uri__normalizeOrSubstring(path, start, end, B.List_XRg, true, true);
+        result = A._Uri__normalizeOrSubstring(path, start, end, B.List_M2I, true, true);
       if (result.length === 0) {
         if (isFile)
           return "/";
@@ -6473,13 +7386,13 @@ self.util = _cliPkgRequires.util;
     },
     _Uri__makeQuery(query, start, end, queryParameters) {
       if (query != null)
-        return A._Uri__normalizeOrSubstring(query, start, end, B.List_oFp, true, false);
+        return A._Uri__normalizeOrSubstring(query, start, end, B.List_42A, true, false);
       return null;
     },
     _Uri__makeFragment(fragment, start, end) {
       if (fragment == null)
         return null;
-      return A._Uri__normalizeOrSubstring(fragment, start, end, B.List_oFp, true, false);
+      return A._Uri__normalizeOrSubstring(fragment, start, end, B.List_42A, true, false);
     },
     _Uri__normalizeEscape(source, index, lowerCase) {
       var firstDigit, secondDigit, firstDigitValue, secondDigitValue, value,
@@ -6493,7 +7406,7 @@ self.util = _cliPkgRequires.util;
       if (firstDigitValue < 0 || secondDigitValue < 0)
         return "%";
       value = firstDigitValue * 16 + secondDigitValue;
-      if (value < 127 && (B.List_M1A[B.JSInt_methods._shrOtherPositive$1(value, 4)] & 1 << (value & 15)) !== 0)
+      if (value < 127 && (B.List_piR[B.JSInt_methods._shrOtherPositive$1(value, 4)] & 1 << (value & 15)) !== 0)
         return A.Primitives_stringFromCharCode(lowerCase && 65 <= value && 90 >= value ? (value | 32) >>> 0 : value);
       if (firstDigit >= 97 || secondDigit >= 97)
         return B.JSString_methods.substring$2(source, index, index + 3).toUpperCase();
@@ -6556,7 +7469,7 @@ self.util = _cliPkgRequires.util;
           } else if (char === 92 && replaceBackslash) {
             replacement = "/";
             sourceLength = 1;
-          } else if (t1 && char <= 93 && (B.List_YmH[char >>> 4] & 1 << (char & 15)) !== 0) {
+          } else if (t1 && char <= 93 && (B.List_VOY[char >>> 4] & 1 << (char & 15)) !== 0) {
             A._Uri__fail(component, index, "Invalid character");
             sourceLength = _null;
             replacement = sourceLength;
@@ -6589,8 +7502,10 @@ self.util = _cliPkgRequires.util;
       }
       if (buffer == null)
         return _null;
-      if (sectionStart < end)
-        buffer._contents += B.JSString_methods.substring$2(component, sectionStart, end);
+      if (sectionStart < end) {
+        t1 = B.JSString_methods.substring$2(component, sectionStart, end);
+        buffer._contents += t1;
+      }
       t1 = buffer._contents;
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     },
@@ -6613,11 +7528,10 @@ self.util = _cliPkgRequires.util;
               output.push("");
           }
           appendSlash = true;
-        } else if ("." === segment)
-          appendSlash = true;
-        else {
-          output.push(segment);
-          appendSlash = false;
+        } else {
+          appendSlash = "." === segment;
+          if (!appendSlash)
+            output.push(segment);
         }
       }
       if (appendSlash)
@@ -6631,19 +7545,16 @@ self.util = _cliPkgRequires.util;
       output = A._setArrayType([], type$.JSArray_String);
       for (t1 = path.split("/"), t2 = t1.length, appendSlash = false, _i = 0; _i < t2; ++_i) {
         segment = t1[_i];
-        if (".." === segment)
-          if (output.length !== 0 && B.JSArray_methods.get$last(output) !== "..") {
+        if (".." === segment) {
+          appendSlash = output.length !== 0 && B.JSArray_methods.get$last(output) !== "..";
+          if (appendSlash)
             output.pop();
-            appendSlash = true;
-          } else {
+          else
             output.push("..");
-            appendSlash = false;
-          }
-        else if ("." === segment)
-          appendSlash = true;
-        else {
-          output.push(segment);
-          appendSlash = false;
+        } else {
+          appendSlash = "." === segment;
+          if (!appendSlash)
+            output.push(segment);
         }
       }
       t1 = output.length;
@@ -6667,7 +7578,7 @@ self.util = _cliPkgRequires.util;
           char = path.charCodeAt(i);
           if (char === 58)
             return B.JSString_methods.substring$2(path, 0, i) + "%3A" + B.JSString_methods.substring$1(path, i + 1);
-          if (char > 127 || (B.List_MMm[char >>> 4] & 1 << (char & 15)) === 0)
+          if (char > 127 || (B.List_GVy[char >>> 4] & 1 << (char & 15)) === 0)
             break;
         }
       return path;
@@ -6678,17 +7589,15 @@ self.util = _cliPkgRequires.util;
       return -1;
     },
     _Uri__toWindowsFilePath(uri) {
-      var hasDriveLetter, t2, host,
+      var t2, host,
         segments = uri.get$pathSegments(),
-        t1 = segments.length;
-      if (t1 > 0 && J.get$length$asx(segments[0]) === 2 && J.codeUnitAt$1$s(segments[0], 1) === 58) {
+        t1 = segments.length,
+        hasDriveLetter = t1 > 0 && J.get$length$asx(segments[0]) === 2 && J.codeUnitAt$1$s(segments[0], 1) === 58;
+      if (hasDriveLetter) {
         A._Uri__checkWindowsDriveLetter(J.codeUnitAt$1$s(segments[0], 0), false);
         A._Uri__checkWindowsPathReservedCharacters(segments, false, 1);
-        hasDriveLetter = true;
-      } else {
+      } else
         A._Uri__checkWindowsPathReservedCharacters(segments, false, 0);
-        hasDriveLetter = false;
-      }
       t2 = uri.get$hasAbsolutePath() && !hasDriveLetter ? "" + "\\" : "";
       if (uri.get$hasAuthority()) {
         host = uri.get$host();
@@ -6725,10 +7634,7 @@ self.util = _cliPkgRequires.util;
         }
         codeUnit = text.charCodeAt(i);
         if (codeUnit <= 127)
-          if (codeUnit !== 37)
-            t1 = false;
-          else
-            t1 = true;
+          t1 = codeUnit === 37;
         else
           t1 = true;
         if (t1) {
@@ -6737,16 +7643,12 @@ self.util = _cliPkgRequires.util;
         }
         ++i;
       }
-      if (simple) {
-        if (B.C_Utf8Codec !== encoding)
-          t1 = false;
-        else
-          t1 = true;
-        if (t1)
+      if (simple)
+        if (B.C_Utf8Codec === encoding)
           return B.JSString_methods.substring$2(text, start, end);
         else
           bytes = new A.CodeUnits(B.JSString_methods.substring$2(text, start, end));
-      } else {
+      else {
         bytes = A._setArrayType([], type$.JSArray_int);
         for (t1 = text.length, i = start; i < end; ++i) {
           codeUnit = text.charCodeAt(i);
@@ -6781,15 +7683,18 @@ self.util = _cliPkgRequires.util;
         slashIndex = A.UriData__validateMimeType(mimeType);
         if (slashIndex < 0)
           throw A.wrapException(A.ArgumentError$value(mimeType, "mimeType", "Invalid MIME type"));
-        t1 = buffer._contents += A._Uri__uriEncode(B.List_yzX, B.JSString_methods.substring$2(mimeType, 0, slashIndex), B.C_Utf8Codec, false);
+        t1 = A._Uri__uriEncode(B.List_oyU, B.JSString_methods.substring$2(mimeType, 0, slashIndex), B.C_Utf8Codec, false);
+        t1 = buffer._contents += t1;
         buffer._contents = t1 + "/";
-        t1 = buffer._contents += A._Uri__uriEncode(B.List_yzX, B.JSString_methods.substring$1(mimeType, slashIndex + 1), B.C_Utf8Codec, false);
+        t1 = A._Uri__uriEncode(B.List_oyU, B.JSString_methods.substring$1(mimeType, slashIndex + 1), B.C_Utf8Codec, false);
+        t1 = buffer._contents += t1;
       }
       if (charsetName != null) {
         indices.push(t1.length);
         indices.push(buffer._contents.length + 8);
         buffer._contents += ";charset=";
-        buffer._contents += A._Uri__uriEncode(B.List_yzX, charsetName, B.C_Utf8Codec, false);
+        t1 = A._Uri__uriEncode(B.List_oyU, charsetName, B.C_Utf8Codec, false);
+        buffer._contents += t1;
       }
     },
     UriData__validateMimeType(mimeType) {
@@ -6848,30 +7753,34 @@ self.util = _cliPkgRequires.util;
       if ((indices.length & 1) === 1)
         text = B.C_Base64Codec.normalize$3(text, t2, t1);
       else {
-        data = A._Uri__normalize(text, t2, t1, B.List_oFp, true, false);
+        data = A._Uri__normalize(text, t2, t1, B.List_42A, true, false);
         if (data != null)
           text = B.JSString_methods.replaceRange$3(text, t2, t1, data);
       }
       return new A.UriData(text, indices, sourceUri);
     },
     UriData__uriEncodeBytes(canonicalTable, bytes, buffer) {
-      var t1, byteOr, i, byte,
+      var t1, byteOr, i, byte, t2,
         _s16_ = "0123456789ABCDEF";
-      for (t1 = J.getInterceptor$asx(bytes), byteOr = 0, i = 0; i < t1.get$length(bytes); ++i) {
-        byte = t1.$index(bytes, i);
+      for (t1 = bytes.length, byteOr = 0, i = 0; i < t1; ++i) {
+        byte = bytes[i];
         byteOr |= byte;
-        if (byte < 128 && (canonicalTable[B.JSInt_methods._shrOtherPositive$1(byte, 4)] & 1 << (byte & 15)) !== 0)
-          buffer._contents += A.Primitives_stringFromCharCode(byte);
-        else {
-          buffer._contents += A.Primitives_stringFromCharCode(37);
-          buffer._contents += A.Primitives_stringFromCharCode(_s16_.charCodeAt(B.JSInt_methods._shrOtherPositive$1(byte, 4)));
-          buffer._contents += A.Primitives_stringFromCharCode(_s16_.charCodeAt(byte & 15));
+        if (byte < 128 && (canonicalTable[byte >>> 4] & 1 << (byte & 15)) !== 0) {
+          t2 = A.Primitives_stringFromCharCode(byte);
+          buffer._contents += t2;
+        } else {
+          t2 = A.Primitives_stringFromCharCode(37);
+          buffer._contents += t2;
+          t2 = A.Primitives_stringFromCharCode(_s16_.charCodeAt(byte >>> 4));
+          buffer._contents += t2;
+          t2 = A.Primitives_stringFromCharCode(_s16_.charCodeAt(byte & 15));
+          buffer._contents += t2;
         }
       }
-      if ((byteOr & 4294967040) >>> 0 !== 0)
-        for (i = 0; i < t1.get$length(bytes); ++i) {
-          byte = t1.$index(bytes, i);
-          if (byte < 0 || byte > 255)
+      if ((byteOr & 4294967040) !== 0)
+        for (i = 0; i < t1; ++i) {
+          byte = bytes[i];
+          if (byte > 255)
             throw A.wrapException(A.ArgumentError$value(byte, "non-byte value", null));
         }
     },
@@ -7071,7 +7980,7 @@ self.util = _cliPkgRequires.util;
       this.sb = t1;
     },
     DateTime: function DateTime(t0, t1) {
-      this._core$_value = t0;
+      this._value = t0;
       this.isUtc = t1;
     },
     Duration: function Duration(t0) {
@@ -7284,7 +8193,7 @@ self.util = _cliPkgRequires.util;
     _noJsifyRequired(o) {
       return o == null || A._isBool(o) || typeof o == "number" || typeof o == "string" || type$.Int8List._is(o) || type$.Uint8List._is(o) || type$.Uint8ClampedList._is(o) || type$.Int16List._is(o) || type$.Uint16List._is(o) || type$.Int32List._is(o) || type$.Uint32List._is(o) || type$.Float32List._is(o) || type$.Float64List._is(o) || type$.ByteBuffer._is(o) || type$.ByteData._is(o);
     },
-    jsify0(object) {
+    jsify(object) {
       if (A._noJsifyRequired(object))
         return object;
       return new A.jsify__convert(new A._IdentityHashMap(type$._IdentityHashMap_of_nullable_Object_and_nullable_Object)).call$1(object);
@@ -7310,9 +8219,24 @@ self.util = _cliPkgRequires.util;
       String(factoryFunction);
       return new factoryFunction();
     },
+    promiseToFuture0(jsPromise, $T) {
+      var t1 = new A._Future($.Zone__current, $T._eval$1("_Future<0>")),
+        completer = new A._AsyncCompleter(t1, $T._eval$1("_AsyncCompleter<0>"));
+      jsPromise.then(A.convertDartClosureToJS(new A.promiseToFuture_closure1(completer), 1), A.convertDartClosureToJS(new A.promiseToFuture_closure2(completer), 1));
+      return t1;
+    },
     jsify__convert: function jsify__convert(t0) {
       this._convertedObjects = t0;
     },
+    promiseToFuture_closure1: function promiseToFuture_closure1(t0) {
+      this.completer = t0;
+    },
+    promiseToFuture_closure2: function promiseToFuture_closure2(t0) {
+      this.completer = t0;
+    },
+    NullRejectionException: function NullRejectionException(t0) {
+      this.isUndefined = t0;
+    },
     max(a, b) {
       return Math.max(a, b);
     },
@@ -7418,6 +8342,21 @@ self.util = _cliPkgRequires.util;
     _Usage__buildAllowedList_closure: function _Usage__buildAllowedList_closure(t0) {
       this.option = t0;
     },
+    FutureGroup: function FutureGroup(t0, t1, t2) {
+      var _ = this;
+      _._future_group$_pending = 0;
+      _._future_group$_closed = false;
+      _._future_group$_completer = t0;
+      _._future_group$_values = t1;
+      _.$ti = t2;
+    },
+    FutureGroup_add_closure: function FutureGroup_add_closure(t0, t1) {
+      this.$this = t0;
+      this.index = t1;
+    },
+    FutureGroup_add_closure0: function FutureGroup_add_closure0(t0) {
+      this.$this = t0;
+    },
     ErrorResult: function ErrorResult(t0, t1) {
       this.error = t0;
       this.stackTrace = t1;
@@ -7574,7 +8513,8 @@ self.util = _cliPkgRequires.util;
       this.key = t1;
       this.value = t2;
     },
-    MapEquality: function MapEquality() {
+    MapEquality: function MapEquality(t0) {
+      this.$ti = t0;
     },
     QueueList$(initialCapacity, $E) {
       return new A.QueueList(A.List_List$filled(A.QueueList__computeInitialCapacity(initialCapacity), null, false, $E._eval$1("0?")), 0, 0, $E._eval$1("QueueList<0>"));
@@ -7775,15 +8715,12 @@ self.util = _cliPkgRequires.util;
     },
     TTYWriteStream: function TTYWriteStream() {
     },
-    jsify(dartObject) {
+    jsify0(dartObject) {
       if (A._isBasicType(dartObject))
         return dartObject;
-      return A.jsify0(dartObject);
+      return A.jsify(dartObject);
     },
     _isBasicType(value) {
-      var t1 = false;
-      if (t1)
-        return true;
       return false;
     },
     promiseToFuture(promise, $T) {
@@ -7971,6 +8908,12 @@ self.util = _cliPkgRequires.util;
         A.throwExpression(A.ArgumentError$("Patch version must be non-negative.", null));
       return new A.Version(major, minor, patch, t1, t2, _text);
     },
+    Version_Version(major, minor, patch, pre) {
+      var text = "" + major + "." + minor + "." + patch;
+      if (pre != null)
+        text += "-" + pre;
+      return A.Version$_(major, minor, patch, pre, null, text);
+    },
     Version___parse_tearOff(text) {
       return A.Version_Version$parse(text);
     },
@@ -8016,6 +8959,9 @@ self.util = _cliPkgRequires.util;
     },
     Version__splitParts_closure: function Version__splitParts_closure() {
     },
+    VersionRange_VersionRange(includeMax, max) {
+      return new A.VersionRange(null, max, false, true);
+    },
     VersionRange: function VersionRange(t0, t1, t2, t3) {
       var _ = this;
       _.min = t0;
@@ -8137,17 +9083,18 @@ self.util = _cliPkgRequires.util;
     },
     ModifiableCssParentNode: function ModifiableCssParentNode() {
     },
-    ModifiableCssStyleRule$(_selector, span, originalSelector) {
+    ModifiableCssStyleRule$(_selector, span, fromPlainCss, originalSelector) {
       var t1 = A._setArrayType([], type$.JSArray_ModifiableCssNode);
-      return new A.ModifiableCssStyleRule(_selector, originalSelector, span, new A.UnmodifiableListView(t1, type$.UnmodifiableListView_ModifiableCssNode), t1);
+      return new A.ModifiableCssStyleRule(_selector, originalSelector, span, fromPlainCss, new A.UnmodifiableListView(t1, type$.UnmodifiableListView_ModifiableCssNode), t1);
     },
-    ModifiableCssStyleRule: function ModifiableCssStyleRule(t0, t1, t2, t3, t4) {
+    ModifiableCssStyleRule: function ModifiableCssStyleRule(t0, t1, t2, t3, t4, t5) {
       var _ = this;
       _._style_rule$_selector = t0;
       _.originalSelector = t1;
       _.span = t2;
-      _.children = t3;
-      _._children = t4;
+      _.fromPlainCss = t3;
+      _.children = t4;
+      _._children = t5;
       _._indexInParent = _._parent = null;
       _.isGroupEnd = false;
     },
@@ -8268,12 +9215,13 @@ self.util = _cliPkgRequires.util;
       this.value = t0;
       this.span = t1;
     },
-    FunctionExpression: function FunctionExpression(t0, t1, t2, t3) {
+    FunctionExpression: function FunctionExpression(t0, t1, t2, t3, t4) {
       var _ = this;
       _.namespace = t0;
-      _.originalName = t1;
-      _.$arguments = t2;
-      _.span = t3;
+      _.name = t1;
+      _.originalName = t2;
+      _.$arguments = t3;
+      _.span = t4;
     },
     IfExpression: function IfExpression(t0, t1) {
       this.$arguments = t0;
@@ -8294,9 +9242,6 @@ self.util = _cliPkgRequires.util;
     ListExpression_toString_closure: function ListExpression_toString_closure(t0) {
       this.$this = t0;
     },
-    ListExpression__elementNeedsParens_closure: function ListExpression__elementNeedsParens_closure(t0) {
-      this._0_0 = t0;
-    },
     MapExpression: function MapExpression(t0, t1) {
       this.pairs = t0;
       this.span = t1;
@@ -8322,11 +9267,12 @@ self.util = _cliPkgRequires.util;
         buffer = new A.StringBuffer("");
       buffer._contents = "" + A.Primitives_stringFromCharCode(quote);
       A.StringExpression__quoteInnerText(text, quote, buffer, true);
-      t1 = buffer._contents += A.Primitives_stringFromCharCode(quote);
+      t1 = A.Primitives_stringFromCharCode(quote);
+      t1 = buffer._contents += t1;
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     },
     StringExpression__quoteInnerText(text, quote, buffer, $static) {
-      var t1, t2, i, _1_0, _0_0, t3, t4;
+      var t1, t2, i, _1_0, _0_0, t3, t4, t0;
       for (t1 = text.length, t2 = t1 - 1, i = 0; i < t1; ++i) {
         _1_0 = text.charCodeAt(i);
         if (_1_0 === 10 || _1_0 === 13 || _1_0 === 12) {
@@ -8349,29 +9295,26 @@ self.util = _cliPkgRequires.util;
           }
           continue;
         }
-        if (92 === _1_0) {
-          t3 = _1_0;
-          t4 = true;
-        } else {
-          t3 = null;
-          t4 = false;
-        }
-        if (!t4) {
-          if (_1_0 === quote) {
-            t3 = _1_0;
-            t4 = true;
-          } else
-            t4 = false;
+        t3 = 92 === _1_0;
+        if (t3)
+          t4 = _1_0;
+        else
+          t4 = null;
+        if (!t3) {
+          t3 = _1_0 === quote;
+          if (t3)
+            t4 = _1_0;
+          t0 = t4;
+          t4 = t3;
+          t3 = t0;
           if (!t4)
             if (35 === _1_0)
               if ($static)
-                if (i < t2)
-                  if (text.charCodeAt(i + 1) === 123) {
+                if (i < t2) {
+                  t4 = text.charCodeAt(i + 1) === 123;
+                  if (t4)
                     t3 = _1_0;
-                    t4 = true;
-                  } else
-                    t4 = false;
-                else
+                } else
                   t4 = false;
               else
                 t4 = false;
@@ -8379,8 +9322,10 @@ self.util = _cliPkgRequires.util;
               t4 = false;
           else
             t4 = true;
-        } else
+        } else {
+          t3 = t4;
           t4 = true;
+        }
         if (t4) {
           buffer.writeCharCode$1(92);
           buffer.writeCharCode$1(t3);
@@ -8390,15 +9335,15 @@ self.util = _cliPkgRequires.util;
       }
     },
     StringExpression__bestQuote(strings) {
-      var t1, containsDoubleQuote, t2, t3, t4;
-      for (t1 = J.get$iterator$ax(strings), containsDoubleQuote = false; t1.moveNext$0();)
-        for (t2 = new A.CodeUnits(t1.get$current(t1)), t2 = new A.ListIterator(t2, t2.get$length(t2)), t3 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
-          t4 = t2.__internal$_current;
-          if (t4 == null)
-            t4 = t3._as(t4);
-          if (t4 === 39)
+      var t1, t2, t3, containsDoubleQuote, t4, t5;
+      for (t1 = J.get$iterator$ax(strings), t2 = type$.CodeUnits, t3 = t2._eval$1("ListIterator<ListBase.E>"), t2 = t2._eval$1("ListBase.E"), containsDoubleQuote = false; t1.moveNext$0();)
+        for (t4 = new A.CodeUnits(t1.get$current(t1)), t4 = new A.ListIterator(t4, t4.get$length(0), t3); t4.moveNext$0();) {
+          t5 = t4.__internal$_current;
+          if (t5 == null)
+            t5 = t2._as(t5);
+          if (t5 === 39)
             return 34;
-          if (t4 === 34)
+          if (t5 === 34)
             containsDoubleQuote = true;
         }
       return containsDoubleQuote ? 39 : 34;
@@ -8447,15 +9392,6 @@ self.util = _cliPkgRequires.util;
       this.contents = t0;
       this.span = t1;
     },
-    Interpolation_asPlain_closure: function Interpolation_asPlain_closure(t0) {
-      this._0_0 = t0;
-    },
-    Interpolation_asPlain_closure0: function Interpolation_asPlain_closure0(t0) {
-      this._0_0 = t0;
-    },
-    Interpolation_initialPlain_closure: function Interpolation_initialPlain_closure(t0) {
-      this._0_0 = t0;
-    },
     Interpolation_toString_closure: function Interpolation_toString_closure() {
     },
     AtRootRule$(children, span, query) {
@@ -8486,17 +9422,20 @@ self.util = _cliPkgRequires.util;
     CallableDeclaration: function CallableDeclaration() {
     },
     ContentBlock$($arguments, children, span) {
-      var t1 = A.List_List$unmodifiable(children, type$.Statement),
-        t2 = B.JSArray_methods.any$1(t1, new A.ParentStatement_closure());
-      return new A.ContentBlock("@content", $arguments, span, t1, t2);
+      var _s8_ = "@content",
+        t1 = A.stringReplaceAllUnchecked(_s8_, "_", "-"),
+        t2 = A.List_List$unmodifiable(children, type$.Statement),
+        t3 = B.JSArray_methods.any$1(t2, new A.ParentStatement_closure());
+      return new A.ContentBlock(t1, _s8_, $arguments, span, t2, t3);
     },
-    ContentBlock: function ContentBlock(t0, t1, t2, t3, t4) {
+    ContentBlock: function ContentBlock(t0, t1, t2, t3, t4, t5) {
       var _ = this;
       _.name = t0;
-      _.$arguments = t1;
-      _.span = t2;
-      _.children = t3;
-      _.hasDeclarations = t4;
+      _.originalName = t1;
+      _.$arguments = t2;
+      _.span = t3;
+      _.children = t4;
+      _.hasDeclarations = t5;
     },
     ContentRule: function ContentRule(t0, t1) {
       this.$arguments = t0;
@@ -8574,17 +9513,19 @@ self.util = _cliPkgRequires.util;
       _.span = t7;
     },
     FunctionRule$($name, $arguments, children, span, comment) {
-      var t1 = A.List_List$unmodifiable(children, type$.Statement),
-        t2 = B.JSArray_methods.any$1(t1, new A.ParentStatement_closure());
-      return new A.FunctionRule($name, $arguments, span, t1, t2);
+      var t1 = A.stringReplaceAllUnchecked($name, "_", "-"),
+        t2 = A.List_List$unmodifiable(children, type$.Statement),
+        t3 = B.JSArray_methods.any$1(t2, new A.ParentStatement_closure());
+      return new A.FunctionRule(t1, $name, $arguments, span, t2, t3);
     },
-    FunctionRule: function FunctionRule(t0, t1, t2, t3, t4) {
+    FunctionRule: function FunctionRule(t0, t1, t2, t3, t4, t5) {
       var _ = this;
       _.name = t0;
-      _.$arguments = t1;
-      _.span = t2;
-      _.children = t3;
-      _.hasDeclarations = t4;
+      _.originalName = t1;
+      _.$arguments = t2;
+      _.span = t3;
+      _.children = t4;
+      _.hasDeclarations = t5;
     },
     IfClause$(expression, children) {
       var t1 = A.List_List$unmodifiable(children, type$.Statement);
@@ -8620,13 +9561,14 @@ self.util = _cliPkgRequires.util;
       this.imports = t0;
       this.span = t1;
     },
-    IncludeRule: function IncludeRule(t0, t1, t2, t3, t4) {
+    IncludeRule: function IncludeRule(t0, t1, t2, t3, t4, t5) {
       var _ = this;
       _.namespace = t0;
       _.name = t1;
-      _.$arguments = t2;
-      _.content = t3;
-      _.span = t4;
+      _.originalName = t2;
+      _.$arguments = t3;
+      _.content = t4;
+      _.span = t5;
     },
     LoudComment: function LoudComment(t0) {
       this.text = t0;
@@ -8644,18 +9586,20 @@ self.util = _cliPkgRequires.util;
       _.hasDeclarations = t3;
     },
     MixinRule$($name, $arguments, children, span, comment) {
-      var t1 = A.List_List$unmodifiable(children, type$.Statement),
-        t2 = B.JSArray_methods.any$1(t1, new A.ParentStatement_closure());
-      return new A.MixinRule($name, $arguments, span, t1, t2);
+      var t1 = A.stringReplaceAllUnchecked($name, "_", "-"),
+        t2 = A.List_List$unmodifiable(children, type$.Statement),
+        t3 = B.JSArray_methods.any$1(t2, new A.ParentStatement_closure());
+      return new A.MixinRule(t1, $name, $arguments, span, t2, t3);
     },
-    MixinRule: function MixinRule(t0, t1, t2, t3, t4) {
+    MixinRule: function MixinRule(t0, t1, t2, t3, t4, t5) {
       var _ = this;
       _.__MixinRule_hasContent_FI = $;
       _.name = t0;
-      _.$arguments = t1;
-      _.span = t2;
-      _.children = t3;
-      _.hasDeclarations = t4;
+      _.originalName = t1;
+      _.$arguments = t2;
+      _.span = t3;
+      _.children = t4;
+      _.hasDeclarations = t5;
     },
     _HasContentVisitor: function _HasContentVisitor() {
     },
@@ -8893,15 +9837,6 @@ self.util = _cliPkgRequires.util;
     },
     ComplexSelector_specificity_closure: function ComplexSelector_specificity_closure() {
     },
-    ComplexSelector_singleCompound_closure: function ComplexSelector_singleCompound_closure(t0) {
-      this._0_0 = t0;
-    },
-    ComplexSelector_withAdditionalCombinators_closure: function ComplexSelector_withAdditionalCombinators_closure(t0) {
-      this._0_0 = t0;
-    },
-    ComplexSelector_concatenate_closure: function ComplexSelector_concatenate_closure(t0) {
-      this._0_0 = t0;
-    },
     ComplexSelectorComponent: function ComplexSelectorComponent(t0, t1, t2) {
       this.selector = t0;
       this.combinators = t1;
@@ -8916,12 +9851,15 @@ self.util = _cliPkgRequires.util;
       return new A.CompoundSelector(t1, span);
     },
     CompoundSelector: function CompoundSelector(t0, t1) {
-      this.components = t0;
-      this.__CompoundSelector_specificity_FI = $;
-      this.span = t1;
+      var _ = this;
+      _.components = t0;
+      _.__CompoundSelector_hasComplicatedSuperselectorSemantics_FI = _.__CompoundSelector_specificity_FI = $;
+      _.span = t1;
     },
     CompoundSelector_specificity_closure: function CompoundSelector_specificity_closure() {
     },
+    CompoundSelector_hasComplicatedSuperselectorSemantics_closure: function CompoundSelector_hasComplicatedSuperselectorSemantics_closure() {
+    },
     IDSelector: function IDSelector(t0, t1) {
       this.name = t0;
       this.span = t1;
@@ -8935,8 +9873,8 @@ self.util = _cliPkgRequires.util;
         A.throwExpression(A.ArgumentError$("components may not be empty.", null));
       return new A.SelectorList(t1, span);
     },
-    SelectorList_SelectorList$parse(contents, allowParent, allowPlaceholder, interpolationMap, logger) {
-      return A.SelectorParser$(contents, allowParent, allowPlaceholder, interpolationMap, logger, null).parse$0();
+    SelectorList_SelectorList$parse(contents, allowParent, interpolationMap, logger, plainCss) {
+      return A.SelectorParser$(contents, allowParent, interpolationMap, logger, plainCss, null).parse$0();
     },
     SelectorList: function SelectorList(t0, t1) {
       this.components = t0;
@@ -8944,26 +9882,25 @@ self.util = _cliPkgRequires.util;
     },
     SelectorList_asSassList_closure: function SelectorList_asSassList_closure() {
     },
-    SelectorList_resolveParentSelectors_closure: function SelectorList_resolveParentSelectors_closure(t0, t1, t2) {
-      this.$this = t0;
-      this.implicitParent = t1;
-      this.parent = t2;
+    SelectorList_nestWithin_closure: function SelectorList_nestWithin_closure(t0, t1, t2, t3) {
+      var _ = this;
+      _.$this = t0;
+      _.preserveParentSelectors = t1;
+      _.implicitParent = t2;
+      _.parent = t3;
     },
-    SelectorList_resolveParentSelectors__closure: function SelectorList_resolveParentSelectors__closure(t0) {
+    SelectorList_nestWithin__closure: function SelectorList_nestWithin__closure(t0) {
       this.complex = t0;
     },
-    SelectorList_resolveParentSelectors__closure0: function SelectorList_resolveParentSelectors__closure0(t0) {
+    SelectorList_nestWithin__closure0: function SelectorList_nestWithin__closure0(t0) {
       this.complex = t0;
     },
-    SelectorList__resolveParentSelectorsCompound_closure: function SelectorList__resolveParentSelectorsCompound_closure() {
+    SelectorList__nestWithinCompound_closure: function SelectorList__nestWithinCompound_closure() {
     },
-    SelectorList__resolveParentSelectorsCompound_closure0: function SelectorList__resolveParentSelectorsCompound_closure0(t0) {
+    SelectorList__nestWithinCompound_closure0: function SelectorList__nestWithinCompound_closure0(t0) {
       this.parent = t0;
     },
-    SelectorList__resolveParentSelectorsCompound__closure: function SelectorList__resolveParentSelectorsCompound__closure(t0) {
-      this._0_0 = t0;
-    },
-    SelectorList__resolveParentSelectorsCompound_closure1: function SelectorList__resolveParentSelectorsCompound_closure1(t0, t1, t2) {
+    SelectorList__nestWithinCompound_closure1: function SelectorList__nestWithinCompound_closure1(t0, t1, t2) {
       this.parentSelector = t0;
       this.resolvedSimples = t1;
       this.component = t2;
@@ -9043,13 +9980,7 @@ self.util = _cliPkgRequires.util;
       this.namespace = t0;
       this.span = t1;
     },
-    UniversalSelector_unify_closure: function UniversalSelector_unify_closure(t0) {
-      this._0_0 = t0;
-    },
-    UniversalSelector_unify_closure0: function UniversalSelector_unify_closure0(t0) {
-      this._0_0 = t0;
-    },
-    compileAsync(path, charset, fatalDeprecations, futureDeprecations, importCache, logger, quietDeps, sourceMap, style, syntax, verbose) {
+    compileAsync(path, charset, fatalDeprecations, futureDeprecations, importCache, logger, quietDeps, silenceDeprecations, sourceMap, style, syntax, verbose) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.CompileResult),
         $async$returnValue, t3, t0, stylesheet, result, t1, t2;
@@ -9062,16 +9993,18 @@ self.util = _cliPkgRequires.util;
               // Function start
               t1 = type$.Deprecation;
               t2 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
-              t2.addAll$1(0, fatalDeprecations);
+              t2.addAll$1(0, silenceDeprecations);
               t3 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
-              t3.addAll$1(0, futureDeprecations);
-              logger = new A.DeprecationHandlingLogger(A.LinkedHashMap_LinkedHashMap$_empty(t1, type$.int), logger, t2, t3, !verbose);
+              t3.addAll$1(0, fatalDeprecations);
+              t1 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
+              t1.addAll$1(0, futureDeprecations);
+              logger = A.DeprecationProcessingLogger$(logger, t3, t1, !verbose, t2);
               t1 = syntax === A.Syntax_forPath(path);
               $async$goto = t1 ? 3 : 5;
               break;
             case 3:
               // then
-              t1 = A.absolute(".", null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+              t1 = $.$get$FilesystemImporter_cwd();
               t2 = A.isNodeJs() ? self.process : null;
               if (!J.$eq$(t2 == null ? null : J.get$platform$x(t2), "win32")) {
                 t2 = A.isNodeJs() ? self.process : null;
@@ -9092,7 +10025,7 @@ self.util = _cliPkgRequires.util;
                 t2 = t0;
               }
               $async$goto = 6;
-              return A._asyncAwait(importCache.importCanonical$3$originalUrl(new A.FilesystemImporter(t1), t3.toUri$1(t2), t3.toUri$1(path)), $async$compileAsync);
+              return A._asyncAwait(importCache.importCanonical$3$originalUrl(t1, t3.toUri$1(t2), t3.toUri$1(path)), $async$compileAsync);
             case 6:
               // returning from await.
               t3 = $async$result;
@@ -9108,7 +10041,7 @@ self.util = _cliPkgRequires.util;
             case 4:
               // join
               $async$goto = 7;
-              return A._asyncAwait(A._compileStylesheet0(stylesheet, logger, importCache, null, new A.FilesystemImporter(A.absolute(".", null, null, null, null, null, null, null, null, null, null, null, null, null, null)), null, style, true, null, null, quietDeps, sourceMap, charset), $async$compileAsync);
+              return A._asyncAwait(A._compileStylesheet0(stylesheet, logger, importCache, null, $.$get$FilesystemImporter_cwd(), null, style, true, null, null, quietDeps, sourceMap, charset), $async$compileAsync);
             case 7:
               // returning from await.
               result = $async$result;
@@ -9124,7 +10057,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$compileAsync, $async$completer);
     },
-    compileStringAsync(source, charset, fatalDeprecations, futureDeprecations, importCache, importer, logger, quietDeps, sourceMap, style, syntax, verbose) {
+    compileStringAsync(source, charset, fatalDeprecations, futureDeprecations, importCache, importer, logger, quietDeps, silenceDeprecations, sourceMap, style, syntax, verbose) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.CompileResult),
         $async$returnValue, t3, stylesheet, result, t1, t2;
@@ -9137,10 +10070,12 @@ self.util = _cliPkgRequires.util;
               // Function start
               t1 = type$.Deprecation;
               t2 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
-              t2.addAll$1(0, fatalDeprecations);
+              t2.addAll$1(0, silenceDeprecations);
               t3 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
-              t3.addAll$1(0, futureDeprecations);
-              logger = new A.DeprecationHandlingLogger(A.LinkedHashMap_LinkedHashMap$_empty(t1, type$.int), logger, t2, t3, !verbose);
+              t3.addAll$1(0, fatalDeprecations);
+              t1 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
+              t1.addAll$1(0, futureDeprecations);
+              logger = A.DeprecationProcessingLogger$(logger, t3, t1, !verbose, t2);
               stylesheet = A.Stylesheet_Stylesheet$parse(source, syntax, logger, null);
               $async$goto = 3;
               return A._asyncAwait(A._compileStylesheet0(stylesheet, logger, importCache, null, importer, null, style, true, null, null, quietDeps, sourceMap, charset), $async$compileStringAsync);
@@ -9177,7 +10112,7 @@ self.util = _cliPkgRequires.util;
               // returning from await.
               serializeResult = $async$temp1.serialize($async$result._1, charset, indentWidth, false, lineFeed, sourceMap, style, true);
               resultSourceMap = serializeResult._1;
-              if (resultSourceMap != null && true)
+              if (resultSourceMap != null)
                 A.mapInPlace(resultSourceMap.urls, new A._compileStylesheet_closure0(stylesheet, importCache));
               $async$returnValue = new A.CompileResult(serializeResult);
               // goto return
@@ -9209,7 +10144,7 @@ self.util = _cliPkgRequires.util;
       return new A.AsyncEnvironment(_modules, _namespaceNodes, _globalModules, _importedModules, _forwardedModules, _nestedForwardedModules, _allModules, _variables, _variableNodes, A.LinkedHashMap_LinkedHashMap$_empty(t1, t2), _functions, A.LinkedHashMap_LinkedHashMap$_empty(t1, t2), _mixins, A.LinkedHashMap_LinkedHashMap$_empty(t1, t2), _content);
     },
     _EnvironmentModule__EnvironmentModule0(environment, css, preModuleComments, extensionStore, forwarded) {
-      var t1, t2, t3, t4, t5, t6, module, comments, result, t7;
+      var t1, t2, t3, t4, t5, t6, module, result, t7;
       if (forwarded == null)
         forwarded = B.Set_empty2;
       t1 = type$.dynamic;
@@ -9217,8 +10152,7 @@ self.util = _cliPkgRequires.util;
       for (t2 = type$.Module_AsyncCallable, t3 = type$.List_CssComment, t4 = A.MapExtensions_get_pairs(preModuleComments, t2, t3), t4 = t4.get$iterator(t4), t5 = type$.CssComment; t4.moveNext$0();) {
         t6 = t4.get$current(t4);
         module = t6._0;
-        comments = t6._1;
-        result = A.List_List$from(comments, false, t5);
+        result = A.List_List$from(t6._1, false, t5);
         result.fixed$length = Array;
         result.immutable$list = Array;
         t1.$indexSet(0, module, result);
@@ -9351,12 +10285,14 @@ self.util = _cliPkgRequires.util;
         sassPath = A.getEnvironmentVariable("SASS_PATH");
       if (A.isBrowser()) {
         t1 = A._setArrayType([], type$.JSArray_AsyncImporter_2);
+        B.JSArray_methods.addAll$1(t1, importers);
         return t1;
       }
       t1 = A._setArrayType([], type$.JSArray_AsyncImporter_2);
+      B.JSArray_methods.addAll$1(t1, importers);
       for (t2 = J.get$iterator$ax(loadPaths); t2.moveNext$0();) {
         t3 = t2.get$current(t2);
-        t1.push(new A.FilesystemImporter($.$get$context().absolute$15(t3, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null)));
+        t1.push(new A.FilesystemImporter($.$get$context().absolute$15(t3, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null), false));
       }
       if (sassPath != null) {
         t2 = A.isNodeJs() ? self.process : _null;
@@ -9365,46 +10301,34 @@ self.util = _cliPkgRequires.util;
         _i = 0;
         for (; _i < t4; ++_i) {
           path = t3[_i];
-          t1.push(new A.FilesystemImporter($.$get$context().absolute$15(path, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null)));
+          t1.push(new A.FilesystemImporter($.$get$context().absolute$15(path, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null), false));
         }
       }
       return t1;
     },
-    AsyncImportCache: function AsyncImportCache(t0, t1, t2, t3, t4, t5) {
+    AsyncImportCache: function AsyncImportCache(t0, t1, t2, t3, t4, t5, t6) {
       var _ = this;
       _._async_import_cache$_importers = t0;
       _._async_import_cache$_logger = t1;
       _._async_import_cache$_canonicalizeCache = t2;
-      _._async_import_cache$_relativeCanonicalizeCache = t3;
-      _._async_import_cache$_importCache = t4;
-      _._async_import_cache$_resultsCache = t5;
+      _._async_import_cache$_perImporterCanonicalizeCache = t3;
+      _._async_import_cache$_nonCanonicalRelativeUrls = t4;
+      _._async_import_cache$_importCache = t5;
+      _._async_import_cache$_resultsCache = t6;
     },
-    AsyncImportCache_canonicalize_closure: function AsyncImportCache_canonicalize_closure(t0, t1, t2, t3, t4) {
+    AsyncImportCache_canonicalize_closure: function AsyncImportCache_canonicalize_closure(t0, t1, t2, t3, t4, t5, t6) {
       var _ = this;
       _.$this = t0;
       _.baseImporter = t1;
-      _.baseUrl = t2;
-      _.url = t3;
+      _.resolvedUrl = t2;
+      _.baseUrl = t3;
       _.forImport = t4;
-    },
-    AsyncImportCache_canonicalize_closure0: function AsyncImportCache_canonicalize_closure0(t0, t1, t2, t3) {
-      var _ = this;
-      _.$this = t0;
-      _.url = t1;
-      _.baseUrl = t2;
-      _.forImport = t3;
+      _.key = t5;
+      _.url = t6;
     },
     AsyncImportCache__canonicalize_closure: function AsyncImportCache__canonicalize_closure(t0, t1) {
       this.importer = t0;
-      this.resolved = t1;
-    },
-    AsyncImportCache__canonicalize__closure: function AsyncImportCache__canonicalize__closure(t0, t1) {
-      this.importer = t0;
-      this.resolved = t1;
-    },
-    AsyncImportCache__canonicalize_closure0: function AsyncImportCache__canonicalize_closure0(t0, t1) {
-      this.importer = t0;
-      this.resolved = t1;
+      this.url = t1;
     },
     AsyncImportCache_importCanonical_closure: function AsyncImportCache_importCanonical_closure(t0, t1, t2, t3, t4) {
       var _ = this;
@@ -9424,7 +10348,7 @@ self.util = _cliPkgRequires.util;
     AsyncImportCache_humanize_closure2: function AsyncImportCache_humanize_closure2(t0) {
       this.canonicalUrl = t0;
     },
-    AsyncBuiltInCallable$mixin($name, $arguments, callback, url) {
+    AsyncBuiltInCallable$mixin($name, $arguments, callback, acceptsContent, url) {
       return new A.AsyncBuiltInCallable($name, A.ScssParser$("@mixin " + $name + "(" + $arguments + ") {", null, url).parseArgumentDeclaration$0(), new A.AsyncBuiltInCallable$mixin_closure(callback), false);
     },
     AsyncBuiltInCallable: function AsyncBuiltInCallable(t0, t1, t2, t3) {
@@ -9476,7 +10400,7 @@ self.util = _cliPkgRequires.util;
     _compileStylesheet(stylesheet, logger, importCache, nodeImporter, importer, functions, style, useSpaces, indentWidth, lineFeed, quietDeps, sourceMap, charset) {
       var serializeResult = A.serialize(A._EvaluateVisitor$(functions, importCache, logger, nodeImporter, quietDeps, sourceMap).run$2(0, importer, stylesheet)._1, charset, indentWidth, false, lineFeed, sourceMap, style, true),
         resultSourceMap = serializeResult._1;
-      if (resultSourceMap != null && true)
+      if (resultSourceMap != null)
         A.mapInPlace(resultSourceMap.urls, new A._compileStylesheet_closure(stylesheet, importCache));
       return new A.CompileResult(serializeResult);
     },
@@ -9502,13 +10426,13 @@ self.util = _cliPkgRequires.util;
       this.assignmentNode = t2;
     },
     Deprecation_fromId(id) {
-      return A.IterableExtension_firstWhereOrNull(B.List_GN8, new A.Deprecation_fromId_closure(id));
+      return A.IterableExtension_firstWhereOrNull(B.List_Yb0, new A.Deprecation_fromId_closure(id));
     },
     Deprecation_forVersion(version) {
       var t2, _i, deprecation, $self, t3,
         t1 = A.LinkedHashSet_LinkedHashSet$_empty(type$.Deprecation);
-      for (t2 = new A.VersionRange(null, version, false, true).get$allows(), _i = 0; _i < 16; ++_i) {
-        deprecation = B.List_GN8[_i];
+      for (t2 = A.VersionRange_VersionRange(true, version).get$allows(), _i = 0; _i < 19; ++_i) {
+        deprecation = B.List_Yb0[_i];
         $self = deprecation._deprecatedIn;
         t3 = $self == null ? null : A.Version___parse_tearOff($self);
         t3 = t3 == null ? null : t2.call$1(t3);
@@ -9517,13 +10441,12 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    Deprecation: function Deprecation(t0, t1, t2, t3, t4) {
+    Deprecation: function Deprecation(t0, t1, t2, t3) {
       var _ = this;
       _.id = t0;
       _._deprecatedIn = t1;
-      _.description = t2;
-      _.isFuture = t3;
-      _._name = t4;
+      _.isFuture = t2;
+      _._name = t3;
     },
     Deprecation_fromId_closure: function Deprecation_fromId_closure(t0) {
       this.id = t0;
@@ -9543,7 +10466,7 @@ self.util = _cliPkgRequires.util;
       return new A.Environment(_modules, _namespaceNodes, _globalModules, _importedModules, _forwardedModules, _nestedForwardedModules, _allModules, _variables, _variableNodes, A.LinkedHashMap_LinkedHashMap$_empty(t1, t2), _functions, A.LinkedHashMap_LinkedHashMap$_empty(t1, t2), _mixins, A.LinkedHashMap_LinkedHashMap$_empty(t1, t2), _content);
     },
     _EnvironmentModule__EnvironmentModule(environment, css, preModuleComments, extensionStore, forwarded) {
-      var t1, t2, t3, t4, t5, t6, module, comments, result, t7;
+      var t1, t2, t3, t4, t5, t6, module, result, t7;
       if (forwarded == null)
         forwarded = B.Set_empty0;
       t1 = type$.dynamic;
@@ -9551,8 +10474,7 @@ self.util = _cliPkgRequires.util;
       for (t2 = type$.Module_Callable, t3 = type$.List_CssComment, t4 = A.MapExtensions_get_pairs(preModuleComments, t2, t3), t4 = t4.get$iterator(t4), t5 = type$.CssComment; t4.moveNext$0();) {
         t6 = t4.get$current(t4);
         module = t6._0;
-        comments = t6._1;
-        result = A.List_List$from(comments, false, t5);
+        result = A.List_List$from(t6._1, false, t5);
         result.fixed$length = Array;
         result.immutable$list = Array;
         t1.$indexSet(0, module, result);
@@ -9851,7 +10773,7 @@ self.util = _cliPkgRequires.util;
     _compileStylesheetWithoutErrorHandling$body(options, graph, source, destination, ifModified) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.void),
-        $async$returnValue, $async$handler = 2, $async$currentError, syntax, result, importCache, error, exception, t1, t2, t3, t4, t5, t6, t7, t8, t9, result0, t10, t11, t12, t13, logger, stylesheet, t0, css, buffer, sourceName, destinationName, nowStr, timestamp, process, importer, $async$exception;
+        $async$returnValue, $async$handler = 2, $async$currentError, syntax, result, importCache, error, t1, exception, t2, t3, t4, t5, t6, t7, t8, t9, t10, result0, t11, t12, t13, t14, logger, stylesheet, t0, css, buffer, sourceName, destinationName, nowStr, timestamp, importer, $async$exception;
       var $async$_compileStylesheetWithoutErrorHandling = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1) {
           $async$currentError = $async$result;
@@ -9861,10 +10783,18 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              importer = new A.FilesystemImporter(A.absolute(".", null, null, null, null, null, null, null, null, null, null, null, null, null, null));
+              importer = $.$get$FilesystemImporter_cwd();
               if (ifModified)
                 try {
-                  if (source != null && destination != null && !graph.modifiedSince$3($.$get$context().toUri$1(source), A.modificationTime(destination), importer)) {
+                  if (source != null)
+                    if (destination != null) {
+                      t1 = A.absolute(source, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+                      t1 = !graph.modifiedSince$3($.$get$context().toUri$1(t1), A.modificationTime(destination), importer);
+                    } else
+                      t1 = false;
+                  else
+                    t1 = false;
+                  if (t1) {
                     // goto return
                     $async$goto = 1;
                     break;
@@ -9887,12 +10817,14 @@ self.util = _cliPkgRequires.util;
               break;
             case 7:
               // then
-              t2 = type$.List_String._as(t1.$index(0, "load-path"));
-              t3 = A._asBool(t1.$index(0, "quiet")) ? $.$get$Logger_quiet() : new A.StderrLogger(options.get$color());
-              t4 = type$.nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl;
-              t5 = type$.Uri;
-              t2 = A.AsyncImportCache__toImporters(null, t2, null);
-              importCache = new A.AsyncImportCache(t2, t3, A.LinkedHashMap_LinkedHashMap$_empty(type$.Record_2_Uri_and_bool_forImport, t4), A.LinkedHashMap_LinkedHashMap$_empty(type$.Record_4_Uri_and_AsyncImporter_baseImporter_and_nullable_Uri_baseUrl_and_bool_forImport, t4), A.LinkedHashMap_LinkedHashMap$_empty(t5, type$.nullable_Stylesheet), A.LinkedHashMap_LinkedHashMap$_empty(t5, type$.ImporterResult));
+              t2 = options.get$pkgImporters();
+              t3 = type$.List_String._as(t1.$index(0, "load-path"));
+              t4 = A._asBool(t1.$index(0, "quiet")) ? $.$get$Logger_quiet() : new A.StderrLogger(options.get$color());
+              t5 = type$.nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl;
+              t6 = type$.Record_3_AsyncImporter_and_Uri_and_bool_forImport;
+              t7 = type$.Uri;
+              t3 = A.AsyncImportCache__toImporters(t2, t3, null);
+              importCache = new A.AsyncImportCache(t3, t4, A.LinkedHashMap_LinkedHashMap$_empty(type$.Record_2_Uri_and_bool_forImport, t5), A.LinkedHashMap_LinkedHashMap$_empty(t6, t5), A.LinkedHashMap_LinkedHashMap$_empty(t6, t7), A.LinkedHashMap_LinkedHashMap$_empty(t7, type$.nullable_Stylesheet), A.LinkedHashMap_LinkedHashMap$_empty(t7, type$.ImporterResult));
               $async$goto = source == null ? 10 : 12;
               break;
             case 10:
@@ -9904,13 +10836,15 @@ self.util = _cliPkgRequires.util;
               t2 = $async$result;
               t3 = syntax;
               t4 = A._asBool(t1.$index(0, "quiet")) ? $.$get$Logger_quiet() : new A.StderrLogger(options.get$color());
-              t5 = A.absolute(".", null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+              t5 = $.$get$FilesystemImporter_cwd();
               t6 = J.$eq$(t1.$index(0, "style"), "compressed") ? B.OutputStyle_1 : B.OutputStyle_0;
               t7 = A._asBool(t1.$index(0, "quiet-deps"));
               t8 = A._asBool(t1.$index(0, "verbose"));
               t9 = options.get$emitSourceMap();
+              t1 = A._asBool(t1.$index(0, "charset"));
+              t10 = options.get$silenceDeprecations(0);
               $async$goto = 14;
-              return A._asyncAwait(A.compileStringAsync(t2, A._asBool(t1.$index(0, "charset")), options.get$fatalDeprecations(), options.get$futureDeprecations(), importCache, new A.FilesystemImporter(t5), t4, t7, t9, t6, t3, t8), $async$_compileStylesheetWithoutErrorHandling);
+              return A._asyncAwait(A.compileStringAsync(t2, t1, options.get$fatalDeprecations(0), options.get$futureDeprecations(0), importCache, t5, t4, t7, t10, t9, t6, t3, t8), $async$_compileStylesheetWithoutErrorHandling);
             case 14:
               // returning from await.
               result0 = $async$result;
@@ -9925,8 +10859,10 @@ self.util = _cliPkgRequires.util;
               t5 = A._asBool(t1.$index(0, "quiet-deps"));
               t6 = A._asBool(t1.$index(0, "verbose"));
               t7 = options.get$emitSourceMap();
+              t1 = A._asBool(t1.$index(0, "charset"));
+              t8 = options.get$silenceDeprecations(0);
               $async$goto = 15;
-              return A._asyncAwait(A.compileAsync(source, A._asBool(t1.$index(0, "charset")), options.get$fatalDeprecations(), options.get$futureDeprecations(), importCache, t3, t5, t7, t4, t2, t6), $async$_compileStylesheetWithoutErrorHandling);
+              return A._asyncAwait(A.compileAsync(source, t1, options.get$fatalDeprecations(0), options.get$futureDeprecations(0), importCache, t3, t5, t8, t7, t4, t2, t6), $async$_compileStylesheetWithoutErrorHandling);
             case 15:
               // returning from await.
               result0 = $async$result;
@@ -9949,22 +10885,25 @@ self.util = _cliPkgRequires.util;
               t2 = $async$result;
               t3 = syntax;
               t4 = A._asBool(t1.$index(0, "quiet")) ? $.$get$Logger_quiet() : new A.StderrLogger(options.get$color());
-              t5 = A.absolute(".", null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+              t5 = $.$get$FilesystemImporter_cwd();
               t6 = J.$eq$(t1.$index(0, "style"), "compressed") ? B.OutputStyle_1 : B.OutputStyle_0;
               t7 = A._asBool(t1.$index(0, "quiet-deps"));
               t8 = A._asBool(t1.$index(0, "verbose"));
               t9 = options.get$emitSourceMap();
               t1 = A._asBool(t1.$index(0, "charset"));
-              t10 = options.get$fatalDeprecations();
-              t11 = options.get$futureDeprecations();
-              t12 = type$.Deprecation;
-              t13 = A.LinkedHashSet_LinkedHashSet$_empty(t12);
-              t13.addAll$1(0, t10);
-              t10 = A.LinkedHashSet_LinkedHashSet$_empty(t12);
+              t10 = options.get$silenceDeprecations(0);
+              t11 = options.get$fatalDeprecations(0);
+              t12 = options.get$futureDeprecations(0);
+              t13 = type$.Deprecation;
+              t14 = A.LinkedHashSet_LinkedHashSet$_empty(t13);
+              t14.addAll$1(0, t10);
+              t10 = A.LinkedHashSet_LinkedHashSet$_empty(t13);
               t10.addAll$1(0, t11);
-              logger = new A.DeprecationHandlingLogger(A.LinkedHashMap_LinkedHashMap$_empty(t12, type$.int), t4, t13, t10, !t8);
+              t11 = A.LinkedHashSet_LinkedHashSet$_empty(t13);
+              t11.addAll$1(0, t12);
+              logger = A.DeprecationProcessingLogger$(t4, t10, t11, !t8, t14);
               stylesheet = A.Stylesheet_Stylesheet$parse(t2, t3 == null ? B.Syntax_SCSS_scss : t3, logger, null);
-              result0 = A._compileStylesheet(stylesheet, logger, graph.importCache, null, new A.FilesystemImporter(t5), null, t6, true, null, null, t7, t9, t1);
+              result0 = A._compileStylesheet(stylesheet, logger, graph.importCache, null, t5, null, t6, true, null, null, t7, t9, t1);
               logger.summarize$1$js(false);
               // goto join
               $async$goto = 17;
@@ -9979,17 +10918,20 @@ self.util = _cliPkgRequires.util;
               t6 = A._asBool(t1.$index(0, "verbose"));
               t7 = options.get$emitSourceMap();
               t1 = A._asBool(t1.$index(0, "charset"));
-              t8 = options.get$fatalDeprecations();
-              t9 = options.get$futureDeprecations();
-              t10 = type$.Deprecation;
-              t11 = A.LinkedHashSet_LinkedHashSet$_empty(t10);
-              t11.addAll$1(0, t8);
-              t8 = A.LinkedHashSet_LinkedHashSet$_empty(t10);
+              t8 = options.get$silenceDeprecations(0);
+              t9 = options.get$fatalDeprecations(0);
+              t10 = options.get$futureDeprecations(0);
+              t11 = type$.Deprecation;
+              t12 = A.LinkedHashSet_LinkedHashSet$_empty(t11);
+              t12.addAll$1(0, t8);
+              t8 = A.LinkedHashSet_LinkedHashSet$_empty(t11);
               t8.addAll$1(0, t9);
-              logger = new A.DeprecationHandlingLogger(A.LinkedHashMap_LinkedHashMap$_empty(t10, type$.int), t3, t11, t8, !t6);
+              t9 = A.LinkedHashSet_LinkedHashSet$_empty(t11);
+              t9.addAll$1(0, t10);
+              logger = A.DeprecationProcessingLogger$(t3, t8, t9, !t6, t12);
               t3 = t2 == null || t2 === A.Syntax_forPath(source);
               if (t3) {
-                t2 = A.absolute(".", null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+                t2 = $.$get$FilesystemImporter_cwd();
                 t3 = A.isNodeJs() ? self.process : null;
                 if (!J.$eq$(t3 == null ? null : J.get$platform$x(t3), "win32")) {
                   t3 = A.isNodeJs() ? self.process : null;
@@ -10009,7 +10951,7 @@ self.util = _cliPkgRequires.util;
                   t6 = t3;
                   t3 = t0;
                 }
-                t6 = importCache.importCanonical$3$originalUrl(new A.FilesystemImporter(t2), t6.toUri$1(t3), t6.toUri$1(source));
+                t6 = importCache.importCanonical$3$originalUrl(t2, t6.toUri$1(t3), t6.toUri$1(source));
                 t6.toString;
                 stylesheet = t6;
               } else {
@@ -10018,7 +10960,7 @@ self.util = _cliPkgRequires.util;
                   t2 = A.Syntax_forPath(source);
                 stylesheet = A.Stylesheet_Stylesheet$parse(t3, t2, logger, $.$get$context().toUri$1(source));
               }
-              result0 = A._compileStylesheet(stylesheet, logger, importCache, null, new A.FilesystemImporter(A.absolute(".", null, null, null, null, null, null, null, null, null, null, null, null, null, null)), null, t4, true, null, null, t5, t7, t1);
+              result0 = A._compileStylesheet(stylesheet, logger, importCache, null, $.$get$FilesystemImporter_cwd(), null, t4, true, null, null, t5, t7, t1);
               logger.summarize$1$js(false);
             case 17:
               // join
@@ -10094,15 +11036,9 @@ self.util = _cliPkgRequires.util;
               buffer._contents = t1;
               if (options.get$color())
                 buffer._contents = t1 + "\x1b[0m";
-              process = A.isNodeJs() ? self.process : null;
-              if (process != null)
-                t1 = true;
-              else {
-                process = null;
-                t1 = false;
-              }
-              if (t1) {
-                t1 = J.get$stdout$x(process);
+              t1 = A.isNodeJs() ? self.process : null;
+              if (t1 != null) {
+                t1 = J.get$stdout$x(t1);
                 J.write$1$x(t1, buffer.toString$0(0) + "\n");
               } else {
                 t1 = self.console;
@@ -10160,117 +11096,6 @@ self.util = _cliPkgRequires.util;
       this.options = t0;
       this.destination = t1;
     },
-    compileStylesheets(options, graph, sourcesToDestinations, ifModified) {
-      var $async$goto = 0,
-        $async$completer = A._makeAsyncAwaitCompleter(type$.bool),
-        $async$returnValue, _1_4, source, destination, t2, t3, _i, t4, printedError, errorWithStackTrace, code, error, stackTrace, buffer, t1, $async$temp1;
-      var $async$compileStylesheets = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
-        if ($async$errorCode === 1)
-          return A._asyncRethrow($async$result, $async$completer);
-        while (true)
-          switch ($async$goto) {
-            case 0:
-              // Function start
-              t1 = type$.nullable_String;
-              t1 = A.List_List$of(A.MapExtensions_get_pairs(sourcesToDestinations, t1, t1), true, type$.Record_2_nullable_String_and_nullable_String);
-              _1_4 = A._InitializedCell$(new A.compileStylesheets_closure(t1));
-              if (t1.length === 1) {
-                source = _1_4._readFinal$0()._0;
-                destination = _1_4._readFinal$0()._1;
-                t2 = true;
-              } else {
-                source = null;
-                destination = null;
-                t2 = false;
-              }
-              $async$goto = t2 ? 4 : 5;
-              break;
-            case 4:
-              // then
-              $async$temp1 = A;
-              $async$goto = 6;
-              return A._asyncAwait(A.compileStylesheet(options, graph, source, destination, ifModified), $async$compileStylesheets);
-            case 6:
-              // returning from await.
-              t1 = $async$temp1._setArrayType([$async$result], type$.JSArray_nullable_Record_3_int_and_String_and_nullable_String);
-              // goto break $label0$0
-              $async$goto = 3;
-              break;
-            case 5:
-              // join
-              t2 = A._setArrayType([], type$.JSArray_Future_nullable_Record_3_int_and_String_and_nullable_String);
-              for (t3 = t1.length, _i = 0; _i < t1.length; t1.length === t3 || (0, A.throwConcurrentModificationError)(t1), ++_i) {
-                t4 = t1[_i];
-                source = t4._0;
-                destination = t4._1;
-                t2.push(A.compileStylesheet(options, graph, source, destination, ifModified));
-              }
-              $async$goto = 7;
-              return A._asyncAwait(A.Future_wait(t2, A._asBool(options._options.$index(0, "stop-on-error")), type$.nullable_Record_3_int_and_String_and_nullable_String), $async$compileStylesheets);
-            case 7:
-              // returning from await.
-              t1 = $async$result;
-              // goto break $label0$0
-              $async$goto = 3;
-              break;
-            case 3:
-              // break $label0$0
-              for (t1 = J.get$iterator$ax(t1), printedError = false; t1.moveNext$0();) {
-                errorWithStackTrace = t1.get$current(t1);
-                if (errorWithStackTrace == null)
-                  continue;
-                code = errorWithStackTrace._0;
-                error = errorWithStackTrace._1;
-                stackTrace = errorWithStackTrace._2;
-                t2 = self.process;
-                if (t2 == null)
-                  t2 = null;
-                else {
-                  t2 = J.get$release$x(t2);
-                  t2 = t2 == null ? null : J.get$name$x(t2);
-                }
-                t2 = J.$eq$(t2, "node") ? self.process : null;
-                t2 = t2 == null ? null : J.get$exitCode$x(t2);
-                if (t2 == null)
-                  t2 = 0;
-                t2 = Math.max(t2, code);
-                t3 = self.process;
-                if (t3 == null)
-                  t3 = null;
-                else {
-                  t3 = J.get$release$x(t3);
-                  t3 = t3 == null ? null : J.get$name$x(t3);
-                }
-                t3 = J.$eq$(t3, "node") ? self.process : null;
-                if (t3 != null)
-                  J.set$exitCode$x(t3, t2);
-                buffer = new A.StringBuffer("");
-                t2 = (printedError ? buffer._contents = "" + "\n" : "") + error;
-                buffer._contents = t2;
-                if (stackTrace != null) {
-                  t2 += "\n";
-                  buffer._contents = t2;
-                  t2 += "\n";
-                  buffer._contents = t2;
-                  buffer._contents = t2 + stackTrace;
-                }
-                A.printError(buffer);
-                printedError = true;
-              }
-              $async$returnValue = !printedError;
-              // goto return
-              $async$goto = 1;
-              break;
-            case 1:
-              // return
-              return A._asyncReturn($async$returnValue, $async$completer);
-          }
-      });
-      return A._asyncStartSync($async$compileStylesheets, $async$completer);
-    },
-    compileStylesheets_closure: function compileStylesheets_closure(t0) {
-      this._1_0 = t0;
-    },
     ExecutableOptions__separator(text) {
       var t1 = $.$get$ExecutableOptions__separatorBar(),
         t2 = B.JSString_methods.$mul(t1, 3),
@@ -10316,12 +11141,6 @@ self.util = _cliPkgRequires.util;
     },
     ExecutableOptions__parser_closure: function ExecutableOptions__parser_closure() {
     },
-    ExecutableOptions__parser__closure: function ExecutableOptions__parser__closure(t0) {
-      this._0_0 = t0;
-    },
-    ExecutableOptions__parser__closure0: function ExecutableOptions__parser__closure0(t0) {
-      this._1_0 = t0;
-    },
     ExecutableOptions_interactive_closure: function ExecutableOptions_interactive_closure(t0) {
       this.$this = t0;
     },
@@ -10336,7 +11155,7 @@ self.util = _cliPkgRequires.util;
     watch(options, graph) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.void),
-        $async$returnValue, t1, t2, t3, t4, t5, t6, dirWatcher, sourcesToDestinations;
+        $async$returnValue, t1, t2, t3, t4, t5, t6, dirWatcher, sourcesToDestinations, t0;
       var $async$watch = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -10370,29 +11189,41 @@ self.util = _cliPkgRequires.util;
               sourcesToDestinations = options._sourcesToDestinations.cast$2$0(0, t2, t2);
               for (t1 = J.get$iterator$ax(sourcesToDestinations.get$keys(sourcesToDestinations)); t1.moveNext$0();) {
                 t2 = t1.get$current(t1);
-                t4 = $.$get$context();
-                t5 = t4.absolute$15(".", null, null, null, null, null, null, null, null, null, null, null, null, null, null);
-                t6 = self.process;
-                if (t6 == null)
-                  t6 = null;
+                t4 = $.$get$FilesystemImporter_cwd();
+                t5 = self.process;
+                if (t5 == null)
+                  t5 = null;
                 else {
-                  t6 = J.get$release$x(t6);
-                  t6 = t6 == null ? null : J.get$name$x(t6);
+                  t5 = J.get$release$x(t5);
+                  t5 = t5 == null ? null : J.get$name$x(t5);
                 }
-                t6 = J.$eq$(t6, "node") ? self.process : null;
-                if (!J.$eq$(t6 == null ? null : J.get$platform$x(t6), "win32")) {
-                  t6 = self.process;
-                  if (t6 == null)
-                    t6 = null;
+                t5 = J.$eq$(t5, "node") ? self.process : null;
+                if (!J.$eq$(t5 == null ? null : J.get$platform$x(t5), "win32")) {
+                  t5 = self.process;
+                  if (t5 == null)
+                    t5 = null;
                   else {
-                    t6 = J.get$release$x(t6);
-                    t6 = t6 == null ? null : J.get$name$x(t6);
+                    t5 = J.get$release$x(t5);
+                    t5 = t5 == null ? null : J.get$name$x(t5);
                   }
-                  t6 = J.$eq$(t6, "node") ? self.process : null;
-                  t6 = J.$eq$(t6 == null ? null : J.get$platform$x(t6), "darwin");
+                  t5 = J.$eq$(t5, "node") ? self.process : null;
+                  t5 = J.$eq$(t5 == null ? null : J.get$platform$x(t5), "darwin");
                 } else
-                  t6 = true;
-                graph.addCanonical$4$recanonicalize(new A.FilesystemImporter(t5), t4.toUri$1(t6 ? A._realCasePath(t4.absolute$15(t4.normalize$1(t2), null, null, null, null, null, null, null, null, null, null, null, null, null, null)) : t4.canonicalize$1(0, t2)), t4.toUri$1(t2), false);
+                  t5 = true;
+                if (t5) {
+                  t5 = $.$get$context();
+                  t6 = A._realCasePath(t5.absolute$15(t5.normalize$1(t2), null, null, null, null, null, null, null, null, null, null, null, null, null, null));
+                  t0 = t6;
+                  t6 = t5;
+                  t5 = t0;
+                } else {
+                  t5 = $.$get$context();
+                  t6 = t5.canonicalize$1(0, t2);
+                  t0 = t6;
+                  t6 = t5;
+                  t5 = t0;
+                }
+                graph.addCanonical$4$recanonicalize(t4, t6.toUri$1(t5), t6.toUri$1(t2), false);
               }
               $async$goto = 4;
               return A._asyncAwait(A.compileStylesheets(options, graph, sourcesToDestinations, true), $async$watch);
@@ -10427,15 +11258,6 @@ self.util = _cliPkgRequires.util;
     },
     _Watcher__debounceEvents_closure: function _Watcher__debounceEvents_closure() {
     },
-    _Watcher__debounceEvents__closure: function _Watcher__debounceEvents__closure(t0) {
-      this._0_0 = t0;
-    },
-    _Watcher__debounceEvents__closure0: function _Watcher__debounceEvents__closure0(t0) {
-      this._0_0 = t0;
-    },
-    _Watcher__debounceEvents__closure1: function _Watcher__debounceEvents__closure1(t0) {
-      this._1_0 = t0;
-    },
     EmptyExtensionStore: function EmptyExtensionStore() {
     },
     Extension: function Extension(t0, t1, t2, t3, t4) {
@@ -10501,9 +11323,6 @@ self.util = _cliPkgRequires.util;
     },
     ExtensionStore__registerSelector_closure: function ExtensionStore__registerSelector_closure() {
     },
-    ExtensionStore__registerSelector_closure0: function ExtensionStore__registerSelector_closure0(t0) {
-      this._0_0 = t0;
-    },
     ExtensionStore_addExtension_closure: function ExtensionStore_addExtension_closure() {
     },
     ExtensionStore_addExtension_closure0: function ExtensionStore_addExtension_closure0() {
@@ -10511,9 +11330,6 @@ self.util = _cliPkgRequires.util;
     ExtensionStore_addExtension_closure1: function ExtensionStore_addExtension_closure1(t0) {
       this.complex = t0;
     },
-    ExtensionStore__simpleSelectors_closure: function ExtensionStore__simpleSelectors_closure(t0) {
-      this._0_0 = t0;
-    },
     ExtensionStore__extendExistingExtensions_closure: function ExtensionStore__extendExistingExtensions_closure() {
     },
     ExtensionStore__extendExistingExtensions_closure0: function ExtensionStore__extendExistingExtensions_closure0() {
@@ -10577,7 +11393,7 @@ self.util = _cliPkgRequires.util;
       _.newMediaContexts = t3;
     },
     unifyComplex(complexes, span) {
-      var t2, trailingCombinator, leadingCombinator, unifiedBase, t3, _0_6, newLeadingCombinator, t4, base, _1_1, newTrailingCombinator, _i, t5, t6, t7, t8, _null = null,
+      var t2, trailingCombinator, leadingCombinator, unifiedBase, t3, t4, _0_6_isSet, _0_6, t5, newLeadingCombinator, base, _1_1, newTrailingCombinator, _i, t6, t7, t8, _null = null,
         t1 = J.getInterceptor$asx(complexes);
       if (t1.get$length(complexes) === 1)
         return complexes;
@@ -10585,36 +11401,31 @@ self.util = _cliPkgRequires.util;
         t3 = t2.get$current(t2);
         if (t3.accept$1(B.C__IsUselessVisitor))
           return _null;
-        _0_6 = A._InitializedCell$(new A.unifyComplex_closure(t3));
-        t3 = t3.components;
-        if (t3.length === 1)
-          if (J.get$length$asx(_0_6._readFinal$0()) === 1) {
-            newLeadingCombinator = J.$index$asx(_0_6._readFinal$0(), 0);
-            t4 = true;
-          } else {
-            newLeadingCombinator = _null;
-            t4 = false;
-          }
-        else {
-          newLeadingCombinator = _null;
-          t4 = false;
+        t4 = t3.components;
+        _0_6_isSet = t4.length === 1;
+        if (_0_6_isSet) {
+          _0_6 = t3.leadingCombinators;
+          t5 = _0_6.length === 1;
+        } else {
+          _0_6 = _null;
+          t5 = false;
         }
-        if (t4)
+        if (t5) {
+          newLeadingCombinator = (_0_6_isSet ? _0_6 : t3.leadingCombinators)[0];
           if (leadingCombinator == null)
             leadingCombinator = newLeadingCombinator;
-          else if (!leadingCombinator.$eq(0, newLeadingCombinator))
+          else if (!(leadingCombinator.$ti._is(newLeadingCombinator) && J.$eq$(newLeadingCombinator.value, leadingCombinator.value)))
             return _null;
-        base = B.JSArray_methods.get$last(t3);
-        _1_1 = A._InitializedCell$(new A.unifyComplex_closure0(base));
-        if (J.get$length$asx(_1_1._readFinal$0()) === 1) {
-          newTrailingCombinator = J.$index$asx(_1_1._readFinal$0(), 0);
-          t3 = true;
-        } else {
-          newTrailingCombinator = _null;
-          t3 = false;
         }
-        if (t3) {
-          if (trailingCombinator != null && !trailingCombinator.$eq(0, newTrailingCombinator))
+        base = B.JSArray_methods.get$last(t4);
+        _1_1 = base.combinators;
+        if (_1_1.length === 1) {
+          newTrailingCombinator = _1_1[0];
+          if (trailingCombinator != null)
+            t3 = !(trailingCombinator.$ti._is(newTrailingCombinator) && J.$eq$(newTrailingCombinator.value, trailingCombinator.value));
+          else
+            t3 = false;
+          if (t3)
             return _null;
           trailingCombinator = newTrailingCombinator;
         }
@@ -10638,11 +11449,11 @@ self.util = _cliPkgRequires.util;
           t3.push(A.ComplexSelector$(t8, B.JSArray_methods.take$1(t6, t7 - 1), t5.span, t5.lineBreak));
         }
       }
-      t4 = leadingCombinator == null ? B.List_empty1 : A._setArrayType([leadingCombinator], type$.JSArray_CssValue_Combinator);
+      t4 = leadingCombinator == null ? B.List_empty0 : A._setArrayType([leadingCombinator], type$.JSArray_CssValue_Combinator);
       unifiedBase.toString;
       t5 = A.CompoundSelector$(unifiedBase, span);
-      t6 = trailingCombinator == null ? B.List_empty1 : A._setArrayType([trailingCombinator], type$.JSArray_CssValue_Combinator);
-      base = A.ComplexSelector$(t4, A._setArrayType([new A.ComplexSelectorComponent(t5, A.List_List$unmodifiable(t6, type$.CssValue_Combinator), span)], type$.JSArray_ComplexSelectorComponent), span, t1.any$1(complexes, new A.unifyComplex_closure1()));
+      t6 = trailingCombinator == null ? B.List_empty0 : A._setArrayType([trailingCombinator], type$.JSArray_CssValue_Combinator);
+      base = A.ComplexSelector$(t4, A._setArrayType([new A.ComplexSelectorComponent(t5, A.List_List$unmodifiable(t6, type$.CssValue_Combinator), span)], type$.JSArray_ComplexSelectorComponent), span, t1.any$1(complexes, new A.unifyComplex_closure()));
       if (t3.length === 0)
         t1 = A._setArrayType([base], t2);
       else {
@@ -10687,31 +11498,15 @@ self.util = _cliPkgRequires.util;
       return $name == null ? new A.UniversalSelector(namespace, t1) : new A.TypeSelector(new A.QualifiedName($name, namespace), t1);
     },
     _namespaceAndName(selector, $name) {
-      var namespace, t1, name0, _null = null,
-        _0_4 = A._InitializedCell$(new A._namespaceAndName_closure(selector));
+      var t1, _0_4;
       $label0$0: {
         if (selector instanceof A.UniversalSelector) {
-          namespace = selector.namespace;
-          t1 = true;
-        } else {
-          namespace = _null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = new A._Record_2(namespace, _null);
+          t1 = new A._Record_2(selector.namespace, null);
           break $label0$0;
         }
         if (selector instanceof A.TypeSelector) {
-          name0 = _0_4._readFinal$0().name;
-          namespace = _0_4._readFinal$0().namespace;
-          t1 = true;
-        } else {
-          namespace = _null;
-          name0 = namespace;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = new A._Record_2(namespace, name0);
+          _0_4 = selector.name;
+          t1 = new A._Record_2(_0_4.namespace, _0_4.name);
           break $label0$0;
         }
         t1 = A.throwExpression(A.ArgumentError$value(selector, $name, string$.must_b));
@@ -10723,22 +11518,16 @@ self.util = _cliPkgRequires.util;
         t1 = J.getInterceptor$asx(complexes);
       if (t1.get$length(complexes) === 1) {
         complex = t1.$index(complexes, 0);
-        t2 = true;
-      } else {
-        complex = null;
-        t2 = false;
-      }
-      if (t2) {
         if (!forceLineBreak || complex.lineBreak)
           return complexes;
         return A._setArrayType([A.ComplexSelector$(complex.leadingCombinators, complex.components, complex.span, true)], type$.JSArray_ComplexSelector);
       }
       t2 = type$.JSArray_ComplexSelector;
       prefixes = A._setArrayType([t1.get$first(complexes)], t2);
-      for (t1 = t1.skip$1(complexes, 1), t1 = new A.ListIterator(t1, t1.get$length(t1)), t3 = type$.ComplexSelectorComponent, t4 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = t1.skip$1(complexes, 1), t3 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t3._eval$1("ListIterator<ListIterable.E>")), t4 = type$.ComplexSelectorComponent, t3 = t3._eval$1("ListIterable.E"); t1.moveNext$0();) {
         t5 = t1.__internal$_current;
         if (t5 == null)
-          t5 = t4._as(t5);
+          t5 = t3._as(t5);
         t6 = t5.components;
         if (t6.length === 1) {
           for (i = 0; i < prefixes.length; ++i)
@@ -10749,13 +11538,13 @@ self.util = _cliPkgRequires.util;
         for (t8 = prefixes.length, _i = 0; _i < prefixes.length; prefixes.length === t8 || (0, A.throwConcurrentModificationError)(prefixes), ++_i) {
           t9 = A._weaveParents(prefixes[_i], t5, span);
           if (t9 == null)
-            t9 = B.List_empty2;
+            t9 = B.List_empty1;
           t10 = t9.length;
           _i0 = 0;
           for (; _i0 < t9.length; t9.length === t10 || (0, A.throwConcurrentModificationError)(t9), ++_i0) {
             parentPrefix = t9[_i0];
             t11 = B.JSArray_methods.get$last(t6);
-            t12 = A.List_List$of(parentPrefix.components, true, t3);
+            t12 = A.List_List$of(parentPrefix.components, true, t4);
             t12.push(t11);
             t11 = parentPrefix.lineBreak || forceLineBreak;
             t7.push(A.ComplexSelector$(parentPrefix.leadingCombinators, t12, span, t11));
@@ -10766,7 +11555,7 @@ self.util = _cliPkgRequires.util;
       return prefixes;
     },
     _weaveParents(prefix, base, span) {
-      var t1, queue1, queue2, trailingCombinators, _0_0, _0_1, _0_3, rootish1, rootish2, rootish, t2, t3, rootish_case_0, rootish_case_1, groups1, groups2, lcs, choices, t4, _i, group, t5, t6, t7, _i0, chunk, t8, t9, _null = null,
+      var t1, queue1, queue2, trailingCombinators, _0_1, _0_3, _0_3_isSet, rootish1, t2, rootish2, _0_30, rootish, t3, rootish_case_0, t0, rootish_case_1, groups1, groups2, lcs, choices, t4, _i, group, t5, t6, t7, _i0, chunk, t8, t9, _null = null,
         leadingCombinators = A._mergeLeadingCombinators(prefix.leadingCombinators, base.leadingCombinators);
       if (leadingCombinators == null)
         return _null;
@@ -10777,29 +11566,24 @@ self.util = _cliPkgRequires.util;
       if (trailingCombinators == null)
         return _null;
       $label0$0: {
-        _0_0 = new A._Record_2(A._firstIfRootish(queue1), A._firstIfRootish(queue2));
-        _0_1 = A._InitializedCell$(new A._weaveParents_closure(_0_0));
-        _0_3 = A._InitializedCell$(new A._weaveParents_closure0(_0_0));
-        if (_0_1._readFinal$0() != null) {
-          rootish1 = _0_1._readFinal$0();
-          t1 = true;
-        } else {
-          rootish1 = _null;
-          t1 = false;
-        }
-        if (t1)
-          if (_0_3._readFinal$0() != null) {
-            rootish2 = _0_3._readFinal$0();
-            t1 = true;
-          } else {
+        _0_1 = A._firstIfRootish(queue1);
+        _0_3 = A._firstIfRootish(queue2);
+        _0_3_isSet = _0_1 != null;
+        if (_0_3_isSet) {
+          rootish1 = _0_1 == null ? t1._as(_0_1) : _0_1;
+          t2 = _0_3 != null;
+          if (t2)
+            rootish2 = _0_3 == null ? t1._as(_0_3) : _0_3;
+          else
             rootish2 = _null;
-            t1 = false;
-          }
-        else {
+          _0_30 = _0_3;
+        } else {
           rootish2 = _null;
-          t1 = false;
+          rootish1 = rootish2;
+          _0_30 = rootish1;
+          t2 = false;
         }
-        if (t1) {
+        if (t2) {
           rootish = A.unifyCompound(rootish1.selector, rootish2.selector);
           if (rootish == null)
             return _null;
@@ -10810,43 +11594,50 @@ self.util = _cliPkgRequires.util;
           queue2.addFirst$1(new A.ComplexSelectorComponent(rootish, A.List_List$unmodifiable(rootish2.combinators, t3), t2));
           break $label0$0;
         }
-        if (_0_1._readFinal$0() != null) {
-          rootish_case_0 = _0_1._readFinal$0();
-          t1 = true;
+        if (_0_1 != null) {
+          rootish_case_0 = _0_1;
+          if (_0_3_isSet)
+            t2 = _0_30;
+          else {
+            t2 = _0_3;
+            _0_30 = t2;
+            _0_3_isSet = true;
+          }
+          t2 = t2 == null;
+          t3 = t2 ? rootish_case_0 : _null;
+          t0 = t3;
+          t3 = t2;
+          t2 = t0;
         } else {
-          rootish_case_0 = _null;
-          t1 = false;
+          t2 = _null;
+          t3 = false;
         }
-        if (t1)
-          if (_0_3._readFinal$0() == null) {
-            t1 = rootish_case_0;
-            t2 = true;
+        if (!t3)
+          if (_0_1 == null) {
+            if (_0_3_isSet)
+              t3 = _0_30;
+            else {
+              t3 = _0_3;
+              _0_30 = t3;
+              _0_3_isSet = true;
+            }
+            t3 = t3 != null;
+            if (t3) {
+              rootish_case_1 = _0_3_isSet ? _0_30 : _0_3;
+              if (rootish_case_1 == null)
+                rootish_case_1 = t1._as(rootish_case_1);
+              t1 = rootish_case_1;
+            } else
+              t1 = t2;
+            t2 = t3;
           } else {
-            t1 = _null;
+            t1 = t2;
             t2 = false;
           }
         else {
-          t1 = _null;
-          t2 = false;
-        }
-        if (!t2)
-          if (_0_1._readFinal$0() == null) {
-            if (_0_3._readFinal$0() != null) {
-              rootish_case_1 = _0_3._readFinal$0();
-              t2 = true;
-            } else {
-              rootish_case_1 = _null;
-              t2 = false;
-            }
-            if (t2) {
-              t1 = rootish_case_1;
-              t2 = true;
-            } else
-              t2 = false;
-          } else
-            t2 = false;
-        else
+          t1 = t2;
           t2 = true;
+        }
         if (t2) {
           queue1.addFirst$1(t1);
           queue2.addFirst$1(t1);
@@ -10855,16 +11646,16 @@ self.util = _cliPkgRequires.util;
       groups1 = A._groupSelectors(queue1);
       groups2 = A._groupSelectors(queue2);
       t1 = type$.List_ComplexSelectorComponent;
-      lcs = A.longestCommonSubsequence(groups2, groups1, new A._weaveParents_closure1(span), t1);
+      lcs = A.longestCommonSubsequence(groups2, groups1, new A._weaveParents_closure(span), t1);
       choices = A._setArrayType([], type$.JSArray_List_Iterable_ComplexSelectorComponent);
       for (t2 = lcs.length, t3 = type$.JSArray_Iterable_ComplexSelectorComponent, t4 = type$.JSArray_ComplexSelectorComponent, _i = 0; _i < lcs.length; lcs.length === t2 || (0, A.throwConcurrentModificationError)(lcs), ++_i) {
         group = lcs[_i];
         t5 = A._setArrayType([], t3);
-        for (t6 = A._chunks(groups1, groups2, new A._weaveParents_closure2(group), t1), t7 = t6.length, _i0 = 0; _i0 < t6.length; t6.length === t7 || (0, A.throwConcurrentModificationError)(t6), ++_i0) {
+        for (t6 = A._chunks(groups1, groups2, new A._weaveParents_closure0(group), t1), t7 = t6.length, _i0 = 0; _i0 < t6.length; t6.length === t7 || (0, A.throwConcurrentModificationError)(t6), ++_i0) {
           chunk = t6[_i0];
           t8 = A._setArrayType([], t4);
-          for (t9 = J.get$iterator$ax(chunk); t9.moveNext$0();)
-            B.JSArray_methods.addAll$1(t8, t9.get$current(t9));
+          for (t9 = B.JSArray_methods.get$iterator(chunk); t9.moveNext$0();)
+            B.JSArray_methods.addAll$1(t8, t9.get$current(0));
           t5.push(t8);
         }
         choices.push(t5);
@@ -10873,17 +11664,17 @@ self.util = _cliPkgRequires.util;
         groups2.removeFirst$0();
       }
       t2 = A._setArrayType([], t3);
-      for (t1 = A._chunks(groups1, groups2, new A._weaveParents_closure3(), t1), t3 = t1.length, _i = 0; _i < t1.length; t1.length === t3 || (0, A.throwConcurrentModificationError)(t1), ++_i) {
+      for (t1 = A._chunks(groups1, groups2, new A._weaveParents_closure1(), t1), t3 = t1.length, _i = 0; _i < t1.length; t1.length === t3 || (0, A.throwConcurrentModificationError)(t1), ++_i) {
         chunk = t1[_i];
         t5 = A._setArrayType([], t4);
-        for (t6 = J.get$iterator$ax(chunk); t6.moveNext$0();)
-          B.JSArray_methods.addAll$1(t5, t6.get$current(t6));
+        for (t6 = B.JSArray_methods.get$iterator(chunk); t6.moveNext$0();)
+          B.JSArray_methods.addAll$1(t5, t6.get$current(0));
         t2.push(t5);
       }
       choices.push(t2);
       B.JSArray_methods.addAll$1(choices, trailingCombinators);
       t1 = A._setArrayType([], type$.JSArray_ComplexSelector);
-      for (t2 = J.get$iterator$ax(A.paths(new A.WhereIterable(choices, new A._weaveParents_closure4(), type$.WhereIterable_List_Iterable_ComplexSelectorComponent), type$.Iterable_ComplexSelectorComponent)), t3 = !prefix.lineBreak, t5 = base.lineBreak; t2.moveNext$0();) {
+      for (t2 = J.get$iterator$ax(A.paths(new A.WhereIterable(choices, new A._weaveParents_closure2(), type$.WhereIterable_List_Iterable_ComplexSelectorComponent), type$.Iterable_ComplexSelectorComponent)), t3 = !prefix.lineBreak, t5 = base.lineBreak; t2.moveNext$0();) {
         t6 = t2.get$current(t2);
         t7 = A._setArrayType([], t4);
         for (t6 = J.get$iterator$ax(t6); t6.moveNext$0();)
@@ -10894,14 +11685,8 @@ self.util = _cliPkgRequires.util;
     },
     _firstIfRootish(queue) {
       var first, t1, t2, _i, simple, t3;
-      if (queue.get$length(queue) >= 1) {
+      if (queue.get$length(0) >= 1) {
         first = queue.$index(0, 0);
-        t1 = true;
-      } else {
-        first = null;
-        t1 = false;
-      }
-      if (t1)
         for (t1 = first.selector.components, t2 = t1.length, _i = 0; _i < t2; ++_i) {
           simple = t1[_i];
           if (simple instanceof A.PseudoSelector)
@@ -10916,44 +11701,89 @@ self.util = _cliPkgRequires.util;
             return first;
           }
         }
+      }
       return null;
     },
     _mergeLeadingCombinators(combinators1, combinators2) {
-      var t1, t2, combinators, _null = null,
-        _0_0 = new A._Record_2(combinators1, combinators2),
-        _0_1 = A._InitializedCell$(new A._mergeLeadingCombinators_closure(_0_0)),
-        _0_4 = A._InitializedCell$(new A._mergeLeadingCombinators_closure0(_0_0)),
-        _0_7 = A._InitializedCell$(new A._mergeLeadingCombinators_closure1(_0_1)),
-        _0_11 = A._InitializedCell$(new A._mergeLeadingCombinators_closure2(_0_4));
+      var _0_4, t1, _0_7_isSet, _0_7, t2, _0_11_isSet, _0_11, _0_4_isSet, combinators, _null = null;
       $label0$0: {
-        if (_0_1._readFinal$0() == null || _0_4._readFinal$0() == null) {
-          t1 = _null;
-          break $label0$0;
-        }
+        _0_4 = combinators2;
         t1 = type$.List_CssValue_Combinator;
-        if (!(t1._is(_0_1._readFinal$0()) && _0_7._readFinal$0() > 1))
-          t2 = t1._is(_0_4._readFinal$0()) && _0_11._readFinal$0() > 1;
-        else
+        _0_7_isSet = t1._is(combinators1);
+        if (_0_7_isSet) {
+          _0_7 = combinators1.length;
+          t2 = _0_7;
+          t2 = t2 > 1;
+        } else {
+          _0_7 = _null;
+          t2 = false;
+        }
+        if (!t2) {
+          t2 = _0_4;
+          _0_11_isSet = t1._is(t2);
+          if (_0_11_isSet) {
+            t2 = _0_4;
+            _0_11 = (t2 == null ? t1._as(t2) : t2).length;
+            t2 = _0_11;
+            _0_4_isSet = true;
+            t2 = t2 > 1;
+          } else {
+            _0_11 = _null;
+            _0_4_isSet = true;
+            t2 = false;
+          }
+        } else {
+          _0_11 = _null;
+          _0_4_isSet = true;
+          _0_11_isSet = false;
           t2 = true;
+        }
         if (t2) {
           t1 = _null;
           break $label0$0;
         }
-        if (t1._is(_0_1._readFinal$0()))
-          if (_0_7._readFinal$0() <= 0) {
-            combinators = _0_4._readFinal$0();
-            t2 = true;
-          } else {
-            combinators = _null;
-            t2 = false;
+        if (t1._is(combinators1)) {
+          if (_0_7_isSet)
+            t2 = _0_7;
+          else {
+            _0_7 = combinators1.length;
+            t2 = _0_7;
           }
-        else {
+          t2 = t2 <= 0;
+          if (t2)
+            if (_0_4_isSet)
+              combinators = _0_4;
+            else {
+              combinators = combinators2;
+              _0_4 = combinators;
+              _0_4_isSet = true;
+            }
+          else
+            combinators = _null;
+        } else {
           combinators = _null;
           t2 = false;
         }
         if (!t2) {
-          combinators = _0_1._readFinal$0();
-          t1 = t1._is(_0_4._readFinal$0()) && _0_11._readFinal$0() <= 0;
+          if (_0_4_isSet)
+            t2 = _0_4;
+          else {
+            t2 = combinators2;
+            _0_4 = t2;
+            _0_4_isSet = true;
+          }
+          if (t1._is(t2)) {
+            if (_0_11_isSet)
+              t1 = _0_11;
+            else {
+              t2 = _0_4_isSet ? _0_4 : combinators2;
+              _0_11 = (t2 == null ? t1._as(t2) : t2).length;
+              t1 = _0_11;
+            }
+            t1 = t1 <= 0;
+          } else
+            t1 = false;
+          combinators = combinators1;
         } else
           t1 = true;
         if (t1) {
@@ -10966,39 +11796,25 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     _mergeTrailingCombinators(components1, components2, span, result) {
-      var _0_1, last, t1, _1_1, t2, t3, _4_0, _4_1, _4_3, _4_4, _4_5, _4_9, _4_6, _4_7, _4_10, component1, component2, t4, t5, choices, _2_0, unified, followingComponents, nextComponents, followingComponents0, next, following, _3_0, siblingComponents_case_0, siblingComponents_case_1, combinator1, combinator2, combinator_case_0, combinatorComponents_case_0, descendantComponents_case_0, combinator_case_1, descendantComponents_case_1, combinatorComponents_case_1, _null = null;
+      var _0_1, t1, _1_1, t2, t3, _4_1, _4_3, _4_4_isSet, _4_4, _4_5, component1, component2, t4, t5, choices, _2_0, _4_4_isSet0, _4_9, _4_6_isSet, _4_6, _4_7, nextComponents, followingComponents, _4_7_isSet, _4_10_isSet, _4_10, _4_5_isSet, next, following, _3_0, siblingComponents_case_0, t0, siblingComponents_case_1, combinator1, combinator2, unified, combinator_case_0, combinatorComponents_case_0, descendantComponents_case_0, t6, combinator_case_1, descendantComponents_case_1, combinatorComponents_case_1, _null = null;
       if (result == null)
         result = A.QueueList$(_null, type$.List_List_ComplexSelectorComponent);
-      _0_1 = A._InitializedCell$(new A._mergeTrailingCombinators_closure(components1));
       $label0$0: {
-        if (_0_1._readFinal$0() >= 1) {
-          last = components1.$index(0, _0_1._readFinal$0() - 1);
-          t1 = true;
-        } else {
-          last = _null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = last.combinators;
+        _0_1 = components1.get$length(0);
+        if (_0_1 >= 1) {
+          t1 = components1.$index(0, _0_1 - 1).combinators;
           break $label0$0;
         }
-        t1 = B.List_empty1;
+        t1 = B.List_empty0;
         break $label0$0;
       }
-      _1_1 = A._InitializedCell$(new A._mergeTrailingCombinators_closure0(components2));
       $label1$1: {
-        if (_1_1._readFinal$0() >= 1) {
-          last = components2.$index(0, _1_1._readFinal$0() - 1);
-          t2 = true;
-        } else {
-          last = _null;
-          t2 = false;
-        }
-        if (t2) {
-          t2 = last.combinators;
+        _1_1 = components2.get$length(0);
+        if (_1_1 >= 1) {
+          t2 = components2.$index(0, _1_1 - 1).combinators;
           break $label1$1;
         }
-        t2 = B.List_empty1;
+        t2 = B.List_empty0;
         break $label1$1;
       }
       t3 = t1.length;
@@ -11010,16 +11826,20 @@ self.util = _cliPkgRequires.util;
         t3 = A.IterableExtension_get_firstOrNull(t1);
         t3 = t3 == null ? _null : t3.value;
         t2 = A.IterableExtension_get_firstOrNull(t2);
-        _4_0 = new A._Record_4([t3, t2 == null ? _null : t2.value, components1, components2]);
-        _4_1 = A._InitializedCell$(new A._mergeTrailingCombinators_closure1(_4_0));
-        _4_3 = A._InitializedCell$(new A._mergeTrailingCombinators_closure2(_4_1));
-        _4_4 = A._InitializedCell$(new A._mergeTrailingCombinators_closure3(_4_0));
-        _4_5 = A._InitializedCell$(new A._mergeTrailingCombinators_closure4(_4_4));
-        _4_9 = A._InitializedCell$(new A._mergeTrailingCombinators_closure5(_4_4));
-        _4_6 = A._InitializedCell$(new A._mergeTrailingCombinators_closure6(_4_0));
-        _4_7 = A._InitializedCell$(new A._mergeTrailingCombinators_closure7(_4_0));
-        _4_10 = A._InitializedCell$(new A._mergeTrailingCombinators_closure8(_4_1));
-        if (_4_3._readFinal$0() && _4_5._readFinal$0()) {
+        t2 = [t3, t2 == null ? _null : t2.value, components1, components2];
+        _4_1 = t2[0];
+        _4_3 = B.Combinator_y18 === _4_1;
+        _4_4_isSet = _4_3;
+        if (_4_4_isSet) {
+          _4_4 = t2[1];
+          _4_5 = B.Combinator_y18 === _4_4;
+          t3 = _4_5;
+        } else {
+          _4_4 = _null;
+          _4_5 = _4_4;
+          t3 = false;
+        }
+        if (t3) {
           component1 = components1.removeLast$0(0);
           component2 = components2.removeLast$0(0);
           t2 = component1.selector;
@@ -11034,50 +11854,98 @@ self.util = _cliPkgRequires.util;
             else {
               choices = A._setArrayType([A._setArrayType([component1, component2], t4), A._setArrayType([component2, component1], t4)], t5);
               _2_0 = A.unifyCompound(t2, t3);
-              if (_2_0 != null) {
-                unified = _2_0;
-                t2 = true;
-              } else {
-                unified = _null;
-                t2 = false;
-              }
-              if (t2)
-                choices.push(A._setArrayType([new A.ComplexSelectorComponent(unified, A.List_List$unmodifiable(A._setArrayType([B.JSArray_methods.get$first(t1)], type$.JSArray_CssValue_Combinator), type$.CssValue_Combinator), span)], t4));
+              if (_2_0 != null)
+                choices.push(A._setArrayType([new A.ComplexSelectorComponent(_2_0, A.List_List$unmodifiable(A._setArrayType([B.JSArray_methods.get$first(t1)], type$.JSArray_CssValue_Combinator), type$.CssValue_Combinator), span)], t4));
               result.addFirst$1(choices);
             }
           }
           break $label2$2;
         }
-        if (_4_3._readFinal$0())
-          if (_4_9._readFinal$0()) {
-            followingComponents = _4_6._readFinal$0();
-            nextComponents = _4_7._readFinal$0();
-            nextComponents = nextComponents;
-            t2 = true;
+        if (_4_3) {
+          if (_4_4_isSet) {
+            t3 = _4_4;
+            _4_4_isSet0 = _4_4_isSet;
+          } else {
+            _4_4 = t2[1];
+            t3 = _4_4;
+            _4_4_isSet0 = true;
+          }
+          _4_9 = B.Combinator_gRV === t3;
+          _4_6_isSet = _4_9;
+          if (_4_6_isSet) {
+            _4_6 = t2[2];
+            _4_7 = t2[3];
+            nextComponents = _4_7;
+            followingComponents = _4_6;
           } else {
             nextComponents = _null;
             followingComponents = nextComponents;
-            t2 = false;
+            _4_7 = followingComponents;
+            _4_6 = _4_7;
           }
-        else {
+          t3 = _4_6_isSet;
+          _4_7_isSet = t3;
+        } else {
           nextComponents = _null;
           followingComponents = nextComponents;
-          t2 = false;
+          _4_7 = followingComponents;
+          _4_6 = _4_7;
+          _4_9 = _4_6;
+          _4_4_isSet0 = _4_4_isSet;
+          _4_6_isSet = false;
+          _4_7_isSet = false;
+          t3 = false;
         }
-        if (!t2)
-          if (_4_10._readFinal$0())
-            if (_4_5._readFinal$0()) {
-              nextComponents = _4_6._readFinal$0();
-              followingComponents0 = _4_7._readFinal$0();
-              followingComponents = followingComponents0;
-              t2 = true;
-            } else
-              t2 = false;
-          else
-            t2 = false;
-        else
-          t2 = true;
-        if (t2) {
+        _4_10_isSet = !t3;
+        if (_4_10_isSet) {
+          _4_10 = B.Combinator_gRV === _4_1;
+          t3 = _4_10;
+          if (t3) {
+            if (_4_4_isSet) {
+              t3 = _4_5;
+              _4_5_isSet = _4_4_isSet;
+              _4_4_isSet = _4_4_isSet0;
+            } else {
+              if (_4_4_isSet0) {
+                t3 = _4_4;
+                _4_4_isSet = _4_4_isSet0;
+              } else {
+                _4_4 = t2[1];
+                t3 = _4_4;
+                _4_4_isSet = true;
+              }
+              _4_5 = B.Combinator_y18 === t3;
+              t3 = _4_5;
+              _4_5_isSet = true;
+            }
+            if (t3) {
+              if (_4_6_isSet)
+                nextComponents = _4_6;
+              else {
+                _4_6 = t2[2];
+                nextComponents = _4_6;
+                _4_6_isSet = true;
+              }
+              if (_4_7_isSet)
+                followingComponents = _4_7;
+              else {
+                _4_7 = t2[3];
+                followingComponents = _4_7;
+                _4_7_isSet = true;
+              }
+            }
+          } else {
+            _4_5_isSet = _4_4_isSet;
+            _4_4_isSet = _4_4_isSet0;
+            t3 = false;
+          }
+        } else {
+          _4_10 = _null;
+          _4_5_isSet = _4_4_isSet;
+          _4_4_isSet = _4_4_isSet0;
+          t3 = true;
+        }
+        if (t3) {
           next = nextComponents.removeLast$0(0);
           following = followingComponents.removeLast$0(0);
           t1 = following.selector;
@@ -11089,128 +11957,214 @@ self.util = _cliPkgRequires.util;
           else {
             t4 = A._setArrayType([A._setArrayType([following, next], t3)], t4);
             _3_0 = A.unifyCompound(t1, t2);
-            if (_3_0 != null) {
-              unified = _3_0;
-              t1 = true;
-            } else {
-              unified = _null;
-              t1 = false;
-            }
-            if (t1)
-              t4.push(A._setArrayType([new A.ComplexSelectorComponent(unified, A.List_List$unmodifiable(next.combinators, type$.CssValue_Combinator), span)], t3));
+            if (_3_0 != null)
+              t4.push(A._setArrayType([new A.ComplexSelectorComponent(_3_0, A.List_List$unmodifiable(next.combinators, type$.CssValue_Combinator), span)], t3));
             result.addFirst$1(t4);
           }
           break $label2$2;
         }
-        if (B.Combinator_Cht === _4_1._readFinal$0())
-          if (_4_9._readFinal$0() || _4_5._readFinal$0()) {
-            siblingComponents_case_0 = _4_7._readFinal$0();
-            t2 = siblingComponents_case_0;
-            t3 = true;
-          } else {
-            t2 = _null;
-            t3 = false;
+        if (B.Combinator_8I8 === _4_1) {
+          if (_4_3)
+            t3 = _4_9;
+          else {
+            if (_4_4_isSet)
+              t3 = _4_4;
+            else {
+              _4_4 = t2[1];
+              t3 = _4_4;
+              _4_4_isSet = true;
+            }
+            _4_9 = B.Combinator_gRV === t3;
+            t3 = _4_9;
           }
-        else {
-          t2 = _null;
-          t3 = false;
-        }
-        if (!t3)
-          if (_4_10._readFinal$0() || _4_3._readFinal$0())
-            if (B.Combinator_Cht === _4_4._readFinal$0()) {
-              siblingComponents_case_1 = _4_6._readFinal$0();
-              t2 = siblingComponents_case_1;
-              t3 = true;
-            } else
-              t3 = false;
+          if (!t3)
+            if (_4_5_isSet)
+              t3 = _4_5;
+            else {
+              if (_4_4_isSet)
+                t3 = _4_4;
+              else {
+                _4_4 = t2[1];
+                t3 = _4_4;
+                _4_4_isSet = true;
+              }
+              _4_5 = B.Combinator_y18 === t3;
+              t3 = _4_5;
+            }
           else
-            t3 = false;
-        else
-          t3 = true;
-        if (t3) {
-          result.addFirst$1(A._setArrayType([A._setArrayType([t2.removeLast$0(0)], type$.JSArray_ComplexSelectorComponent)], type$.JSArray_List_ComplexSelectorComponent));
+            t3 = true;
+          if (t3) {
+            if (_4_7_isSet)
+              siblingComponents_case_0 = _4_7;
+            else {
+              _4_7 = t2[3];
+              siblingComponents_case_0 = _4_7;
+              _4_7_isSet = true;
+            }
+            t4 = siblingComponents_case_0;
+          } else
+            t4 = _null;
+          t0 = t4;
+          t4 = t3;
+          t3 = t0;
+        } else {
+          t3 = _null;
+          t4 = false;
+        }
+        if (!t4) {
+          if (_4_10_isSet)
+            t4 = _4_10;
+          else {
+            _4_10 = B.Combinator_gRV === _4_1;
+            t4 = _4_10;
+          }
+          if (!t4)
+            t4 = _4_3;
+          else
+            t4 = true;
+          if (t4) {
+            if (_4_4_isSet)
+              t4 = _4_4;
+            else {
+              _4_4 = t2[1];
+              t4 = _4_4;
+              _4_4_isSet = true;
+            }
+            t4 = B.Combinator_8I8 === t4;
+            if (t4) {
+              if (_4_6_isSet)
+                siblingComponents_case_1 = _4_6;
+              else {
+                _4_6 = t2[2];
+                siblingComponents_case_1 = _4_6;
+                _4_6_isSet = true;
+              }
+              t3 = siblingComponents_case_1;
+            }
+          } else
+            t4 = false;
+        } else
+          t4 = true;
+        if (t4) {
+          result.addFirst$1(A._setArrayType([A._setArrayType([t3.removeLast$0(0)], type$.JSArray_ComplexSelectorComponent)], type$.JSArray_List_ComplexSelectorComponent));
           break $label2$2;
         }
-        if (_4_1._readFinal$0() != null) {
-          combinator1 = _4_1._readFinal$0();
-          t2 = true;
-        } else {
-          combinator1 = _null;
-          t2 = false;
-        }
-        if (t2) {
-          if (_4_4._readFinal$0() != null) {
-            combinator2 = _4_4._readFinal$0();
-            t2 = true;
-          } else {
-            combinator2 = _null;
-            t2 = false;
+        t3 = _4_1 == null;
+        t4 = !t3;
+        if (t4) {
+          combinator1 = _4_1;
+          if (_4_4_isSet)
+            t5 = _4_4;
+          else {
+            _4_4 = t2[1];
+            t5 = _4_4;
+            _4_4_isSet = true;
           }
-          t2 = t2 && combinator1 == combinator2;
+          if (t5 != null) {
+            if (_4_4_isSet)
+              combinator2 = _4_4;
+            else {
+              _4_4 = t2[1];
+              combinator2 = _4_4;
+              _4_4_isSet = true;
+            }
+            t5 = combinator1 === (combinator2 == null ? type$.Combinator._as(combinator2) : combinator2);
+          } else
+            t5 = false;
         } else
-          t2 = false;
-        if (t2) {
+          t5 = false;
+        if (t5) {
           unified = A.unifyCompound(components1.removeLast$0(0).selector, components2.removeLast$0(0).selector);
           if (unified == null)
             return _null;
           result.addFirst$1(A._setArrayType([A._setArrayType([new A.ComplexSelectorComponent(unified, A.List_List$unmodifiable(A._setArrayType([B.JSArray_methods.get$first(t1)], type$.JSArray_CssValue_Combinator), type$.CssValue_Combinator), span)], type$.JSArray_ComplexSelectorComponent)], type$.JSArray_List_ComplexSelectorComponent));
           break $label2$2;
         }
-        if (_4_1._readFinal$0() != null) {
-          combinator_case_0 = _4_1._readFinal$0();
-          t1 = true;
-        } else {
-          combinator_case_0 = _null;
-          t1 = false;
-        }
-        if (t1)
-          if (_4_4._readFinal$0() == null) {
-            combinatorComponents_case_0 = _4_6._readFinal$0();
-            descendantComponents_case_0 = _4_7._readFinal$0();
-            t1 = descendantComponents_case_0;
-            t2 = true;
-            t4 = t2;
-            t2 = combinatorComponents_case_0;
-            t3 = t1;
-            t1 = combinator_case_0;
-          } else {
-            t3 = _null;
-            t2 = t3;
-            t1 = t2;
-            t4 = false;
+        if (t4) {
+          combinator_case_0 = _4_1;
+          if (_4_4_isSet)
+            t1 = _4_4;
+          else {
+            _4_4 = t2[1];
+            t1 = _4_4;
+            _4_4_isSet = true;
           }
-        else {
-          t3 = _null;
-          t2 = t3;
-          t1 = t2;
-          t4 = false;
-        }
-        if (!t4)
-          if (_4_1._readFinal$0() == null) {
-            if (_4_4._readFinal$0() != null) {
-              combinator_case_1 = _4_4._readFinal$0();
-              t4 = true;
-            } else {
-              combinator_case_1 = _null;
-              t4 = false;
+          t1 = t1 == null;
+          if (t1) {
+            if (_4_6_isSet)
+              combinatorComponents_case_0 = _4_6;
+            else {
+              _4_6 = t2[2];
+              combinatorComponents_case_0 = _4_6;
+              _4_6_isSet = true;
             }
-            if (t4) {
-              descendantComponents_case_1 = _4_6._readFinal$0();
-              combinatorComponents_case_1 = _4_7._readFinal$0();
+            if (_4_7_isSet)
+              descendantComponents_case_0 = _4_7;
+            else {
+              _4_7 = t2[3];
+              descendantComponents_case_0 = _4_7;
+              _4_7_isSet = true;
+            }
+            t4 = descendantComponents_case_0;
+            t6 = t4;
+            t4 = combinator_case_0;
+            t5 = combinatorComponents_case_0;
+          } else {
+            t6 = _null;
+            t5 = t6;
+            t4 = t5;
+          }
+          t0 = t6;
+          t6 = t1;
+          t1 = t4;
+          t4 = t5;
+          t5 = t0;
+        } else {
+          t5 = _null;
+          t4 = t5;
+          t1 = t4;
+          t6 = false;
+        }
+        if (!t6)
+          if (t3) {
+            if (_4_4_isSet)
+              t3 = _4_4;
+            else {
+              _4_4 = t2[1];
+              t3 = _4_4;
+              _4_4_isSet = true;
+            }
+            t3 = t3 != null;
+            if (t3) {
+              combinator_case_1 = _4_4_isSet ? _4_4 : t2[1];
+              if (combinator_case_1 == null)
+                combinator_case_1 = type$.Combinator._as(combinator_case_1);
+              descendantComponents_case_1 = _4_6_isSet ? _4_6 : t2[2];
+              combinatorComponents_case_1 = _4_7_isSet ? _4_7 : t2[3];
               t1 = combinatorComponents_case_1;
-              t2 = true;
+              t2 = descendantComponents_case_1;
               t4 = t2;
               t2 = t1;
               t1 = combinator_case_1;
-              t3 = descendantComponents_case_1;
-            } else
-              t4 = false;
-          } else
+            } else {
+              t2 = t4;
+              t4 = t5;
+            }
+            t0 = t4;
+            t4 = t3;
+            t3 = t0;
+          } else {
+            t3 = t5;
+            t2 = t4;
             t4 = false;
-        else
+          }
+        else {
+          t3 = t5;
+          t2 = t4;
           t4 = true;
+        }
         if (t4) {
-          if (t1 === B.Combinator_Cht) {
+          if (t1 === B.Combinator_8I8) {
             t1 = A.IterableExtension_get_lastOrNull(t3);
             t1 = t1 == null ? _null : A.compoundIsSuperselector(t1.selector, t2.get$last(t2).selector, _null);
             t1 = t1 === true;
@@ -11230,7 +12184,7 @@ self.util = _cliPkgRequires.util;
         t1 = A.LinkedHashSet_LinkedHashSet$_empty(type$.SimpleSelector);
       for (t2 = J.get$iterator$ax(complex1); t2.moveNext$0();)
         for (t3 = B.JSArray_methods.get$iterator(t2.get$current(t2).selector.components), t4 = new A.WhereIterator(t3, A.functions___isUnique$closure()); t4.moveNext$0();)
-          t1.add$1(0, t3.get$current(t3));
+          t1.add$1(0, t3.get$current(0));
       if (t1._collection$_length === 0)
         return false;
       return J.any$1$ax(complex2, new A._mustUnify_closure(t1));
@@ -11244,7 +12198,7 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     _chunks(queue1, queue2, done, $T) {
-      var chunk2, _0_0, _0_1, _0_4, _0_5, _0_7, chunk, t2,
+      var chunk2, _0_4, _0_5_isSet, _0_1, _0_7, _0_5, chunk, _0_5_isSet0, t2, _null = null,
         t1 = $T._eval$1("JSArray<0>"),
         chunk1 = A._setArrayType([], t1);
       for (; !done.call$1(queue1);)
@@ -11252,27 +12206,44 @@ self.util = _cliPkgRequires.util;
       chunk2 = A._setArrayType([], t1);
       for (; !done.call$1(queue2);)
         chunk2.push(queue2.removeFirst$0());
-      _0_0 = new A._Record_2(chunk1, chunk2);
-      _0_1 = A._InitializedCell$(new A._chunks_closure(_0_0, $T));
-      _0_4 = A._InitializedCell$(new A._chunks_closure0(_0_1));
-      _0_5 = A._InitializedCell$(new A._chunks_closure1(_0_0, $T));
-      _0_7 = A._InitializedCell$(new A._chunks_closure2(_0_5));
       $label0$0: {
-        if (_0_4._readFinal$0() && _0_7._readFinal$0()) {
+        _0_4 = chunk1.length <= 0;
+        _0_5_isSet = _0_4;
+        _0_1 = chunk1;
+        if (_0_5_isSet) {
+          _0_7 = chunk2.length <= 0;
+          t1 = _0_7;
+          _0_5 = chunk2;
+        } else {
+          _0_5 = _null;
+          _0_7 = _0_5;
+          t1 = false;
+        }
+        if (t1) {
           t1 = A._setArrayType([], $T._eval$1("JSArray<List<0>>"));
           break $label0$0;
         }
-        if (_0_4._readFinal$0()) {
-          chunk = _0_5._readFinal$0();
-          t1 = true;
-        } else {
-          chunk = null;
-          t1 = false;
+        if (_0_4)
+          if (_0_5_isSet) {
+            chunk = _0_5;
+            _0_5_isSet0 = _0_5_isSet;
+          } else {
+            chunk = chunk2;
+            _0_5 = chunk;
+            _0_5_isSet0 = true;
+          }
+        else {
+          chunk = _null;
+          _0_5_isSet0 = _0_5_isSet;
         }
-        if (!t1) {
-          chunk = _0_1._readFinal$0();
-          t1 = _0_7._readFinal$0();
-          t1 = t1;
+        if (!_0_4) {
+          if (_0_5_isSet)
+            t1 = _0_7;
+          else {
+            _0_7 = (_0_5_isSet0 ? _0_5 : chunk2).length <= 0;
+            t1 = _0_7;
+          }
+          chunk = _0_1;
         } else
           t1 = true;
         if (t1) {
@@ -11297,10 +12268,10 @@ self.util = _cliPkgRequires.util;
         groups = A.QueueList$(null, type$.List_ComplexSelectorComponent),
         t1 = type$.JSArray_ComplexSelectorComponent,
         group = A._setArrayType([], t1);
-      for (t2 = new A.ListIterator(complex, complex.get$length(complex)), t3 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
-        t4 = t2.__internal$_current;
+      for (t2 = complex.$ti, t3 = new A.ListIterator(complex, complex.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t2 = t2._eval$1("ListBase.E"); t3.moveNext$0();) {
+        t4 = t3.__internal$_current;
         if (t4 == null)
-          t4 = t3._as(t4);
+          t4 = t2._as(t4);
         group.push(t4);
         if (t4.combinators.length === 0) {
           groups._queue_list$_add$1(group);
@@ -11319,7 +12290,7 @@ self.util = _cliPkgRequires.util;
       if (J.get$length$asx(complex1) > J.get$length$asx(complex2))
         return false;
       t1 = $.$get$bogusSpan();
-      base = new A.ComplexSelectorComponent(A.CompoundSelector$(A._setArrayType([new A.PlaceholderSelector("<temp>", t1)], type$.JSArray_SimpleSelector), t1), A.List_List$unmodifiable(B.List_empty1, type$.CssValue_Combinator), t1);
+      base = new A.ComplexSelectorComponent(A.CompoundSelector$(A._setArrayType([new A.PlaceholderSelector("<temp>", t1)], type$.JSArray_SimpleSelector), t1), A.List_List$unmodifiable(B.List_empty0, type$.CssValue_Combinator), t1);
       t1 = type$.ComplexSelectorComponent;
       t2 = A.List_List$of(complex1, true, t1);
       t2.push(base);
@@ -11328,84 +12299,85 @@ self.util = _cliPkgRequires.util;
       return A.complexIsSuperselector(t2, t1);
     },
     complexIsSuperselector(complex1, complex2) {
-      var t1, t2, t3, i1, i2, previousCombinator, remaining1, t4, remaining2, component1, t5, parents, endOfSubselector, component2, combinator1;
+      var t1, t2, previousCombinator, i1, i2, remaining1, remaining2, component1, t3, t4, endOfSubselector, component2, t5, combinator1, _null = null;
       if (B.JSArray_methods.get$last(complex1).combinators.length !== 0)
         return false;
       if (B.JSArray_methods.get$last(complex2).combinators.length !== 0)
         return false;
-      for (t1 = type$.JSArray_ComplexSelectorComponent, t2 = A._arrayInstanceType(complex2), t3 = t2._precomputed1, t2 = t2._eval$1("SubListIterable<1>"), i1 = 0, i2 = 0, previousCombinator = null; true; previousCombinator = combinator1) {
+      for (t1 = A._arrayInstanceType(complex2), t2 = t1._precomputed1, t1 = t1._eval$1("SubListIterable<1>"), previousCombinator = _null, i1 = 0, i2 = 0; true; previousCombinator = combinator1) {
         remaining1 = complex1.length - i1;
-        t4 = complex2.length;
-        remaining2 = t4 - i2;
+        remaining2 = complex2.length - i2;
         if (remaining1 === 0 || remaining2 === 0)
           return false;
         if (remaining1 > remaining2)
           return false;
         component1 = complex1[i1];
-        t5 = component1.combinators;
-        if (t5.length > 1)
+        t3 = component1.combinators;
+        if (t3.length > 1)
           return false;
-        if (remaining1 === 1) {
-          parents = B.JSArray_methods.sublist$2(complex2, i2, t4 - 1);
-          if (B.JSArray_methods.any$1(parents, new A.complexIsSuperselector_closure()))
+        if (remaining1 === 1)
+          if (B.JSArray_methods.any$1(complex2, new A.complexIsSuperselector_closure()))
             return false;
-          return A.compoundIsSuperselector(component1.selector, B.JSArray_methods.get$last(complex2).selector, parents);
-        }
-        for (t4 = component1.selector, endOfSubselector = i2, parents = null; true;) {
+          else {
+            t1 = component1.selector;
+            t2 = B.JSArray_methods.get$last(complex2).selector;
+            return A.compoundIsSuperselector(t1, t2, t1.get$hasComplicatedSuperselectorSemantics() ? B.JSArray_methods.sublist$2(complex2, i2, complex2.length - 1) : _null);
+          }
+        for (t4 = component1.selector, endOfSubselector = i2; true;) {
           component2 = complex2[endOfSubselector];
           if (component2.combinators.length > 1)
             return false;
-          if (A.compoundIsSuperselector(t4, component2.selector, parents))
+          t5 = component2.selector;
+          if (A.compoundIsSuperselector(t4, t5, t4.get$hasComplicatedSuperselectorSemantics() ? B.JSArray_methods.sublist$2(complex2, i2, endOfSubselector) : _null))
             break;
           ++endOfSubselector;
           if (endOfSubselector === complex2.length - 1)
             return false;
-          if (parents == null)
-            parents = A._setArrayType([], t1);
-          parents.push(component2);
         }
-        if (!A._compatibleWithPreviousCombinator(previousCombinator, parents == null ? B.List_empty0 : parents))
+        t4 = new A.SubListIterable(complex2, 0, endOfSubselector, t1);
+        t4.SubListIterable$3(complex2, 0, endOfSubselector, t2);
+        if (!A._compatibleWithPreviousCombinator(previousCombinator, t4.skip$1(0, i2)))
           return false;
         component2 = complex2[endOfSubselector];
-        combinator1 = A.IterableExtension_get_firstOrNull(t5);
+        combinator1 = A.IterableExtension_get_firstOrNull(t3);
         if (!A._isSupercombinator(combinator1, A.IterableExtension_get_firstOrNull(component2.combinators)))
           return false;
         ++i1;
         i2 = endOfSubselector + 1;
         if (complex1.length - i1 === 1) {
-          t4 = combinator1 == null;
-          if (J.$eq$(t4 ? null : combinator1.value, B.Combinator_Htt)) {
-            t4 = complex2.length - 1;
-            t5 = new A.SubListIterable(complex2, 0, t4, t2);
-            t5.SubListIterable$3(complex2, 0, t4, t3);
-            if (!t5.skip$1(0, i2).every$1(0, new A.complexIsSuperselector_closure0(combinator1)))
+          t3 = combinator1 == null;
+          if (J.$eq$(t3 ? _null : combinator1.value, B.Combinator_y18)) {
+            t3 = complex2.length - 1;
+            t4 = new A.SubListIterable(complex2, 0, t3, t1);
+            t4.SubListIterable$3(complex2, 0, t3, t2);
+            if (!t4.skip$1(0, i2).every$1(0, new A.complexIsSuperselector_closure0(combinator1)))
               return false;
-          } else if (!t4)
+          } else if (!t3)
             if (complex2.length - i2 > 1)
               return false;
         }
       }
     },
     _compatibleWithPreviousCombinator(previous, parents) {
-      if (parents.length === 0)
+      if (parents.get$isEmpty(parents))
         return true;
       if (previous == null)
         return true;
-      if (previous.value !== B.Combinator_Htt)
+      if (previous.value !== B.Combinator_y18)
         return false;
-      return B.JSArray_methods.every$1(parents, new A._compatibleWithPreviousCombinator_closure());
+      return parents.every$1(0, new A._compatibleWithPreviousCombinator_closure());
     },
     _isSupercombinator(combinator1, combinator2) {
       var t1, t2;
       if (!J.$eq$(combinator1, combinator2)) {
         t1 = combinator1 == null;
         if (t1)
-          t2 = J.$eq$(combinator2 == null ? null : combinator2.value, B.Combinator_Cht);
+          t2 = J.$eq$(combinator2 == null ? null : combinator2.value, B.Combinator_8I8);
         else
           t2 = false;
         if (!t2)
-          if (J.$eq$(t1 ? null : combinator1.value, B.Combinator_Htt))
-            t1 = J.$eq$(combinator2 == null ? null : combinator2.value, B.Combinator_4QF);
+          if (J.$eq$(t1 ? null : combinator1.value, B.Combinator_y18))
+            t1 = J.$eq$(combinator2 == null ? null : combinator2.value, B.Combinator_gRV);
           else
             t1 = false;
         else
@@ -11415,29 +12387,38 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     compoundIsSuperselector(compound1, compound2, parents) {
-      var t2, pseudo1, index1, pseudo2, index2, t3, t4, t5, _i, simple1, _null = null,
-        _0_0 = new A._Record_2(A._findPseudoElementIndexed(compound1), A._findPseudoElementIndexed(compound2)),
-        _0_1 = A._InitializedCell$(new A.compoundIsSuperselector_closure(_0_0)),
-        _0_5 = A._InitializedCell$(new A.compoundIsSuperselector_closure0(_0_0)),
-        t1 = type$.Record_2_nullable_Object_and_nullable_Object;
-      if (t1._is(_0_1._readFinal$0())) {
-        t2 = type$.PseudoSelector;
-        pseudo1 = t2._as(_0_1._readFinal$0()._0);
-        index1 = A._asInt(_0_1._readFinal$0()._1);
-        if (t1._is(_0_5._readFinal$0())) {
-          pseudo2 = t2._as(_0_5._readFinal$0()._0);
-          index2 = A._asInt(_0_5._readFinal$0()._1);
-          t1 = true;
+      var t1, _0_1, _0_5, _0_5_isSet, t2, pseudo1, index1, t3, pseudo2, index2, _0_50, t4, t5, _i, simple1, _null = null;
+      if (!compound1.get$hasComplicatedSuperselectorSemantics() && !compound2.get$hasComplicatedSuperselectorSemantics()) {
+        t1 = compound1.components;
+        if (t1.length > compound2.components.length)
+          return false;
+        return B.JSArray_methods.every$1(t1, new A.compoundIsSuperselector_closure(compound2));
+      }
+      _0_1 = A._findPseudoElementIndexed(compound1);
+      _0_5 = A._findPseudoElementIndexed(compound2);
+      t1 = type$.Record_2_nullable_Object_and_nullable_Object;
+      _0_5_isSet = t1._is(_0_1);
+      if (_0_5_isSet) {
+        t2 = _0_1 == null;
+        pseudo1 = (t2 ? t1._as(_0_1) : _0_1)._0;
+        index1 = (t2 ? t1._as(_0_1) : _0_1)._1;
+        t2 = t1._is(_0_5);
+        if (t2) {
+          t3 = _0_5 == null;
+          pseudo2 = (t3 ? t1._as(_0_5) : _0_5)._0;
+          index2 = (t3 ? t1._as(_0_5) : _0_5)._1;
         } else {
           index2 = _null;
           pseudo2 = index2;
-          t1 = false;
         }
+        t1 = t2;
+        _0_50 = _0_5;
       } else {
         index2 = _null;
         pseudo2 = index2;
         index1 = pseudo2;
         pseudo1 = index1;
+        _0_50 = pseudo1;
         t1 = false;
       }
       if (t1) {
@@ -11452,15 +12433,19 @@ self.util = _cliPkgRequires.util;
           t1 = false;
         return t1;
       }
-      if (!(_0_1._readFinal$0() != null && true))
-        t1 = _0_5._readFinal$0() != null && true;
+      if (_0_1 == null)
+        t1 = (_0_5_isSet ? _0_50 : _0_5) != null;
       else
         t1 = true;
       if (t1)
         return false;
       for (t1 = compound1.components, t2 = t1.length, t3 = compound2.components, _i = 0; _i < t2; ++_i) {
         simple1 = t1[_i];
-        if (simple1 instanceof A.PseudoSelector && simple1.selector != null && true) {
+        if (simple1 instanceof A.PseudoSelector)
+          t4 = simple1.selector != null;
+        else
+          t4 = false;
+        if (t4) {
           if (!A._selectorPseudoIsSuperselector(simple1, compound2, parents))
             return false;
         } else if (!B.JSArray_methods.any$1(t3, simple1.get$isSuperselector()))
@@ -11479,9 +12464,9 @@ self.util = _cliPkgRequires.util;
     },
     _compoundComponentsIsSuperselector(compound1, compound2, parents) {
       var t1;
-      if (compound1.get$length(compound1) === 0)
+      if (compound1.get$length(0) === 0)
         return true;
-      if (compound2.get$length(compound2) === 0)
+      if (compound2.get$length(0) === 0)
         compound2 = A._setArrayType([new A.UniversalSelector("*", $.$get$bogusSpan())], type$.JSArray_SimpleSelector);
       t1 = $.$get$bogusSpan();
       return A.compoundIsSuperselector(A.CompoundSelector$(compound1, t1), A.CompoundSelector$(compound2, t1), parents);
@@ -11517,74 +12502,17 @@ self.util = _cliPkgRequires.util;
       var t1 = type$.WhereTypeIterable_PseudoSelector;
       return A.IterableNullableExtension_whereNotNull(new A.MappedIterable(new A.WhereIterable(new A.WhereTypeIterable(compound.components, t1), new A._selectorPseudoArgs_closure(isClass, $name), t1._eval$1("WhereIterable<Iterable.E>")), new A._selectorPseudoArgs_closure0(), t1._eval$1("MappedIterable<Iterable.E,SelectorList?>")), type$.SelectorList);
     },
-    unifyComplex_closure: function unifyComplex_closure(t0) {
-      this._0_0 = t0;
-    },
-    unifyComplex_closure0: function unifyComplex_closure0(t0) {
-      this._1_0 = t0;
-    },
-    unifyComplex_closure1: function unifyComplex_closure1() {
-    },
-    _namespaceAndName_closure: function _namespaceAndName_closure(t0) {
-      this._0_0 = t0;
+    unifyComplex_closure: function unifyComplex_closure() {
     },
     _weaveParents_closure: function _weaveParents_closure(t0) {
-      this._0_0 = t0;
-    },
-    _weaveParents_closure0: function _weaveParents_closure0(t0) {
-      this._0_0 = t0;
-    },
-    _weaveParents_closure1: function _weaveParents_closure1(t0) {
       this.span = t0;
     },
-    _weaveParents_closure2: function _weaveParents_closure2(t0) {
+    _weaveParents_closure0: function _weaveParents_closure0(t0) {
       this.group = t0;
     },
-    _weaveParents_closure3: function _weaveParents_closure3() {
+    _weaveParents_closure1: function _weaveParents_closure1() {
     },
-    _weaveParents_closure4: function _weaveParents_closure4() {
-    },
-    _mergeLeadingCombinators_closure: function _mergeLeadingCombinators_closure(t0) {
-      this._0_0 = t0;
-    },
-    _mergeLeadingCombinators_closure0: function _mergeLeadingCombinators_closure0(t0) {
-      this._0_0 = t0;
-    },
-    _mergeLeadingCombinators_closure1: function _mergeLeadingCombinators_closure1(t0) {
-      this._0_1 = t0;
-    },
-    _mergeLeadingCombinators_closure2: function _mergeLeadingCombinators_closure2(t0) {
-      this._0_4 = t0;
-    },
-    _mergeTrailingCombinators_closure: function _mergeTrailingCombinators_closure(t0) {
-      this._0_0 = t0;
-    },
-    _mergeTrailingCombinators_closure0: function _mergeTrailingCombinators_closure0(t0) {
-      this._1_0 = t0;
-    },
-    _mergeTrailingCombinators_closure1: function _mergeTrailingCombinators_closure1(t0) {
-      this._4_0 = t0;
-    },
-    _mergeTrailingCombinators_closure2: function _mergeTrailingCombinators_closure2(t0) {
-      this._4_1 = t0;
-    },
-    _mergeTrailingCombinators_closure3: function _mergeTrailingCombinators_closure3(t0) {
-      this._4_0 = t0;
-    },
-    _mergeTrailingCombinators_closure4: function _mergeTrailingCombinators_closure4(t0) {
-      this._4_4 = t0;
-    },
-    _mergeTrailingCombinators_closure6: function _mergeTrailingCombinators_closure6(t0) {
-      this._4_0 = t0;
-    },
-    _mergeTrailingCombinators_closure7: function _mergeTrailingCombinators_closure7(t0) {
-      this._4_0 = t0;
-    },
-    _mergeTrailingCombinators_closure5: function _mergeTrailingCombinators_closure5(t0) {
-      this._4_4 = t0;
-    },
-    _mergeTrailingCombinators_closure8: function _mergeTrailingCombinators_closure8(t0) {
-      this._4_1 = t0;
+    _weaveParents_closure2: function _weaveParents_closure2() {
     },
     _mustUnify_closure: function _mustUnify_closure(t0) {
       this.uniqueSelectors = t0;
@@ -11592,20 +12520,6 @@ self.util = _cliPkgRequires.util;
     _mustUnify__closure: function _mustUnify__closure(t0) {
       this.uniqueSelectors = t0;
     },
-    _chunks_closure: function _chunks_closure(t0, t1) {
-      this._0_0 = t0;
-      this.T = t1;
-    },
-    _chunks_closure0: function _chunks_closure0(t0) {
-      this._0_1 = t0;
-    },
-    _chunks_closure1: function _chunks_closure1(t0, t1) {
-      this._0_0 = t0;
-      this.T = t1;
-    },
-    _chunks_closure2: function _chunks_closure2(t0) {
-      this._0_5 = t0;
-    },
     paths_closure: function paths_closure(t0) {
       this.T = t0;
     },
@@ -11631,10 +12545,7 @@ self.util = _cliPkgRequires.util;
     _compatibleWithPreviousCombinator_closure: function _compatibleWithPreviousCombinator_closure() {
     },
     compoundIsSuperselector_closure: function compoundIsSuperselector_closure(t0) {
-      this._0_0 = t0;
-    },
-    compoundIsSuperselector_closure0: function compoundIsSuperselector_closure0(t0) {
-      this._0_0 = t0;
+      this.compound2 = t0;
     },
     _selectorPseudoIsSuperselector_closure: function _selectorPseudoIsSuperselector_closure(t0) {
       this.selector1 = t0;
@@ -11657,15 +12568,12 @@ self.util = _cliPkgRequires.util;
       this.complex = t0;
       this.pseudo1 = t1;
     },
+    _selectorPseudoIsSuperselector___closure: function _selectorPseudoIsSuperselector___closure(t0) {
+      this.simple2 = t0;
+    },
     _selectorPseudoIsSuperselector___closure0: function _selectorPseudoIsSuperselector___closure0(t0) {
       this.simple2 = t0;
     },
-    _selectorPseudoIsSuperselector___closure1: function _selectorPseudoIsSuperselector___closure1(t0) {
-      this.simple2 = t0;
-    },
-    _selectorPseudoIsSuperselector___closure: function _selectorPseudoIsSuperselector___closure(t0) {
-      this._0_0 = t0;
-    },
     _selectorPseudoIsSuperselector_closure4: function _selectorPseudoIsSuperselector_closure4(t0) {
       this.selector1 = t0;
     },
@@ -11740,7 +12648,7 @@ self.util = _cliPkgRequires.util;
       blackness = t1.call$3$assertPercent("blackness", 100, true);
       t1 = keywords.__js_helper$_length;
       if (t1 !== 0)
-        throw A.wrapException(A.SassScriptException$("No " + A.pluralize("argument", t1, _null) + " named " + A.toSentence(keywords.get$keys(keywords).map$1$1(0, new A._updateComponents_closure0(), type$.Object), "or") + ".", _null));
+        throw A.wrapException(A.SassScriptException$("No " + A.pluralize("argument", t1, _null) + " named " + A.toSentence(keywords.get$keys(0).map$1$1(0, new A._updateComponents_closure0(), type$.Object), "or") + ".", _null));
       hasRgb = red != null || green != null || blue != null;
       hasSL = saturation != null || lightness != null;
       hasWB = whiteness != null || blackness != null;
@@ -11755,27 +12663,27 @@ self.util = _cliPkgRequires.util;
       t1 = new A._updateComponents_updateValue(change, adjust);
       t2 = new A._updateComponents_updateRgb(t1);
       if (hasRgb) {
-        t3 = t2.call$2(color.get$red(color), red);
-        t4 = t2.call$2(color.get$green(color), green);
-        t2 = t2.call$2(color.get$blue(color), blue);
+        t3 = t2.call$2(color.get$red(0), red);
+        t4 = t2.call$2(color.get$green(0), green);
+        t2 = t2.call$2(color.get$blue(0), blue);
         return color.changeRgb$4$alpha$blue$green$red(t1.call$3(color._alpha, alpha, 1), t2, t4, t3);
       } else if (hasWB) {
         if (change)
           t2 = hue;
         else {
-          t2 = color.get$hue(color);
+          t2 = color.get$hue(0);
           t2 += hue == null ? 0 : hue;
         }
-        t3 = t1.call$3(color.get$whiteness(color), whiteness, 100);
-        t4 = t1.call$3(color.get$blackness(color), blackness, 100);
+        t3 = t1.call$3(color.get$whiteness(0), whiteness, 100);
+        t4 = t1.call$3(color.get$blackness(0), blackness, 100);
         t5 = color._alpha;
         t1 = t1.call$3(t5, alpha, 1);
         if (t2 == null)
-          t2 = color.get$hue(color);
+          t2 = color.get$hue(0);
         if (t3 == null)
-          t3 = color.get$whiteness(color);
+          t3 = color.get$whiteness(0);
         if (t4 == null)
-          t4 = color.get$blackness(color);
+          t4 = color.get$blackness(0);
         return A.SassColor_SassColor$hwb(t2, t3, t4, t1 == null ? t5 : t1);
       } else {
         t2 = hue == null;
@@ -11783,12 +12691,12 @@ self.util = _cliPkgRequires.util;
           if (change)
             t2 = hue;
           else {
-            t3 = color.get$hue(color);
+            t3 = color.get$hue(0);
             t3 += t2 ? 0 : hue;
             t2 = t3;
           }
-          t3 = t1.call$3(color.get$saturation(color), saturation, 100);
-          t4 = t1.call$3(color.get$lightness(color), lightness, 100);
+          t3 = t1.call$3(color.get$saturation(0), saturation, 100);
+          t4 = t1.call$3(color.get$lightness(0), lightness, 100);
           return color.changeHsl$4$alpha$hue$lightness$saturation(t1.call$3(color._alpha, alpha, 1), t2, t4, t3);
         } else if (alpha != null)
           return color.changeAlpha$1(t1.call$3(color._alpha, alpha, 1));
@@ -11839,7 +12747,7 @@ self.util = _cliPkgRequires.util;
         return A._functionString($name, $arguments);
       else if (t1.$index($arguments, 1).get$isSpecialNumber()) {
         color = t1.$index($arguments, 0).assertColor$1("color");
-        return new A.SassString($name + "(" + color.get$red(color) + ", " + color.get$green(color) + ", " + color.get$blue(color) + ", " + A.serializeValue(t1.$index($arguments, 1), false, true) + ")", false);
+        return new A.SassString($name + "(" + color.get$red(0) + ", " + color.get$green(0) + ", " + color.get$blue(0) + ", " + A.serializeValue(t1.$index($arguments, 1), false, true) + ")", false);
       }
       return t1.$index($arguments, 0).assertColor$1("color").changeAlpha$1(A._percentageOrUnitless(t1.$index($arguments, 1).assertNumber$1("alpha"), 1, "alpha"));
     },
@@ -11873,22 +12781,16 @@ self.util = _cliPkgRequires.util;
       return A.SassColor$hslInternal(hue, t1, t2, t3 == null ? 1 : t3, B._ColorFormatEnum_hslFunction);
     },
     _angleValue(angleValue, $name) {
-      var t1, t2,
-        angle = angleValue.assertNumber$1($name);
+      var angle = angleValue.assertNumber$1($name);
       if (angle.compatibleWithUnit$1("deg"))
         return angle.coerceValueToUnit$1("deg");
-      t1 = angle.toString$0(0);
-      t2 = angle.unitSuggestion$1($name);
-      A.EvaluationContext_current().warn$2(0, "$" + $name + ": Passing a unit other than deg (" + t1 + string$.x29x20is_d + t2 + string$.x0a_See_, B.Deprecation_8WR);
+      A.warnForDeprecation("$" + $name + ": Passing a unit other than deg (" + angle.toString$0(0) + string$.x29x20is_d + angle.unitSuggestion$1($name) + string$.x0a_See_, B.Deprecation_2jN);
       return angle._number$_value;
     },
     _checkPercent(number, $name) {
-      var t1, t2;
       if (number.hasUnit$1("%"))
         return;
-      t1 = number.toString$0(0);
-      t2 = number.unitSuggestion$2($name, "%");
-      A.EvaluationContext_current().warn$2(0, "$" + $name + ": Passing a number without unit % (" + t1 + string$.x29x20is_d + t2 + string$.x0a_Morex3a, B.Deprecation_8WR);
+      A.warnForDeprecation("$" + $name + ": Passing a number without unit % (" + number.toString$0(0) + string$.x29x20is_d + number.unitSuggestion$2($name, "%") + string$.x0a_Morex3a, B.Deprecation_2jN);
     },
     _hwb($arguments) {
       var t2, t3,
@@ -11907,11 +12809,11 @@ self.util = _cliPkgRequires.util;
       return A.SassColor_SassColor$hwb(hue, t1, t2, t3 == null ? 1 : t3);
     },
     _parseChannels($name, argumentNames, channels) {
-      var list, t1, channels0, alphaFromSlashList, isCommaSeparated, isBracketed, buffer, _0_4, text, _1_0, _1_2, channel3, alpha, _null = null,
+      var list, t1, channels0, alphaFromSlashList, isCommaSeparated, isBracketed, buffer, _0_4, _1_0, _1_2_isSet, _1_2, t2, _null = null,
         _s17_ = "$channels must be";
       if (channels.get$isVar())
         return A._functionString($name, A._setArrayType([channels], type$.JSArray_Value));
-      if (channels.get$separator(channels) === B.ListSeparator_zg9) {
+      if (channels.get$separator(channels) === B.ListSeparator_cQA) {
         list = channels.get$asList();
         t1 = list.length;
         if (t1 !== 2)
@@ -11926,7 +12828,7 @@ self.util = _cliPkgRequires.util;
         alphaFromSlashList = _null;
         channels0 = channels;
       }
-      isCommaSeparated = channels0.get$separator(channels0) === B.ListSeparator_rXA;
+      isCommaSeparated = channels0.get$separator(channels0) === B.ListSeparator_ECn;
       isBracketed = channels0.get$hasBrackets();
       if (isCommaSeparated || isBracketed) {
         buffer = new A.StringBuffer(_s17_);
@@ -11944,14 +12846,15 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException(A.SassScriptException$(buffer.toString$0(0), _null));
       }
       list = channels0.get$asList();
-      _0_4 = A._InitializedCell$(new A._parseChannels_closure(list));
-      if (list.length >= 2)
-        if (_0_4._readFinal$0() instanceof A.SassString) {
-          text = _0_4._readFinal$0()._string$_text;
-          t1 = !_0_4._readFinal$0()._hasQuotes && A.equalsIgnoreCase(text, "from");
+      if (list.length >= 2) {
+        _0_4 = list[0];
+        t1 = _0_4;
+        if (t1 instanceof A.SassString) {
+          type$.SassString._as(_0_4);
+          t1 = !_0_4._hasQuotes && A.equalsIgnoreCase(_0_4._string$_text, "from");
         } else
           t1 = false;
-      else
+      } else
         t1 = false;
       if (t1)
         return A._functionString($name, A._setArrayType([channels], type$.JSArray_Value));
@@ -11959,7 +12862,7 @@ self.util = _cliPkgRequires.util;
       if (t1 > 3)
         throw A.wrapException(A.SassScriptException$("Only 3 elements allowed, but " + t1 + " were passed.", _null));
       else if (t1 < 3) {
-        if (!B.JSArray_methods.any$1(list, new A._parseChannels_closure0()))
+        if (!B.JSArray_methods.any$1(list, new A._parseChannels_closure()))
           if (list.length !== 0) {
             t1 = B.JSArray_methods.get$last(list);
             if (t1 instanceof A.SassString)
@@ -11985,26 +12888,30 @@ self.util = _cliPkgRequires.util;
         return t1;
       }
       _1_0 = list[2];
-      _1_2 = A._InitializedCell$(new A._parseChannels_closure1(_1_0));
       $label0$0: {
-        if (_1_0 instanceof A.SassNumber)
-          if (type$.Record_2_nullable_Object_and_nullable_Object._is(_1_2._readFinal$0())) {
-            t1 = type$.SassNumber;
-            channel3 = t1._as(_1_2._readFinal$0()._0);
-            alpha = t1._as(_1_2._readFinal$0()._1);
-            t1 = true;
-          } else {
-            alpha = _null;
-            channel3 = alpha;
-            t1 = false;
-          }
-        else {
-          alpha = _null;
-          channel3 = alpha;
+        _1_2_isSet = _1_0 instanceof A.SassNumber;
+        if (_1_2_isSet) {
+          _1_2 = _1_0.asSlash;
+          t1 = type$.Record_2_nullable_Object_and_nullable_Object._is(_1_2);
+        } else {
+          _1_2 = _null;
           t1 = false;
         }
         if (t1) {
-          t1 = A._setArrayType([list[0], list[1], channel3, alpha], type$.JSArray_Value);
+          if (_1_2_isSet)
+            t1 = _1_2;
+          else {
+            _1_2 = _1_0.asSlash;
+            t1 = _1_2;
+            _1_2_isSet = true;
+          }
+          if (t1 == null)
+            t1 = type$.Record_2_nullable_Object_and_nullable_Object._as(t1);
+          t2 = _1_2_isSet ? _1_2 : _1_0.asSlash;
+          if (t2 == null)
+            t2 = type$.Record_2_nullable_Object_and_nullable_Object._as(t2);
+          t2 = A._setArrayType([list[0], list[1], t1._0, t2._1], type$.JSArray_Value);
+          t1 = t2;
           break $label0$0;
         }
         if (_1_0 instanceof A.SassString)
@@ -12044,7 +12951,7 @@ self.util = _cliPkgRequires.util;
       t3 = normalizedWeight * alphaDistance;
       weight1 = ((t3 === -1 ? normalizedWeight : (normalizedWeight + alphaDistance) / (1 + t3)) + 1) / 2;
       weight2 = 1 - weight1;
-      return A.SassColor$rgb(A.fuzzyRound(color1.get$red(color1) * weight1 + color2.get$red(color2) * weight2), A.fuzzyRound(color1.get$green(color1) * weight1 + color2.get$green(color2) * weight2), A.fuzzyRound(color1.get$blue(color1) * weight1 + color2.get$blue(color2) * weight2), t1 * weightScale + t2 * (1 - weightScale));
+      return A.SassColor$rgb(A.fuzzyRound(color1.get$red(0) * weight1 + color2.get$red(0) * weight2), A.fuzzyRound(color1.get$green(0) * weight1 + color2.get$green(0) * weight2), A.fuzzyRound(color1.get$blue(0) * weight1 + color2.get$blue(0) * weight2), t1 * weightScale + t2 * (1 - weightScale));
     },
     _opacify($arguments) {
       var t1 = J.getInterceptor$asx($arguments),
@@ -12190,13 +13097,7 @@ self.util = _cliPkgRequires.util;
     },
     _hwb_closure: function _hwb_closure() {
     },
-    _parseChannels_closure: function _parseChannels_closure(t0) {
-      this._0_0 = t0;
-    },
-    _parseChannels_closure0: function _parseChannels_closure0() {
-    },
-    _parseChannels_closure1: function _parseChannels_closure1(t0) {
-      this._1_0 = t0;
+    _parseChannels_closure: function _parseChannels_closure() {
     },
     _function3($name, $arguments, callback) {
       return A.BuiltInCallable$function($name, $arguments, callback, "sass:list");
@@ -12209,15 +13110,6 @@ self.util = _cliPkgRequires.util;
     },
     _join_closure: function _join_closure() {
     },
-    _join__closure: function _join__closure(t0) {
-      this._0_0 = t0;
-    },
-    _join__closure0: function _join__closure0(t0) {
-      this._0_1 = t0;
-    },
-    _join__closure1: function _join__closure1(t0) {
-      this._0_0 = t0;
-    },
     _append_closure0: function _append_closure0() {
     },
     _zip_closure: function _zip_closure() {
@@ -12243,7 +13135,7 @@ self.util = _cliPkgRequires.util;
       return keyIterator.moveNext$0() ? new A._modify_modifyNestedMap(keyIterator, modify, addNesting).call$1(map) : modify.call$1(map);
     },
     _deepMergeImpl(map1, map2) {
-      var t2, t3, result, key, value, _1_0, _1_1, _1_3, resultMap, valueMap, merged, _null = null,
+      var t2, t3, result, t4, key, value, _1_1, _1_3, _1_3_isSet, resultMap, _1_30, valueMap, merged, _null = null,
         t1 = map1._map$_contents;
       if (t1.get$isEmpty(t1))
         return map2;
@@ -12252,36 +13144,26 @@ self.util = _cliPkgRequires.util;
         return map1;
       t3 = type$.Value;
       result = A.LinkedHashMap_LinkedHashMap$of(t1, t3, t3);
-      for (t1 = A.MapExtensions_get_pairs(t2, t3, t3), t1 = t1.get$iterator(t1); t1.moveNext$0();) {
-        t2 = t1.get$current(t1);
-        key = t2._0;
-        value = t2._1;
-        t2 = result.$index(0, key);
-        t2 = t2 == null ? _null : t2.tryMap$0();
-        _1_0 = new A._Record_2(t2, value.tryMap$0());
-        _1_1 = A._InitializedCell$(new A._deepMergeImpl_closure(_1_0));
-        _1_3 = A._InitializedCell$(new A._deepMergeImpl_closure0(_1_0));
-        if (_1_1._readFinal$0() != null) {
-          resultMap = _1_1._readFinal$0();
-          t2 = true;
+      for (t1 = A.MapExtensions_get_pairs(t2, t3, t3), t1 = t1.get$iterator(t1), t2 = type$.SassMap; t1.moveNext$0();) {
+        t4 = t1.get$current(t1);
+        key = t4._0;
+        value = t4._1;
+        t4 = result.$index(0, key);
+        _1_1 = t4 == null ? _null : t4.tryMap$0();
+        _1_3 = value.tryMap$0();
+        _1_3_isSet = _1_1 != null;
+        if (_1_3_isSet) {
+          resultMap = _1_1 == null ? t2._as(_1_1) : _1_1;
+          t4 = _1_3 != null;
+          _1_30 = _1_3;
         } else {
           resultMap = _null;
-          t2 = false;
+          _1_30 = resultMap;
+          t4 = false;
         }
-        if (t2)
-          if (_1_3._readFinal$0() != null) {
-            valueMap = _1_3._readFinal$0();
-            t2 = true;
-          } else {
-            valueMap = _null;
-            t2 = false;
-          }
-        else {
-          valueMap = _null;
-          t2 = false;
-        }
-        if (t2) {
-          merged = A._deepMergeImpl(resultMap, valueMap);
+        if (t4) {
+          valueMap = _1_3_isSet ? _1_30 : _1_3;
+          merged = A._deepMergeImpl(resultMap, valueMap == null ? t2._as(valueMap) : valueMap);
           if (merged === resultMap)
             continue;
           result.$indexSet(0, key, merged);
@@ -12297,15 +13179,12 @@ self.util = _cliPkgRequires.util;
     },
     _set_closure: function _set_closure() {
     },
-    _set__closure1: function _set__closure1(t0) {
+    _set__closure0: function _set__closure0(t0) {
       this.$arguments = t0;
     },
     _set_closure0: function _set_closure0() {
     },
     _set__closure: function _set__closure(t0) {
-      this._0_0 = t0;
-    },
-    _set__closure0: function _set__closure0(t0) {
       this._box_0 = t0;
     },
     _merge_closure: function _merge_closure() {
@@ -12313,9 +13192,6 @@ self.util = _cliPkgRequires.util;
     _merge_closure0: function _merge_closure0() {
     },
     _merge__closure: function _merge__closure(t0) {
-      this._0_0 = t0;
-    },
-    _merge__closure0: function _merge__closure0(t0) {
       this.map2 = t0;
     },
     _deepMerge_closure: function _deepMerge_closure() {
@@ -12340,12 +13216,6 @@ self.util = _cliPkgRequires.util;
       this.modify = t1;
       this.addNesting = t2;
     },
-    _deepMergeImpl_closure: function _deepMergeImpl_closure(t0) {
-      this._1_0 = t0;
-    },
-    _deepMergeImpl_closure0: function _deepMergeImpl_closure0(t0) {
-      this._1_0 = t0;
-    },
     _singleArgumentMathFunc($name, mathFunc) {
       return A.BuiltInCallable$function($name, "$number", new A._singleArgumentMathFunc_closure(mathFunc), "sass:math");
     },
@@ -12414,52 +13284,63 @@ self.util = _cliPkgRequires.util;
     },
     local_closure0: function local_closure0() {
     },
-    local__closure0: function local__closure0() {
+    local__closure: function local__closure() {
     },
     local_closure1: function local_closure1() {
     },
-    local__closure: function local__closure(t0) {
-      this._0_0 = t0;
-    },
     _prependParent(compound) {
-      var t1, type, rest, _null = null,
-        span = A.EvaluationContext_current().get$currentCallableSpan(),
-        _0_0 = compound.components,
-        _0_3 = A._InitializedCell$(new A._prependParent_closure(_0_0)),
-        _0_4 = A._InitializedCell$(new A._prependParent_closure0(_0_0));
+      var _0_3, _0_4, _0_4_isSet, rest, _null = null,
+        t1 = A.EvaluationContext_currentOrNull(),
+        span = (t1 == null ? A.throwExpression(A.StateError$(string$.No_Sass)) : t1).get$currentCallableSpan(),
+        _0_0 = compound.components;
       $label0$0: {
-        if (_0_3._readFinal$0() && _0_4._readFinal$0() instanceof A.UniversalSelector) {
-          t1 = _null;
-          break $label0$0;
-        }
-        if (_0_3._readFinal$0())
-          if (_0_4._readFinal$0() instanceof A.TypeSelector)
-            t1 = _0_4._readFinal$0().name.namespace != null;
-          else
-            t1 = false;
-        else
+        _0_3 = _0_0.length >= 1;
+        if (_0_3) {
+          _0_4 = _0_0[0];
+          t1 = _0_4;
+          t1 = t1 instanceof A.UniversalSelector;
+        } else {
+          _0_4 = _null;
           t1 = false;
+        }
         if (t1) {
           t1 = _null;
           break $label0$0;
         }
-        if (_0_3._readFinal$0())
-          if (_0_4._readFinal$0() instanceof A.TypeSelector) {
-            type = _0_4._readFinal$0();
-            rest = B.JSArray_methods.sublist$1(_0_0, 1);
-            t1 = true;
+        if (_0_3) {
+          t1 = _0_4;
+          if (t1 instanceof A.TypeSelector) {
+            t1 = _0_4;
+            t1 = type$.TypeSelector._as(t1).name.namespace != null;
+            _0_4_isSet = true;
           } else {
-            rest = _null;
-            type = rest;
+            _0_4_isSet = true;
             t1 = false;
           }
-        else {
-          rest = _null;
-          type = rest;
+        } else {
+          _0_4_isSet = _0_3;
           t1 = false;
         }
         if (t1) {
-          t1 = A._setArrayType([new A.ParentSelector(type.name.name, span)], type$.JSArray_SimpleSelector);
+          t1 = _null;
+          break $label0$0;
+        }
+        if (_0_3) {
+          if (_0_4_isSet)
+            t1 = _0_4;
+          else {
+            _0_4 = _0_0[0];
+            t1 = _0_4;
+            _0_4_isSet = true;
+          }
+          t1 = t1 instanceof A.TypeSelector;
+        } else
+          t1 = false;
+        if (t1) {
+          t1 = _0_4_isSet ? _0_4 : _0_0[0];
+          type$.TypeSelector._as(t1);
+          rest = B.JSArray_methods.sublist$1(_0_0, 1);
+          t1 = A._setArrayType([new A.ParentSelector(t1.name.name, span)], type$.JSArray_SimpleSelector);
           B.JSArray_methods.addAll$1(t1, rest);
           t1 = A.CompoundSelector$(t1, span);
           break $label0$0;
@@ -12506,12 +13387,6 @@ self.util = _cliPkgRequires.util;
     },
     _parse_closure: function _parse_closure() {
     },
-    _prependParent_closure: function _prependParent_closure(t0) {
-      this._0_0 = t0;
-    },
-    _prependParent_closure0: function _prependParent_closure0(t0) {
-      this._0_0 = t0;
-    },
     _codepointForIndex(index, lengthInCodepoints, allowNegative) {
       var result;
       if (index === 0)
@@ -12552,23 +13427,26 @@ self.util = _cliPkgRequires.util;
     },
     _uniqueId_closure: function _uniqueId_closure() {
     },
-    ImportCache$(loadPaths, logger) {
+    ImportCache$(importers, loadPaths, logger) {
       var t1 = type$.nullable_Record_3_Importer_and_Uri_and_Uri_originalUrl,
-        t2 = type$.Uri,
-        t3 = A.ImportCache__toImporters(null, loadPaths, null);
-      return new A.ImportCache(t3, logger, A.LinkedHashMap_LinkedHashMap$_empty(type$.Record_2_Uri_and_bool_forImport, t1), A.LinkedHashMap_LinkedHashMap$_empty(type$.Record_4_Uri_and_Importer_baseImporter_and_nullable_Uri_baseUrl_and_bool_forImport, t1), A.LinkedHashMap_LinkedHashMap$_empty(t2, type$.nullable_Stylesheet), A.LinkedHashMap_LinkedHashMap$_empty(t2, type$.ImporterResult));
+        t2 = type$.Record_3_Importer_and_Uri_and_bool_forImport,
+        t3 = type$.Uri,
+        t4 = A.ImportCache__toImporters(importers, loadPaths, null);
+      return new A.ImportCache(t4, logger, A.LinkedHashMap_LinkedHashMap$_empty(type$.Record_2_Uri_and_bool_forImport, t1), A.LinkedHashMap_LinkedHashMap$_empty(t2, t1), A.LinkedHashMap_LinkedHashMap$_empty(t2, t3), A.LinkedHashMap_LinkedHashMap$_empty(t3, type$.nullable_Stylesheet), A.LinkedHashMap_LinkedHashMap$_empty(t3, type$.ImporterResult));
     },
     ImportCache__toImporters(importers, loadPaths, packageConfig) {
       var t1, t2, t3, t4, _i, path, _null = null,
         sassPath = A.getEnvironmentVariable("SASS_PATH");
       if (A.isBrowser()) {
-        t1 = A._setArrayType([], type$.JSArray_Importer_2);
+        t1 = A._setArrayType([], type$.JSArray_Importer);
+        B.JSArray_methods.addAll$1(t1, importers);
         return t1;
       }
-      t1 = A._setArrayType([], type$.JSArray_Importer_2);
+      t1 = A._setArrayType([], type$.JSArray_Importer);
+      B.JSArray_methods.addAll$1(t1, importers);
       for (t2 = J.get$iterator$ax(loadPaths); t2.moveNext$0();) {
         t3 = t2.get$current(t2);
-        t1.push(new A.FilesystemImporter($.$get$context().absolute$15(t3, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null)));
+        t1.push(new A.FilesystemImporter($.$get$context().absolute$15(t3, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null), false));
       }
       if (sassPath != null) {
         t2 = A.isNodeJs() ? self.process : _null;
@@ -12577,46 +13455,34 @@ self.util = _cliPkgRequires.util;
         _i = 0;
         for (; _i < t4; ++_i) {
           path = t3[_i];
-          t1.push(new A.FilesystemImporter($.$get$context().absolute$15(path, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null)));
+          t1.push(new A.FilesystemImporter($.$get$context().absolute$15(path, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null), false));
         }
       }
       return t1;
     },
-    ImportCache: function ImportCache(t0, t1, t2, t3, t4, t5) {
+    ImportCache: function ImportCache(t0, t1, t2, t3, t4, t5, t6) {
       var _ = this;
       _._importers = t0;
       _._logger = t1;
       _._canonicalizeCache = t2;
-      _._relativeCanonicalizeCache = t3;
-      _._importCache = t4;
-      _._resultsCache = t5;
+      _._perImporterCanonicalizeCache = t3;
+      _._nonCanonicalRelativeUrls = t4;
+      _._importCache = t5;
+      _._resultsCache = t6;
     },
-    ImportCache_canonicalize_closure: function ImportCache_canonicalize_closure(t0, t1, t2, t3, t4) {
+    ImportCache_canonicalize_closure: function ImportCache_canonicalize_closure(t0, t1, t2, t3, t4, t5, t6) {
       var _ = this;
       _.$this = t0;
       _.baseImporter = t1;
-      _.baseUrl = t2;
-      _.url = t3;
+      _.resolvedUrl = t2;
+      _.baseUrl = t3;
       _.forImport = t4;
-    },
-    ImportCache_canonicalize_closure0: function ImportCache_canonicalize_closure0(t0, t1, t2, t3) {
-      var _ = this;
-      _.$this = t0;
-      _.url = t1;
-      _.baseUrl = t2;
-      _.forImport = t3;
+      _.key = t5;
+      _.url = t6;
     },
     ImportCache__canonicalize_closure: function ImportCache__canonicalize_closure(t0, t1) {
       this.importer = t0;
-      this.resolved = t1;
-    },
-    ImportCache__canonicalize__closure: function ImportCache__canonicalize__closure(t0, t1) {
-      this.importer = t0;
-      this.resolved = t1;
-    },
-    ImportCache__canonicalize_closure0: function ImportCache__canonicalize_closure0(t0, t1) {
-      this.importer = t0;
-      this.resolved = t1;
+      this.url = t1;
     },
     ImportCache_importCanonical_closure: function ImportCache_importCanonical_closure(t0, t1, t2, t3, t4) {
       var _ = this;
@@ -12636,33 +13502,73 @@ self.util = _cliPkgRequires.util;
     ImportCache_humanize_closure2: function ImportCache_humanize_closure2(t0) {
       this.canonicalUrl = t0;
     },
-    ImportCache_clearCanonicalize_closure: function ImportCache_clearCanonicalize_closure(t0) {
-      this.url = t0;
+    ImportCache_clearCanonicalize_closure: function ImportCache_clearCanonicalize_closure(t0, t1) {
+      this.$this = t0;
+      this.url = t1;
     },
     Importer: function Importer() {
     },
     AsyncImporter: function AsyncImporter() {
     },
-    FilesystemImporter: function FilesystemImporter(t0) {
+    CanonicalizeContext: function CanonicalizeContext(t0, t1) {
+      this._fromImport = t0;
+      this._containingUrl = t1;
+      this._wasContainingUrlAccessed = false;
+    },
+    FilesystemImporter: function FilesystemImporter(t0, t1) {
       this._loadPath = t0;
+      this._loadPathDeprecated = t1;
     },
     FilesystemImporter_canonicalize_closure: function FilesystemImporter_canonicalize_closure() {
     },
     NoOpImporter: function NoOpImporter() {
     },
+    NodePackageImporter: function NodePackageImporter() {
+      this.__NodePackageImporter__entryPointDirectory_F = $;
+    },
+    NodePackageImporter__nodePackageExportsResolve_closure: function NodePackageImporter__nodePackageExportsResolve_closure() {
+    },
+    NodePackageImporter__nodePackageExportsResolve_closure0: function NodePackageImporter__nodePackageExportsResolve_closure0() {
+    },
+    NodePackageImporter__nodePackageExportsResolve_closure1: function NodePackageImporter__nodePackageExportsResolve_closure1() {
+    },
+    NodePackageImporter__nodePackageExportsResolve_closure2: function NodePackageImporter__nodePackageExportsResolve_closure2(t0, t1, t2) {
+      this.$this = t0;
+      this.exports = t1;
+      this.packageRoot = t2;
+    },
+    NodePackageImporter__nodePackageExportsResolve__closure: function NodePackageImporter__nodePackageExportsResolve__closure(t0, t1, t2) {
+      this.$this = t0;
+      this.variant = t1;
+      this.packageRoot = t2;
+    },
+    NodePackageImporter__nodePackageExportsResolve__closure0: function NodePackageImporter__nodePackageExportsResolve__closure0() {
+    },
+    NodePackageImporter__getMainExport_closure: function NodePackageImporter__getMainExport_closure() {
+    },
     ImporterResult: function ImporterResult(t0, t1, t2) {
       this.contents = t0;
       this._sourceMapUrl = t1;
       this.syntax = t2;
     },
     fromImport() {
-      var t1 = A._asBoolQ($.Zone__current.$index(0, B.Symbol__inImportRule));
+      var t1 = type$.nullable_CanonicalizeContext._as($.Zone__current.$index(0, B.Symbol__canonicalizeContext));
+      t1 = t1 == null ? null : t1._fromImport;
       return t1 === true;
     },
-    withContainingUrl(url, callback, $T) {
-      var t1 = url == null ? B.Symbol__none : url,
-        t2 = type$.nullable_Object;
-      return A.runZoned(callback, A.LinkedHashMap_LinkedHashMap$_literal([B.Symbol__containingUrl, t1], t2, t2), $T);
+    canonicalizeContext() {
+      var t1,
+        _0_0 = $.Zone__current.$index(0, B.Symbol__canonicalizeContext);
+      $label0$0: {
+        if (_0_0 == null)
+          A.throwExpression(A.StateError$(string$.canoni));
+        if (_0_0 instanceof A.CanonicalizeContext) {
+          t1 = _0_0;
+          break $label0$0;
+        }
+        t1 = A.throwExpression(A.StateError$(string$.Unexpe + A.S(_0_0) + "."));
+      }
+      return t1;
     },
     resolveImportPath(path) {
       var t1,
@@ -12699,25 +13605,19 @@ self.util = _cliPkgRequires.util;
       return t1 == null ? A._exactlyOne(A._tryPathWithExtensions(A.join(path, "index", null))) : t1;
     },
     _exactlyOne(paths) {
-      var t1, path,
-        _0_1 = A._InitializedCell$(new A._exactlyOne_closure(paths));
+      var _0_1, t1, path;
       $label0$0: {
-        if (_0_1._readFinal$0() <= 0) {
+        _0_1 = paths.length;
+        if (_0_1 <= 0) {
           t1 = null;
           break $label0$0;
         }
-        if (J.$eq$(_0_1._readFinal$0(), 1)) {
+        if (_0_1 === 1) {
           path = paths[0];
-          t1 = true;
-        } else {
-          path = null;
-          t1 = false;
-        }
-        if (t1) {
           t1 = path;
           break $label0$0;
         }
-        t1 = A.throwExpression(string$.It_s_n + B.JSArray_methods.map$1$1(paths, new A._exactlyOne_closure0(), type$.String).join$1(0, "\n"));
+        t1 = A.throwExpression(string$.It_s_n + B.JSArray_methods.map$1$1(paths, new A._exactlyOne_closure(), type$.String).join$1(0, "\n"));
       }
       return t1;
     },
@@ -12731,18 +13631,12 @@ self.util = _cliPkgRequires.util;
     _tryPathAsDirectory_closure: function _tryPathAsDirectory_closure(t0) {
       this.path = t0;
     },
-    _exactlyOne_closure: function _exactlyOne_closure(t0) {
-      this._0_0 = t0;
-    },
-    _exactlyOne_closure0: function _exactlyOne_closure0() {
+    _exactlyOne_closure: function _exactlyOne_closure() {
     },
     InterpolationBuffer: function InterpolationBuffer(t0, t1) {
       this._interpolation_buffer$_text = t0;
       this._interpolation_buffer$_contents = t1;
     },
-    InterpolationBuffer_addInterpolation_closure: function InterpolationBuffer_addInterpolation_closure(t0) {
-      this._0_0 = t0;
-    },
     InterpolationMap$(_interpolation, targetLocations) {
       var t1 = A.List_List$unmodifiable(targetLocations, type$.SourceLocation),
         t2 = _interpolation.contents.length,
@@ -12757,12 +13651,6 @@ self.util = _cliPkgRequires.util;
     },
     InterpolationMap_mapException_closure: function InterpolationMap_mapException_closure() {
     },
-    InterpolationMap_mapSpan_closure: function InterpolationMap_mapSpan_closure(t0) {
-      this._0_0 = t0;
-    },
-    InterpolationMap_mapSpan_closure0: function InterpolationMap_mapSpan_closure0(t0) {
-      this._0_0 = t0;
-    },
     _realCasePath(path) {
       var prefix, _null = null,
         t1 = A.isNodeJs() ? self.process : _null;
@@ -12793,16 +13681,9 @@ self.util = _cliPkgRequires.util;
       this.basename = t0;
     },
     printError(message) {
-      var t1,
-        process = A.isNodeJs() ? self.process : null;
-      if (process != null)
-        t1 = true;
-      else {
-        process = null;
-        t1 = false;
-      }
-      if (t1) {
-        t1 = J.get$stderr$x(process);
+      var t1 = A.isNodeJs() ? self.process : null;
+      if (t1 != null) {
+        t1 = J.get$stderr$x(t1);
         J.write$1$x(t1, A.S(message == null ? "" : message) + "\n");
       } else {
         t1 = self.console;
@@ -13044,6 +13925,10 @@ self.util = _cliPkgRequires.util;
     },
     RenderContextResultStats: function RenderContextResultStats() {
     },
+    JSModule: function JSModule() {
+    },
+    JSModuleRequire: function JSModuleRequire() {
+    },
     JSClass: function JSClass() {
     },
     JSUrl: function JSUrl() {
@@ -13053,39 +13938,37 @@ self.util = _cliPkgRequires.util;
     },
     _PropertyDescriptor: function _PropertyDescriptor() {
     },
+    _RequireMain: function _RequireMain() {
+    },
     WarnForDeprecation_warnForDeprecation(_this, deprecation, message, span, trace) {
-      var $self, t1;
-      if (_this instanceof A.DeprecationHandlingLogger) {
-        $self = _this;
-        t1 = true;
-      } else {
-        $self = null;
-        t1 = false;
-      }
-      if (t1)
-        $self.warnForDeprecation$4$span$trace(deprecation, message, span, trace);
-      else if (!deprecation.isFuture)
+      if (deprecation.isFuture && !(_this instanceof A.DeprecationProcessingLogger))
+        return;
+      if (_this instanceof A.DeprecationProcessingLogger)
+        _this.internalWarn$4$deprecation$span$trace(message, deprecation, span, trace);
+      else
         _this.warn$4$deprecation$span$trace(0, message, true, span, trace);
     },
+    LoggerWithDeprecationType0: function LoggerWithDeprecationType0() {
+    },
     _QuietLogger: function _QuietLogger() {
     },
-    DeprecationHandlingLogger: function DeprecationHandlingLogger(t0, t1, t2, t3, t4) {
+    DeprecationProcessingLogger$(_inner, fatalDeprecations, futureDeprecations, limitRepetition, silenceDeprecations) {
+      var t1 = new A.DeprecationProcessingLogger(A.LinkedHashMap_LinkedHashMap$_empty(type$.Deprecation, type$.int), _inner, silenceDeprecations, fatalDeprecations, futureDeprecations, limitRepetition);
+      t1.DeprecationProcessingLogger$5$fatalDeprecations$futureDeprecations$limitRepetition$silenceDeprecations(_inner, fatalDeprecations, futureDeprecations, limitRepetition, silenceDeprecations);
+      return t1;
+    },
+    DeprecationProcessingLogger: function DeprecationProcessingLogger(t0, t1, t2, t3, t4, t5) {
       var _ = this;
       _._warningCounts = t0;
       _._inner = t1;
-      _.fatalDeprecations = t2;
-      _.futureDeprecations = t3;
-      _.limitRepetition = t4;
+      _.silenceDeprecations = t2;
+      _.fatalDeprecations = t3;
+      _.futureDeprecations = t4;
+      _.limitRepetition = t5;
     },
-    DeprecationHandlingLogger_warnForDeprecation_closure: function DeprecationHandlingLogger_warnForDeprecation_closure(t0) {
-      this._0_0 = t0;
+    DeprecationProcessingLogger_summarize_closure: function DeprecationProcessingLogger_summarize_closure() {
     },
-    DeprecationHandlingLogger_warnForDeprecation_closure0: function DeprecationHandlingLogger_warnForDeprecation_closure0(t0) {
-      this._0_0 = t0;
-    },
-    DeprecationHandlingLogger_summarize_closure: function DeprecationHandlingLogger_summarize_closure() {
-    },
-    DeprecationHandlingLogger_summarize_closure0: function DeprecationHandlingLogger_summarize_closure0() {
+    DeprecationProcessingLogger_summarize_closure0: function DeprecationProcessingLogger_summarize_closure0() {
     },
     StderrLogger: function StderrLogger(t0) {
       this.color = t0;
@@ -13130,20 +14013,10 @@ self.util = _cliPkgRequires.util;
         if (rule.shownMixinsAndFunctions == null)
           if (rule.shownVariables == null) {
             t1 = rule.hiddenMixinsAndFunctions;
-            if (t1 == null)
-              t1 = null;
-            else {
-              t1 = t1._base;
-              t1 = t1.get$isEmpty(t1);
-            }
+            t1 = t1 == null ? null : t1._base.get$isEmpty(0);
             if (t1 === true) {
               t1 = rule.hiddenVariables;
-              if (t1 == null)
-                t1 = null;
-              else {
-                t1 = t1._base;
-                t1 = t1.get$isEmpty(t1);
-              }
+              t1 = t1 == null ? null : t1._base.get$isEmpty(0);
               t1 = t1 === true;
             } else
               t1 = false;
@@ -13171,11 +14044,7 @@ self.util = _cliPkgRequires.util;
         t1 = prefix == null;
       if (t1)
         if (safelist == null)
-          if (blocklist != null) {
-            t2 = blocklist._base;
-            t2 = t2.get$isEmpty(t2);
-          } else
-            t2 = true;
+          t2 = blocklist == null || blocklist._base.get$isEmpty(0);
         else
           t2 = false;
       else
@@ -13186,15 +14055,8 @@ self.util = _cliPkgRequires.util;
         map = new A.PrefixedMapView(map, prefix, $V._eval$1("PrefixedMapView<0>"));
       if (safelist != null)
         map = new A.LimitedMapView(map, safelist._base.intersection$1(new A.MapKeySet(map, type$.MapKeySet_nullable_Object)), type$.$env_1_1_String._bind$1($V)._eval$1("LimitedMapView<1,2>"));
-      else {
-        if (blocklist != null) {
-          t1 = blocklist._base;
-          t1 = t1.get$isNotEmpty(t1);
-        } else
-          t1 = false;
-        if (t1)
-          map = A.LimitedMapView$blocklist(map, blocklist, type$.String, $V);
-      }
+      else if (blocklist != null && blocklist._base.get$isNotEmpty(0))
+        map = A.LimitedMapView$blocklist(map, blocklist, type$.String, $V);
       return map;
     },
     ForwardedModuleView: function ForwardedModuleView(t0, t1, t2, t3, t4, t5, t6) {
@@ -13243,7 +14105,7 @@ self.util = _cliPkgRequires.util;
     CssParser: function CssParser(t0, t1, t2, t3) {
       var _ = this;
       _._isUseAllowed = true;
-      _._inParentheses = _._inStyleRule = _._stylesheet$_inUnknownAtRule = _._inControlDirective = _._inContentBlock = _._stylesheet$_inMixin = false;
+      _._inExpression = _._inParentheses = _._inStyleRule = _._stylesheet$_inUnknownAtRule = _._inControlDirective = _._inContentBlock = _._stylesheet$_inMixin = false;
       _._globalVariables = t0;
       _.lastSilentComment = null;
       _.scanner = t1;
@@ -13307,7 +14169,7 @@ self.util = _cliPkgRequires.util;
       _._currentIndentation = 0;
       _._spaces = _._nextIndentationEnd = _._nextIndentation = null;
       _._isUseAllowed = true;
-      _._inParentheses = _._inStyleRule = _._stylesheet$_inUnknownAtRule = _._inControlDirective = _._inContentBlock = _._stylesheet$_inMixin = false;
+      _._inExpression = _._inParentheses = _._inStyleRule = _._stylesheet$_inUnknownAtRule = _._inControlDirective = _._inContentBlock = _._stylesheet$_inMixin = false;
       _._globalVariables = t0;
       _.lastSilentComment = null;
       _.scanner = t1;
@@ -13333,21 +14195,21 @@ self.util = _cliPkgRequires.util;
     ScssParser: function ScssParser(t0, t1, t2, t3) {
       var _ = this;
       _._isUseAllowed = true;
-      _._inParentheses = _._inStyleRule = _._stylesheet$_inUnknownAtRule = _._inControlDirective = _._inContentBlock = _._stylesheet$_inMixin = false;
+      _._inExpression = _._inParentheses = _._inStyleRule = _._stylesheet$_inUnknownAtRule = _._inControlDirective = _._inContentBlock = _._stylesheet$_inMixin = false;
       _._globalVariables = t0;
       _.lastSilentComment = null;
       _.scanner = t1;
       _.logger = t2;
       _._interpolationMap = t3;
     },
-    SelectorParser$(contents, allowParent, allowPlaceholder, interpolationMap, logger, url) {
+    SelectorParser$(contents, allowParent, interpolationMap, logger, plainCss, url) {
       var t1 = A.SpanScanner$(contents, url);
-      return new A.SelectorParser(allowParent, allowPlaceholder, t1, logger == null ? B.StderrLogger_false : logger, interpolationMap);
+      return new A.SelectorParser(allowParent, plainCss, t1, logger == null ? B.StderrLogger_false : logger, interpolationMap);
     },
     SelectorParser: function SelectorParser(t0, t1, t2, t3, t4) {
       var _ = this;
       _._allowParent = t0;
-      _._allowPlaceholder = t1;
+      _._plainCss = t1;
       _.scanner = t2;
       _.logger = t3;
       _._interpolationMap = t4;
@@ -13392,13 +14254,6 @@ self.util = _cliPkgRequires.util;
     StylesheetParser_variableDeclarationWithoutNamespace_closure0: function StylesheetParser_variableDeclarationWithoutNamespace_closure0(t0) {
       this.declaration = t0;
     },
-    StylesheetParser__declarationOrBuffer_closure: function StylesheetParser__declarationOrBuffer_closure(t0) {
-      this.name = t0;
-    },
-    StylesheetParser__declarationOrBuffer_closure0: function StylesheetParser__declarationOrBuffer_closure0(t0, t1) {
-      this._box_0 = t0;
-      this.name = t1;
-    },
     StylesheetParser__styleRule_closure: function StylesheetParser__styleRule_closure(t0, t1, t2, t3) {
       var _ = this;
       _._box_0 = t0;
@@ -13406,11 +14261,8 @@ self.util = _cliPkgRequires.util;
       _.wasInStyleRule = t2;
       _.start = t3;
     },
-    StylesheetParser__propertyOrVariableDeclaration_closure: function StylesheetParser__propertyOrVariableDeclaration_closure(t0) {
-      this._box_0 = t0;
-    },
-    StylesheetParser__propertyOrVariableDeclaration_closure0: function StylesheetParser__propertyOrVariableDeclaration_closure0(t0, t1) {
-      this._box_0 = t0;
+    StylesheetParser__tryDeclarationChildren_closure: function StylesheetParser__tryDeclarationChildren_closure(t0, t1) {
+      this.name = t0;
       this.value = t1;
     },
     StylesheetParser__atRootRule_closure: function StylesheetParser__atRootRule_closure(t0) {
@@ -13510,63 +14362,24 @@ self.util = _cliPkgRequires.util;
       this.$this = t1;
       this.resolveOperations = t2;
     },
-    StylesheetParser__expression_closure: function StylesheetParser__expression_closure(t0) {
-      this._3_0 = t0;
-    },
-    StylesheetParser__expression_closure0: function StylesheetParser__expression_closure0(t0) {
-      this._3_0 = t0;
-    },
-    StylesheetParser__expression_closure1: function StylesheetParser__expression_closure1(t0) {
-      this._3_0 = t0;
-    },
     StylesheetParser_expressionUntilComma_closure: function StylesheetParser_expressionUntilComma_closure(t0) {
       this.$this = t0;
     },
-    StylesheetParser__isHexColor_closure: function StylesheetParser__isHexColor_closure(t0) {
-      this._0_0 = t0;
-    },
-    StylesheetParser__isHexColor_closure0: function StylesheetParser__isHexColor_closure0() {
+    StylesheetParser__isHexColor_closure: function StylesheetParser__isHexColor_closure() {
     },
     StylesheetParser__unicodeRange_closure: function StylesheetParser__unicodeRange_closure() {
     },
     StylesheetParser__unicodeRange_closure0: function StylesheetParser__unicodeRange_closure0() {
     },
-    StylesheetParser_identifierLike_closure: function StylesheetParser_identifierLike_closure(t0) {
-      this._2_0 = t0;
-    },
-    StylesheetParser_identifierLike_closure0: function StylesheetParser_identifierLike_closure0(t0) {
-      this._2_0 = t0;
-    },
     StylesheetParser_namespacedExpression_closure: function StylesheetParser_namespacedExpression_closure(t0, t1) {
       this.$this = t0;
       this.start = t1;
     },
     StylesheetParser_trySpecialFunction_closure: function StylesheetParser_trySpecialFunction_closure() {
     },
-    StylesheetParser__tryUrlContents_closure: function StylesheetParser__tryUrlContents_closure(t0) {
-      this._0_0 = t0;
-    },
-    StylesheetParser__interpolatedDeclarationValue_closure: function StylesheetParser__interpolatedDeclarationValue_closure(t0) {
-      this._1_0 = t0;
-    },
-    StylesheetParser__interpolatedDeclarationValue_closure0: function StylesheetParser__interpolatedDeclarationValue_closure0(t0) {
-      this._1_0 = t0;
-    },
-    StylesheetParser__interpolatedDeclarationValue_closure1: function StylesheetParser__interpolatedDeclarationValue_closure1(t0) {
-      this._1_0 = t0;
-    },
-    StylesheetParser__interpolatedDeclarationValue_closure2: function StylesheetParser__interpolatedDeclarationValue_closure2(t0) {
-      this._1_0 = t0;
-    },
-    StylesheetParser__interpolatedDeclarationValue_closure3: function StylesheetParser__interpolatedDeclarationValue_closure3(t0) {
-      this._1_0 = t0;
-    },
     StylesheetParser__expressionUntilComparison_closure: function StylesheetParser__expressionUntilComparison_closure(t0) {
       this.$this = t0;
     },
-    StylesheetParser__supportsConditionInParens_closure: function StylesheetParser__supportsConditionInParens_closure(t0) {
-      this._0_0 = t0;
-    },
     StylesheetParser__publicIdentifier_closure: function StylesheetParser__publicIdentifier_closure(t0, t1) {
       this.$this = t0;
       this.start = t1;
@@ -13698,9 +14511,6 @@ self.util = _cliPkgRequires.util;
       this._group = t1;
       this._poll = t2;
     },
-    MultiDirWatcher_watch_closure: function MultiDirWatcher_watch_closure(t0) {
-      this._0_0 = t0;
-    },
     MultiSpan: function MultiSpan(t0, t1, t2) {
       this._multi_span$_primary = t0;
       this.primaryLabel = t1;
@@ -13865,7 +14675,7 @@ self.util = _cliPkgRequires.util;
       var t1, i;
       if (string1 === string2)
         return true;
-      if (string1 == null || false)
+      if (string1 == null)
         return false;
       t1 = string1.length;
       if (t1 !== string2.length)
@@ -13892,11 +14702,11 @@ self.util = _cliPkgRequires.util;
     },
     longestCommonSubsequence(list1, list2, select, $T) {
       var t1, _i, selections, i, i0, j, selection, j0,
-        _length = list1.get$length(list1) + 1,
+        _length = list1.get$length(0) + 1,
         lengths = J.JSArray_JSArray$allocateFixed(_length, type$.List_int);
       for (t1 = type$.int, _i = 0; _i < _length; ++_i)
         lengths[_i] = A.List_List$filled(((list2._queue_list$_tail - list2._queue_list$_head & J.get$length$asx(list2._queue_list$_table) - 1) >>> 0) + 1, 0, false, t1);
-      _length = list1.get$length(list1);
+      _length = list1.get$length(0);
       selections = J.JSArray_JSArray$allocateFixed(_length, $T._eval$1("List<0?>"));
       for (t1 = $T._eval$1("0?"), _i = 0; _i < _length; ++_i)
         selections[_i] = A.List_List$filled((list2._queue_list$_tail - list2._queue_list$_head & J.get$length$asx(list2._queue_list$_table) - 1) >>> 0, null, false, t1);
@@ -13908,7 +14718,7 @@ self.util = _cliPkgRequires.util;
           j0 = j + 1;
           t1[j0] = selection == null ? Math.max(t1[j], lengths[i][j0]) : lengths[i][j] + 1;
         }
-      return new A.longestCommonSubsequence_backtrack(selections, lengths, $T).call$2(list1.get$length(list1) - 1, list2.get$length(list2) - 1);
+      return new A.longestCommonSubsequence_backtrack(selections, lengths, $T).call$2(list1.get$length(0) - 1, list2.get$length(0) - 1);
     },
     removeFirstWhere(list, test, orElse) {
       var i;
@@ -14037,14 +14847,12 @@ self.util = _cliPkgRequires.util;
       return t2;
     },
     copyMapOfList(map, $K, $E) {
-      var t3, key, list,
+      var t3,
         t1 = $E._eval$1("List<0>"),
         t2 = A.LinkedHashMap_LinkedHashMap$_empty($K, t1);
       for (t1 = A.MapExtensions_get_pairs(map, $K, t1), t1 = t1.get$iterator(t1); t1.moveNext$0();) {
         t3 = t1.get$current(t1);
-        key = t3._0;
-        list = t3._1;
-        t2.$indexSet(0, key, J.toList$0$ax(list));
+        t2.$indexSet(0, t3._0, J.toList$0$ax(t3._1));
       }
       return t2;
     },
@@ -14144,7 +14952,7 @@ self.util = _cliPkgRequires.util;
       var error, stackTrace, t1, exception,
         string = _this._selectorString$1($name);
       try {
-        t1 = A.SelectorList_SelectorList$parse(string, allowParent, true, null, null);
+        t1 = A.SelectorList_SelectorList$parse(string, allowParent, null, null, false);
         return t1;
       } catch (exception) {
         t1 = A.unwrapException(exception);
@@ -14162,7 +14970,7 @@ self.util = _cliPkgRequires.util;
         allowParent = false,
         string = _this._selectorString$1($name);
       try {
-        t1 = A.SelectorParser$(string, allowParent, true, null, null, null).parseCompoundSelector$0();
+        t1 = A.SelectorParser$(string, allowParent, null, null, false, null).parseCompoundSelector$0();
         return t1;
       } catch (exception) {
         t1 = A.unwrapException(exception);
@@ -14195,29 +15003,15 @@ self.util = _cliPkgRequires.util;
       this.value = t0;
     },
     SassCalculation_calc(argument) {
-      var value, t1,
+      var t1,
         _0_0 = A.SassCalculation__simplify(argument);
       $label0$0: {
         if (_0_0 instanceof A.SassNumber) {
-          value = _0_0;
-          t1 = true;
-        } else {
-          value = null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = value;
+          t1 = _0_0;
           break $label0$0;
         }
         if (_0_0 instanceof A.SassCalculation) {
-          value = _0_0;
-          t1 = true;
-        } else {
-          value = null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = value;
+          t1 = _0_0;
           break $label0$0;
         }
         t1 = new A.SassCalculation("calc", A.List_List$unmodifiable([_0_0], type$.Object));
@@ -14295,15 +15089,11 @@ self.util = _cliPkgRequires.util;
       return A.SassNumber_SassNumber$withUnits(t1, t2.get$denominatorUnits(first), t3);
     },
     SassCalculation_abs(argument) {
-      var t1, t2;
       argument = A.SassCalculation__simplify(argument);
       if (!(argument instanceof A.SassNumber))
         return new A.SassCalculation("abs", A._setArrayType([argument], type$.JSArray_Object));
-      if (argument.hasUnit$1("%")) {
-        t1 = argument.toString$0(0);
-        t2 = argument.toString$0(0);
-        A.EvaluationContext_current().warn$2(0, string$.Passinp + t1 + ")\nTo emit a CSS abs() now: abs(#{" + t2 + string$.x7d__Mor, B.Deprecation_043);
-      }
+      if (argument.hasUnit$1("%"))
+        A.warnForDeprecation(string$.Passinp + argument.toString$0(0) + ")\nTo emit a CSS abs() now: abs(#{" + argument.toString$0(0) + string$.x7d__Mor, B.Deprecation_GFc);
       return A.SassNumber_SassNumber(Math.abs(argument._number$_value), null).coerceToMatch$1(argument);
     },
     SassCalculation_exp(argument) {
@@ -14314,14 +15104,17 @@ self.util = _cliPkgRequires.util;
       return A.pow0(A.SassNumber_SassNumber(2.718281828459045, null), argument);
     },
     SassCalculation_sign(argument) {
-      var _0_2, t1, t2, arg;
+      var t1, _0_2, t2, arg;
       argument = A.SassCalculation__simplify(argument);
-      _0_2 = A._InitializedCell$(new A.SassCalculation_sign_closure(argument));
       $label0$0: {
         t1 = argument instanceof A.SassNumber;
-        if (t1)
-          t2 = isNaN(_0_2._readFinal$0()) || 0 === _0_2._readFinal$0();
-        else
+        if (t1) {
+          _0_2 = argument._number$_value;
+          if (!isNaN(_0_2))
+            t2 = 0 === _0_2;
+          else
+            t2 = true;
+        } else
           t2 = false;
         if (t2) {
           t1 = argument;
@@ -14450,23 +15243,38 @@ self.util = _cliPkgRequires.util;
       return dividend.modulo$1(modulus);
     },
     SassCalculation_round(strategyOrNumber, numberOrStep, step) {
-      var number, t1, t2, strategy, rest, _null = null, _s5_ = "round",
-        _0_0 = new A._Record_3(A.SassCalculation__simplify(strategyOrNumber), A.NullableExtension_andThen(numberOrStep, A.calculation_SassCalculation__simplify$closure()), A.NullableExtension_andThen(step, A.calculation_SassCalculation__simplify$closure())),
-        _0_1 = A._InitializedCell$(new A.SassCalculation_round_closure(_0_0)),
-        _0_2 = A._InitializedCell$(new A.SassCalculation_round_closure0(_0_0)),
-        _0_4 = A._InitializedCell$(new A.SassCalculation_round_closure1(_0_2)),
-        _0_5 = A._InitializedCell$(new A.SassCalculation_round_closure2(_0_0)),
-        _0_6 = A._InitializedCell$(new A.SassCalculation_round_closure3(_0_5)),
-        _0_8 = A._InitializedCell$(new A.SassCalculation_round_closure4(_0_1)),
-        _0_10 = A._InitializedCell$(new A.SassCalculation_round_closure5(_0_8)),
-        _0_12 = A._InitializedCell$(new A.SassCalculation_round_closure6(_0_8)),
-        _0_14 = A._InitializedCell$(new A.SassCalculation_round_closure7(_0_8)),
-        _0_16 = A._InitializedCell$(new A.SassCalculation_round_closure8(_0_8));
-      if (_0_1._readFinal$0() instanceof A.SassNumber) {
-        number = _0_1._readFinal$0();
-        t1 = _0_4._readFinal$0() && _0_6._readFinal$0();
+      var _0_4, _0_5_isSet, _0_20, _0_6, t1, _0_50, _0_6_isSet, number, t2, _0_2_isSet, _0_10_isSet, _0_8, _0_12_isSet, _0_12, _0_14_isSet, _0_14, _0_16_isSet, _0_16, t3, strategy, _0_8_isSet, t4, rest, _null = null, _s5_ = "round",
+        _0_1 = A.SassCalculation__simplify(strategyOrNumber),
+        _0_2 = A.NullableExtension_andThen(numberOrStep, A.calculation_SassCalculation__simplify$closure()),
+        _0_5 = A.NullableExtension_andThen(step, A.calculation_SassCalculation__simplify$closure()),
+        _0_10 = _0_1,
+        _0_4_isSet = _0_1 instanceof A.SassNumber;
+      if (_0_4_isSet) {
+        type$.SassNumber._as(_0_10);
+        _0_4 = _0_2 == null;
+        _0_5_isSet = _0_4;
+        _0_20 = _0_2;
+        if (_0_5_isSet) {
+          _0_6 = _0_5 == null;
+          t1 = _0_6;
+          _0_50 = _0_5;
+        } else {
+          _0_50 = _null;
+          _0_6 = _0_50;
+          t1 = false;
+        }
+        _0_6_isSet = _0_5_isSet;
+        number = _0_10;
+        _0_1 = number;
       } else {
         number = _null;
+        _0_50 = number;
+        _0_6 = _0_50;
+        _0_20 = _0_6;
+        _0_4 = _0_20;
+        _0_1 = _0_10;
+        _0_6_isSet = false;
+        _0_5_isSet = false;
         t1 = false;
       }
       if (t1) {
@@ -14474,18 +15282,50 @@ self.util = _cliPkgRequires.util;
         t2 = number.get$numeratorUnits(number);
         return A.SassNumber_SassNumber$withUnits(t1, number.get$denominatorUnits(number), t2);
       }
-      if (_0_1._readFinal$0() instanceof A.SassNumber) {
-        number = _0_1._readFinal$0();
-        if (_0_2._readFinal$0() instanceof A.SassNumber) {
-          step = _0_2._readFinal$0();
-          t1 = _0_6._readFinal$0() && !number.hasCompatibleUnits$1(step);
+      if (_0_1 instanceof A.SassNumber) {
+        if (_0_4_isSet) {
+          t1 = _0_20;
+          _0_2_isSet = _0_4_isSet;
+        } else {
+          t1 = _0_2;
+          _0_20 = t1;
+          _0_2_isSet = true;
+        }
+        if (t1 instanceof A.SassNumber) {
+          if (_0_2_isSet)
+            t1 = _0_20;
+          else {
+            t1 = _0_2;
+            _0_20 = t1;
+            _0_2_isSet = true;
+          }
+          type$.SassNumber._as(t1);
+          if (_0_6_isSet)
+            t2 = _0_6;
+          else {
+            if (_0_5_isSet)
+              t2 = _0_50;
+            else {
+              t2 = _0_5;
+              _0_50 = t2;
+              _0_5_isSet = true;
+            }
+            _0_6 = t2 == null;
+            t2 = _0_6;
+            _0_6_isSet = true;
+          }
+          t2 = t2 && !_0_1.hasCompatibleUnits$1(t1);
+          step = t1;
+          t1 = t2;
         } else {
           step = _null;
           t1 = false;
         }
+        number = _0_1;
       } else {
         step = _null;
         number = step;
+        _0_2_isSet = _0_4_isSet;
         t1 = false;
       }
       if (t1) {
@@ -14493,16 +15333,44 @@ self.util = _cliPkgRequires.util;
         A.SassCalculation__verifyCompatibleNumbers(A._setArrayType([number, step], t1));
         return new A.SassCalculation(_s5_, A._setArrayType([number, step], t1));
       }
-      if (_0_1._readFinal$0() instanceof A.SassNumber) {
-        number = _0_1._readFinal$0();
-        if (_0_2._readFinal$0() instanceof A.SassNumber) {
-          step = _0_2._readFinal$0();
-          t1 = _0_6._readFinal$0();
-          t1 = t1;
+      if (_0_1 instanceof A.SassNumber) {
+        if (_0_2_isSet)
+          t1 = _0_20;
+        else {
+          t1 = _0_2;
+          _0_20 = t1;
+          _0_2_isSet = true;
+        }
+        if (t1 instanceof A.SassNumber) {
+          if (_0_2_isSet)
+            t1 = _0_20;
+          else {
+            t1 = _0_2;
+            _0_20 = t1;
+            _0_2_isSet = true;
+          }
+          type$.SassNumber._as(t1);
+          if (_0_6_isSet)
+            t2 = _0_6;
+          else {
+            if (_0_5_isSet)
+              t2 = _0_50;
+            else {
+              t2 = _0_5;
+              _0_50 = t2;
+              _0_5_isSet = true;
+            }
+            _0_6 = t2 == null;
+            t2 = _0_6;
+            _0_6_isSet = true;
+          }
+          step = t1;
+          t1 = t2;
         } else {
           step = _null;
           t1 = false;
         }
+        number = _0_1;
       } else {
         step = _null;
         number = step;
@@ -14512,33 +15380,108 @@ self.util = _cliPkgRequires.util;
         A.SassCalculation__verifyCompatibleNumbers(A._setArrayType([number, step], type$.JSArray_Object));
         return A.SassCalculation__roundWithStep("nearest", number, step);
       }
-      if (_0_1._readFinal$0() instanceof A.SassString)
-        if (_0_10._readFinal$0() || _0_12._readFinal$0() || _0_14._readFinal$0() || _0_16._readFinal$0()) {
-          strategy = _0_1._readFinal$0();
-          if (_0_2._readFinal$0() instanceof A.SassNumber) {
-            number = _0_2._readFinal$0();
-            if (_0_5._readFinal$0() instanceof A.SassNumber) {
-              step = _0_5._readFinal$0();
-              t1 = !number.hasCompatibleUnits$1(step);
+      _0_10_isSet = _0_1 instanceof A.SassString;
+      if (_0_10_isSet) {
+        _0_8 = _0_1._string$_text;
+        t1 = _0_8;
+        _0_10 = "nearest" === t1;
+        t1 = _0_10;
+        _0_12_isSet = !t1;
+        if (_0_12_isSet) {
+          _0_12 = "up" === _0_8;
+          t1 = _0_12;
+          _0_14_isSet = !t1;
+          if (_0_14_isSet) {
+            _0_14 = "down" === _0_8;
+            t1 = _0_14;
+            _0_16_isSet = !t1;
+            if (_0_16_isSet) {
+              _0_16 = "to-zero" === _0_8;
+              t1 = _0_16;
+            } else {
+              _0_16 = _null;
+              t1 = true;
+            }
+          } else {
+            _0_16 = _null;
+            _0_14 = _0_16;
+            _0_16_isSet = false;
+            t1 = true;
+          }
+        } else {
+          _0_16 = _null;
+          _0_14 = _0_16;
+          _0_12 = _0_14;
+          _0_14_isSet = false;
+          _0_16_isSet = false;
+          t1 = true;
+        }
+        if (t1) {
+          if (_0_2_isSet)
+            t1 = _0_20;
+          else {
+            t1 = _0_2;
+            _0_20 = t1;
+            _0_2_isSet = true;
+          }
+          if (t1 instanceof A.SassNumber) {
+            if (_0_2_isSet)
+              t1 = _0_20;
+            else {
+              t1 = _0_2;
+              _0_20 = t1;
+              _0_2_isSet = true;
+            }
+            t2 = type$.SassNumber;
+            t2._as(t1);
+            if (_0_5_isSet)
+              t3 = _0_50;
+            else {
+              t3 = _0_5;
+              _0_50 = t3;
+              _0_5_isSet = true;
+            }
+            if (t3 instanceof A.SassNumber) {
+              if (_0_5_isSet)
+                t3 = _0_50;
+              else {
+                t3 = _0_5;
+                _0_50 = t3;
+                _0_5_isSet = true;
+              }
+              t2._as(t3);
+              t2 = !t1.hasCompatibleUnits$1(t3);
+              step = t3;
             } else {
               step = _null;
-              t1 = false;
+              t2 = false;
             }
+            number = t1;
+            t1 = t2;
           } else {
             step = _null;
             number = step;
             t1 = false;
           }
+          strategy = _0_1;
         } else {
           step = _null;
           number = step;
           strategy = number;
           t1 = false;
         }
-      else {
+      } else {
         step = _null;
         number = step;
         strategy = number;
+        _0_16 = strategy;
+        _0_14 = _0_16;
+        _0_12 = _0_14;
+        _0_8 = _0_12;
+        _0_10 = _0_8;
+        _0_12_isSet = false;
+        _0_14_isSet = false;
+        _0_16_isSet = false;
         t1 = false;
       }
       if (t1) {
@@ -14546,129 +15489,672 @@ self.util = _cliPkgRequires.util;
         A.SassCalculation__verifyCompatibleNumbers(A._setArrayType([number, step], t1));
         return new A.SassCalculation(_s5_, A._setArrayType([strategy, number, step], t1));
       }
-      if (_0_1._readFinal$0() instanceof A.SassString)
-        if (_0_10._readFinal$0() || _0_12._readFinal$0() || _0_14._readFinal$0() || _0_16._readFinal$0()) {
-          strategy = _0_1._readFinal$0();
-          if (_0_2._readFinal$0() instanceof A.SassNumber) {
-            number = _0_2._readFinal$0();
-            if (_0_5._readFinal$0() instanceof A.SassNumber) {
-              step = _0_5._readFinal$0();
-              t1 = true;
-            } else {
-              step = _null;
-              t1 = false;
+      if (_0_1 instanceof A.SassString) {
+        if (_0_10_isSet) {
+          t1 = _0_10;
+          _0_8_isSet = _0_10_isSet;
+        } else {
+          _0_8 = _0_1._string$_text;
+          t1 = _0_8;
+          _0_10 = "nearest" === t1;
+          t1 = _0_10;
+          _0_10_isSet = true;
+          _0_8_isSet = true;
+        }
+        if (!t1) {
+          if (_0_12_isSet)
+            t1 = _0_12;
+          else {
+            if (_0_8_isSet)
+              t1 = _0_8;
+            else {
+              _0_8 = _0_1._string$_text;
+              t1 = _0_8;
+              _0_8_isSet = true;
             }
+            _0_12 = "up" === t1;
+            t1 = _0_12;
+            _0_12_isSet = true;
+          }
+          if (!t1) {
+            if (_0_14_isSet)
+              t1 = _0_14;
+            else {
+              if (_0_8_isSet)
+                t1 = _0_8;
+              else {
+                _0_8 = _0_1._string$_text;
+                t1 = _0_8;
+                _0_8_isSet = true;
+              }
+              _0_14 = "down" === t1;
+              t1 = _0_14;
+              _0_14_isSet = true;
+            }
+            if (!t1)
+              if (_0_16_isSet)
+                t1 = _0_16;
+              else {
+                if (_0_8_isSet)
+                  t1 = _0_8;
+                else {
+                  _0_8 = _0_1._string$_text;
+                  t1 = _0_8;
+                  _0_8_isSet = true;
+                }
+                _0_16 = "to-zero" === t1;
+                t1 = _0_16;
+                _0_16_isSet = true;
+              }
+            else
+              t1 = true;
+          } else
+            t1 = true;
+        } else
+          t1 = true;
+        if (t1) {
+          if (_0_2_isSet)
+            t1 = _0_20;
+          else {
+            t1 = _0_2;
+            _0_20 = t1;
+            _0_2_isSet = true;
+          }
+          if (t1 instanceof A.SassNumber) {
+            if (_0_2_isSet)
+              t1 = _0_20;
+            else {
+              t1 = _0_2;
+              _0_20 = t1;
+              _0_2_isSet = true;
+            }
+            t2 = type$.SassNumber;
+            t2._as(t1);
+            if (_0_5_isSet)
+              t3 = _0_50;
+            else {
+              t3 = _0_5;
+              _0_50 = t3;
+              _0_5_isSet = true;
+            }
+            t3 = t3 instanceof A.SassNumber;
+            if (t3) {
+              if (_0_5_isSet)
+                t4 = _0_50;
+              else {
+                t4 = _0_5;
+                _0_50 = t4;
+                _0_5_isSet = true;
+              }
+              t2._as(t4);
+              step = t4;
+            } else
+              step = _null;
+            t2 = t3;
+            number = t1;
+            t1 = t2;
           } else {
             step = _null;
             number = step;
             t1 = false;
           }
+          strategy = _0_1;
         } else {
           step = _null;
           number = step;
           strategy = number;
           t1 = false;
         }
-      else {
+      } else {
         step = _null;
         number = step;
         strategy = number;
+        _0_8_isSet = _0_10_isSet;
         t1 = false;
       }
       if (t1) {
         A.SassCalculation__verifyCompatibleNumbers(A._setArrayType([number, step], type$.JSArray_Object));
         return A.SassCalculation__roundWithStep(strategy._string$_text, number, step);
       }
-      if (_0_1._readFinal$0() instanceof A.SassString)
-        if (_0_10._readFinal$0() || _0_12._readFinal$0() || _0_14._readFinal$0() || _0_16._readFinal$0()) {
-          strategy = _0_1._readFinal$0();
-          if (_0_2._readFinal$0() instanceof A.SassString) {
-            rest = _0_2._readFinal$0();
-            t1 = _0_6._readFinal$0();
-            t1 = t1;
+      if (_0_1 instanceof A.SassString) {
+        if (_0_10_isSet)
+          t1 = _0_10;
+        else {
+          if (_0_8_isSet)
+            t1 = _0_8;
+          else {
+            _0_8 = _0_1._string$_text;
+            t1 = _0_8;
+            _0_8_isSet = true;
+          }
+          _0_10 = "nearest" === t1;
+          t1 = _0_10;
+          _0_10_isSet = true;
+        }
+        if (!t1) {
+          if (_0_12_isSet)
+            t1 = _0_12;
+          else {
+            if (_0_8_isSet)
+              t1 = _0_8;
+            else {
+              _0_8 = _0_1._string$_text;
+              t1 = _0_8;
+              _0_8_isSet = true;
+            }
+            _0_12 = "up" === t1;
+            t1 = _0_12;
+            _0_12_isSet = true;
+          }
+          if (!t1) {
+            if (_0_14_isSet)
+              t1 = _0_14;
+            else {
+              if (_0_8_isSet)
+                t1 = _0_8;
+              else {
+                _0_8 = _0_1._string$_text;
+                t1 = _0_8;
+                _0_8_isSet = true;
+              }
+              _0_14 = "down" === t1;
+              t1 = _0_14;
+              _0_14_isSet = true;
+            }
+            if (!t1)
+              if (_0_16_isSet)
+                t1 = _0_16;
+              else {
+                if (_0_8_isSet)
+                  t1 = _0_8;
+                else {
+                  _0_8 = _0_1._string$_text;
+                  t1 = _0_8;
+                  _0_8_isSet = true;
+                }
+                _0_16 = "to-zero" === t1;
+                t1 = _0_16;
+                _0_16_isSet = true;
+              }
+            else
+              t1 = true;
+          } else
+            t1 = true;
+        } else
+          t1 = true;
+        if (t1) {
+          if (_0_2_isSet)
+            t1 = _0_20;
+          else {
+            t1 = _0_2;
+            _0_20 = t1;
+            _0_2_isSet = true;
+          }
+          if (t1 instanceof A.SassString) {
+            if (_0_2_isSet)
+              t1 = _0_20;
+            else {
+              t1 = _0_2;
+              _0_20 = t1;
+              _0_2_isSet = true;
+            }
+            type$.SassString._as(t1);
+            if (_0_6_isSet)
+              t2 = _0_6;
+            else {
+              if (_0_5_isSet)
+                t2 = _0_50;
+              else {
+                t2 = _0_5;
+                _0_50 = t2;
+                _0_5_isSet = true;
+              }
+              _0_6 = t2 == null;
+              t2 = _0_6;
+              _0_6_isSet = true;
+            }
+            rest = t1;
+            t1 = t2;
           } else {
             rest = _null;
             t1 = false;
           }
+          strategy = _0_1;
         } else {
           rest = _null;
           strategy = rest;
           t1 = false;
         }
-      else {
+      } else {
         rest = _null;
         strategy = rest;
         t1 = false;
       }
       if (t1)
         return new A.SassCalculation(_s5_, A._setArrayType([strategy, rest], type$.JSArray_Object));
-      if (_0_1._readFinal$0() instanceof A.SassString)
-        if (_0_10._readFinal$0() || _0_12._readFinal$0() || _0_14._readFinal$0() || _0_16._readFinal$0())
-          t1 = _0_2._readFinal$0() != null && true && _0_6._readFinal$0();
-        else
+      if (_0_1 instanceof A.SassString) {
+        if (_0_10_isSet)
+          t1 = _0_10;
+        else {
+          if (_0_8_isSet)
+            t1 = _0_8;
+          else {
+            _0_8 = _0_1._string$_text;
+            t1 = _0_8;
+            _0_8_isSet = true;
+          }
+          _0_10 = "nearest" === t1;
+          t1 = _0_10;
+          _0_10_isSet = true;
+        }
+        if (!t1) {
+          if (_0_12_isSet)
+            t1 = _0_12;
+          else {
+            if (_0_8_isSet)
+              t1 = _0_8;
+            else {
+              _0_8 = _0_1._string$_text;
+              t1 = _0_8;
+              _0_8_isSet = true;
+            }
+            _0_12 = "up" === t1;
+            t1 = _0_12;
+            _0_12_isSet = true;
+          }
+          if (!t1) {
+            if (_0_14_isSet)
+              t1 = _0_14;
+            else {
+              if (_0_8_isSet)
+                t1 = _0_8;
+              else {
+                _0_8 = _0_1._string$_text;
+                t1 = _0_8;
+                _0_8_isSet = true;
+              }
+              _0_14 = "down" === t1;
+              t1 = _0_14;
+              _0_14_isSet = true;
+            }
+            if (!t1)
+              if (_0_16_isSet)
+                t1 = _0_16;
+              else {
+                if (_0_8_isSet)
+                  t1 = _0_8;
+                else {
+                  _0_8 = _0_1._string$_text;
+                  t1 = _0_8;
+                  _0_8_isSet = true;
+                }
+                _0_16 = "to-zero" === t1;
+                t1 = _0_16;
+                _0_16_isSet = true;
+              }
+            else
+              t1 = true;
+          } else
+            t1 = true;
+        } else
+          t1 = true;
+        if (t1) {
+          if (_0_2_isSet)
+            t1 = _0_20;
+          else {
+            t1 = _0_2;
+            _0_20 = t1;
+            _0_2_isSet = true;
+          }
+          if (t1 != null)
+            if (_0_6_isSet)
+              t1 = _0_6;
+            else {
+              if (_0_5_isSet)
+                t1 = _0_50;
+              else {
+                t1 = _0_5;
+                _0_50 = t1;
+                _0_5_isSet = true;
+              }
+              _0_6 = t1 == null;
+              t1 = _0_6;
+              _0_6_isSet = true;
+            }
+          else
+            t1 = false;
+        } else
           t1 = false;
-      else
+      } else
         t1 = false;
       if (t1)
         throw A.wrapException(A.SassScriptException$(string$.If_str, _null));
-      if (_0_1._readFinal$0() instanceof A.SassString)
-        t1 = (_0_10._readFinal$0() || _0_12._readFinal$0() || _0_14._readFinal$0() || _0_16._readFinal$0()) && _0_4._readFinal$0() && _0_6._readFinal$0();
-      else
+      if (_0_1 instanceof A.SassString) {
+        if (_0_10_isSet)
+          t1 = _0_10;
+        else {
+          if (_0_8_isSet)
+            t1 = _0_8;
+          else {
+            _0_8 = _0_1._string$_text;
+            t1 = _0_8;
+            _0_8_isSet = true;
+          }
+          _0_10 = "nearest" === t1;
+          t1 = _0_10;
+          _0_10_isSet = true;
+        }
+        if (!t1) {
+          if (_0_12_isSet)
+            t1 = _0_12;
+          else {
+            if (_0_8_isSet)
+              t1 = _0_8;
+            else {
+              _0_8 = _0_1._string$_text;
+              t1 = _0_8;
+              _0_8_isSet = true;
+            }
+            _0_12 = "up" === t1;
+            t1 = _0_12;
+            _0_12_isSet = true;
+          }
+          if (!t1) {
+            if (_0_14_isSet)
+              t1 = _0_14;
+            else {
+              if (_0_8_isSet)
+                t1 = _0_8;
+              else {
+                _0_8 = _0_1._string$_text;
+                t1 = _0_8;
+                _0_8_isSet = true;
+              }
+              _0_14 = "down" === t1;
+              t1 = _0_14;
+              _0_14_isSet = true;
+            }
+            if (!t1)
+              if (_0_16_isSet)
+                t1 = _0_16;
+              else {
+                if (_0_8_isSet)
+                  t1 = _0_8;
+                else {
+                  _0_8 = _0_1._string$_text;
+                  t1 = _0_8;
+                  _0_8_isSet = true;
+                }
+                _0_16 = "to-zero" === t1;
+                t1 = _0_16;
+                _0_16_isSet = true;
+              }
+            else
+              t1 = true;
+          } else
+            t1 = true;
+        } else
+          t1 = true;
+        if (t1) {
+          if (_0_4_isSet)
+            t1 = _0_4;
+          else {
+            if (_0_2_isSet)
+              t1 = _0_20;
+            else {
+              t1 = _0_2;
+              _0_20 = t1;
+              _0_2_isSet = true;
+            }
+            _0_4 = t1 == null;
+            t1 = _0_4;
+            _0_4_isSet = true;
+          }
+          if (t1)
+            if (_0_6_isSet)
+              t1 = _0_6;
+            else {
+              if (_0_5_isSet)
+                t1 = _0_50;
+              else {
+                t1 = _0_5;
+                _0_50 = t1;
+                _0_5_isSet = true;
+              }
+              _0_6 = t1 == null;
+              t1 = _0_6;
+              _0_6_isSet = true;
+            }
+          else
+            t1 = false;
+        } else
+          t1 = false;
+      } else
         t1 = false;
       if (t1)
         throw A.wrapException(A.SassScriptException$(string$.Number, _null));
-      if (_0_1._readFinal$0() instanceof A.SassString) {
-        rest = _0_1._readFinal$0();
-        t1 = _0_4._readFinal$0() && _0_6._readFinal$0();
+      if (_0_1 instanceof A.SassString) {
+        if (_0_4_isSet)
+          t1 = _0_4;
+        else {
+          if (_0_2_isSet)
+            t1 = _0_20;
+          else {
+            t1 = _0_2;
+            _0_20 = t1;
+            _0_2_isSet = true;
+          }
+          _0_4 = t1 == null;
+          t1 = _0_4;
+          _0_4_isSet = true;
+        }
+        if (t1)
+          if (_0_6_isSet)
+            t1 = _0_6;
+          else {
+            if (_0_5_isSet)
+              t1 = _0_50;
+            else {
+              t1 = _0_5;
+              _0_50 = t1;
+              _0_5_isSet = true;
+            }
+            _0_6 = t1 == null;
+            t1 = _0_6;
+            _0_6_isSet = true;
+          }
+        else
+          t1 = false;
+        rest = _0_1;
       } else {
         rest = _null;
         t1 = false;
       }
       if (t1)
         return new A.SassCalculation(_s5_, A._setArrayType([rest], type$.JSArray_Object));
-      number = _0_1._readFinal$0();
-      if (_0_4._readFinal$0() && _0_6._readFinal$0())
-        throw A.wrapException(A.SassScriptException$("Single argument " + A.S(number) + " expected to be simplifiable.", _null));
-      number = _0_1._readFinal$0();
-      if (_0_2._readFinal$0() != null) {
-        step = _0_2._readFinal$0();
-        t1 = true;
+      if (_0_4_isSet)
+        t1 = _0_4;
+      else {
+        if (_0_2_isSet)
+          t1 = _0_20;
+        else {
+          t1 = _0_2;
+          _0_20 = t1;
+          _0_2_isSet = true;
+        }
+        _0_4 = t1 == null;
+        t1 = _0_4;
+      }
+      if (t1)
+        if (_0_6_isSet)
+          t1 = _0_6;
+        else {
+          if (_0_5_isSet)
+            t1 = _0_50;
+          else {
+            t1 = _0_5;
+            _0_50 = t1;
+            _0_5_isSet = true;
+          }
+          _0_6 = t1 == null;
+          t1 = _0_6;
+          _0_6_isSet = true;
+        }
+      else
+        t1 = false;
+      if (t1)
+        throw A.wrapException(A.SassScriptException$("Single argument " + A.S(_0_1) + " expected to be simplifiable.", _null));
+      if (_0_2_isSet)
+        t1 = _0_20;
+      else {
+        t1 = _0_2;
+        _0_20 = t1;
+        _0_2_isSet = true;
+      }
+      if (t1 != null) {
+        if (_0_2_isSet)
+          step = _0_20;
+        else {
+          step = _0_2;
+          _0_20 = step;
+          _0_2_isSet = true;
+        }
+        if (step == null)
+          step = type$.Object._as(step);
+        if (_0_6_isSet)
+          t1 = _0_6;
+        else {
+          if (_0_5_isSet)
+            t1 = _0_50;
+          else {
+            t1 = _0_5;
+            _0_50 = t1;
+            _0_5_isSet = true;
+          }
+          _0_6 = t1 == null;
+          t1 = _0_6;
+        }
       } else {
         step = _null;
         t1 = false;
       }
-      t1 = t1 && _0_6._readFinal$0();
       if (t1)
-        return new A.SassCalculation(_s5_, A._setArrayType([number, step], type$.JSArray_Object));
-      if (_0_1._readFinal$0() instanceof A.SassString)
-        t1 = _0_10._readFinal$0() || _0_12._readFinal$0() || _0_14._readFinal$0() || _0_16._readFinal$0();
-      else
+        return new A.SassCalculation(_s5_, A._setArrayType([_0_1, step], type$.JSArray_Object));
+      if (_0_1 instanceof A.SassString) {
+        if (_0_10_isSet)
+          t1 = _0_10;
+        else {
+          if (_0_8_isSet)
+            t1 = _0_8;
+          else {
+            _0_8 = _0_1._string$_text;
+            t1 = _0_8;
+            _0_8_isSet = true;
+          }
+          _0_10 = "nearest" === t1;
+          t1 = _0_10;
+        }
+        if (!t1) {
+          if (_0_12_isSet)
+            t1 = _0_12;
+          else {
+            if (_0_8_isSet)
+              t1 = _0_8;
+            else {
+              _0_8 = _0_1._string$_text;
+              t1 = _0_8;
+              _0_8_isSet = true;
+            }
+            _0_12 = "up" === t1;
+            t1 = _0_12;
+          }
+          if (!t1) {
+            if (_0_14_isSet)
+              t1 = _0_14;
+            else {
+              if (_0_8_isSet)
+                t1 = _0_8;
+              else {
+                _0_8 = _0_1._string$_text;
+                t1 = _0_8;
+                _0_8_isSet = true;
+              }
+              _0_14 = "down" === t1;
+              t1 = _0_14;
+            }
+            if (!t1)
+              if (_0_16_isSet)
+                t1 = _0_16;
+              else {
+                if (_0_8_isSet)
+                  t1 = _0_8;
+                else {
+                  _0_8 = _0_1._string$_text;
+                  t1 = _0_8;
+                }
+                _0_16 = "to-zero" === t1;
+                t1 = _0_16;
+              }
+            else
+              t1 = true;
+          } else
+            t1 = true;
+        } else
+          t1 = true;
+      } else
         t1 = false;
       if (!t1)
-        t1 = _0_1._readFinal$0() instanceof A.SassString && _0_1._readFinal$0().get$isVar();
+        if (_0_1 instanceof A.SassString)
+          t1 = _0_1.get$isVar();
+        else
+          t1 = false;
       else
         t1 = true;
       if (t1) {
-        strategy = _0_1._readFinal$0();
-        if (_0_2._readFinal$0() != null) {
-          number = _0_2._readFinal$0();
-          t1 = true;
-        } else {
-          number = _null;
-          t1 = false;
-        }
-        if (t1)
-          if (_0_5._readFinal$0() != null) {
-            step = _0_5._readFinal$0();
-            t1 = true;
-          } else {
-            step = _null;
-            t1 = false;
-          }
+        type$.SassString._as(_0_1);
+        if (_0_2_isSet)
+          t1 = _0_20;
         else {
+          t1 = _0_2;
+          _0_20 = t1;
+          _0_2_isSet = true;
+        }
+        if (t1 != null) {
+          if (_0_2_isSet)
+            number = _0_20;
+          else {
+            number = _0_2;
+            _0_20 = number;
+            _0_2_isSet = true;
+          }
+          if (number == null)
+            number = type$.Object._as(number);
+          if (_0_5_isSet)
+            t1 = _0_50;
+          else {
+            t1 = _0_5;
+            _0_50 = t1;
+            _0_5_isSet = true;
+          }
+          t1 = t1 != null;
+          if (t1) {
+            if (_0_5_isSet)
+              step = _0_50;
+            else {
+              step = _0_5;
+              _0_50 = step;
+              _0_5_isSet = true;
+            }
+            if (step == null)
+              step = type$.Object._as(step);
+          } else
+            step = _null;
+        } else {
           step = _null;
+          number = step;
           t1 = false;
         }
+        strategy = _0_1;
       } else {
         step = _null;
         number = step;
@@ -14677,10 +16163,12 @@ self.util = _cliPkgRequires.util;
       }
       if (t1)
         return new A.SassCalculation(_s5_, A._setArrayType([strategy, number, step], type$.JSArray_Object));
-      if (_0_2._readFinal$0() != null && true && _0_5._readFinal$0() != null && true)
+      if ((_0_2_isSet ? _0_20 : _0_2) != null)
+        t1 = (_0_5_isSet ? _0_50 : _0_5) != null;
+      else
+        t1 = false;
+      if (t1)
         throw A.wrapException(A.SassScriptException$(A.S(strategyOrNumber) + string$.x20must_b, _null));
-      if (_0_4._readFinal$0())
-        _0_5._readFinal$0();
       t1 = A.SassScriptException$("Invalid parameters.", _null);
       throw A.wrapException(t1);
     },
@@ -14690,7 +16178,7 @@ self.util = _cliPkgRequires.util;
         return new A.CalculationOperation(operator, left, right);
       left = A.SassCalculation__simplify(left);
       right = A.SassCalculation__simplify(right);
-      if (B.CalculationOperator_IyK === operator || B.CalculationOperator_2bx === operator) {
+      if (B.CalculationOperator_g2q === operator || B.CalculationOperator_CxF === operator) {
         if (left instanceof A.SassNumber)
           if (right instanceof A.SassNumber)
             t1 = inLegacySassFunction ? left.isComparableTo$1(right) : left.hasCompatibleUnits$1(right);
@@ -14699,7 +16187,7 @@ self.util = _cliPkgRequires.util;
         else
           t1 = false;
         if (t1)
-          return operator === B.CalculationOperator_IyK ? left.plus$1(right) : left.minus$1(right);
+          return operator === B.CalculationOperator_g2q ? left.plus$1(right) : left.minus$1(right);
         A.SassCalculation__verifyCompatibleNumbers(A._setArrayType([left, right], type$.JSArray_Object));
         if (right instanceof A.SassNumber) {
           t1 = right._number$_value;
@@ -14708,76 +16196,111 @@ self.util = _cliPkgRequires.util;
           t1 = false;
         if (t1) {
           right = right.times$1(A.SassNumber_SassNumber(-1, null));
-          operator = operator === B.CalculationOperator_IyK ? B.CalculationOperator_2bx : B.CalculationOperator_IyK;
+          operator = operator === B.CalculationOperator_g2q ? B.CalculationOperator_CxF : B.CalculationOperator_g2q;
         }
         return new A.CalculationOperation(operator, left, right);
       } else if (left instanceof A.SassNumber && right instanceof A.SassNumber)
-        return operator === B.CalculationOperator_jFr ? left.times$1(right) : left.dividedBy$1(right);
+        return operator === B.CalculationOperator_171 ? left.times$1(right) : left.dividedBy$1(right);
       else
         return new A.CalculationOperation(operator, left, right);
     },
     SassCalculation__roundWithStep(strategy, number, step) {
-      var t1, t2, _0_0, _0_2, _0_1, _0_6, _0_8, _0_9, _0_11, _0_13, stepWithNumberUnit;
+      var _0_2, t1, _0_6, _0_8_isSet, _0_8, _0_9_isSet, _0_9, _0_11, _0_13, stepWithNumberUnit, t2, _null = null;
       if (!A.LinkedHashSet_LinkedHashSet$_literal(["nearest", "up", "down", "to-zero"], type$.String).contains$1(0, strategy))
-        throw A.wrapException(A.ArgumentError$(strategy + string$.x20must_b, null));
-      t1 = number._number$_value;
-      if (t1 == 1 / 0 || t1 == -1 / 0) {
-        t2 = step._number$_value;
-        t2 = t2 == 1 / 0 || t2 == -1 / 0;
+        throw A.wrapException(A.ArgumentError$(strategy + string$.x20must_b, _null));
+      _0_2 = number._number$_value;
+      if (_0_2 == 1 / 0 || _0_2 == -1 / 0) {
+        t1 = step._number$_value;
+        t1 = t1 == 1 / 0 || t1 == -1 / 0;
       } else
-        t2 = false;
-      if (!t2) {
-        t2 = step._number$_value;
-        t2 = t2 === 0 || isNaN(t1) || isNaN(t2);
+        t1 = false;
+      if (!t1) {
+        t1 = step._number$_value;
+        t1 = t1 === 0 || isNaN(_0_2) || isNaN(t1);
       } else
-        t2 = true;
-      if (t2) {
+        t1 = true;
+      if (t1) {
         t1 = number.get$numeratorUnits(number);
         return A.SassNumber_SassNumber$withUnits(0 / 0, number.get$denominatorUnits(number), t1);
       }
-      if (t1 == 1 / 0 || t1 == -1 / 0)
+      if (_0_2 == 1 / 0 || _0_2 == -1 / 0)
         return number;
-      t2 = step._number$_value;
-      if (t2 == 1 / 0 || t2 == -1 / 0) {
-        _0_0 = new A._Record_2(strategy, t1);
-        _0_2 = A._InitializedCell$(new A.SassCalculation__roundWithStep_closure(_0_0));
-        _0_1 = A._InitializedCell$(new A.SassCalculation__roundWithStep_closure0(_0_0));
-        _0_6 = A._InitializedCell$(new A.SassCalculation__roundWithStep_closure1(_0_1));
-        _0_8 = A._InitializedCell$(new A.SassCalculation__roundWithStep_closure2(_0_1));
-        _0_9 = A._InitializedCell$(new A.SassCalculation__roundWithStep_closure3(_0_2));
-        _0_11 = A._InitializedCell$(new A.SassCalculation__roundWithStep_closure4(_0_1));
-        _0_13 = A._InitializedCell$(new A.SassCalculation__roundWithStep_closure5(_0_1));
+      t1 = step._number$_value;
+      if (t1 == 1 / 0 || t1 == -1 / 0) {
         $label0$0: {
-          if (0 === _0_2._readFinal$0()) {
+          if (0 === _0_2) {
             t1 = number;
             break $label0$0;
           }
-          if ((_0_6._readFinal$0() || _0_8._readFinal$0()) && _0_9._readFinal$0()) {
+          _0_6 = "nearest" === strategy;
+          t1 = _0_6;
+          _0_8_isSet = !t1;
+          if (_0_8_isSet) {
+            _0_8 = "to-zero" === strategy;
+            _0_9_isSet = _0_8;
+          } else {
+            _0_8 = _null;
+            _0_9_isSet = true;
+          }
+          if (_0_9_isSet) {
+            _0_9 = _0_2 > 0;
+            t1 = _0_9;
+          } else {
+            _0_9 = _null;
+            t1 = false;
+          }
+          if (t1) {
             t1 = number.get$numeratorUnits(number);
             t1 = A.SassNumber_SassNumber$withUnits(0, number.get$denominatorUnits(number), t1);
             break $label0$0;
           }
-          if (_0_6._readFinal$0() || _0_8._readFinal$0()) {
+          if (!_0_6)
+            if (_0_8_isSet)
+              t1 = _0_8;
+            else {
+              _0_8 = "to-zero" === strategy;
+              t1 = _0_8;
+            }
+          else
+            t1 = true;
+          if (t1) {
             t1 = number.get$numeratorUnits(number);
             t1 = A.SassNumber_SassNumber$withUnits(-0.0, number.get$denominatorUnits(number), t1);
             break $label0$0;
           }
-          if (_0_11._readFinal$0() && _0_9._readFinal$0()) {
+          _0_11 = "up" === strategy;
+          t1 = _0_11;
+          if (t1)
+            if (_0_9_isSet)
+              t1 = _0_9;
+            else {
+              _0_9 = _0_2 > 0;
+              t1 = _0_9;
+            }
+          else
+            t1 = false;
+          if (t1) {
             t1 = number.get$numeratorUnits(number);
             t1 = A.SassNumber_SassNumber$withUnits(1 / 0, number.get$denominatorUnits(number), t1);
             break $label0$0;
           }
-          if (_0_11._readFinal$0()) {
+          if (_0_11) {
             t1 = number.get$numeratorUnits(number);
             t1 = A.SassNumber_SassNumber$withUnits(-0.0, number.get$denominatorUnits(number), t1);
             break $label0$0;
           }
-          if (_0_13._readFinal$0() && _0_2._readFinal$0() < 0) {
+          _0_13 = "down" === strategy;
+          t1 = _0_13;
+          if (t1)
+            t1 = _0_2 < 0;
+          else
+            t1 = false;
+          if (t1) {
             t1 = number.get$numeratorUnits(number);
             t1 = A.SassNumber_SassNumber$withUnits(-1 / 0, number.get$denominatorUnits(number), t1);
             break $label0$0;
           }
-          if (_0_13._readFinal$0()) {
+          if (_0_13) {
             t1 = number.get$numeratorUnits(number);
             t1 = A.SassNumber_SassNumber$withUnits(0, number.get$denominatorUnits(number), t1);
             break $label0$0;
@@ -14789,37 +16312,37 @@ self.util = _cliPkgRequires.util;
       stepWithNumberUnit = step.convertValueToMatch$1(number);
       $label1$1: {
         if ("nearest" === strategy) {
-          t1 = B.JSNumber_methods.round$0(t1 / stepWithNumberUnit);
+          t1 = B.JSNumber_methods.round$0(_0_2 / stepWithNumberUnit);
           t2 = number.get$numeratorUnits(number);
           t2 = A.SassNumber_SassNumber$withUnits(t1 * stepWithNumberUnit, number.get$denominatorUnits(number), t2);
           t1 = t2;
           break $label1$1;
         }
         if ("up" === strategy) {
-          t1 /= stepWithNumberUnit;
-          t1 = t2 < 0 ? B.JSNumber_methods.floor$0(t1) : B.JSNumber_methods.ceil$0(t1);
+          t2 = _0_2 / stepWithNumberUnit;
+          t1 = t1 < 0 ? B.JSNumber_methods.floor$0(t2) : B.JSNumber_methods.ceil$0(t2);
           t2 = number.get$numeratorUnits(number);
           t2 = A.SassNumber_SassNumber$withUnits(t1 * stepWithNumberUnit, number.get$denominatorUnits(number), t2);
           t1 = t2;
           break $label1$1;
         }
         if ("down" === strategy) {
-          t1 /= stepWithNumberUnit;
-          t1 = t2 < 0 ? B.JSNumber_methods.ceil$0(t1) : B.JSNumber_methods.floor$0(t1);
+          t2 = _0_2 / stepWithNumberUnit;
+          t1 = t1 < 0 ? B.JSNumber_methods.ceil$0(t2) : B.JSNumber_methods.floor$0(t2);
           t2 = number.get$numeratorUnits(number);
           t2 = A.SassNumber_SassNumber$withUnits(t1 * stepWithNumberUnit, number.get$denominatorUnits(number), t2);
           t1 = t2;
           break $label1$1;
         }
         if ("to-zero" === strategy) {
-          t2 = t1 / stepWithNumberUnit;
-          if (t1 < 0) {
-            t1 = B.JSNumber_methods.ceil$0(t2);
+          t1 = _0_2 / stepWithNumberUnit;
+          if (_0_2 < 0) {
+            t1 = B.JSNumber_methods.ceil$0(t1);
             t2 = number.get$numeratorUnits(number);
             t2 = A.SassNumber_SassNumber$withUnits(t1 * stepWithNumberUnit, number.get$denominatorUnits(number), t2);
             t1 = t2;
           } else {
-            t1 = B.JSNumber_methods.floor$0(t2);
+            t1 = B.JSNumber_methods.floor$0(t1);
             t2 = number.get$numeratorUnits(number);
             t2 = A.SassNumber_SassNumber$withUnits(t1 * stepWithNumberUnit, number.get$denominatorUnits(number), t2);
             t1 = t2;
@@ -14833,12 +16356,8 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     SassCalculation__simplify(arg) {
-      var t1, text, t2, value, _null = null,
-        _s32_ = " can't be used in a calculation.",
-        _0_11 = A._InitializedCell$(new A.SassCalculation__simplify_closure(arg)),
-        _0_12 = A._InitializedCell$(new A.SassCalculation__simplify_closure0(arg)),
-        _0_15 = A._InitializedCell$(new A.SassCalculation__simplify_closure1(_0_12)),
-        _0_16 = A._InitializedCell$(new A.SassCalculation__simplify_closure2(_0_12));
+      var t1, _0_11_isSet, _0_11, _0_12, _0_15, _0_16_isSet, _0_16, text, _0_12_isSet, _0_15_isSet, value, _null = null,
+        _s32_ = " can't be used in a calculation.";
       $label0$0: {
         if (arg instanceof A.SassNumber || arg instanceof A.CalculationOperation) {
           t1 = arg;
@@ -14851,60 +16370,89 @@ self.util = _cliPkgRequires.util;
         }
         if (t1)
           A.throwExpression(A.SassScriptException$("Quoted string " + arg.toString$0(0) + _s32_, _null));
-        t1 = arg instanceof A.SassCalculation;
-        if (t1)
-          if (_0_11._readFinal$0())
-            if (_0_15._readFinal$0())
-              if (_0_16._readFinal$0() instanceof A.SassString)
-                if (!_0_16._readFinal$0()._hasQuotes) {
-                  text = _0_16._readFinal$0()._string$_text;
-                  t2 = A.SassCalculation__needsParentheses(text);
+        _0_11_isSet = arg instanceof A.SassCalculation;
+        if (_0_11_isSet) {
+          _0_11 = "calc" === arg.name;
+          if (_0_11) {
+            _0_12 = arg.$arguments;
+            _0_15 = _0_12.length === 1;
+            _0_16_isSet = _0_15;
+            if (_0_16_isSet) {
+              _0_16 = _0_12[0];
+              t1 = _0_16;
+              if (t1 instanceof A.SassString) {
+                type$.SassString._as(_0_16);
+                if (!_0_16._hasQuotes) {
+                  text = _0_16._string$_text;
+                  t1 = A.SassCalculation__needsParentheses(text);
                 } else {
                   text = _null;
-                  t2 = false;
+                  t1 = false;
                 }
-              else {
+              } else {
                 text = _null;
-                t2 = false;
+                t1 = false;
               }
-            else {
+            } else {
               text = _null;
-              t2 = false;
+              _0_16 = text;
+              t1 = false;
             }
-          else {
+          } else {
             text = _null;
-            t2 = false;
+            _0_16 = text;
+            _0_12 = _0_16;
+            _0_15 = _0_12;
+            _0_16_isSet = false;
+            t1 = false;
           }
-        else {
+          _0_12_isSet = _0_11;
+          _0_15_isSet = _0_12_isSet;
+        } else {
           text = _null;
-          t2 = false;
+          _0_16 = text;
+          _0_12 = _0_16;
+          _0_15 = _0_12;
+          _0_11 = _0_15;
+          _0_15_isSet = false;
+          _0_12_isSet = false;
+          _0_16_isSet = false;
+          t1 = false;
         }
-        if (t2) {
+        if (t1) {
           t1 = new A.SassString("(" + A.S(text) + ")", false);
           break $label0$0;
         }
-        if (t1)
-          if (_0_11._readFinal$0())
-            if (_0_15._readFinal$0()) {
-              value = _0_16._readFinal$0();
-              t2 = true;
-            } else {
-              value = _null;
-              t2 = false;
+        if (_0_11_isSet)
+          if (_0_11)
+            if (_0_15_isSet)
+              t1 = _0_15;
+            else {
+              if (_0_12_isSet)
+                t1 = _0_12;
+              else {
+                _0_12 = arg.$arguments;
+                t1 = _0_12;
+                _0_12_isSet = true;
+              }
+              _0_15 = t1.length === 1;
+              t1 = _0_15;
             }
+          else
+            t1 = false;
+        else
+          t1 = false;
+        if (t1) {
+          if (_0_16_isSet)
+            value = _0_16;
           else {
-            value = _null;
-            t2 = false;
+            _0_16 = (_0_12_isSet ? _0_12 : arg.$arguments)[0];
+            value = _0_16;
           }
-        else {
-          value = _null;
-          t2 = false;
-        }
-        if (t2) {
           t1 = value;
           break $label0$0;
         }
-        if (t1) {
+        if (_0_11_isSet) {
           t1 = arg;
           break $label0$0;
         }
@@ -14989,72 +16537,6 @@ self.util = _cliPkgRequires.util;
       this.name = t0;
       this.$arguments = t1;
     },
-    SassCalculation_sign_closure: function SassCalculation_sign_closure(t0) {
-      this._0_0 = t0;
-    },
-    SassCalculation_round_closure: function SassCalculation_round_closure(t0) {
-      this._0_0 = t0;
-    },
-    SassCalculation_round_closure0: function SassCalculation_round_closure0(t0) {
-      this._0_0 = t0;
-    },
-    SassCalculation_round_closure1: function SassCalculation_round_closure1(t0) {
-      this._0_2 = t0;
-    },
-    SassCalculation_round_closure2: function SassCalculation_round_closure2(t0) {
-      this._0_0 = t0;
-    },
-    SassCalculation_round_closure3: function SassCalculation_round_closure3(t0) {
-      this._0_5 = t0;
-    },
-    SassCalculation_round_closure4: function SassCalculation_round_closure4(t0) {
-      this._0_1 = t0;
-    },
-    SassCalculation_round_closure5: function SassCalculation_round_closure5(t0) {
-      this._0_8 = t0;
-    },
-    SassCalculation_round_closure6: function SassCalculation_round_closure6(t0) {
-      this._0_8 = t0;
-    },
-    SassCalculation_round_closure7: function SassCalculation_round_closure7(t0) {
-      this._0_8 = t0;
-    },
-    SassCalculation_round_closure8: function SassCalculation_round_closure8(t0) {
-      this._0_8 = t0;
-    },
-    SassCalculation__roundWithStep_closure0: function SassCalculation__roundWithStep_closure0(t0) {
-      this._0_0 = t0;
-    },
-    SassCalculation__roundWithStep_closure: function SassCalculation__roundWithStep_closure(t0) {
-      this._0_0 = t0;
-    },
-    SassCalculation__roundWithStep_closure1: function SassCalculation__roundWithStep_closure1(t0) {
-      this._0_1 = t0;
-    },
-    SassCalculation__roundWithStep_closure2: function SassCalculation__roundWithStep_closure2(t0) {
-      this._0_1 = t0;
-    },
-    SassCalculation__roundWithStep_closure3: function SassCalculation__roundWithStep_closure3(t0) {
-      this._0_2 = t0;
-    },
-    SassCalculation__roundWithStep_closure4: function SassCalculation__roundWithStep_closure4(t0) {
-      this._0_1 = t0;
-    },
-    SassCalculation__roundWithStep_closure5: function SassCalculation__roundWithStep_closure5(t0) {
-      this._0_1 = t0;
-    },
-    SassCalculation__simplify_closure: function SassCalculation__simplify_closure(t0) {
-      this._0_0 = t0;
-    },
-    SassCalculation__simplify_closure0: function SassCalculation__simplify_closure0(t0) {
-      this._0_0 = t0;
-    },
-    SassCalculation__simplify_closure1: function SassCalculation__simplify_closure1(t0) {
-      this._0_12 = t0;
-    },
-    SassCalculation__simplify_closure2: function SassCalculation__simplify_closure2(t0) {
-      this._0_12 = t0;
-    },
     SassCalculation__verifyLength_closure: function SassCalculation__verifyLength_closure() {
     },
     CalculationOperation: function CalculationOperation(t0, t1, t2) {
@@ -15072,16 +16554,16 @@ self.util = _cliPkgRequires.util;
     SassColor$rgb(red, green, blue, alpha) {
       var _null = null,
         t1 = new A.SassColor(red, green, blue, _null, _null, _null, A.fuzzyAssertRange(A.SassColor__handleNullAlpha(alpha), 0, 1, "alpha"), _null);
-      A.RangeError_checkValueInInterval(t1.get$red(t1), 0, 255, "red");
-      A.RangeError_checkValueInInterval(t1.get$green(t1), 0, 255, "green");
-      A.RangeError_checkValueInInterval(t1.get$blue(t1), 0, 255, "blue");
+      A.RangeError_checkValueInInterval(t1.get$red(0), 0, 255, "red");
+      A.RangeError_checkValueInInterval(t1.get$green(0), 0, 255, "green");
+      A.RangeError_checkValueInInterval(t1.get$blue(0), 0, 255, "blue");
       return t1;
     },
     SassColor$rgbInternal(_red, _green, _blue, alpha, format) {
       var t1 = new A.SassColor(_red, _green, _blue, null, null, null, A.fuzzyAssertRange(alpha, 0, 1, "alpha"), format);
-      A.RangeError_checkValueInInterval(t1.get$red(t1), 0, 255, "red");
-      A.RangeError_checkValueInInterval(t1.get$green(t1), 0, 255, "green");
-      A.RangeError_checkValueInInterval(t1.get$blue(t1), 0, 255, "blue");
+      A.RangeError_checkValueInInterval(t1.get$red(0), 0, 255, "red");
+      A.RangeError_checkValueInInterval(t1.get$green(0), 0, 255, "green");
+      A.RangeError_checkValueInInterval(t1.get$blue(0), 0, 255, "blue");
       return t1;
     },
     SassColor$hslInternal(hue, saturation, lightness, alpha, format) {
@@ -15178,84 +16660,180 @@ self.util = _cliPkgRequires.util;
     _SassNull: function _SassNull() {
     },
     conversionFactor(unit1, unit2) {
-      var _0_0, innerMap, t1;
+      var _0_0;
       if (unit1 === unit2)
         return 1;
-      _0_0 = B.Map_nfuzN.$index(0, unit1);
-      if (_0_0 != null) {
-        innerMap = _0_0;
-        t1 = true;
-      } else {
-        innerMap = null;
-        t1 = false;
-      }
-      if (t1)
-        return innerMap.$index(0, unit2);
+      _0_0 = B.Map_gQqJO.$index(0, unit1);
+      if (_0_0 != null)
+        return _0_0.$index(0, unit2);
       return null;
     },
     SassNumber_SassNumber(value, unit) {
       return unit == null ? new A.UnitlessSassNumber(value, null) : new A.SingleUnitSassNumber(unit, value, null);
     },
     SassNumber_SassNumber$withUnits(value, denominatorUnits, numeratorUnits) {
-      var t1, unit, numerators, denominators, unsimplifiedDenominators, valueDouble, _i, denominator, simplifiedAway, i, factor, _1_0, _1_1, _1_2, _1_7, _null = null,
-        _0_0 = new A._Record_2(numeratorUnits, denominatorUnits),
-        _0_1 = A._InitializedCell$(new A.SassNumber_SassNumber$withUnits_closure(_0_0)),
-        _0_3 = A._InitializedCell$(new A.SassNumber_SassNumber$withUnits_closure0(_0_1)),
-        _0_4 = A._InitializedCell$(new A.SassNumber_SassNumber$withUnits_closure1(_0_1)),
-        _0_6 = A._InitializedCell$(new A.SassNumber_SassNumber$withUnits_closure2(_0_4)),
-        _0_7 = A._InitializedCell$(new A.SassNumber_SassNumber$withUnits_closure3(_0_0)),
-        _0_8 = A._InitializedCell$(new A.SassNumber_SassNumber$withUnits_closure4(_0_7)),
-        _0_10 = A._InitializedCell$(new A.SassNumber_SassNumber$withUnits_closure5(_0_7));
-      if (_0_3._readFinal$0() || _0_6._readFinal$0())
-        t1 = _0_8._readFinal$0() || _0_10._readFinal$0();
-      else
+      var _0_4, t1, _0_6, _0_8_isSet, _0_8, _0_10_isSet, _0_10, _0_7, t2, _0_4_isSet, unit, _0_7_isSet, numerators, t3, denominators, unsimplifiedDenominators, valueDouble, _i, denominator, simplifiedAway, i, factor, _1_2, _1_7_isSet, _1_7, _null = null,
+        _0_6_isSet = !false;
+      if (_0_6_isSet) {
+        _0_4 = (numeratorUnits === null ? type$.List_String._as(numeratorUnits) : numeratorUnits).length;
+        t1 = _0_4;
+        _0_6 = t1 <= 0;
+        _0_8_isSet = _0_6;
+      } else {
+        _0_4 = _null;
+        _0_6 = _0_4;
+        _0_8_isSet = true;
+      }
+      if (_0_8_isSet) {
+        _0_8 = denominatorUnits == null;
+        t1 = _0_8;
+        _0_10_isSet = !t1;
+        if (_0_10_isSet) {
+          _0_10 = (denominatorUnits == null ? type$.List_String._as(denominatorUnits) : denominatorUnits).length <= 0;
+          t1 = _0_10;
+        } else {
+          _0_10 = _null;
+          t1 = true;
+        }
+        _0_7 = denominatorUnits;
+      } else {
+        _0_10 = _null;
+        _0_7 = _0_10;
+        _0_8 = _0_7;
+        _0_10_isSet = false;
         t1 = false;
+      }
       if (t1)
         return new A.UnitlessSassNumber(value, _null);
-      if (type$.List_String._is(_0_1._readFinal$0()))
-        if (J.$eq$(_0_4._readFinal$0(), 1)) {
-          unit = J.$index$asx(_0_1._readFinal$0(), 0);
-          t1 = _0_8._readFinal$0() || _0_10._readFinal$0();
+      t1 = type$.List_String;
+      if (t1._is(numeratorUnits)) {
+        if (_0_6_isSet) {
+          t2 = _0_4;
+          _0_4_isSet = _0_6_isSet;
+        } else {
+          _0_4 = numeratorUnits.length;
+          t2 = _0_4;
+          _0_4_isSet = true;
+        }
+        if (t2 === 1) {
+          unit = numeratorUnits[0];
+          if (_0_8_isSet) {
+            t2 = _0_8;
+            _0_7_isSet = _0_8_isSet;
+          } else {
+            _0_8 = denominatorUnits == null;
+            t2 = _0_8;
+            _0_7 = denominatorUnits;
+            _0_8_isSet = true;
+            _0_7_isSet = true;
+          }
+          if (!t2)
+            if (_0_10_isSet)
+              t2 = _0_10;
+            else {
+              if (_0_7_isSet)
+                t2 = _0_7;
+              else {
+                t2 = denominatorUnits;
+                _0_7 = t2;
+                _0_7_isSet = true;
+              }
+              _0_10 = (t2 == null ? t1._as(t2) : t2).length <= 0;
+              t2 = _0_10;
+              _0_10_isSet = true;
+            }
+          else
+            t2 = true;
         } else {
           unit = _null;
-          t1 = false;
+          _0_7_isSet = _0_8_isSet;
+          t2 = false;
         }
-      else {
+      } else {
         unit = _null;
-        t1 = false;
+        _0_7_isSet = _0_8_isSet;
+        _0_4_isSet = _0_6_isSet;
+        t2 = false;
       }
-      if (t1)
+      if (t2)
         return new A.SingleUnitSassNumber(unit, value, _null);
-      if (_0_1._readFinal$0() != null) {
-        numerators = _0_1._readFinal$0();
-        t1 = true;
+      t2 = numeratorUnits === null;
+      if (!t2) {
+        numerators = numeratorUnits;
+        if (_0_8_isSet)
+          t3 = _0_8;
+        else {
+          if (_0_7_isSet)
+            t3 = _0_7;
+          else {
+            t3 = denominatorUnits;
+            _0_7 = t3;
+            _0_7_isSet = true;
+          }
+          _0_8 = t3 == null;
+          t3 = _0_8;
+        }
+        if (!t3)
+          if (_0_10_isSet)
+            t3 = _0_10;
+          else {
+            if (_0_7_isSet)
+              t3 = _0_7;
+            else {
+              t3 = denominatorUnits;
+              _0_7 = t3;
+              _0_7_isSet = true;
+            }
+            _0_10 = (t3 == null ? t1._as(t3) : t3).length <= 0;
+            t3 = _0_10;
+          }
+        else
+          t3 = true;
       } else {
         numerators = _null;
-        t1 = false;
+        t3 = false;
       }
-      if (t1)
-        t1 = _0_8._readFinal$0() || _0_10._readFinal$0();
-      else
-        t1 = false;
-      if (t1)
+      if (t3)
         return new A.ComplexSassNumber(A.List_List$unmodifiable(numerators, type$.String), B.List_empty, value, _null);
-      if (_0_3._readFinal$0() || _0_6._readFinal$0())
-        if (_0_7._readFinal$0() != null) {
-          denominators = _0_7._readFinal$0();
-          t1 = true;
-        } else {
-          denominators = _null;
-          t1 = false;
+      if (!false)
+        if (_0_6_isSet)
+          t2 = _0_6;
+        else {
+          if (_0_4_isSet)
+            t2 = _0_4;
+          else {
+            _0_4 = (t2 ? t1._as(numeratorUnits) : numeratorUnits).length;
+            t2 = _0_4;
+          }
+          _0_6 = t2 <= 0;
+          t2 = _0_6;
         }
-      else {
+      else
+        t2 = true;
+      if (t2) {
+        if (_0_7_isSet)
+          t2 = _0_7;
+        else {
+          t2 = denominatorUnits;
+          _0_7 = t2;
+          _0_7_isSet = true;
+        }
+        t2 = t2 != null;
+        if (t2) {
+          denominators = _0_7_isSet ? _0_7 : denominatorUnits;
+          if (denominators == null)
+            denominators = t1._as(denominators);
+        } else
+          denominators = _null;
+        t1 = t2;
+      } else {
         denominators = _null;
         t1 = false;
       }
       if (t1)
         return new A.ComplexSassNumber(B.List_empty, A.List_List$unmodifiable(denominators, type$.String), value, _null);
-      numerators = J.toList$0$ax(numeratorUnits);
-      denominatorUnits.toString;
-      unsimplifiedDenominators = J.toList$0$ax(denominatorUnits);
+      numerators = A._setArrayType(numeratorUnits.slice(0), A._arrayInstanceType(numeratorUnits));
+      unsimplifiedDenominators = A._setArrayType(denominatorUnits.slice(0), A.instanceType(denominatorUnits));
       denominators = A._setArrayType([], type$.JSArray_String);
       for (t1 = unsimplifiedDenominators.length, valueDouble = value, _i = 0; _i < unsimplifiedDenominators.length; unsimplifiedDenominators.length === t1 || (0, A.throwConcurrentModificationError)(unsimplifiedDenominators), ++_i) {
         denominator = unsimplifiedDenominators[_i];
@@ -15279,19 +16857,24 @@ self.util = _cliPkgRequires.util;
         if (!simplifiedAway)
           denominators.push(denominator);
       }
-      _1_0 = new A._Record_2(numerators, denominators);
-      _1_1 = A._InitializedCell$(new A.SassNumber_SassNumber$withUnits_closure6(_1_0));
-      _1_2 = A._InitializedCell$(new A.SassNumber_SassNumber$withUnits_closure7(_1_1));
-      _1_7 = A._InitializedCell$(new A.SassNumber_SassNumber$withUnits_closure8(_1_0));
       $label0$1: {
-        if (_1_2._readFinal$0() <= 0 && _1_7._readFinal$0()) {
+        _1_2 = numerators.length;
+        t1 = _1_2;
+        _1_7_isSet = t1 <= 0;
+        if (_1_7_isSet) {
+          _1_7 = denominators.length <= 0;
+          t1 = _1_7;
+        } else {
+          _1_7 = _null;
+          t1 = false;
+        }
+        if (t1) {
           t1 = new A.UnitlessSassNumber(valueDouble, _null);
           break $label0$1;
         }
-        if (J.$eq$(_1_2._readFinal$0(), 1)) {
-          unit = J.$index$asx(_1_1._readFinal$0(), 0);
-          t1 = _1_7._readFinal$0();
-          t1 = t1;
+        if (_1_2 === 1) {
+          unit = numerators[0];
+          t1 = _1_7_isSet ? _1_7 : denominators.length <= 0;
         } else {
           unit = _null;
           t1 = false;
@@ -15308,36 +16891,6 @@ self.util = _cliPkgRequires.util;
     },
     SassNumber: function SassNumber() {
     },
-    SassNumber_SassNumber$withUnits_closure0: function SassNumber_SassNumber$withUnits_closure0(t0) {
-      this._0_1 = t0;
-    },
-    SassNumber_SassNumber$withUnits_closure: function SassNumber_SassNumber$withUnits_closure(t0) {
-      this._0_0 = t0;
-    },
-    SassNumber_SassNumber$withUnits_closure1: function SassNumber_SassNumber$withUnits_closure1(t0) {
-      this._0_1 = t0;
-    },
-    SassNumber_SassNumber$withUnits_closure2: function SassNumber_SassNumber$withUnits_closure2(t0) {
-      this._0_4 = t0;
-    },
-    SassNumber_SassNumber$withUnits_closure4: function SassNumber_SassNumber$withUnits_closure4(t0) {
-      this._0_7 = t0;
-    },
-    SassNumber_SassNumber$withUnits_closure3: function SassNumber_SassNumber$withUnits_closure3(t0) {
-      this._0_0 = t0;
-    },
-    SassNumber_SassNumber$withUnits_closure5: function SassNumber_SassNumber$withUnits_closure5(t0) {
-      this._0_7 = t0;
-    },
-    SassNumber_SassNumber$withUnits_closure6: function SassNumber_SassNumber$withUnits_closure6(t0) {
-      this._1_0 = t0;
-    },
-    SassNumber_SassNumber$withUnits_closure7: function SassNumber_SassNumber$withUnits_closure7(t0) {
-      this._1_1 = t0;
-    },
-    SassNumber_SassNumber$withUnits_closure8: function SassNumber_SassNumber$withUnits_closure8(t0) {
-      this._1_0 = t0;
-    },
     SassNumber__coerceOrConvertValue_compatibilityException: function SassNumber__coerceOrConvertValue_compatibilityException(t0, t1, t2, t3, t4, t5, t6) {
       var _ = this;
       _.$this = t0;
@@ -15366,61 +16919,25 @@ self.util = _cliPkgRequires.util;
     },
     SassNumber_minus_closure: function SassNumber_minus_closure() {
     },
-    SassNumber_multiplyUnits_closure: function SassNumber_multiplyUnits_closure(t0) {
-      this._0_0 = t0;
-    },
-    SassNumber_multiplyUnits_closure0: function SassNumber_multiplyUnits_closure0(t0) {
-      this._0_0 = t0;
-    },
-    SassNumber_multiplyUnits_closure1: function SassNumber_multiplyUnits_closure1(t0) {
-      this._0_0 = t0;
-    },
-    SassNumber_multiplyUnits_closure2: function SassNumber_multiplyUnits_closure2(t0) {
-      this._0_3 = t0;
-    },
-    SassNumber_multiplyUnits_closure3: function SassNumber_multiplyUnits_closure3(t0) {
-      this._0_0 = t0;
-    },
-    SassNumber_multiplyUnits_closure4: function SassNumber_multiplyUnits_closure4(t0) {
-      this._0_7 = t0;
-    },
-    SassNumber_multiplyUnits_closure5: function SassNumber_multiplyUnits_closure5(t0) {
-      this._0_1 = t0;
-    },
-    SassNumber_multiplyUnits_closure6: function SassNumber_multiplyUnits_closure6(t0) {
-      this._0_2 = t0;
-    },
-    SassNumber_multiplyUnits_closure7: function SassNumber_multiplyUnits_closure7(t0, t1) {
+    SassNumber_multiplyUnits_closure: function SassNumber_multiplyUnits_closure(t0, t1) {
       this._box_0 = t0;
       this.numerator = t1;
     },
-    SassNumber_multiplyUnits_closure8: function SassNumber_multiplyUnits_closure8(t0, t1) {
+    SassNumber_multiplyUnits_closure0: function SassNumber_multiplyUnits_closure0(t0, t1) {
       this.newNumerators = t0;
       this.numerator = t1;
     },
-    SassNumber_multiplyUnits_closure9: function SassNumber_multiplyUnits_closure9(t0, t1) {
+    SassNumber_multiplyUnits_closure1: function SassNumber_multiplyUnits_closure1(t0, t1) {
       this._box_0 = t0;
       this.numerator = t1;
     },
-    SassNumber_multiplyUnits_closure10: function SassNumber_multiplyUnits_closure10(t0, t1) {
+    SassNumber_multiplyUnits_closure2: function SassNumber_multiplyUnits_closure2(t0, t1) {
       this.newNumerators = t0;
       this.numerator = t1;
     },
     SassNumber__areAnyConvertible_closure: function SassNumber__areAnyConvertible_closure(t0) {
       this.units2 = t0;
     },
-    SassNumber__unitString_closure: function SassNumber__unitString_closure(t0) {
-      this._0_0 = t0;
-    },
-    SassNumber__unitString_closure0: function SassNumber__unitString_closure0(t0) {
-      this._0_0 = t0;
-    },
-    SassNumber__unitString_closure1: function SassNumber__unitString_closure1(t0) {
-      this._0_5 = t0;
-    },
-    SassNumber__unitString_closure2: function SassNumber__unitString_closure2(t0) {
-      this._0_6 = t0;
-    },
     SassNumber__canonicalizeUnitList_closure: function SassNumber__canonicalizeUnitList_closure() {
     },
     SassNumber__canonicalMultiplier_closure: function SassNumber__canonicalMultiplier_closure(t0) {
@@ -15784,7 +17301,7 @@ self.util = _cliPkgRequires.util;
       _.environment = t3;
       _.children = t4;
     },
-    _EvaluateVisitor__applyMixin_closure3: function _EvaluateVisitor__applyMixin_closure3(t0, t1, t2, t3) {
+    _EvaluateVisitor__applyMixin_closure1: function _EvaluateVisitor__applyMixin_closure1(t0, t1, t2, t3) {
       var _ = this;
       _.$this = t0;
       _.$arguments = t1;
@@ -15798,10 +17315,7 @@ self.util = _cliPkgRequires.util;
       _.mixin = t2;
       _.nodeWithSpanWithoutContent = t3;
     },
-    _EvaluateVisitor__applyMixin_closure2: function _EvaluateVisitor__applyMixin_closure2(t0) {
-      this._1_0 = t0;
-    },
-    _EvaluateVisitor__applyMixin_closure4: function _EvaluateVisitor__applyMixin_closure4(t0, t1, t2, t3) {
+    _EvaluateVisitor__applyMixin_closure2: function _EvaluateVisitor__applyMixin_closure2(t0, t1, t2, t3) {
       var _ = this;
       _.$this = t0;
       _.contentCallable = t1;
@@ -15855,11 +17369,11 @@ self.util = _cliPkgRequires.util;
     _EvaluateVisitor_visitMediaRule_closure4: function _EvaluateVisitor_visitMediaRule_closure4(t0) {
       this.mergedSources = t0;
     },
-    _EvaluateVisitor_visitStyleRule_closure4: function _EvaluateVisitor_visitStyleRule_closure4(t0, t1) {
+    _EvaluateVisitor_visitStyleRule_closure3: function _EvaluateVisitor_visitStyleRule_closure3(t0, t1) {
       this.$this = t0;
       this.node = t1;
     },
-    _EvaluateVisitor_visitStyleRule_closure5: function _EvaluateVisitor_visitStyleRule_closure5() {
+    _EvaluateVisitor_visitStyleRule_closure4: function _EvaluateVisitor_visitStyleRule_closure4() {
     },
     _EvaluateVisitor_visitStyleRule_closure6: function _EvaluateVisitor_visitStyleRule_closure6(t0, t1, t2) {
       this.$this = t0;
@@ -15870,9 +17384,9 @@ self.util = _cliPkgRequires.util;
       this.$this = t0;
       this.node = t1;
     },
-    _EvaluateVisitor_visitStyleRule_closure7: function _EvaluateVisitor_visitStyleRule_closure7() {
+    _EvaluateVisitor_visitStyleRule_closure5: function _EvaluateVisitor_visitStyleRule_closure5() {
     },
-    _EvaluateVisitor_visitStyleRule_closure8: function _EvaluateVisitor_visitStyleRule_closure8() {
+    _EvaluateVisitor__warnForBogusCombinators_closure0: function _EvaluateVisitor__warnForBogusCombinators_closure0() {
     },
     _EvaluateVisitor_visitSupportsRule_closure1: function _EvaluateVisitor_visitSupportsRule_closure1(t0, t1) {
       this.$this = t0;
@@ -15921,12 +17435,6 @@ self.util = _cliPkgRequires.util;
       this.$this = t0;
       this.node = t1;
     },
-    _EvaluateVisitor__slash_closure1: function _EvaluateVisitor__slash_closure1(t0) {
-      this._1_0 = t0;
-    },
-    _EvaluateVisitor__slash_closure2: function _EvaluateVisitor__slash_closure2(t0) {
-      this._1_0 = t0;
-    },
     _EvaluateVisitor__slash_recommendation0: function _EvaluateVisitor__slash_recommendation0() {
     },
     _EvaluateVisitor_visitVariableExpression_closure0: function _EvaluateVisitor_visitVariableExpression_closure0(t0, t1) {
@@ -15962,9 +17470,6 @@ self.util = _cliPkgRequires.util;
       _.node = t2;
       _.inLegacySassFunction = t3;
     },
-    _EvaluateVisitor__checkAdjacentCalculationValues_closure0: function _EvaluateVisitor__checkAdjacentCalculationValues_closure0(t0) {
-      this._0_0 = t0;
-    },
     _EvaluateVisitor_visitInterpolatedFunctionExpression_closure0: function _EvaluateVisitor_visitInterpolatedFunctionExpression_closure0(t0, t1, t2) {
       this.$this = t0;
       this.node = t1;
@@ -16106,10 +17611,7 @@ self.util = _cliPkgRequires.util;
       this.$this = t0;
       this.node = t1;
     },
-    _EvaluateVisitor_visitCssStyleRule_closure3: function _EvaluateVisitor_visitCssStyleRule_closure3() {
-    },
-    _EvaluateVisitor_visitCssStyleRule_closure4: function _EvaluateVisitor_visitCssStyleRule_closure4(t0) {
-      this._0_0 = t0;
+    _EvaluateVisitor_visitCssStyleRule_closure1: function _EvaluateVisitor_visitCssStyleRule_closure1() {
     },
     _EvaluateVisitor_visitCssSupportsRule_closure1: function _EvaluateVisitor_visitCssSupportsRule_closure1(t0, t1) {
       this.$this = t0;
@@ -16175,7 +17677,7 @@ self.util = _cliPkgRequires.util;
     _EvaluateVisitor: function _EvaluateVisitor(t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15) {
       var _ = this;
       _._evaluate$_importCache = t0;
-      _._nodeImporter = t1;
+      _._evaluate$_nodeImporter = t1;
       _._builtInFunctions = t2;
       _._builtInModules = t3;
       _._modules = t4;
@@ -16491,7 +17993,7 @@ self.util = _cliPkgRequires.util;
       _.environment = t3;
       _.children = t4;
     },
-    _EvaluateVisitor__applyMixin_closure0: function _EvaluateVisitor__applyMixin_closure0(t0, t1, t2, t3) {
+    _EvaluateVisitor__applyMixin_closure: function _EvaluateVisitor__applyMixin_closure(t0, t1, t2, t3) {
       var _ = this;
       _.$this = t0;
       _.$arguments = t1;
@@ -16505,10 +18007,7 @@ self.util = _cliPkgRequires.util;
       _.mixin = t2;
       _.nodeWithSpanWithoutContent = t3;
     },
-    _EvaluateVisitor__applyMixin_closure: function _EvaluateVisitor__applyMixin_closure(t0) {
-      this._1_0 = t0;
-    },
-    _EvaluateVisitor__applyMixin_closure1: function _EvaluateVisitor__applyMixin_closure1(t0, t1, t2, t3) {
+    _EvaluateVisitor__applyMixin_closure0: function _EvaluateVisitor__applyMixin_closure0(t0, t1, t2, t3) {
       var _ = this;
       _.$this = t0;
       _.contentCallable = t1;
@@ -16568,7 +18067,7 @@ self.util = _cliPkgRequires.util;
     },
     _EvaluateVisitor_visitStyleRule_closure0: function _EvaluateVisitor_visitStyleRule_closure0() {
     },
-    _EvaluateVisitor_visitStyleRule_closure1: function _EvaluateVisitor_visitStyleRule_closure1(t0, t1, t2) {
+    _EvaluateVisitor_visitStyleRule_closure2: function _EvaluateVisitor_visitStyleRule_closure2(t0, t1, t2) {
       this.$this = t0;
       this.rule = t1;
       this.node = t2;
@@ -16577,9 +18076,9 @@ self.util = _cliPkgRequires.util;
       this.$this = t0;
       this.node = t1;
     },
-    _EvaluateVisitor_visitStyleRule_closure2: function _EvaluateVisitor_visitStyleRule_closure2() {
+    _EvaluateVisitor_visitStyleRule_closure1: function _EvaluateVisitor_visitStyleRule_closure1() {
     },
-    _EvaluateVisitor_visitStyleRule_closure3: function _EvaluateVisitor_visitStyleRule_closure3() {
+    _EvaluateVisitor__warnForBogusCombinators_closure: function _EvaluateVisitor__warnForBogusCombinators_closure() {
     },
     _EvaluateVisitor_visitSupportsRule_closure: function _EvaluateVisitor_visitSupportsRule_closure(t0, t1) {
       this.$this = t0;
@@ -16628,12 +18127,6 @@ self.util = _cliPkgRequires.util;
       this.$this = t0;
       this.node = t1;
     },
-    _EvaluateVisitor__slash_closure: function _EvaluateVisitor__slash_closure(t0) {
-      this._1_0 = t0;
-    },
-    _EvaluateVisitor__slash_closure0: function _EvaluateVisitor__slash_closure0(t0) {
-      this._1_0 = t0;
-    },
     _EvaluateVisitor__slash_recommendation: function _EvaluateVisitor__slash_recommendation() {
     },
     _EvaluateVisitor_visitVariableExpression_closure: function _EvaluateVisitor_visitVariableExpression_closure(t0, t1) {
@@ -16669,9 +18162,6 @@ self.util = _cliPkgRequires.util;
       _.node = t2;
       _.inLegacySassFunction = t3;
     },
-    _EvaluateVisitor__checkAdjacentCalculationValues_closure: function _EvaluateVisitor__checkAdjacentCalculationValues_closure(t0) {
-      this._0_0 = t0;
-    },
     _EvaluateVisitor_visitInterpolatedFunctionExpression_closure: function _EvaluateVisitor_visitInterpolatedFunctionExpression_closure(t0, t1, t2) {
       this.$this = t0;
       this.node = t1;
@@ -16804,7 +18294,7 @@ self.util = _cliPkgRequires.util;
     _EvaluateVisitor_visitCssMediaRule_closure1: function _EvaluateVisitor_visitCssMediaRule_closure1(t0) {
       this.mergedSources = t0;
     },
-    _EvaluateVisitor_visitCssStyleRule_closure: function _EvaluateVisitor_visitCssStyleRule_closure(t0, t1, t2) {
+    _EvaluateVisitor_visitCssStyleRule_closure0: function _EvaluateVisitor_visitCssStyleRule_closure0(t0, t1, t2) {
       this.$this = t0;
       this.rule = t1;
       this.node = t2;
@@ -16813,10 +18303,7 @@ self.util = _cliPkgRequires.util;
       this.$this = t0;
       this.node = t1;
     },
-    _EvaluateVisitor_visitCssStyleRule_closure0: function _EvaluateVisitor_visitCssStyleRule_closure0() {
-    },
-    _EvaluateVisitor_visitCssStyleRule_closure1: function _EvaluateVisitor_visitCssStyleRule_closure1(t0) {
-      this._0_0 = t0;
+    _EvaluateVisitor_visitCssStyleRule_closure: function _EvaluateVisitor_visitCssStyleRule_closure() {
     },
     _EvaluateVisitor_visitCssSupportsRule_closure: function _EvaluateVisitor_visitCssSupportsRule_closure(t0, t1) {
       this.$this = t0;
@@ -16881,10 +18368,14 @@ self.util = _cliPkgRequires.util;
       this.$this = t0;
     },
     expressionToCalc(expression) {
-      var t1 = A._setArrayType([B.C__MakeExpressionCalculationSafe.visitBinaryOperationExpression$1(expression)], type$.JSArray_Expression),
-        t2 = expression.get$span(expression),
+      var t4,
+        t1 = A._setArrayType([B.C__MakeExpressionCalculationSafe.visitBinaryOperationExpression$1(expression)], type$.JSArray_Expression),
+        t2 = expression.get$span(0),
         t3 = type$.Expression;
-      return new A.FunctionExpression(null, "calc", new A.ArgumentInvocation(A.List_List$unmodifiable(t1, t3), A.ConstantMap_ConstantMap$from(B.Map_empty6, type$.String, t3), null, null, t2), expression.get$span(expression));
+      t1 = A.List_List$unmodifiable(t1, t3);
+      t3 = A.ConstantMap_ConstantMap$from(B.Map_empty6, type$.String, t3);
+      t4 = expression.get$span(0);
+      return new A.FunctionExpression(null, A.stringReplaceAllUnchecked("calc", "_", "-"), "calc", new A.ArgumentInvocation(t1, t3, null, null, t2), t4);
     },
     _MakeExpressionCalculationSafe: function _MakeExpressionCalculationSafe() {
     },
@@ -16898,12 +18389,6 @@ self.util = _cliPkgRequires.util;
       _._imports = t3;
       _._metaNamespaces = t4;
     },
-    _FindDependenciesVisitor_visitIncludeRule_closure: function _FindDependenciesVisitor_visitIncludeRule_closure(t0) {
-      this._0_0 = t0;
-    },
-    _FindDependenciesVisitor_visitIncludeRule_closure0: function _FindDependenciesVisitor_visitIncludeRule_closure0(t0) {
-      this._0_4 = t0;
-    },
     DependencyReport: function DependencyReport(t0, t1, t2, t3) {
       var _ = this;
       _.uses = t0;
@@ -17022,9 +18507,6 @@ self.util = _cliPkgRequires.util;
       this.$this = t0;
       this.node = t1;
     },
-    _SerializeVisitor__writeCalculationValue_closure: function _SerializeVisitor__writeCalculationValue_closure(t0) {
-      this._2_0 = t0;
-    },
     _SerializeVisitor_visitList_closure: function _SerializeVisitor_visitList_closure() {
     },
     _SerializeVisitor_visitList_closure0: function _SerializeVisitor_visitList_closure0(t0, t1) {
@@ -17037,17 +18519,8 @@ self.util = _cliPkgRequires.util;
     _SerializeVisitor_visitMap_closure: function _SerializeVisitor_visitMap_closure(t0) {
       this.$this = t0;
     },
-    _SerializeVisitor__visitQuotedString_closure: function _SerializeVisitor__visitQuotedString_closure(t0) {
-      this._1_0 = t0;
-    },
-    _SerializeVisitor__visitQuotedString_closure0: function _SerializeVisitor__visitQuotedString_closure0(t0) {
-      this._1_0 = t0;
-    },
     _SerializeVisitor_visitSelectorList_closure: function _SerializeVisitor_visitSelectorList_closure() {
     },
-    _SerializeVisitor_visitPseudoSelector_closure: function _SerializeVisitor_visitPseudoSelector_closure(t0) {
-      this._0_0 = t0;
-    },
     _SerializeVisitor__write_closure: function _SerializeVisitor__write_closure(t0, t1) {
       this.$this = t0;
       this.value = t1;
@@ -17089,7 +18562,7 @@ self.util = _cliPkgRequires.util;
       this.identifierName = t2;
     },
     SingleMapping_SingleMapping$fromEntries(entries) {
-      var lines, t1, t2, urls, names, files, targetEntries, t3, t4, lineNum, _i, sourceEntry, t5, t6, sourceUrl, t7, urlId,
+      var lines, t1, t2, urls, names, files, targetEntries, t3, lineNum, _i, sourceEntry, t4, t5, sourceUrl, t6, urlId,
         sourceEntries = J.toList$0$ax(entries);
       B.JSArray_methods.sort$0(sourceEntries);
       lines = A._setArrayType([], type$.JSArray_TargetLineEntry);
@@ -17099,27 +18572,27 @@ self.util = _cliPkgRequires.util;
       names = A.LinkedHashMap_LinkedHashMap$_empty(t1, t2);
       files = A.LinkedHashMap_LinkedHashMap$_empty(t2, type$.SourceFile);
       targetEntries = A._Cell$();
-      for (t2 = sourceEntries.length, t3 = type$.JSArray_TargetEntry, t4 = targetEntries.__late_helper$_name, lineNum = null, _i = 0; _i < sourceEntries.length; sourceEntries.length === t2 || (0, A.throwConcurrentModificationError)(sourceEntries), ++_i) {
+      for (t2 = sourceEntries.length, t3 = type$.JSArray_TargetEntry, lineNum = null, _i = 0; _i < sourceEntries.length; sourceEntries.length === t2 || (0, A.throwConcurrentModificationError)(sourceEntries), ++_i) {
         sourceEntry = sourceEntries[_i];
         if (lineNum == null || sourceEntry.target.line > lineNum) {
           lineNum = sourceEntry.target.line;
-          t5 = A._setArrayType([], t3);
-          targetEntries._value = t5;
-          lines.push(new A.TargetLineEntry(lineNum, t5));
+          t4 = A._setArrayType([], t3);
+          targetEntries.__late_helper$_value = t4;
+          lines.push(new A.TargetLineEntry(lineNum, t4));
         }
-        t5 = sourceEntry.source;
-        t6 = t5.file;
-        sourceUrl = t6.url;
-        t7 = sourceUrl == null ? "" : sourceUrl.toString$0(0);
-        urlId = urls.putIfAbsent$2(t7, new A.SingleMapping_SingleMapping$fromEntries_closure(urls));
+        t4 = sourceEntry.source;
+        t5 = t4.file;
+        sourceUrl = t5.url;
+        t6 = sourceUrl == null ? "" : sourceUrl.toString$0(0);
+        urlId = urls.putIfAbsent$2(t6, new A.SingleMapping_SingleMapping$fromEntries_closure(urls));
         files.putIfAbsent$2(urlId, new A.SingleMapping_SingleMapping$fromEntries_closure0(sourceEntry));
-        t7 = targetEntries._value;
-        if (t7 === targetEntries)
-          A.throwExpression(A.LateError$localNI(t4));
-        t5 = t5.offset;
-        J.add$1$ax(t7, new A.TargetEntry(sourceEntry.target.column, urlId, t6.getLine$1(t5), t6.getColumn$1(t5), null));
+        t6 = targetEntries.__late_helper$_value;
+        if (t6 === targetEntries)
+          A.throwExpression(A.LateError$localNI(""));
+        t4 = t4.offset;
+        J.add$1$ax(t6, new A.TargetEntry(sourceEntry.target.column, urlId, t5.getLine$1(t4), t5.getColumn$1(t4), null));
       }
-      t2 = urls.get$values(urls);
+      t2 = urls.get$values(0);
       t2 = A.MappedIterable_MappedIterable(t2, new A.SingleMapping_SingleMapping$fromEntries_closure1(files), A._instanceType(t2)._eval$1("Iterable.E"), type$.nullable_SourceFile);
       t2 = A.List_List$of(t2, true, A._instanceType(t2)._eval$1("Iterable.E"));
       t3 = urls.$ti._eval$1("LinkedHashMapKeyIterable<1>");
@@ -17183,14 +18656,14 @@ self.util = _cliPkgRequires.util;
       if (offset < 0)
         A.throwExpression(A.RangeError$("Offset may not be negative, was " + offset + "."));
       else if (offset > file._decodedChars.length)
-        A.throwExpression(A.RangeError$("Offset " + offset + string$.x20must_n + file.get$length(file) + "."));
+        A.throwExpression(A.RangeError$("Offset " + offset + string$.x20must_n + file.get$length(0) + "."));
       return new A.FileLocation(file, offset);
     },
     _FileSpan$(file, _start, _end) {
       if (_end < _start)
         A.throwExpression(A.ArgumentError$("End " + _end + " must come after start " + _start + ".", null));
       else if (_end > file._decodedChars.length)
-        A.throwExpression(A.RangeError$("End " + _end + string$.x20must_n + file.get$length(file) + "."));
+        A.throwExpression(A.RangeError$("End " + _end + string$.x20must_n + file.get$length(0) + "."));
       else if (_start < 0)
         A.throwExpression(A.RangeError$("Start may not be negative, was " + _start + "."));
       return new A._FileSpan(file, _start, _end);
@@ -17268,13 +18741,13 @@ self.util = _cliPkgRequires.util;
     Highlighter__collateLines(highlights) {
       var t1, t2, t3,
         highlightsByUrl = A.groupBy(highlights, new A.Highlighter__collateLines_closure(), type$._Highlight, type$.Object);
-      for (t1 = highlightsByUrl.get$values(highlightsByUrl), t1 = new A.MappedIterator(J.get$iterator$ax(t1.__internal$_iterable), t1._f), t2 = A._instanceType(t1)._rest[1]; t1.moveNext$0();) {
+      for (t1 = highlightsByUrl.get$values(0), t2 = A._instanceType(t1), t2 = t2._eval$1("@<1>")._bind$1(t2._rest[1]), t1 = new A.MappedIterator(J.get$iterator$ax(t1.__internal$_iterable), t1._f, t2._eval$1("MappedIterator<1,2>")), t2 = t2._rest[1]; t1.moveNext$0();) {
         t3 = t1.__internal$_current;
         if (t3 == null)
           t3 = t2._as(t3);
         J.sort$1$ax(t3, new A.Highlighter__collateLines_closure0());
       }
-      t1 = highlightsByUrl.get$entries(highlightsByUrl);
+      t1 = highlightsByUrl.get$entries(0);
       t2 = A._instanceType(t1)._eval$1("ExpandIterable<Iterable.E,_Line>");
       return A.List_List$of(new A.ExpandIterable(t1, new A.Highlighter__collateLines_closure1(), t2), true, t2._eval$1("Iterable.E"));
     },
@@ -17495,14 +18968,16 @@ self.util = _cliPkgRequires.util;
     SourceLocationMixin: function SourceLocationMixin() {
     },
     SourceSpanExtension_messageMultiple(_this, message, label, secondarySpans, color, primaryColor, secondaryColor) {
-      var t2,
+      var t2, t3,
         t1 = _this.get$start(_this);
       t1 = t1.file.getLine$1(t1.offset);
       t2 = _this.get$start(_this);
       t2 = "" + ("line " + (t1 + 1) + ", column " + (t2.file.getColumn$1(t2.offset) + 1));
       if (_this.get$sourceUrl(_this) != null) {
         t1 = _this.get$sourceUrl(_this);
-        t1 = t2 + (" of " + $.$get$context().prettyUri$1(t1));
+        t3 = $.$get$context();
+        t1.toString;
+        t1 = t2 + (" of " + t3.prettyUri$1(t1));
       } else
         t1 = t2;
       t1 = t1 + (": " + message + "\n") + A.Highlighter$multiple(_this, label, secondarySpans, color, primaryColor, secondaryColor).highlight$0();
@@ -17519,12 +18994,13 @@ self.util = _cliPkgRequires.util;
     },
     MultiSourceSpanException: function MultiSourceSpanException() {
     },
-    MultiSourceSpanFormatException: function MultiSourceSpanFormatException(t0, t1, t2, t3) {
+    MultiSourceSpanFormatException: function MultiSourceSpanFormatException(t0, t1, t2, t3, t4) {
       var _ = this;
-      _.primaryLabel = t0;
-      _.secondarySpans = t1;
-      _._span_exception$_message = t2;
-      _._span = t3;
+      _.source = t0;
+      _.primaryLabel = t1;
+      _.secondarySpans = t2;
+      _._span_exception$_message = t3;
+      _._span = t4;
     },
     SourceSpanMixin: function SourceSpanMixin() {
     },
@@ -17716,13 +19192,13 @@ self.util = _cliPkgRequires.util;
         t2 = $.$get$vmChainGap(),
         t3 = type$.WhereIterable_String,
         lines = new A.WhereIterable(A._setArrayType(A.stringReplaceAllUnchecked(t1, t2, "").split("\n"), type$.JSArray_String), new A.Trace__parseVM_closure(), t3);
-      if (!lines.get$iterator(lines).moveNext$0())
+      if (!lines.get$iterator(0).moveNext$0())
         return A._setArrayType([], type$.JSArray_Frame);
-      t1 = A.TakeIterable_TakeIterable(lines, lines.get$length(lines) - 1, t3._eval$1("Iterable.E"));
+      t1 = A.TakeIterable_TakeIterable(lines, lines.get$length(0) - 1, t3._eval$1("Iterable.E"));
       t1 = A.MappedIterable_MappedIterable(t1, A.frame_Frame___parseVM_tearOff$closure(), A._instanceType(t1)._eval$1("Iterable.E"), type$.Frame);
       $frames = A.List_List$of(t1, true, A._instanceType(t1)._eval$1("Iterable.E"));
-      if (!J.endsWith$1$s(lines.get$last(lines), ".da"))
-        B.JSArray_methods.add$1($frames, A.Frame_Frame$parseVM(lines.get$last(lines)));
+      if (!J.endsWith$1$s(lines.get$last(0), ".da"))
+        B.JSArray_methods.add$1($frames, A.Frame_Frame$parseVM(lines.get$last(0)));
       return $frames;
     },
     Trace$parseV8(trace) {
@@ -18004,7 +19480,7 @@ self.util = _cliPkgRequires.util;
       this.$this = t0;
       this.url = t1;
     },
-    AsyncBuiltInCallable$mixin0($name, $arguments, callback, url) {
+    AsyncBuiltInCallable$mixin0($name, $arguments, callback, acceptsContent, url) {
       return new A.AsyncBuiltInCallable0($name, A.ScssParser$0("@mixin " + $name + "(" + $arguments + ") {", null, url).parseArgumentDeclaration$0(), new A.AsyncBuiltInCallable$mixin_closure0(callback), false);
     },
     AsyncBuiltInCallable0: function AsyncBuiltInCallable0(t0, t1, t2, t3) {
@@ -18017,10 +19493,10 @@ self.util = _cliPkgRequires.util;
     AsyncBuiltInCallable$mixin_closure0: function AsyncBuiltInCallable$mixin_closure0(t0) {
       this.callback = t0;
     },
-    compileAsync0(path, charset, fatalDeprecations, functions, futureDeprecations, importCache, indentWidth, lineFeed, logger, nodeImporter, quietDeps, sourceMap, style, syntax, useSpaces, verbose) {
+    compileAsync0(path, charset, fatalDeprecations, functions, futureDeprecations, importCache, indentWidth, lineFeed, logger, nodeImporter, quietDeps, silenceDeprecations, sourceMap, style, syntax, useSpaces, verbose) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.CompileResult_2),
-        $async$returnValue, t2, t3, t4, t0, stylesheet, result, t1;
+        $async$returnValue, t3, t4, t0, stylesheet, result, t1, t2;
       var $async$compileAsync0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -18028,8 +19504,17 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              t1 = type$.Deprecation_2;
-              logger = new A.DeprecationHandlingLogger0(A.LinkedHashMap_LinkedHashMap$_empty(t1, type$.int), logger, A.LinkedHashSet_LinkedHashSet$_empty(t1), A.LinkedHashSet_LinkedHashSet$_empty(t1), !verbose);
+              t1 = type$.Deprecation_3;
+              t2 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
+              if (silenceDeprecations != null)
+                t2.addAll$1(0, silenceDeprecations);
+              t3 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
+              if (fatalDeprecations != null)
+                t3.addAll$1(0, fatalDeprecations);
+              t1 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
+              if (futureDeprecations != null)
+                t1.addAll$1(0, futureDeprecations);
+              logger = A.DeprecationProcessingLogger$0(logger, t3, t1, !verbose, t2);
               t1 = nodeImporter == null;
               if (t1)
                 t2 = syntax == null || syntax === A.Syntax_forPath0(path);
@@ -18041,7 +19526,7 @@ self.util = _cliPkgRequires.util;
               // then
               if (importCache == null)
                 importCache = A.AsyncImportCache$none(logger);
-              t2 = A.absolute(".", null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+              t2 = $.$get$FilesystemImporter_cwd0();
               t3 = A.isNodeJs() ? self.process : null;
               if (!J.$eq$(t3 == null ? null : J.get$platform$x(t3), "win32")) {
                 t3 = A.isNodeJs() ? self.process : null;
@@ -18062,7 +19547,7 @@ self.util = _cliPkgRequires.util;
                 t3 = t0;
               }
               $async$goto = 6;
-              return A._asyncAwait(importCache.importCanonical$3$originalUrl(new A.FilesystemImporter0(t2), t4.toUri$1(t3), t4.toUri$1(path)), $async$compileAsync0);
+              return A._asyncAwait(importCache.importCanonical$3$originalUrl(t2, t4.toUri$1(t3), t4.toUri$1(path)), $async$compileAsync0);
             case 6:
               // returning from await.
               t4 = $async$result;
@@ -18079,7 +19564,7 @@ self.util = _cliPkgRequires.util;
             case 4:
               // join
               $async$goto = 7;
-              return A._asyncAwait(A._compileStylesheet2(stylesheet, logger, importCache, nodeImporter, new A.FilesystemImporter0(A.absolute(".", null, null, null, null, null, null, null, null, null, null, null, null, null, null)), functions, style, useSpaces, indentWidth, lineFeed, quietDeps, sourceMap, charset), $async$compileAsync0);
+              return A._asyncAwait(A._compileStylesheet2(stylesheet, logger, importCache, nodeImporter, $.$get$FilesystemImporter_cwd0(), functions, style, useSpaces, indentWidth, lineFeed, quietDeps, sourceMap, charset), $async$compileAsync0);
             case 7:
               // returning from await.
               result = $async$result;
@@ -18095,10 +19580,10 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$compileAsync0, $async$completer);
     },
-    compileStringAsync0(source, charset, functions, importCache, importer, indentWidth, lineFeed, logger, nodeImporter, quietDeps, sourceMap, style, syntax, url, useSpaces, verbose) {
+    compileStringAsync0(source, charset, fatalDeprecations, functions, futureDeprecations, importCache, importer, indentWidth, lineFeed, logger, nodeImporter, quietDeps, silenceDeprecations, sourceMap, style, syntax, url, useSpaces, verbose) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.CompileResult_2),
-        $async$returnValue, stylesheet, result, t1;
+        $async$returnValue, t3, stylesheet, result, t1, t2;
       var $async$compileStringAsync0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -18106,11 +19591,20 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              t1 = type$.Deprecation_2;
-              logger = new A.DeprecationHandlingLogger0(A.LinkedHashMap_LinkedHashMap$_empty(t1, type$.int), logger, A.LinkedHashSet_LinkedHashSet$_empty(t1), A.LinkedHashSet_LinkedHashSet$_empty(t1), !verbose);
+              t1 = type$.Deprecation_3;
+              t2 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
+              if (silenceDeprecations != null)
+                t2.addAll$1(0, silenceDeprecations);
+              t3 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
+              if (fatalDeprecations != null)
+                t3.addAll$1(0, fatalDeprecations);
+              t1 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
+              if (futureDeprecations != null)
+                t1.addAll$1(0, futureDeprecations);
+              logger = A.DeprecationProcessingLogger$0(logger, t3, t1, !verbose, t2);
               stylesheet = A.Stylesheet_Stylesheet$parse0(source, syntax == null ? B.Syntax_SCSS_scss0 : syntax, logger, url);
               if (importer == null)
-                t1 = A.isBrowser() ? new A.NoOpImporter0() : new A.FilesystemImporter0(A.absolute(".", null, null, null, null, null, null, null, null, null, null, null, null, null, null));
+                t1 = A.isBrowser() ? new A.NoOpImporter0() : $.$get$FilesystemImporter_cwd0();
               else
                 t1 = importer;
               $async$goto = 3;
@@ -18180,7 +19674,7 @@ self.util = _cliPkgRequires.util;
       return new A.AsyncEnvironment0(_modules, _namespaceNodes, _globalModules, _importedModules, _forwardedModules, _nestedForwardedModules, _allModules, _variables, _variableNodes, A.LinkedHashMap_LinkedHashMap$_empty(t1, t2), _functions, A.LinkedHashMap_LinkedHashMap$_empty(t1, t2), _mixins, A.LinkedHashMap_LinkedHashMap$_empty(t1, t2), _content);
     },
     _EnvironmentModule__EnvironmentModule2(environment, css, preModuleComments, extensionStore, forwarded) {
-      var t1, t2, t3, t4, t5, t6, module, comments, result, t7;
+      var t1, t2, t3, t4, t5, t6, module, result, t7;
       if (forwarded == null)
         forwarded = B.Set_empty6;
       t1 = type$.dynamic;
@@ -18188,8 +19682,7 @@ self.util = _cliPkgRequires.util;
       for (t2 = type$.Module_AsyncCallable_2, t3 = type$.List_CssComment_2, t4 = A.MapExtensions_get_pairs0(preModuleComments, t2, t3), t4 = t4.get$iterator(t4), t5 = type$.CssComment_2; t4.moveNext$0();) {
         t6 = t4.get$current(t4);
         module = t6._0;
-        comments = t6._1;
-        result = A.List_List$from(comments, false, t5);
+        result = A.List_List$from(t6._1, false, t5);
         result.fixed$length = Array;
         result.immutable$list = Array;
         t1.$indexSet(0, module, result);
@@ -18322,10 +19815,10 @@ self.util = _cliPkgRequires.util;
         t1 = type$.Uri,
         t2 = type$.Module_AsyncCallable_2,
         t3 = A._setArrayType([], type$.JSArray_Record_2_String_and_AstNode_2);
-      if (nodeImporter == null)
-        t4 = importCache == null ? A.AsyncImportCache$none(logger) : importCache;
+      if (importCache == null)
+        t4 = nodeImporter == null ? A.AsyncImportCache$none(logger) : null;
       else
-        t4 = null;
+        t4 = importCache;
       t1 = new A._EvaluateVisitor2(t4, nodeImporter, A.LinkedHashMap_LinkedHashMap$_empty(type$.String, type$.AsyncCallable_2), A.LinkedHashMap_LinkedHashMap$_empty(t1, t2), A.LinkedHashMap_LinkedHashMap$_empty(t1, t2), A.LinkedHashMap_LinkedHashMap$_empty(t1, type$.Configuration_2), A.LinkedHashMap_LinkedHashMap$_empty(t1, type$.AstNode_2), logger, A.LinkedHashSet_LinkedHashSet$_empty(type$.Record_2_String_and_SourceSpan), quietDeps, sourceMap, A.AsyncEnvironment$0(), A.LinkedHashSet_LinkedHashSet$_empty(t1), A.LinkedHashMap_LinkedHashMap$_empty(t1, type$.nullable_AstNode_2), t3, B.Configuration_Map_empty_null0);
       t1._EvaluateVisitor$6$functions$importCache$logger$nodeImporter$quietDeps$sourceMap2(functions, importCache, logger, nodeImporter, quietDeps, sourceMap);
       return t1;
@@ -18623,7 +20116,7 @@ self.util = _cliPkgRequires.util;
       _.environment = t3;
       _.children = t4;
     },
-    _EvaluateVisitor__applyMixin_closure9: function _EvaluateVisitor__applyMixin_closure9(t0, t1, t2, t3) {
+    _EvaluateVisitor__applyMixin_closure5: function _EvaluateVisitor__applyMixin_closure5(t0, t1, t2, t3) {
       var _ = this;
       _.$this = t0;
       _.$arguments = t1;
@@ -18637,10 +20130,7 @@ self.util = _cliPkgRequires.util;
       _.mixin = t2;
       _.nodeWithSpanWithoutContent = t3;
     },
-    _EvaluateVisitor__applyMixin_closure8: function _EvaluateVisitor__applyMixin_closure8(t0) {
-      this._1_0 = t0;
-    },
-    _EvaluateVisitor__applyMixin_closure10: function _EvaluateVisitor__applyMixin_closure10(t0, t1, t2, t3) {
+    _EvaluateVisitor__applyMixin_closure6: function _EvaluateVisitor__applyMixin_closure6(t0, t1, t2, t3) {
       var _ = this;
       _.$this = t0;
       _.contentCallable = t1;
@@ -18694,13 +20184,13 @@ self.util = _cliPkgRequires.util;
     _EvaluateVisitor_visitMediaRule_closure10: function _EvaluateVisitor_visitMediaRule_closure10(t0) {
       this.mergedSources = t0;
     },
-    _EvaluateVisitor_visitStyleRule_closure14: function _EvaluateVisitor_visitStyleRule_closure14(t0, t1) {
+    _EvaluateVisitor_visitStyleRule_closure11: function _EvaluateVisitor_visitStyleRule_closure11(t0, t1) {
       this.$this = t0;
       this.node = t1;
     },
-    _EvaluateVisitor_visitStyleRule_closure15: function _EvaluateVisitor_visitStyleRule_closure15() {
+    _EvaluateVisitor_visitStyleRule_closure12: function _EvaluateVisitor_visitStyleRule_closure12() {
     },
-    _EvaluateVisitor_visitStyleRule_closure16: function _EvaluateVisitor_visitStyleRule_closure16(t0, t1, t2) {
+    _EvaluateVisitor_visitStyleRule_closure14: function _EvaluateVisitor_visitStyleRule_closure14(t0, t1, t2) {
       this.$this = t0;
       this.rule = t1;
       this.node = t2;
@@ -18709,9 +20199,9 @@ self.util = _cliPkgRequires.util;
       this.$this = t0;
       this.node = t1;
     },
-    _EvaluateVisitor_visitStyleRule_closure17: function _EvaluateVisitor_visitStyleRule_closure17() {
+    _EvaluateVisitor_visitStyleRule_closure13: function _EvaluateVisitor_visitStyleRule_closure13() {
     },
-    _EvaluateVisitor_visitStyleRule_closure18: function _EvaluateVisitor_visitStyleRule_closure18() {
+    _EvaluateVisitor__warnForBogusCombinators_closure2: function _EvaluateVisitor__warnForBogusCombinators_closure2() {
     },
     _EvaluateVisitor_visitSupportsRule_closure5: function _EvaluateVisitor_visitSupportsRule_closure5(t0, t1) {
       this.$this = t0;
@@ -18760,12 +20250,6 @@ self.util = _cliPkgRequires.util;
       this.$this = t0;
       this.node = t1;
     },
-    _EvaluateVisitor__slash_closure5: function _EvaluateVisitor__slash_closure5(t0) {
-      this._1_0 = t0;
-    },
-    _EvaluateVisitor__slash_closure6: function _EvaluateVisitor__slash_closure6(t0) {
-      this._1_0 = t0;
-    },
     _EvaluateVisitor__slash_recommendation2: function _EvaluateVisitor__slash_recommendation2() {
     },
     _EvaluateVisitor_visitVariableExpression_closure2: function _EvaluateVisitor_visitVariableExpression_closure2(t0, t1) {
@@ -18801,9 +20285,6 @@ self.util = _cliPkgRequires.util;
       _.node = t2;
       _.inLegacySassFunction = t3;
     },
-    _EvaluateVisitor__checkAdjacentCalculationValues_closure2: function _EvaluateVisitor__checkAdjacentCalculationValues_closure2(t0) {
-      this._0_0 = t0;
-    },
     _EvaluateVisitor_visitInterpolatedFunctionExpression_closure2: function _EvaluateVisitor_visitInterpolatedFunctionExpression_closure2(t0, t1, t2) {
       this.$this = t0;
       this.node = t1;
@@ -18936,7 +20417,7 @@ self.util = _cliPkgRequires.util;
     _EvaluateVisitor_visitCssMediaRule_closure10: function _EvaluateVisitor_visitCssMediaRule_closure10(t0) {
       this.mergedSources = t0;
     },
-    _EvaluateVisitor_visitCssStyleRule_closure8: function _EvaluateVisitor_visitCssStyleRule_closure8(t0, t1, t2) {
+    _EvaluateVisitor_visitCssStyleRule_closure6: function _EvaluateVisitor_visitCssStyleRule_closure6(t0, t1, t2) {
       this.$this = t0;
       this.rule = t1;
       this.node = t2;
@@ -18945,10 +20426,7 @@ self.util = _cliPkgRequires.util;
       this.$this = t0;
       this.node = t1;
     },
-    _EvaluateVisitor_visitCssStyleRule_closure9: function _EvaluateVisitor_visitCssStyleRule_closure9() {
-    },
-    _EvaluateVisitor_visitCssStyleRule_closure10: function _EvaluateVisitor_visitCssStyleRule_closure10(t0) {
-      this._0_0 = t0;
+    _EvaluateVisitor_visitCssStyleRule_closure5: function _EvaluateVisitor_visitCssStyleRule_closure5() {
     },
     _EvaluateVisitor_visitCssSupportsRule_closure5: function _EvaluateVisitor_visitCssSupportsRule_closure5(t0, t1) {
       this.$this = t0;
@@ -19001,14 +20479,16 @@ self.util = _cliPkgRequires.util;
     },
     AsyncImportCache$(importers, loadPaths, logger, packageConfig) {
       var t1 = type$.nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl_2,
-        t2 = type$.Uri,
-        t3 = A.AsyncImportCache__toImporters0(importers, loadPaths, packageConfig);
-      return new A.AsyncImportCache0(t3, logger, A.LinkedHashMap_LinkedHashMap$_empty(type$.Record_2_Uri_and_bool_forImport, t1), A.LinkedHashMap_LinkedHashMap$_empty(type$.Record_4_Uri_and_AsyncImporter_baseImporter_and_nullable_Uri_baseUrl_and_bool_forImport_2, t1), A.LinkedHashMap_LinkedHashMap$_empty(t2, type$.nullable_Stylesheet_2), A.LinkedHashMap_LinkedHashMap$_empty(t2, type$.ImporterResult_2));
+        t2 = type$.Record_3_AsyncImporter_and_Uri_and_bool_forImport_2,
+        t3 = type$.Uri,
+        t4 = A.AsyncImportCache__toImporters0(importers, loadPaths, packageConfig);
+      return new A.AsyncImportCache0(t4, logger, A.LinkedHashMap_LinkedHashMap$_empty(type$.Record_2_Uri_and_bool_forImport, t1), A.LinkedHashMap_LinkedHashMap$_empty(t2, t1), A.LinkedHashMap_LinkedHashMap$_empty(t2, t3), A.LinkedHashMap_LinkedHashMap$_empty(t3, type$.nullable_Stylesheet_2), A.LinkedHashMap_LinkedHashMap$_empty(t3, type$.ImporterResult_2));
     },
     AsyncImportCache$none(logger) {
       var t1 = type$.nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl_2,
-        t2 = type$.Uri;
-      return new A.AsyncImportCache0(B.List_empty25, logger, A.LinkedHashMap_LinkedHashMap$_empty(type$.Record_2_Uri_and_bool_forImport, t1), A.LinkedHashMap_LinkedHashMap$_empty(type$.Record_4_Uri_and_AsyncImporter_baseImporter_and_nullable_Uri_baseUrl_and_bool_forImport_2, t1), A.LinkedHashMap_LinkedHashMap$_empty(t2, type$.nullable_Stylesheet_2), A.LinkedHashMap_LinkedHashMap$_empty(t2, type$.ImporterResult_2));
+        t2 = type$.Record_3_AsyncImporter_and_Uri_and_bool_forImport_2,
+        t3 = type$.Uri;
+      return new A.AsyncImportCache0(B.List_empty25, logger, A.LinkedHashMap_LinkedHashMap$_empty(type$.Record_2_Uri_and_bool_forImport, t1), A.LinkedHashMap_LinkedHashMap$_empty(t2, t1), A.LinkedHashMap_LinkedHashMap$_empty(t2, t3), A.LinkedHashMap_LinkedHashMap$_empty(t3, type$.nullable_Stylesheet_2), A.LinkedHashMap_LinkedHashMap$_empty(t3, type$.ImporterResult_2));
     },
     AsyncImportCache__toImporters0(importers, loadPaths, packageConfig) {
       var t1, t2, t3, t4, _i, path, _null = null,
@@ -19025,7 +20505,7 @@ self.util = _cliPkgRequires.util;
       if (loadPaths != null)
         for (t2 = J.get$iterator$ax(loadPaths); t2.moveNext$0();) {
           t3 = t2.get$current(t2);
-          t1.push(new A.FilesystemImporter0($.$get$context().absolute$15(t3, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null)));
+          t1.push(new A.FilesystemImporter0($.$get$context().absolute$15(t3, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null), false));
         }
       if (sassPath != null) {
         t2 = A.isNodeJs() ? self.process : _null;
@@ -19034,46 +20514,34 @@ self.util = _cliPkgRequires.util;
         _i = 0;
         for (; _i < t4; ++_i) {
           path = t3[_i];
-          t1.push(new A.FilesystemImporter0($.$get$context().absolute$15(path, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null)));
+          t1.push(new A.FilesystemImporter0($.$get$context().absolute$15(path, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null), false));
         }
       }
       return t1;
     },
-    AsyncImportCache0: function AsyncImportCache0(t0, t1, t2, t3, t4, t5) {
+    AsyncImportCache0: function AsyncImportCache0(t0, t1, t2, t3, t4, t5, t6) {
       var _ = this;
       _._async_import_cache0$_importers = t0;
       _._async_import_cache0$_logger = t1;
       _._async_import_cache0$_canonicalizeCache = t2;
-      _._async_import_cache0$_relativeCanonicalizeCache = t3;
-      _._async_import_cache0$_importCache = t4;
-      _._async_import_cache0$_resultsCache = t5;
+      _._async_import_cache0$_perImporterCanonicalizeCache = t3;
+      _._async_import_cache0$_nonCanonicalRelativeUrls = t4;
+      _._async_import_cache0$_importCache = t5;
+      _._async_import_cache0$_resultsCache = t6;
     },
-    AsyncImportCache_canonicalize_closure1: function AsyncImportCache_canonicalize_closure1(t0, t1, t2, t3, t4) {
+    AsyncImportCache_canonicalize_closure0: function AsyncImportCache_canonicalize_closure0(t0, t1, t2, t3, t4, t5, t6) {
       var _ = this;
       _.$this = t0;
       _.baseImporter = t1;
-      _.baseUrl = t2;
-      _.url = t3;
+      _.resolvedUrl = t2;
+      _.baseUrl = t3;
       _.forImport = t4;
+      _.key = t5;
+      _.url = t6;
     },
-    AsyncImportCache_canonicalize_closure2: function AsyncImportCache_canonicalize_closure2(t0, t1, t2, t3) {
-      var _ = this;
-      _.$this = t0;
-      _.url = t1;
-      _.baseUrl = t2;
-      _.forImport = t3;
-    },
-    AsyncImportCache__canonicalize_closure1: function AsyncImportCache__canonicalize_closure1(t0, t1) {
+    AsyncImportCache__canonicalize_closure0: function AsyncImportCache__canonicalize_closure0(t0, t1) {
       this.importer = t0;
-      this.resolved = t1;
-    },
-    AsyncImportCache__canonicalize__closure0: function AsyncImportCache__canonicalize__closure0(t0, t1) {
-      this.importer = t0;
-      this.resolved = t1;
-    },
-    AsyncImportCache__canonicalize_closure2: function AsyncImportCache__canonicalize_closure2(t0, t1) {
-      this.importer = t0;
-      this.resolved = t1;
+      this.url = t1;
     },
     AsyncImportCache_importCanonical_closure0: function AsyncImportCache_importCanonical_closure0(t0, t1, t2, t3, t4) {
       var _ = this;
@@ -19282,11 +20750,8 @@ self.util = _cliPkgRequires.util;
           t1 = arg instanceof A.SassString0 && !arg._string0$_hasQuotes;
         else
           t1 = true;
-        if (t1) {
-          t1 = true;
+        if (t1)
           break $label0$0;
-        }
-        t1 = false;
         break $label0$0;
       }
       return t1;
@@ -19335,29 +20800,15 @@ self.util = _cliPkgRequires.util;
     calculationInterpolationClass__closure2: function calculationInterpolationClass__closure2() {
     },
     SassCalculation_calc0(argument) {
-      var value, t1,
+      var t1,
         _0_0 = A.SassCalculation__simplify0(argument);
       $label0$0: {
         if (_0_0 instanceof A.SassNumber0) {
-          value = _0_0;
-          t1 = true;
-        } else {
-          value = null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = value;
+          t1 = _0_0;
           break $label0$0;
         }
         if (_0_0 instanceof A.SassCalculation0) {
-          value = _0_0;
-          t1 = true;
-        } else {
-          value = null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = value;
+          t1 = _0_0;
           break $label0$0;
         }
         t1 = new A.SassCalculation0("calc", A.List_List$unmodifiable([_0_0], type$.Object));
@@ -19367,7 +20818,7 @@ self.util = _cliPkgRequires.util;
     },
     SassCalculation_min0($arguments) {
       var minimum, _i, arg, t2,
-        args = A.List_List$unmodifiable(J.map$1$1$ax($arguments, A.calculation0_SassCalculation__simplify$closure(), type$.dynamic), type$.Object),
+        args = A.List_List$unmodifiable(new A.MappedListIterable($arguments, A.calculation0_SassCalculation__simplify$closure(), A._arrayInstanceType($arguments)._eval$1("MappedListIterable<1,@>")), type$.Object),
         t1 = args.length;
       if (t1 === 0)
         throw A.wrapException(A.ArgumentError$("min() must have at least one argument.", null));
@@ -19390,7 +20841,7 @@ self.util = _cliPkgRequires.util;
     },
     SassCalculation_max0($arguments) {
       var maximum, _i, arg, t2,
-        args = A.List_List$unmodifiable(J.map$1$1$ax($arguments, A.calculation0_SassCalculation__simplify$closure(), type$.dynamic), type$.Object),
+        args = A.List_List$unmodifiable(new A.MappedListIterable($arguments, A.calculation0_SassCalculation__simplify$closure(), A._arrayInstanceType($arguments)._eval$1("MappedListIterable<1,@>")), type$.Object),
         t1 = args.length;
       if (t1 === 0)
         throw A.wrapException(A.ArgumentError$("max() must have at least one argument.", null));
@@ -19413,7 +20864,7 @@ self.util = _cliPkgRequires.util;
     },
     SassCalculation_hypot0($arguments) {
       var first, subtotal, i, number, value, t2, t3,
-        args = A.List_List$unmodifiable(B.JSArray_methods.map$1$1($arguments, A.calculation0_SassCalculation__simplify$closure(), type$.dynamic), type$.Object),
+        args = A.List_List$unmodifiable(new A.MappedListIterable($arguments, A.calculation0_SassCalculation__simplify$closure(), A._arrayInstanceType($arguments)._eval$1("MappedListIterable<1,@>")), type$.Object),
         t1 = args.length;
       if (t1 === 0)
         throw A.wrapException(A.ArgumentError$("hypot() must have at least one argument.", null));
@@ -19435,15 +20886,11 @@ self.util = _cliPkgRequires.util;
       return A.SassNumber_SassNumber$withUnits0(t1, t2.get$denominatorUnits(first), t3);
     },
     SassCalculation_abs0(argument) {
-      var t1, t2;
       argument = A.SassCalculation__simplify0(argument);
       if (!(argument instanceof A.SassNumber0))
         return new A.SassCalculation0("abs", A._setArrayType([argument], type$.JSArray_Object));
-      if (argument.hasUnit$1("%")) {
-        t1 = argument.toString$0(0);
-        t2 = argument.toString$0(0);
-        A.EvaluationContext_current0().warn$2(0, string$.Passinp + t1 + ")\nTo emit a CSS abs() now: abs(#{" + t2 + string$.x7d__Mor, B.Deprecation_la6);
-      }
+      if (argument.hasUnit$1("%"))
+        A.warnForDeprecation0(string$.Passinp + argument.toString$0(0) + ")\nTo emit a CSS abs() now: abs(#{" + argument.toString$0(0) + string$.x7d__Mor, B.Deprecation_jYb);
       return A.SassNumber_SassNumber0(Math.abs(argument._number1$_value), null).coerceToMatch$1(argument);
     },
     SassCalculation_exp0(argument) {
@@ -19454,14 +20901,17 @@ self.util = _cliPkgRequires.util;
       return A.pow1(A.SassNumber_SassNumber0(2.718281828459045, null), argument);
     },
     SassCalculation_sign0(argument) {
-      var _0_2, t1, t2, arg;
+      var t1, _0_2, t2, arg;
       argument = A.SassCalculation__simplify0(argument);
-      _0_2 = A._InitializedCell$(new A.SassCalculation_sign_closure0(argument));
       $label0$0: {
         t1 = argument instanceof A.SassNumber0;
-        if (t1)
-          t2 = isNaN(_0_2._readFinal$0()) || 0 === _0_2._readFinal$0();
-        else
+        if (t1) {
+          _0_2 = argument._number1$_value;
+          if (!isNaN(_0_2))
+            t2 = 0 === _0_2;
+          else
+            t2 = true;
+        } else
           t2 = false;
         if (t2) {
           t1 = argument;
@@ -19590,23 +21040,38 @@ self.util = _cliPkgRequires.util;
       return dividend.modulo$1(modulus);
     },
     SassCalculation_round0(strategyOrNumber, numberOrStep, step) {
-      var number, t1, t2, strategy, rest, _null = null, _s5_ = "round",
-        _0_0 = new A._Record_3(A.SassCalculation__simplify0(strategyOrNumber), A.NullableExtension_andThen0(numberOrStep, A.calculation0_SassCalculation__simplify$closure()), A.NullableExtension_andThen0(step, A.calculation0_SassCalculation__simplify$closure())),
-        _0_1 = A._InitializedCell$(new A.SassCalculation_round_closure9(_0_0)),
-        _0_2 = A._InitializedCell$(new A.SassCalculation_round_closure10(_0_0)),
-        _0_4 = A._InitializedCell$(new A.SassCalculation_round_closure11(_0_2)),
-        _0_5 = A._InitializedCell$(new A.SassCalculation_round_closure12(_0_0)),
-        _0_6 = A._InitializedCell$(new A.SassCalculation_round_closure13(_0_5)),
-        _0_8 = A._InitializedCell$(new A.SassCalculation_round_closure14(_0_1)),
-        _0_10 = A._InitializedCell$(new A.SassCalculation_round_closure15(_0_8)),
-        _0_12 = A._InitializedCell$(new A.SassCalculation_round_closure16(_0_8)),
-        _0_14 = A._InitializedCell$(new A.SassCalculation_round_closure17(_0_8)),
-        _0_16 = A._InitializedCell$(new A.SassCalculation_round_closure18(_0_8));
-      if (_0_1._readFinal$0() instanceof A.SassNumber0) {
-        number = _0_1._readFinal$0();
-        t1 = _0_4._readFinal$0() && _0_6._readFinal$0();
+      var _0_4, _0_5_isSet, _0_20, _0_6, t1, _0_50, _0_6_isSet, number, t2, _0_2_isSet, _0_10_isSet, _0_8, _0_12_isSet, _0_12, _0_14_isSet, _0_14, _0_16_isSet, _0_16, t3, strategy, _0_8_isSet, t4, rest, _null = null, _s5_ = "round",
+        _0_1 = A.SassCalculation__simplify0(strategyOrNumber),
+        _0_2 = A.NullableExtension_andThen0(numberOrStep, A.calculation0_SassCalculation__simplify$closure()),
+        _0_5 = A.NullableExtension_andThen0(step, A.calculation0_SassCalculation__simplify$closure()),
+        _0_10 = _0_1,
+        _0_4_isSet = _0_1 instanceof A.SassNumber0;
+      if (_0_4_isSet) {
+        type$.SassNumber_2._as(_0_10);
+        _0_4 = _0_2 == null;
+        _0_5_isSet = _0_4;
+        _0_20 = _0_2;
+        if (_0_5_isSet) {
+          _0_6 = _0_5 == null;
+          t1 = _0_6;
+          _0_50 = _0_5;
+        } else {
+          _0_50 = _null;
+          _0_6 = _0_50;
+          t1 = false;
+        }
+        _0_6_isSet = _0_5_isSet;
+        number = _0_10;
+        _0_1 = number;
       } else {
         number = _null;
+        _0_50 = number;
+        _0_6 = _0_50;
+        _0_20 = _0_6;
+        _0_4 = _0_20;
+        _0_1 = _0_10;
+        _0_6_isSet = false;
+        _0_5_isSet = false;
         t1 = false;
       }
       if (t1) {
@@ -19614,18 +21079,50 @@ self.util = _cliPkgRequires.util;
         t2 = number.get$numeratorUnits(number);
         return A.SassNumber_SassNumber$withUnits0(t1, number.get$denominatorUnits(number), t2);
       }
-      if (_0_1._readFinal$0() instanceof A.SassNumber0) {
-        number = _0_1._readFinal$0();
-        if (_0_2._readFinal$0() instanceof A.SassNumber0) {
-          step = _0_2._readFinal$0();
-          t1 = _0_6._readFinal$0() && !number.hasCompatibleUnits$1(step);
+      if (_0_1 instanceof A.SassNumber0) {
+        if (_0_4_isSet) {
+          t1 = _0_20;
+          _0_2_isSet = _0_4_isSet;
+        } else {
+          t1 = _0_2;
+          _0_20 = t1;
+          _0_2_isSet = true;
+        }
+        if (t1 instanceof A.SassNumber0) {
+          if (_0_2_isSet)
+            t1 = _0_20;
+          else {
+            t1 = _0_2;
+            _0_20 = t1;
+            _0_2_isSet = true;
+          }
+          type$.SassNumber_2._as(t1);
+          if (_0_6_isSet)
+            t2 = _0_6;
+          else {
+            if (_0_5_isSet)
+              t2 = _0_50;
+            else {
+              t2 = _0_5;
+              _0_50 = t2;
+              _0_5_isSet = true;
+            }
+            _0_6 = t2 == null;
+            t2 = _0_6;
+            _0_6_isSet = true;
+          }
+          t2 = t2 && !_0_1.hasCompatibleUnits$1(t1);
+          step = t1;
+          t1 = t2;
         } else {
           step = _null;
           t1 = false;
         }
+        number = _0_1;
       } else {
         step = _null;
         number = step;
+        _0_2_isSet = _0_4_isSet;
         t1 = false;
       }
       if (t1) {
@@ -19633,16 +21130,44 @@ self.util = _cliPkgRequires.util;
         A.SassCalculation__verifyCompatibleNumbers0(A._setArrayType([number, step], t1));
         return new A.SassCalculation0(_s5_, A._setArrayType([number, step], t1));
       }
-      if (_0_1._readFinal$0() instanceof A.SassNumber0) {
-        number = _0_1._readFinal$0();
-        if (_0_2._readFinal$0() instanceof A.SassNumber0) {
-          step = _0_2._readFinal$0();
-          t1 = _0_6._readFinal$0();
-          t1 = t1;
+      if (_0_1 instanceof A.SassNumber0) {
+        if (_0_2_isSet)
+          t1 = _0_20;
+        else {
+          t1 = _0_2;
+          _0_20 = t1;
+          _0_2_isSet = true;
+        }
+        if (t1 instanceof A.SassNumber0) {
+          if (_0_2_isSet)
+            t1 = _0_20;
+          else {
+            t1 = _0_2;
+            _0_20 = t1;
+            _0_2_isSet = true;
+          }
+          type$.SassNumber_2._as(t1);
+          if (_0_6_isSet)
+            t2 = _0_6;
+          else {
+            if (_0_5_isSet)
+              t2 = _0_50;
+            else {
+              t2 = _0_5;
+              _0_50 = t2;
+              _0_5_isSet = true;
+            }
+            _0_6 = t2 == null;
+            t2 = _0_6;
+            _0_6_isSet = true;
+          }
+          step = t1;
+          t1 = t2;
         } else {
           step = _null;
           t1 = false;
         }
+        number = _0_1;
       } else {
         step = _null;
         number = step;
@@ -19652,33 +21177,108 @@ self.util = _cliPkgRequires.util;
         A.SassCalculation__verifyCompatibleNumbers0(A._setArrayType([number, step], type$.JSArray_Object));
         return A.SassCalculation__roundWithStep0("nearest", number, step);
       }
-      if (_0_1._readFinal$0() instanceof A.SassString0)
-        if (_0_10._readFinal$0() || _0_12._readFinal$0() || _0_14._readFinal$0() || _0_16._readFinal$0()) {
-          strategy = _0_1._readFinal$0();
-          if (_0_2._readFinal$0() instanceof A.SassNumber0) {
-            number = _0_2._readFinal$0();
-            if (_0_5._readFinal$0() instanceof A.SassNumber0) {
-              step = _0_5._readFinal$0();
-              t1 = !number.hasCompatibleUnits$1(step);
+      _0_10_isSet = _0_1 instanceof A.SassString0;
+      if (_0_10_isSet) {
+        _0_8 = _0_1._string0$_text;
+        t1 = _0_8;
+        _0_10 = "nearest" === t1;
+        t1 = _0_10;
+        _0_12_isSet = !t1;
+        if (_0_12_isSet) {
+          _0_12 = "up" === _0_8;
+          t1 = _0_12;
+          _0_14_isSet = !t1;
+          if (_0_14_isSet) {
+            _0_14 = "down" === _0_8;
+            t1 = _0_14;
+            _0_16_isSet = !t1;
+            if (_0_16_isSet) {
+              _0_16 = "to-zero" === _0_8;
+              t1 = _0_16;
+            } else {
+              _0_16 = _null;
+              t1 = true;
+            }
+          } else {
+            _0_16 = _null;
+            _0_14 = _0_16;
+            _0_16_isSet = false;
+            t1 = true;
+          }
+        } else {
+          _0_16 = _null;
+          _0_14 = _0_16;
+          _0_12 = _0_14;
+          _0_14_isSet = false;
+          _0_16_isSet = false;
+          t1 = true;
+        }
+        if (t1) {
+          if (_0_2_isSet)
+            t1 = _0_20;
+          else {
+            t1 = _0_2;
+            _0_20 = t1;
+            _0_2_isSet = true;
+          }
+          if (t1 instanceof A.SassNumber0) {
+            if (_0_2_isSet)
+              t1 = _0_20;
+            else {
+              t1 = _0_2;
+              _0_20 = t1;
+              _0_2_isSet = true;
+            }
+            t2 = type$.SassNumber_2;
+            t2._as(t1);
+            if (_0_5_isSet)
+              t3 = _0_50;
+            else {
+              t3 = _0_5;
+              _0_50 = t3;
+              _0_5_isSet = true;
+            }
+            if (t3 instanceof A.SassNumber0) {
+              if (_0_5_isSet)
+                t3 = _0_50;
+              else {
+                t3 = _0_5;
+                _0_50 = t3;
+                _0_5_isSet = true;
+              }
+              t2._as(t3);
+              t2 = !t1.hasCompatibleUnits$1(t3);
+              step = t3;
             } else {
               step = _null;
-              t1 = false;
+              t2 = false;
             }
+            number = t1;
+            t1 = t2;
           } else {
             step = _null;
             number = step;
             t1 = false;
           }
+          strategy = _0_1;
         } else {
           step = _null;
           number = step;
           strategy = number;
           t1 = false;
         }
-      else {
+      } else {
         step = _null;
         number = step;
         strategy = number;
+        _0_16 = strategy;
+        _0_14 = _0_16;
+        _0_12 = _0_14;
+        _0_8 = _0_12;
+        _0_10 = _0_8;
+        _0_12_isSet = false;
+        _0_14_isSet = false;
+        _0_16_isSet = false;
         t1 = false;
       }
       if (t1) {
@@ -19686,129 +21286,672 @@ self.util = _cliPkgRequires.util;
         A.SassCalculation__verifyCompatibleNumbers0(A._setArrayType([number, step], t1));
         return new A.SassCalculation0(_s5_, A._setArrayType([strategy, number, step], t1));
       }
-      if (_0_1._readFinal$0() instanceof A.SassString0)
-        if (_0_10._readFinal$0() || _0_12._readFinal$0() || _0_14._readFinal$0() || _0_16._readFinal$0()) {
-          strategy = _0_1._readFinal$0();
-          if (_0_2._readFinal$0() instanceof A.SassNumber0) {
-            number = _0_2._readFinal$0();
-            if (_0_5._readFinal$0() instanceof A.SassNumber0) {
-              step = _0_5._readFinal$0();
-              t1 = true;
-            } else {
-              step = _null;
-              t1 = false;
+      if (_0_1 instanceof A.SassString0) {
+        if (_0_10_isSet) {
+          t1 = _0_10;
+          _0_8_isSet = _0_10_isSet;
+        } else {
+          _0_8 = _0_1._string0$_text;
+          t1 = _0_8;
+          _0_10 = "nearest" === t1;
+          t1 = _0_10;
+          _0_10_isSet = true;
+          _0_8_isSet = true;
+        }
+        if (!t1) {
+          if (_0_12_isSet)
+            t1 = _0_12;
+          else {
+            if (_0_8_isSet)
+              t1 = _0_8;
+            else {
+              _0_8 = _0_1._string0$_text;
+              t1 = _0_8;
+              _0_8_isSet = true;
             }
+            _0_12 = "up" === t1;
+            t1 = _0_12;
+            _0_12_isSet = true;
+          }
+          if (!t1) {
+            if (_0_14_isSet)
+              t1 = _0_14;
+            else {
+              if (_0_8_isSet)
+                t1 = _0_8;
+              else {
+                _0_8 = _0_1._string0$_text;
+                t1 = _0_8;
+                _0_8_isSet = true;
+              }
+              _0_14 = "down" === t1;
+              t1 = _0_14;
+              _0_14_isSet = true;
+            }
+            if (!t1)
+              if (_0_16_isSet)
+                t1 = _0_16;
+              else {
+                if (_0_8_isSet)
+                  t1 = _0_8;
+                else {
+                  _0_8 = _0_1._string0$_text;
+                  t1 = _0_8;
+                  _0_8_isSet = true;
+                }
+                _0_16 = "to-zero" === t1;
+                t1 = _0_16;
+                _0_16_isSet = true;
+              }
+            else
+              t1 = true;
+          } else
+            t1 = true;
+        } else
+          t1 = true;
+        if (t1) {
+          if (_0_2_isSet)
+            t1 = _0_20;
+          else {
+            t1 = _0_2;
+            _0_20 = t1;
+            _0_2_isSet = true;
+          }
+          if (t1 instanceof A.SassNumber0) {
+            if (_0_2_isSet)
+              t1 = _0_20;
+            else {
+              t1 = _0_2;
+              _0_20 = t1;
+              _0_2_isSet = true;
+            }
+            t2 = type$.SassNumber_2;
+            t2._as(t1);
+            if (_0_5_isSet)
+              t3 = _0_50;
+            else {
+              t3 = _0_5;
+              _0_50 = t3;
+              _0_5_isSet = true;
+            }
+            t3 = t3 instanceof A.SassNumber0;
+            if (t3) {
+              if (_0_5_isSet)
+                t4 = _0_50;
+              else {
+                t4 = _0_5;
+                _0_50 = t4;
+                _0_5_isSet = true;
+              }
+              t2._as(t4);
+              step = t4;
+            } else
+              step = _null;
+            t2 = t3;
+            number = t1;
+            t1 = t2;
           } else {
             step = _null;
             number = step;
             t1 = false;
           }
+          strategy = _0_1;
         } else {
           step = _null;
           number = step;
           strategy = number;
           t1 = false;
         }
-      else {
+      } else {
         step = _null;
         number = step;
         strategy = number;
+        _0_8_isSet = _0_10_isSet;
         t1 = false;
       }
       if (t1) {
         A.SassCalculation__verifyCompatibleNumbers0(A._setArrayType([number, step], type$.JSArray_Object));
         return A.SassCalculation__roundWithStep0(strategy._string0$_text, number, step);
       }
-      if (_0_1._readFinal$0() instanceof A.SassString0)
-        if (_0_10._readFinal$0() || _0_12._readFinal$0() || _0_14._readFinal$0() || _0_16._readFinal$0()) {
-          strategy = _0_1._readFinal$0();
-          if (_0_2._readFinal$0() instanceof A.SassString0) {
-            rest = _0_2._readFinal$0();
-            t1 = _0_6._readFinal$0();
-            t1 = t1;
+      if (_0_1 instanceof A.SassString0) {
+        if (_0_10_isSet)
+          t1 = _0_10;
+        else {
+          if (_0_8_isSet)
+            t1 = _0_8;
+          else {
+            _0_8 = _0_1._string0$_text;
+            t1 = _0_8;
+            _0_8_isSet = true;
+          }
+          _0_10 = "nearest" === t1;
+          t1 = _0_10;
+          _0_10_isSet = true;
+        }
+        if (!t1) {
+          if (_0_12_isSet)
+            t1 = _0_12;
+          else {
+            if (_0_8_isSet)
+              t1 = _0_8;
+            else {
+              _0_8 = _0_1._string0$_text;
+              t1 = _0_8;
+              _0_8_isSet = true;
+            }
+            _0_12 = "up" === t1;
+            t1 = _0_12;
+            _0_12_isSet = true;
+          }
+          if (!t1) {
+            if (_0_14_isSet)
+              t1 = _0_14;
+            else {
+              if (_0_8_isSet)
+                t1 = _0_8;
+              else {
+                _0_8 = _0_1._string0$_text;
+                t1 = _0_8;
+                _0_8_isSet = true;
+              }
+              _0_14 = "down" === t1;
+              t1 = _0_14;
+              _0_14_isSet = true;
+            }
+            if (!t1)
+              if (_0_16_isSet)
+                t1 = _0_16;
+              else {
+                if (_0_8_isSet)
+                  t1 = _0_8;
+                else {
+                  _0_8 = _0_1._string0$_text;
+                  t1 = _0_8;
+                  _0_8_isSet = true;
+                }
+                _0_16 = "to-zero" === t1;
+                t1 = _0_16;
+                _0_16_isSet = true;
+              }
+            else
+              t1 = true;
+          } else
+            t1 = true;
+        } else
+          t1 = true;
+        if (t1) {
+          if (_0_2_isSet)
+            t1 = _0_20;
+          else {
+            t1 = _0_2;
+            _0_20 = t1;
+            _0_2_isSet = true;
+          }
+          if (t1 instanceof A.SassString0) {
+            if (_0_2_isSet)
+              t1 = _0_20;
+            else {
+              t1 = _0_2;
+              _0_20 = t1;
+              _0_2_isSet = true;
+            }
+            type$.SassString_2._as(t1);
+            if (_0_6_isSet)
+              t2 = _0_6;
+            else {
+              if (_0_5_isSet)
+                t2 = _0_50;
+              else {
+                t2 = _0_5;
+                _0_50 = t2;
+                _0_5_isSet = true;
+              }
+              _0_6 = t2 == null;
+              t2 = _0_6;
+              _0_6_isSet = true;
+            }
+            rest = t1;
+            t1 = t2;
           } else {
             rest = _null;
             t1 = false;
           }
+          strategy = _0_1;
         } else {
           rest = _null;
           strategy = rest;
           t1 = false;
         }
-      else {
+      } else {
         rest = _null;
         strategy = rest;
         t1 = false;
       }
       if (t1)
         return new A.SassCalculation0(_s5_, A._setArrayType([strategy, rest], type$.JSArray_Object));
-      if (_0_1._readFinal$0() instanceof A.SassString0)
-        if (_0_10._readFinal$0() || _0_12._readFinal$0() || _0_14._readFinal$0() || _0_16._readFinal$0())
-          t1 = _0_2._readFinal$0() != null && true && _0_6._readFinal$0();
-        else
+      if (_0_1 instanceof A.SassString0) {
+        if (_0_10_isSet)
+          t1 = _0_10;
+        else {
+          if (_0_8_isSet)
+            t1 = _0_8;
+          else {
+            _0_8 = _0_1._string0$_text;
+            t1 = _0_8;
+            _0_8_isSet = true;
+          }
+          _0_10 = "nearest" === t1;
+          t1 = _0_10;
+          _0_10_isSet = true;
+        }
+        if (!t1) {
+          if (_0_12_isSet)
+            t1 = _0_12;
+          else {
+            if (_0_8_isSet)
+              t1 = _0_8;
+            else {
+              _0_8 = _0_1._string0$_text;
+              t1 = _0_8;
+              _0_8_isSet = true;
+            }
+            _0_12 = "up" === t1;
+            t1 = _0_12;
+            _0_12_isSet = true;
+          }
+          if (!t1) {
+            if (_0_14_isSet)
+              t1 = _0_14;
+            else {
+              if (_0_8_isSet)
+                t1 = _0_8;
+              else {
+                _0_8 = _0_1._string0$_text;
+                t1 = _0_8;
+                _0_8_isSet = true;
+              }
+              _0_14 = "down" === t1;
+              t1 = _0_14;
+              _0_14_isSet = true;
+            }
+            if (!t1)
+              if (_0_16_isSet)
+                t1 = _0_16;
+              else {
+                if (_0_8_isSet)
+                  t1 = _0_8;
+                else {
+                  _0_8 = _0_1._string0$_text;
+                  t1 = _0_8;
+                  _0_8_isSet = true;
+                }
+                _0_16 = "to-zero" === t1;
+                t1 = _0_16;
+                _0_16_isSet = true;
+              }
+            else
+              t1 = true;
+          } else
+            t1 = true;
+        } else
+          t1 = true;
+        if (t1) {
+          if (_0_2_isSet)
+            t1 = _0_20;
+          else {
+            t1 = _0_2;
+            _0_20 = t1;
+            _0_2_isSet = true;
+          }
+          if (t1 != null)
+            if (_0_6_isSet)
+              t1 = _0_6;
+            else {
+              if (_0_5_isSet)
+                t1 = _0_50;
+              else {
+                t1 = _0_5;
+                _0_50 = t1;
+                _0_5_isSet = true;
+              }
+              _0_6 = t1 == null;
+              t1 = _0_6;
+              _0_6_isSet = true;
+            }
+          else
+            t1 = false;
+        } else
           t1 = false;
-      else
+      } else
         t1 = false;
       if (t1)
         throw A.wrapException(A.SassScriptException$0(string$.If_str, _null));
-      if (_0_1._readFinal$0() instanceof A.SassString0)
-        t1 = (_0_10._readFinal$0() || _0_12._readFinal$0() || _0_14._readFinal$0() || _0_16._readFinal$0()) && _0_4._readFinal$0() && _0_6._readFinal$0();
-      else
+      if (_0_1 instanceof A.SassString0) {
+        if (_0_10_isSet)
+          t1 = _0_10;
+        else {
+          if (_0_8_isSet)
+            t1 = _0_8;
+          else {
+            _0_8 = _0_1._string0$_text;
+            t1 = _0_8;
+            _0_8_isSet = true;
+          }
+          _0_10 = "nearest" === t1;
+          t1 = _0_10;
+          _0_10_isSet = true;
+        }
+        if (!t1) {
+          if (_0_12_isSet)
+            t1 = _0_12;
+          else {
+            if (_0_8_isSet)
+              t1 = _0_8;
+            else {
+              _0_8 = _0_1._string0$_text;
+              t1 = _0_8;
+              _0_8_isSet = true;
+            }
+            _0_12 = "up" === t1;
+            t1 = _0_12;
+            _0_12_isSet = true;
+          }
+          if (!t1) {
+            if (_0_14_isSet)
+              t1 = _0_14;
+            else {
+              if (_0_8_isSet)
+                t1 = _0_8;
+              else {
+                _0_8 = _0_1._string0$_text;
+                t1 = _0_8;
+                _0_8_isSet = true;
+              }
+              _0_14 = "down" === t1;
+              t1 = _0_14;
+              _0_14_isSet = true;
+            }
+            if (!t1)
+              if (_0_16_isSet)
+                t1 = _0_16;
+              else {
+                if (_0_8_isSet)
+                  t1 = _0_8;
+                else {
+                  _0_8 = _0_1._string0$_text;
+                  t1 = _0_8;
+                  _0_8_isSet = true;
+                }
+                _0_16 = "to-zero" === t1;
+                t1 = _0_16;
+                _0_16_isSet = true;
+              }
+            else
+              t1 = true;
+          } else
+            t1 = true;
+        } else
+          t1 = true;
+        if (t1) {
+          if (_0_4_isSet)
+            t1 = _0_4;
+          else {
+            if (_0_2_isSet)
+              t1 = _0_20;
+            else {
+              t1 = _0_2;
+              _0_20 = t1;
+              _0_2_isSet = true;
+            }
+            _0_4 = t1 == null;
+            t1 = _0_4;
+            _0_4_isSet = true;
+          }
+          if (t1)
+            if (_0_6_isSet)
+              t1 = _0_6;
+            else {
+              if (_0_5_isSet)
+                t1 = _0_50;
+              else {
+                t1 = _0_5;
+                _0_50 = t1;
+                _0_5_isSet = true;
+              }
+              _0_6 = t1 == null;
+              t1 = _0_6;
+              _0_6_isSet = true;
+            }
+          else
+            t1 = false;
+        } else
+          t1 = false;
+      } else
         t1 = false;
       if (t1)
         throw A.wrapException(A.SassScriptException$0(string$.Number, _null));
-      if (_0_1._readFinal$0() instanceof A.SassString0) {
-        rest = _0_1._readFinal$0();
-        t1 = _0_4._readFinal$0() && _0_6._readFinal$0();
+      if (_0_1 instanceof A.SassString0) {
+        if (_0_4_isSet)
+          t1 = _0_4;
+        else {
+          if (_0_2_isSet)
+            t1 = _0_20;
+          else {
+            t1 = _0_2;
+            _0_20 = t1;
+            _0_2_isSet = true;
+          }
+          _0_4 = t1 == null;
+          t1 = _0_4;
+          _0_4_isSet = true;
+        }
+        if (t1)
+          if (_0_6_isSet)
+            t1 = _0_6;
+          else {
+            if (_0_5_isSet)
+              t1 = _0_50;
+            else {
+              t1 = _0_5;
+              _0_50 = t1;
+              _0_5_isSet = true;
+            }
+            _0_6 = t1 == null;
+            t1 = _0_6;
+            _0_6_isSet = true;
+          }
+        else
+          t1 = false;
+        rest = _0_1;
       } else {
         rest = _null;
         t1 = false;
       }
       if (t1)
         return new A.SassCalculation0(_s5_, A._setArrayType([rest], type$.JSArray_Object));
-      number = _0_1._readFinal$0();
-      if (_0_4._readFinal$0() && _0_6._readFinal$0())
-        throw A.wrapException(A.SassScriptException$0("Single argument " + A.S(number) + " expected to be simplifiable.", _null));
-      number = _0_1._readFinal$0();
-      if (_0_2._readFinal$0() != null) {
-        step = _0_2._readFinal$0();
-        t1 = true;
+      if (_0_4_isSet)
+        t1 = _0_4;
+      else {
+        if (_0_2_isSet)
+          t1 = _0_20;
+        else {
+          t1 = _0_2;
+          _0_20 = t1;
+          _0_2_isSet = true;
+        }
+        _0_4 = t1 == null;
+        t1 = _0_4;
+      }
+      if (t1)
+        if (_0_6_isSet)
+          t1 = _0_6;
+        else {
+          if (_0_5_isSet)
+            t1 = _0_50;
+          else {
+            t1 = _0_5;
+            _0_50 = t1;
+            _0_5_isSet = true;
+          }
+          _0_6 = t1 == null;
+          t1 = _0_6;
+          _0_6_isSet = true;
+        }
+      else
+        t1 = false;
+      if (t1)
+        throw A.wrapException(A.SassScriptException$0("Single argument " + A.S(_0_1) + " expected to be simplifiable.", _null));
+      if (_0_2_isSet)
+        t1 = _0_20;
+      else {
+        t1 = _0_2;
+        _0_20 = t1;
+        _0_2_isSet = true;
+      }
+      if (t1 != null) {
+        if (_0_2_isSet)
+          step = _0_20;
+        else {
+          step = _0_2;
+          _0_20 = step;
+          _0_2_isSet = true;
+        }
+        if (step == null)
+          step = type$.Object._as(step);
+        if (_0_6_isSet)
+          t1 = _0_6;
+        else {
+          if (_0_5_isSet)
+            t1 = _0_50;
+          else {
+            t1 = _0_5;
+            _0_50 = t1;
+            _0_5_isSet = true;
+          }
+          _0_6 = t1 == null;
+          t1 = _0_6;
+        }
       } else {
         step = _null;
         t1 = false;
       }
-      t1 = t1 && _0_6._readFinal$0();
       if (t1)
-        return new A.SassCalculation0(_s5_, A._setArrayType([number, step], type$.JSArray_Object));
-      if (_0_1._readFinal$0() instanceof A.SassString0)
-        t1 = _0_10._readFinal$0() || _0_12._readFinal$0() || _0_14._readFinal$0() || _0_16._readFinal$0();
-      else
+        return new A.SassCalculation0(_s5_, A._setArrayType([_0_1, step], type$.JSArray_Object));
+      if (_0_1 instanceof A.SassString0) {
+        if (_0_10_isSet)
+          t1 = _0_10;
+        else {
+          if (_0_8_isSet)
+            t1 = _0_8;
+          else {
+            _0_8 = _0_1._string0$_text;
+            t1 = _0_8;
+            _0_8_isSet = true;
+          }
+          _0_10 = "nearest" === t1;
+          t1 = _0_10;
+        }
+        if (!t1) {
+          if (_0_12_isSet)
+            t1 = _0_12;
+          else {
+            if (_0_8_isSet)
+              t1 = _0_8;
+            else {
+              _0_8 = _0_1._string0$_text;
+              t1 = _0_8;
+              _0_8_isSet = true;
+            }
+            _0_12 = "up" === t1;
+            t1 = _0_12;
+          }
+          if (!t1) {
+            if (_0_14_isSet)
+              t1 = _0_14;
+            else {
+              if (_0_8_isSet)
+                t1 = _0_8;
+              else {
+                _0_8 = _0_1._string0$_text;
+                t1 = _0_8;
+                _0_8_isSet = true;
+              }
+              _0_14 = "down" === t1;
+              t1 = _0_14;
+            }
+            if (!t1)
+              if (_0_16_isSet)
+                t1 = _0_16;
+              else {
+                if (_0_8_isSet)
+                  t1 = _0_8;
+                else {
+                  _0_8 = _0_1._string0$_text;
+                  t1 = _0_8;
+                }
+                _0_16 = "to-zero" === t1;
+                t1 = _0_16;
+              }
+            else
+              t1 = true;
+          } else
+            t1 = true;
+        } else
+          t1 = true;
+      } else
         t1 = false;
       if (!t1)
-        t1 = _0_1._readFinal$0() instanceof A.SassString0 && _0_1._readFinal$0().get$isVar();
+        if (_0_1 instanceof A.SassString0)
+          t1 = _0_1.get$isVar();
+        else
+          t1 = false;
       else
         t1 = true;
       if (t1) {
-        strategy = _0_1._readFinal$0();
-        if (_0_2._readFinal$0() != null) {
-          number = _0_2._readFinal$0();
-          t1 = true;
-        } else {
-          number = _null;
-          t1 = false;
-        }
-        if (t1)
-          if (_0_5._readFinal$0() != null) {
-            step = _0_5._readFinal$0();
-            t1 = true;
-          } else {
-            step = _null;
-            t1 = false;
-          }
+        type$.SassString_2._as(_0_1);
+        if (_0_2_isSet)
+          t1 = _0_20;
         else {
+          t1 = _0_2;
+          _0_20 = t1;
+          _0_2_isSet = true;
+        }
+        if (t1 != null) {
+          if (_0_2_isSet)
+            number = _0_20;
+          else {
+            number = _0_2;
+            _0_20 = number;
+            _0_2_isSet = true;
+          }
+          if (number == null)
+            number = type$.Object._as(number);
+          if (_0_5_isSet)
+            t1 = _0_50;
+          else {
+            t1 = _0_5;
+            _0_50 = t1;
+            _0_5_isSet = true;
+          }
+          t1 = t1 != null;
+          if (t1) {
+            if (_0_5_isSet)
+              step = _0_50;
+            else {
+              step = _0_5;
+              _0_50 = step;
+              _0_5_isSet = true;
+            }
+            if (step == null)
+              step = type$.Object._as(step);
+          } else
+            step = _null;
+        } else {
           step = _null;
+          number = step;
           t1 = false;
         }
+        strategy = _0_1;
       } else {
         step = _null;
         number = step;
@@ -19817,10 +21960,12 @@ self.util = _cliPkgRequires.util;
       }
       if (t1)
         return new A.SassCalculation0(_s5_, A._setArrayType([strategy, number, step], type$.JSArray_Object));
-      if (_0_2._readFinal$0() != null && true && _0_5._readFinal$0() != null && true)
+      if ((_0_2_isSet ? _0_20 : _0_2) != null)
+        t1 = (_0_5_isSet ? _0_50 : _0_5) != null;
+      else
+        t1 = false;
+      if (t1)
         throw A.wrapException(A.SassScriptException$0(A.S(strategyOrNumber) + string$.x20must_b, _null));
-      if (_0_4._readFinal$0())
-        _0_5._readFinal$0();
       t1 = A.SassScriptException$0("Invalid parameters.", _null);
       throw A.wrapException(t1);
     },
@@ -19830,7 +21975,7 @@ self.util = _cliPkgRequires.util;
         return new A.CalculationOperation0(operator, left, right);
       left = A.SassCalculation__simplify0(left);
       right = A.SassCalculation__simplify0(right);
-      if (B.CalculationOperator_IyK0 === operator || B.CalculationOperator_2bx0 === operator) {
+      if (B.CalculationOperator_g2q0 === operator || B.CalculationOperator_CxF0 === operator) {
         if (left instanceof A.SassNumber0)
           if (right instanceof A.SassNumber0)
             t1 = inLegacySassFunction ? left.isComparableTo$1(right) : left.hasCompatibleUnits$1(right);
@@ -19839,7 +21984,7 @@ self.util = _cliPkgRequires.util;
         else
           t1 = false;
         if (t1)
-          return operator === B.CalculationOperator_IyK0 ? left.plus$1(right) : left.minus$1(right);
+          return operator === B.CalculationOperator_g2q0 ? left.plus$1(right) : left.minus$1(right);
         A.SassCalculation__verifyCompatibleNumbers0(A._setArrayType([left, right], type$.JSArray_Object));
         if (right instanceof A.SassNumber0) {
           t1 = right._number1$_value;
@@ -19848,76 +21993,111 @@ self.util = _cliPkgRequires.util;
           t1 = false;
         if (t1) {
           right = right.times$1(A.SassNumber_SassNumber0(-1, null));
-          operator = operator === B.CalculationOperator_IyK0 ? B.CalculationOperator_2bx0 : B.CalculationOperator_IyK0;
+          operator = operator === B.CalculationOperator_g2q0 ? B.CalculationOperator_CxF0 : B.CalculationOperator_g2q0;
         }
         return new A.CalculationOperation0(operator, left, right);
       } else if (left instanceof A.SassNumber0 && right instanceof A.SassNumber0)
-        return operator === B.CalculationOperator_jFr0 ? left.times$1(right) : left.dividedBy$1(right);
+        return operator === B.CalculationOperator_1710 ? left.times$1(right) : left.dividedBy$1(right);
       else
         return new A.CalculationOperation0(operator, left, right);
     },
     SassCalculation__roundWithStep0(strategy, number, step) {
-      var t1, t2, _0_0, _0_2, _0_1, _0_6, _0_8, _0_9, _0_11, _0_13, stepWithNumberUnit;
+      var _0_2, t1, _0_6, _0_8_isSet, _0_8, _0_9_isSet, _0_9, _0_11, _0_13, stepWithNumberUnit, t2, _null = null;
       if (!A.LinkedHashSet_LinkedHashSet$_literal(["nearest", "up", "down", "to-zero"], type$.String).contains$1(0, strategy))
-        throw A.wrapException(A.ArgumentError$(strategy + string$.x20must_b, null));
-      t1 = number._number1$_value;
-      if (t1 == 1 / 0 || t1 == -1 / 0) {
-        t2 = step._number1$_value;
-        t2 = t2 == 1 / 0 || t2 == -1 / 0;
+        throw A.wrapException(A.ArgumentError$(strategy + string$.x20must_b, _null));
+      _0_2 = number._number1$_value;
+      if (_0_2 == 1 / 0 || _0_2 == -1 / 0) {
+        t1 = step._number1$_value;
+        t1 = t1 == 1 / 0 || t1 == -1 / 0;
       } else
-        t2 = false;
-      if (!t2) {
-        t2 = step._number1$_value;
-        t2 = t2 === 0 || isNaN(t1) || isNaN(t2);
+        t1 = false;
+      if (!t1) {
+        t1 = step._number1$_value;
+        t1 = t1 === 0 || isNaN(_0_2) || isNaN(t1);
       } else
-        t2 = true;
-      if (t2) {
+        t1 = true;
+      if (t1) {
         t1 = number.get$numeratorUnits(number);
         return A.SassNumber_SassNumber$withUnits0(0 / 0, number.get$denominatorUnits(number), t1);
       }
-      if (t1 == 1 / 0 || t1 == -1 / 0)
+      if (_0_2 == 1 / 0 || _0_2 == -1 / 0)
         return number;
-      t2 = step._number1$_value;
-      if (t2 == 1 / 0 || t2 == -1 / 0) {
-        _0_0 = new A._Record_2(strategy, t1);
-        _0_2 = A._InitializedCell$(new A.SassCalculation__roundWithStep_closure6(_0_0));
-        _0_1 = A._InitializedCell$(new A.SassCalculation__roundWithStep_closure7(_0_0));
-        _0_6 = A._InitializedCell$(new A.SassCalculation__roundWithStep_closure8(_0_1));
-        _0_8 = A._InitializedCell$(new A.SassCalculation__roundWithStep_closure9(_0_1));
-        _0_9 = A._InitializedCell$(new A.SassCalculation__roundWithStep_closure10(_0_2));
-        _0_11 = A._InitializedCell$(new A.SassCalculation__roundWithStep_closure11(_0_1));
-        _0_13 = A._InitializedCell$(new A.SassCalculation__roundWithStep_closure12(_0_1));
+      t1 = step._number1$_value;
+      if (t1 == 1 / 0 || t1 == -1 / 0) {
         $label0$0: {
-          if (0 === _0_2._readFinal$0()) {
+          if (0 === _0_2) {
             t1 = number;
             break $label0$0;
           }
-          if ((_0_6._readFinal$0() || _0_8._readFinal$0()) && _0_9._readFinal$0()) {
+          _0_6 = "nearest" === strategy;
+          t1 = _0_6;
+          _0_8_isSet = !t1;
+          if (_0_8_isSet) {
+            _0_8 = "to-zero" === strategy;
+            _0_9_isSet = _0_8;
+          } else {
+            _0_8 = _null;
+            _0_9_isSet = true;
+          }
+          if (_0_9_isSet) {
+            _0_9 = _0_2 > 0;
+            t1 = _0_9;
+          } else {
+            _0_9 = _null;
+            t1 = false;
+          }
+          if (t1) {
             t1 = number.get$numeratorUnits(number);
             t1 = A.SassNumber_SassNumber$withUnits0(0, number.get$denominatorUnits(number), t1);
             break $label0$0;
           }
-          if (_0_6._readFinal$0() || _0_8._readFinal$0()) {
+          if (!_0_6)
+            if (_0_8_isSet)
+              t1 = _0_8;
+            else {
+              _0_8 = "to-zero" === strategy;
+              t1 = _0_8;
+            }
+          else
+            t1 = true;
+          if (t1) {
             t1 = number.get$numeratorUnits(number);
             t1 = A.SassNumber_SassNumber$withUnits0(-0.0, number.get$denominatorUnits(number), t1);
             break $label0$0;
           }
-          if (_0_11._readFinal$0() && _0_9._readFinal$0()) {
+          _0_11 = "up" === strategy;
+          t1 = _0_11;
+          if (t1)
+            if (_0_9_isSet)
+              t1 = _0_9;
+            else {
+              _0_9 = _0_2 > 0;
+              t1 = _0_9;
+            }
+          else
+            t1 = false;
+          if (t1) {
             t1 = number.get$numeratorUnits(number);
             t1 = A.SassNumber_SassNumber$withUnits0(1 / 0, number.get$denominatorUnits(number), t1);
             break $label0$0;
           }
-          if (_0_11._readFinal$0()) {
+          if (_0_11) {
             t1 = number.get$numeratorUnits(number);
             t1 = A.SassNumber_SassNumber$withUnits0(-0.0, number.get$denominatorUnits(number), t1);
             break $label0$0;
           }
-          if (_0_13._readFinal$0() && _0_2._readFinal$0() < 0) {
+          _0_13 = "down" === strategy;
+          t1 = _0_13;
+          if (t1)
+            t1 = _0_2 < 0;
+          else
+            t1 = false;
+          if (t1) {
             t1 = number.get$numeratorUnits(number);
             t1 = A.SassNumber_SassNumber$withUnits0(-1 / 0, number.get$denominatorUnits(number), t1);
             break $label0$0;
           }
-          if (_0_13._readFinal$0()) {
+          if (_0_13) {
             t1 = number.get$numeratorUnits(number);
             t1 = A.SassNumber_SassNumber$withUnits0(0, number.get$denominatorUnits(number), t1);
             break $label0$0;
@@ -19929,37 +22109,37 @@ self.util = _cliPkgRequires.util;
       stepWithNumberUnit = step.convertValueToMatch$1(number);
       $label1$1: {
         if ("nearest" === strategy) {
-          t1 = B.JSNumber_methods.round$0(t1 / stepWithNumberUnit);
+          t1 = B.JSNumber_methods.round$0(_0_2 / stepWithNumberUnit);
           t2 = number.get$numeratorUnits(number);
           t2 = A.SassNumber_SassNumber$withUnits0(t1 * stepWithNumberUnit, number.get$denominatorUnits(number), t2);
           t1 = t2;
           break $label1$1;
         }
         if ("up" === strategy) {
-          t1 /= stepWithNumberUnit;
-          t1 = t2 < 0 ? B.JSNumber_methods.floor$0(t1) : B.JSNumber_methods.ceil$0(t1);
+          t2 = _0_2 / stepWithNumberUnit;
+          t1 = t1 < 0 ? B.JSNumber_methods.floor$0(t2) : B.JSNumber_methods.ceil$0(t2);
           t2 = number.get$numeratorUnits(number);
           t2 = A.SassNumber_SassNumber$withUnits0(t1 * stepWithNumberUnit, number.get$denominatorUnits(number), t2);
           t1 = t2;
           break $label1$1;
         }
         if ("down" === strategy) {
-          t1 /= stepWithNumberUnit;
-          t1 = t2 < 0 ? B.JSNumber_methods.ceil$0(t1) : B.JSNumber_methods.floor$0(t1);
+          t2 = _0_2 / stepWithNumberUnit;
+          t1 = t1 < 0 ? B.JSNumber_methods.ceil$0(t2) : B.JSNumber_methods.floor$0(t2);
           t2 = number.get$numeratorUnits(number);
           t2 = A.SassNumber_SassNumber$withUnits0(t1 * stepWithNumberUnit, number.get$denominatorUnits(number), t2);
           t1 = t2;
           break $label1$1;
         }
         if ("to-zero" === strategy) {
-          t2 = t1 / stepWithNumberUnit;
-          if (t1 < 0) {
-            t1 = B.JSNumber_methods.ceil$0(t2);
+          t1 = _0_2 / stepWithNumberUnit;
+          if (_0_2 < 0) {
+            t1 = B.JSNumber_methods.ceil$0(t1);
             t2 = number.get$numeratorUnits(number);
             t2 = A.SassNumber_SassNumber$withUnits0(t1 * stepWithNumberUnit, number.get$denominatorUnits(number), t2);
             t1 = t2;
           } else {
-            t1 = B.JSNumber_methods.floor$0(t2);
+            t1 = B.JSNumber_methods.floor$0(t1);
             t2 = number.get$numeratorUnits(number);
             t2 = A.SassNumber_SassNumber$withUnits0(t1 * stepWithNumberUnit, number.get$denominatorUnits(number), t2);
             t1 = t2;
@@ -19973,12 +22153,8 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     SassCalculation__simplify0(arg) {
-      var t1, text, t2, value, _null = null,
-        _s32_ = " can't be used in a calculation.",
-        _0_11 = A._InitializedCell$(new A.SassCalculation__simplify_closure3(arg)),
-        _0_12 = A._InitializedCell$(new A.SassCalculation__simplify_closure4(arg)),
-        _0_15 = A._InitializedCell$(new A.SassCalculation__simplify_closure5(_0_12)),
-        _0_16 = A._InitializedCell$(new A.SassCalculation__simplify_closure6(_0_12));
+      var t1, _0_11_isSet, _0_11, _0_12, _0_15, _0_16_isSet, _0_16, text, _0_12_isSet, _0_15_isSet, value, _null = null,
+        _s32_ = " can't be used in a calculation.";
       $label0$0: {
         if (arg instanceof A.SassNumber0 || arg instanceof A.CalculationOperation0) {
           t1 = arg;
@@ -19995,60 +22171,89 @@ self.util = _cliPkgRequires.util;
         }
         if (t1)
           A.throwExpression(A.SassScriptException$0("Quoted string " + arg.toString$0(0) + _s32_, _null));
-        t1 = arg instanceof A.SassCalculation0;
-        if (t1)
-          if (_0_11._readFinal$0())
-            if (_0_15._readFinal$0())
-              if (_0_16._readFinal$0() instanceof A.SassString0)
-                if (!_0_16._readFinal$0()._string0$_hasQuotes) {
-                  text = _0_16._readFinal$0()._string0$_text;
-                  t2 = A.SassCalculation__needsParentheses0(text);
+        _0_11_isSet = arg instanceof A.SassCalculation0;
+        if (_0_11_isSet) {
+          _0_11 = "calc" === arg.name;
+          if (_0_11) {
+            _0_12 = arg.$arguments;
+            _0_15 = _0_12.length === 1;
+            _0_16_isSet = _0_15;
+            if (_0_16_isSet) {
+              _0_16 = _0_12[0];
+              t1 = _0_16;
+              if (t1 instanceof A.SassString0) {
+                type$.SassString_2._as(_0_16);
+                if (!_0_16._string0$_hasQuotes) {
+                  text = _0_16._string0$_text;
+                  t1 = A.SassCalculation__needsParentheses0(text);
                 } else {
                   text = _null;
-                  t2 = false;
+                  t1 = false;
                 }
-              else {
+              } else {
                 text = _null;
-                t2 = false;
+                t1 = false;
               }
-            else {
+            } else {
               text = _null;
-              t2 = false;
+              _0_16 = text;
+              t1 = false;
             }
-          else {
+          } else {
             text = _null;
-            t2 = false;
+            _0_16 = text;
+            _0_12 = _0_16;
+            _0_15 = _0_12;
+            _0_16_isSet = false;
+            t1 = false;
           }
-        else {
+          _0_12_isSet = _0_11;
+          _0_15_isSet = _0_12_isSet;
+        } else {
           text = _null;
-          t2 = false;
+          _0_16 = text;
+          _0_12 = _0_16;
+          _0_15 = _0_12;
+          _0_11 = _0_15;
+          _0_15_isSet = false;
+          _0_12_isSet = false;
+          _0_16_isSet = false;
+          t1 = false;
         }
-        if (t2) {
+        if (t1) {
           t1 = new A.SassString0("(" + A.S(text) + ")", false);
           break $label0$0;
         }
-        if (t1)
-          if (_0_11._readFinal$0())
-            if (_0_15._readFinal$0()) {
-              value = _0_16._readFinal$0();
-              t2 = true;
-            } else {
-              value = _null;
-              t2 = false;
+        if (_0_11_isSet)
+          if (_0_11)
+            if (_0_15_isSet)
+              t1 = _0_15;
+            else {
+              if (_0_12_isSet)
+                t1 = _0_12;
+              else {
+                _0_12 = arg.$arguments;
+                t1 = _0_12;
+                _0_12_isSet = true;
+              }
+              _0_15 = t1.length === 1;
+              t1 = _0_15;
             }
+          else
+            t1 = false;
+        else
+          t1 = false;
+        if (t1) {
+          if (_0_16_isSet)
+            value = _0_16;
           else {
-            value = _null;
-            t2 = false;
+            _0_16 = (_0_12_isSet ? _0_12 : arg.$arguments)[0];
+            value = _0_16;
           }
-        else {
-          value = _null;
-          t2 = false;
-        }
-        if (t2) {
           t1 = value;
           break $label0$0;
         }
-        if (t1) {
+        if (_0_11_isSet) {
           t1 = arg;
           break $label0$0;
         }
@@ -20133,72 +22338,6 @@ self.util = _cliPkgRequires.util;
       this.name = t0;
       this.$arguments = t1;
     },
-    SassCalculation_sign_closure0: function SassCalculation_sign_closure0(t0) {
-      this._0_0 = t0;
-    },
-    SassCalculation_round_closure9: function SassCalculation_round_closure9(t0) {
-      this._0_0 = t0;
-    },
-    SassCalculation_round_closure10: function SassCalculation_round_closure10(t0) {
-      this._0_0 = t0;
-    },
-    SassCalculation_round_closure11: function SassCalculation_round_closure11(t0) {
-      this._0_2 = t0;
-    },
-    SassCalculation_round_closure12: function SassCalculation_round_closure12(t0) {
-      this._0_0 = t0;
-    },
-    SassCalculation_round_closure13: function SassCalculation_round_closure13(t0) {
-      this._0_5 = t0;
-    },
-    SassCalculation_round_closure14: function SassCalculation_round_closure14(t0) {
-      this._0_1 = t0;
-    },
-    SassCalculation_round_closure15: function SassCalculation_round_closure15(t0) {
-      this._0_8 = t0;
-    },
-    SassCalculation_round_closure16: function SassCalculation_round_closure16(t0) {
-      this._0_8 = t0;
-    },
-    SassCalculation_round_closure17: function SassCalculation_round_closure17(t0) {
-      this._0_8 = t0;
-    },
-    SassCalculation_round_closure18: function SassCalculation_round_closure18(t0) {
-      this._0_8 = t0;
-    },
-    SassCalculation__roundWithStep_closure7: function SassCalculation__roundWithStep_closure7(t0) {
-      this._0_0 = t0;
-    },
-    SassCalculation__roundWithStep_closure6: function SassCalculation__roundWithStep_closure6(t0) {
-      this._0_0 = t0;
-    },
-    SassCalculation__roundWithStep_closure8: function SassCalculation__roundWithStep_closure8(t0) {
-      this._0_1 = t0;
-    },
-    SassCalculation__roundWithStep_closure9: function SassCalculation__roundWithStep_closure9(t0) {
-      this._0_1 = t0;
-    },
-    SassCalculation__roundWithStep_closure10: function SassCalculation__roundWithStep_closure10(t0) {
-      this._0_2 = t0;
-    },
-    SassCalculation__roundWithStep_closure11: function SassCalculation__roundWithStep_closure11(t0) {
-      this._0_1 = t0;
-    },
-    SassCalculation__roundWithStep_closure12: function SassCalculation__roundWithStep_closure12(t0) {
-      this._0_1 = t0;
-    },
-    SassCalculation__simplify_closure3: function SassCalculation__simplify_closure3(t0) {
-      this._0_0 = t0;
-    },
-    SassCalculation__simplify_closure4: function SassCalculation__simplify_closure4(t0) {
-      this._0_0 = t0;
-    },
-    SassCalculation__simplify_closure5: function SassCalculation__simplify_closure5(t0) {
-      this._0_12 = t0;
-    },
-    SassCalculation__simplify_closure6: function SassCalculation__simplify_closure6(t0) {
-      this._0_12 = t0;
-    },
     SassCalculation__verifyLength_closure0: function SassCalculation__verifyLength_closure0() {
     },
     CalculationOperation0: function CalculationOperation0(t0, t1, t2) {
@@ -20218,6 +22357,20 @@ self.util = _cliPkgRequires.util;
     },
     CallableDeclaration0: function CallableDeclaration0() {
     },
+    updateCanonicalizeContextPrototype() {
+      var t1 = type$.JSClass._as(new A.CanonicalizeContext0(false, null).constructor);
+      A.LinkedHashMap_LinkedHashMap$_literal(["fromImport", new A.updateCanonicalizeContextPrototype_closure(), "containingUrl", new A.updateCanonicalizeContextPrototype_closure0()], type$.String, type$.Function).forEach$1(0, A.JSClassExtension_get_defineGetter(t1));
+      return null;
+    },
+    updateCanonicalizeContextPrototype_closure: function updateCanonicalizeContextPrototype_closure() {
+    },
+    updateCanonicalizeContextPrototype_closure0: function updateCanonicalizeContextPrototype_closure0() {
+    },
+    CanonicalizeContext0: function CanonicalizeContext0(t0, t1) {
+      this._canonicalize_context$_fromImport = t0;
+      this._canonicalize_context$_containingUrl = t1;
+      this._canonicalize_context$_wasContainingUrlAccessed = false;
+    },
     Chokidar0: function Chokidar0() {
     },
     ChokidarOptions0: function ChokidarOptions0() {
@@ -20260,7 +22413,7 @@ self.util = _cliPkgRequires.util;
       blackness = t1.call$3$assertPercent("blackness", 100, true);
       t1 = keywords.__js_helper$_length;
       if (t1 !== 0)
-        throw A.wrapException(A.SassScriptException$0("No " + A.pluralize0("argument", t1, _null) + " named " + A.toSentence0(keywords.get$keys(keywords).map$1$1(0, new A._updateComponents_closure2(), type$.Object), "or") + ".", _null));
+        throw A.wrapException(A.SassScriptException$0("No " + A.pluralize0("argument", t1, _null) + " named " + A.toSentence0(keywords.get$keys(0).map$1$1(0, new A._updateComponents_closure2(), type$.Object), "or") + ".", _null));
       hasRgb = red != null || green != null || blue != null;
       hasSL = saturation != null || lightness != null;
       hasWB = whiteness != null || blackness != null;
@@ -20275,19 +22428,19 @@ self.util = _cliPkgRequires.util;
       t1 = new A._updateComponents_updateValue0(change, adjust);
       t2 = new A._updateComponents_updateRgb0(t1);
       if (hasRgb) {
-        t3 = t2.call$2(color.get$red(color), red);
-        t4 = t2.call$2(color.get$green(color), green);
-        t2 = t2.call$2(color.get$blue(color), blue);
+        t3 = t2.call$2(color.get$red(0), red);
+        t4 = t2.call$2(color.get$green(0), green);
+        t2 = t2.call$2(color.get$blue(0), blue);
         return color.changeRgb$4$alpha$blue$green$red(t1.call$3(color._color1$_alpha, alpha, 1), t2, t4, t3);
       } else if (hasWB) {
         if (change)
           t2 = hue;
         else {
-          t2 = color.get$hue(color);
+          t2 = color.get$hue(0);
           t2 += hue == null ? 0 : hue;
         }
-        t3 = t1.call$3(color.get$whiteness(color), whiteness, 100);
-        t4 = t1.call$3(color.get$blackness(color), blackness, 100);
+        t3 = t1.call$3(color.get$whiteness(0), whiteness, 100);
+        t4 = t1.call$3(color.get$blackness(0), blackness, 100);
         return color.changeHwb$4$alpha$blackness$hue$whiteness(t1.call$3(color._color1$_alpha, alpha, 1), t4, t2, t3);
       } else {
         t2 = hue == null;
@@ -20295,12 +22448,12 @@ self.util = _cliPkgRequires.util;
           if (change)
             t2 = hue;
           else {
-            t3 = color.get$hue(color);
+            t3 = color.get$hue(0);
             t3 += t2 ? 0 : hue;
             t2 = t3;
           }
-          t3 = t1.call$3(color.get$saturation(color), saturation, 100);
-          t4 = t1.call$3(color.get$lightness(color), lightness, 100);
+          t3 = t1.call$3(color.get$saturation(0), saturation, 100);
+          t4 = t1.call$3(color.get$lightness(0), lightness, 100);
           return color.changeHsl$4$alpha$hue$lightness$saturation(t1.call$3(color._color1$_alpha, alpha, 1), t2, t4, t3);
         } else if (alpha != null)
           return color.changeAlpha$1(t1.call$3(color._color1$_alpha, alpha, 1));
@@ -20351,7 +22504,7 @@ self.util = _cliPkgRequires.util;
         return A._functionString0($name, $arguments);
       else if (t1.$index($arguments, 1).get$isSpecialNumber()) {
         color = t1.$index($arguments, 0).assertColor$1("color");
-        return new A.SassString0($name + "(" + color.get$red(color) + ", " + color.get$green(color) + ", " + color.get$blue(color) + ", " + A.serializeValue0(t1.$index($arguments, 1), false, true) + ")", false);
+        return new A.SassString0($name + "(" + color.get$red(0) + ", " + color.get$green(0) + ", " + color.get$blue(0) + ", " + A.serializeValue0(t1.$index($arguments, 1), false, true) + ")", false);
       }
       return t1.$index($arguments, 0).assertColor$1("color").changeAlpha$1(A._percentageOrUnitless0(t1.$index($arguments, 1).assertNumber$1("alpha"), 1, "alpha"));
     },
@@ -20385,22 +22538,16 @@ self.util = _cliPkgRequires.util;
       return A.SassColor$hslInternal0(hue, t1, t2, t3 == null ? 1 : t3, B._ColorFormatEnum_hslFunction0);
     },
     _angleValue0(angleValue, $name) {
-      var t1, t2,
-        angle = angleValue.assertNumber$1($name);
+      var angle = angleValue.assertNumber$1($name);
       if (angle.compatibleWithUnit$1("deg"))
         return angle.coerceValueToUnit$1("deg");
-      t1 = angle.toString$0(0);
-      t2 = angle.unitSuggestion$1($name);
-      A.EvaluationContext_current0().warn$2(0, "$" + $name + ": Passing a unit other than deg (" + t1 + string$.x29x20is_d + t2 + string$.x0a_See_, B.Deprecation_0bn);
+      A.warnForDeprecation0("$" + $name + ": Passing a unit other than deg (" + angle.toString$0(0) + string$.x29x20is_d + angle.unitSuggestion$1($name) + string$.x0a_See_, B.Deprecation_oCX);
       return angle._number1$_value;
     },
     _checkPercent0(number, $name) {
-      var t1, t2;
       if (number.hasUnit$1("%"))
         return;
-      t1 = number.toString$0(0);
-      t2 = number.unitSuggestion$2($name, "%");
-      A.EvaluationContext_current0().warn$2(0, "$" + $name + ": Passing a number without unit % (" + t1 + string$.x29x20is_d + t2 + string$.x0a_Morex3a, B.Deprecation_0bn);
+      A.warnForDeprecation0("$" + $name + ": Passing a number without unit % (" + number.toString$0(0) + string$.x29x20is_d + number.unitSuggestion$2($name, "%") + string$.x0a_Morex3a, B.Deprecation_oCX);
     },
     _hwb0($arguments) {
       var t2, t3,
@@ -20419,11 +22566,11 @@ self.util = _cliPkgRequires.util;
       return A.SassColor_SassColor$hwb0(hue, t1, t2, t3 == null ? 1 : t3);
     },
     _parseChannels0($name, argumentNames, channels) {
-      var list, t1, channels0, alphaFromSlashList, isCommaSeparated, isBracketed, buffer, _0_4, text, _1_0, _1_2, channel3, alpha, _null = null,
+      var list, t1, channels0, alphaFromSlashList, isCommaSeparated, isBracketed, buffer, _0_4, _1_0, _1_2_isSet, _1_2, t2, _null = null,
         _s17_ = "$channels must be";
       if (channels.get$isVar())
         return A._functionString0($name, A._setArrayType([channels], type$.JSArray_Value_2));
-      if (channels.get$separator(channels) === B.ListSeparator_zg90) {
+      if (channels.get$separator(channels) === B.ListSeparator_cQA0) {
         list = channels.get$asList();
         t1 = list.length;
         if (t1 !== 2)
@@ -20438,7 +22585,7 @@ self.util = _cliPkgRequires.util;
         alphaFromSlashList = _null;
         channels0 = channels;
       }
-      isCommaSeparated = channels0.get$separator(channels0) === B.ListSeparator_rXA0;
+      isCommaSeparated = channels0.get$separator(channels0) === B.ListSeparator_ECn0;
       isBracketed = channels0.get$hasBrackets();
       if (isCommaSeparated || isBracketed) {
         buffer = new A.StringBuffer(_s17_);
@@ -20456,14 +22603,15 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException(A.SassScriptException$0(buffer.toString$0(0), _null));
       }
       list = channels0.get$asList();
-      _0_4 = A._InitializedCell$(new A._parseChannels_closure2(list));
-      if (list.length >= 2)
-        if (_0_4._readFinal$0() instanceof A.SassString0) {
-          text = _0_4._readFinal$0()._string0$_text;
-          t1 = !_0_4._readFinal$0()._string0$_hasQuotes && A.equalsIgnoreCase0(text, "from");
+      if (list.length >= 2) {
+        _0_4 = list[0];
+        t1 = _0_4;
+        if (t1 instanceof A.SassString0) {
+          type$.SassString_2._as(_0_4);
+          t1 = !_0_4._string0$_hasQuotes && A.equalsIgnoreCase0(_0_4._string0$_text, "from");
         } else
           t1 = false;
-      else
+      } else
         t1 = false;
       if (t1)
         return A._functionString0($name, A._setArrayType([channels], type$.JSArray_Value_2));
@@ -20471,7 +22619,7 @@ self.util = _cliPkgRequires.util;
       if (t1 > 3)
         throw A.wrapException(A.SassScriptException$0("Only 3 elements allowed, but " + t1 + " were passed.", _null));
       else if (t1 < 3) {
-        if (!B.JSArray_methods.any$1(list, new A._parseChannels_closure3()))
+        if (!B.JSArray_methods.any$1(list, new A._parseChannels_closure0()))
           if (list.length !== 0) {
             t1 = B.JSArray_methods.get$last(list);
             if (t1 instanceof A.SassString0)
@@ -20497,26 +22645,30 @@ self.util = _cliPkgRequires.util;
         return t1;
       }
       _1_0 = list[2];
-      _1_2 = A._InitializedCell$(new A._parseChannels_closure4(_1_0));
       $label0$0: {
-        if (_1_0 instanceof A.SassNumber0)
-          if (type$.Record_2_nullable_Object_and_nullable_Object._is(_1_2._readFinal$0())) {
-            t1 = type$.SassNumber_2;
-            channel3 = t1._as(_1_2._readFinal$0()._0);
-            alpha = t1._as(_1_2._readFinal$0()._1);
-            t1 = true;
-          } else {
-            alpha = _null;
-            channel3 = alpha;
-            t1 = false;
-          }
-        else {
-          alpha = _null;
-          channel3 = alpha;
+        _1_2_isSet = _1_0 instanceof A.SassNumber0;
+        if (_1_2_isSet) {
+          _1_2 = _1_0.asSlash;
+          t1 = type$.Record_2_nullable_Object_and_nullable_Object._is(_1_2);
+        } else {
+          _1_2 = _null;
           t1 = false;
         }
         if (t1) {
-          t1 = A._setArrayType([list[0], list[1], channel3, alpha], type$.JSArray_Value_2);
+          if (_1_2_isSet)
+            t1 = _1_2;
+          else {
+            _1_2 = _1_0.asSlash;
+            t1 = _1_2;
+            _1_2_isSet = true;
+          }
+          if (t1 == null)
+            t1 = type$.Record_2_nullable_Object_and_nullable_Object._as(t1);
+          t2 = _1_2_isSet ? _1_2 : _1_0.asSlash;
+          if (t2 == null)
+            t2 = type$.Record_2_nullable_Object_and_nullable_Object._as(t2);
+          t2 = A._setArrayType([list[0], list[1], t1._0, t2._1], type$.JSArray_Value_2);
+          t1 = t2;
           break $label0$0;
         }
         if (_1_0 instanceof A.SassString0)
@@ -20556,7 +22708,7 @@ self.util = _cliPkgRequires.util;
       t3 = normalizedWeight * alphaDistance;
       weight1 = ((t3 === -1 ? normalizedWeight : (normalizedWeight + alphaDistance) / (1 + t3)) + 1) / 2;
       weight2 = 1 - weight1;
-      return A.SassColor$rgb0(A.fuzzyRound0(color1.get$red(color1) * weight1 + color2.get$red(color2) * weight2), A.fuzzyRound0(color1.get$green(color1) * weight1 + color2.get$green(color2) * weight2), A.fuzzyRound0(color1.get$blue(color1) * weight1 + color2.get$blue(color2) * weight2), t1 * weightScale + t2 * (1 - weightScale));
+      return A.SassColor$rgb0(A.fuzzyRound0(color1.get$red(0) * weight1 + color2.get$red(0) * weight2), A.fuzzyRound0(color1.get$green(0) * weight1 + color2.get$green(0) * weight2), A.fuzzyRound0(color1.get$blue(0) * weight1 + color2.get$blue(0) * weight2), t1 * weightScale + t2 * (1 - weightScale));
     },
     _opacify0($arguments) {
       var t1 = J.getInterceptor$asx($arguments),
@@ -20702,13 +22854,7 @@ self.util = _cliPkgRequires.util;
     },
     _hwb_closure0: function _hwb_closure0() {
     },
-    _parseChannels_closure2: function _parseChannels_closure2(t0) {
-      this._0_0 = t0;
-    },
-    _parseChannels_closure3: function _parseChannels_closure3() {
-    },
-    _parseChannels_closure4: function _parseChannels_closure4(t0) {
-      this._1_0 = t0;
+    _parseChannels_closure0: function _parseChannels_closure0() {
     },
     colorClass_closure: function colorClass_closure() {
     },
@@ -20759,16 +22905,16 @@ self.util = _cliPkgRequires.util;
     SassColor$rgb0(red, green, blue, alpha) {
       var _null = null,
         t1 = new A.SassColor0(red, green, blue, _null, _null, _null, A.fuzzyAssertRange0(A.SassColor__handleNullAlpha0(alpha), 0, 1, "alpha"), _null);
-      A.RangeError_checkValueInInterval(t1.get$red(t1), 0, 255, "red");
-      A.RangeError_checkValueInInterval(t1.get$green(t1), 0, 255, "green");
-      A.RangeError_checkValueInInterval(t1.get$blue(t1), 0, 255, "blue");
+      A.RangeError_checkValueInInterval(t1.get$red(0), 0, 255, "red");
+      A.RangeError_checkValueInInterval(t1.get$green(0), 0, 255, "green");
+      A.RangeError_checkValueInInterval(t1.get$blue(0), 0, 255, "blue");
       return t1;
     },
     SassColor$rgbInternal0(_red, _green, _blue, alpha, format) {
       var t1 = new A.SassColor0(_red, _green, _blue, null, null, null, A.fuzzyAssertRange0(alpha, 0, 1, "alpha"), format);
-      A.RangeError_checkValueInInterval(t1.get$red(t1), 0, 255, "red");
-      A.RangeError_checkValueInInterval(t1.get$green(t1), 0, 255, "green");
-      A.RangeError_checkValueInInterval(t1.get$blue(t1), 0, 255, "blue");
+      A.RangeError_checkValueInInterval(t1.get$red(0), 0, 255, "red");
+      A.RangeError_checkValueInInterval(t1.get$green(0), 0, 255, "green");
+      A.RangeError_checkValueInInterval(t1.get$blue(0), 0, 255, "blue");
       return t1;
     },
     SassColor$hsl(hue, saturation, lightness, alpha) {
@@ -20796,7 +22942,7 @@ self.util = _cliPkgRequires.util;
     SassColor__handleNullAlpha0(alpha) {
       if (alpha != null)
         return alpha;
-      A.EvaluationContext_current0().warn$2(0, "Passing null for alpha in the JS API is deprecated.\nTo preserve current behavior, pass 1 or undefined instead.\nMore info: https://sass-lang.com/d/null-alpha", B.Deprecation_UZD);
+      A.warnForDeprecation0("Passing null for alpha in the JS API is deprecated.\nTo preserve current behavior, pass 1 or undefined instead.\nMore info: https://sass-lang.com/d/null-alpha", B.Deprecation_omH);
       return 1;
     },
     SassColor__hueToRgb0(m1, m2, hue) {
@@ -20856,7 +23002,7 @@ self.util = _cliPkgRequires.util;
       _.isGroupEnd = false;
     },
     compile0(path, options) {
-      var color, ascii, result, error, stackTrace, t1, color0, ascii0, t2, t3, t4, t5, t6, t7, t8, t9, t10, exception, _null = null;
+      var color, ascii, logger, result, error, stackTrace, t1, color0, ascii0, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, exception, _null = null;
       if (!A.isNodeJs())
         A.jsThrow(new self.Error("The compile() method is only available in Node.js."));
       t1 = options == null;
@@ -20864,6 +23010,11 @@ self.util = _cliPkgRequires.util;
       color = color0 == null ? A.hasTerminal0() : color0;
       ascii0 = t1 ? _null : J.get$alertAscii$x(options);
       ascii = ascii0 == null ? $._glyphs === B.C_AsciiGlyphSet : ascii0;
+      t2 = t1 ? _null : J.get$logger$x(options);
+      t3 = ascii;
+      if (t3 == null)
+        t3 = $._glyphs === B.C_AsciiGlyphSet;
+      logger = new A.JSToDartLogger(t2, new A.StderrLogger0(color), t3);
       try {
         t2 = t1 ? _null : J.get$loadPaths$x(options);
         t3 = t1 ? _null : J.get$quietDeps$x(options);
@@ -20879,19 +23030,21 @@ self.util = _cliPkgRequires.util;
         t7 = t1 ? _null : J.get$sourceMap$x(options);
         if (t7 == null)
           t7 = false;
-        t8 = t1 ? _null : J.get$logger$x(options);
-        t9 = ascii;
-        if (t9 == null)
-          t9 = $._glyphs === B.C_AsciiGlyphSet;
-        t9 = new A.JSToDartLogger(t8, new A.StderrLogger0(color), t9);
+        t8 = logger;
         if (t1)
-          t8 = _null;
+          t9 = _null;
         else {
-          t8 = J.get$importers$x(options);
-          t8 = t8 == null ? _null : J.map$1$1$ax(t8, A.compile___parseImporter$closure(), type$.Importer);
+          t9 = J.get$importers$x(options);
+          t9 = t9 == null ? _null : J.map$1$1$ax(t9, A.compile___parseImporter$closure(), type$.Importer);
         }
         t10 = A._parseFunctions0(t1 ? _null : J.get$functions$x(options), false);
-        result = A.compile(path, t6, _null, new A.CastList(t10, A._arrayInstanceType(t10)._eval$1("CastList<1,Callable>")), _null, A.ImportCache$0(t8, t2, t9, _null), _null, _null, t9, _null, t3, t7, t4, _null, true, t5);
+        t11 = t1 ? _null : J.get$fatalDeprecations$x(options);
+        t11 = A._parseDeprecations(logger, t11, true);
+        t12 = t1 ? _null : J.get$silenceDeprecations$x(options);
+        t12 = A._parseDeprecations(logger, t12, false);
+        t13 = t1 ? _null : J.get$futureDeprecations$x(options);
+        t13 = A._parseDeprecations(logger, t13, false);
+        result = A.compile(path, t6, t11, new A.CastList(t10, A._arrayInstanceType(t10)._eval$1("CastList<1,Callable>")), t13, A.ImportCache$0(t9, t2, t8 == null ? new A.StderrLogger0(color) : t8, _null), _null, _null, t8, _null, t3, t12, t7, t4, _null, true, t5);
         t1 = t1 ? _null : J.get$sourceMapIncludeSources$x(options);
         if (t1 == null)
           t1 = false;
@@ -20908,12 +23061,17 @@ self.util = _cliPkgRequires.util;
       }
     },
     compileString0(text, options) {
-      var result, error, stackTrace, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, exception, _null = null,
+      var logger, result, error, stackTrace, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, exception, _null = null,
         t1 = options == null,
         color0 = t1 ? _null : J.get$alertColor$x(options),
         color = color0 == null ? A.hasTerminal0() : color0,
         ascii0 = t1 ? _null : J.get$alertAscii$x(options),
-        ascii = ascii0 == null ? $._glyphs === B.C_AsciiGlyphSet : ascii0;
+        ascii = ascii0 == null ? $._glyphs === B.C_AsciiGlyphSet : ascii0,
+        t2 = t1 ? _null : J.get$logger$x(options),
+        t3 = ascii;
+      if (t3 == null)
+        t3 = $._glyphs === B.C_AsciiGlyphSet;
+      logger = new A.JSToDartLogger(t2, new A.StderrLogger0(color), t3);
       try {
         t2 = A.parseSyntax(t1 ? _null : J.get$syntax$x(options));
         t3 = t1 ? _null : A.NullableExtension_andThen0(J.get$url$x(options), A.utils1__jsToDartUrl$closure());
@@ -20931,22 +23089,24 @@ self.util = _cliPkgRequires.util;
         t9 = t1 ? _null : J.get$sourceMap$x(options);
         if (t9 == null)
           t9 = false;
-        t10 = t1 ? _null : J.get$logger$x(options);
-        t11 = ascii;
-        if (t11 == null)
-          t11 = $._glyphs === B.C_AsciiGlyphSet;
-        t11 = new A.JSToDartLogger(t10, new A.StderrLogger0(color), t11);
+        t10 = logger;
         if (t1)
-          t10 = _null;
+          t11 = _null;
         else {
-          t10 = J.get$importers$x(options);
-          t10 = t10 == null ? _null : J.map$1$1$ax(t10, A.compile___parseImporter$closure(), type$.Importer);
+          t11 = J.get$importers$x(options);
+          t11 = t11 == null ? _null : J.map$1$1$ax(t11, A.compile___parseImporter$closure(), type$.Importer);
         }
         t12 = t1 ? _null : A.NullableExtension_andThen0(J.get$importer$x(options), A.compile___parseImporter$closure());
         if (t12 == null)
           t12 = (t1 ? _null : J.get$url$x(options)) == null ? new A.NoOpImporter0() : _null;
         t13 = A._parseFunctions0(t1 ? _null : J.get$functions$x(options), false);
-        result = A.compileString(text, t8, _null, new A.CastList(t13, A._arrayInstanceType(t13)._eval$1("CastList<1,Callable>")), _null, A.ImportCache$0(t10, t4, t11, _null), t12, _null, _null, t11, _null, t5, t9, t6, t2, t3, true, t7);
+        t14 = t1 ? _null : J.get$fatalDeprecations$x(options);
+        t14 = A._parseDeprecations(logger, t14, true);
+        t15 = t1 ? _null : J.get$silenceDeprecations$x(options);
+        t15 = A._parseDeprecations(logger, t15, false);
+        t16 = t1 ? _null : J.get$futureDeprecations$x(options);
+        t16 = A._parseDeprecations(logger, t16, false);
+        result = A.compileString(text, t8, t14, new A.CastList(t13, A._arrayInstanceType(t13)._eval$1("CastList<1,Callable>")), t16, A.ImportCache$0(t11, t4, t10 == null ? new A.StderrLogger0(color) : t10, _null), t12, _null, _null, t10, _null, t5, t15, t9, t6, t2, t3, true, t7);
         t1 = t1 ? _null : J.get$sourceMapIncludeSources$x(options);
         if (t1 == null)
           t1 = false;
@@ -20973,7 +23133,8 @@ self.util = _cliPkgRequires.util;
       ascii = t1 ? null : J.get$alertAscii$x(options);
       if (ascii == null)
         ascii = $._glyphs === B.C_AsciiGlyphSet;
-      return A._wrapAsyncSassExceptions(A.futureToPromise0(new A.compileAsync_closure(path, color, options, ascii).call$0()), ascii, color);
+      t1 = t1 ? null : J.get$logger$x(options);
+      return A._wrapAsyncSassExceptions(A.futureToPromise0(new A.compileAsync_closure(path, color, options, new A.JSToDartLogger(t1, new A.StderrLogger0(color), ascii)).call$0()), ascii, color);
     },
     compileStringAsync1(text, options) {
       var ascii,
@@ -20984,7 +23145,8 @@ self.util = _cliPkgRequires.util;
       ascii = t1 ? null : J.get$alertAscii$x(options);
       if (ascii == null)
         ascii = $._glyphs === B.C_AsciiGlyphSet;
-      return A._wrapAsyncSassExceptions(A.futureToPromise0(new A.compileStringAsync_closure(text, options, color, ascii).call$0()), ascii, color);
+      t1 = t1 ? null : J.get$logger$x(options);
+      return A._wrapAsyncSassExceptions(A.futureToPromise0(new A.compileStringAsync_closure(text, options, color, new A.JSToDartLogger(t1, new A.StderrLogger0(color), ascii)).call$0()), ascii, color);
     },
     _convertResult(result, includeSourceContents) {
       var loadedUrls,
@@ -20995,7 +23157,7 @@ self.util = _cliPkgRequires.util;
         sourceMap.$indexSet(0, "sources", A._setArrayType([], type$.JSArray_String));
       loadedUrls = A.toJSArray(result._evaluate._0.map$1$1(0, A.utils1__dartToJSUrl$closure(), type$.nullable_Object));
       t1 = t1._0;
-      return sourceMap == null ? {css: t1, loadedUrls: loadedUrls} : {css: t1, sourceMap: A.jsify(sourceMap), loadedUrls: loadedUrls};
+      return sourceMap == null ? {css: t1, loadedUrls: loadedUrls} : {css: t1, sourceMap: A.jsify0(sourceMap), loadedUrls: loadedUrls};
     },
     _wrapAsyncSassExceptions(promise, ascii, color) {
       return J.then$2$x(promise, null, A.allowInterop(new A._wrapAsyncSassExceptions_closure(color, ascii)));
@@ -21016,7 +23178,9 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     _parseAsyncImporter(importer) {
-      var t1, canonicalize, load, _0_0, findFileUrl, t2;
+      var t1, canonicalize, load, _0_0;
+      if (importer instanceof A.NodePackageImporter0)
+        return importer;
       if (importer == null)
         A.jsThrow(new self.Error("Importers may not be null."));
       type$.JSImporter._as(importer);
@@ -21024,18 +23188,11 @@ self.util = _cliPkgRequires.util;
       canonicalize = t1.get$canonicalize(importer);
       load = t1.get$load(importer);
       _0_0 = t1.get$findFileUrl(importer);
-      if (_0_0 != null) {
-        findFileUrl = _0_0;
-        t2 = true;
-      } else {
-        findFileUrl = null;
-        t2 = false;
-      }
-      if (t2)
+      if (_0_0 != null)
         if (canonicalize != null || load != null)
           A.jsThrow(new self.Error(string$.An_impa));
         else
-          return new A.JSToDartAsyncFileImporter(findFileUrl);
+          return new A.JSToDartAsyncFileImporter(_0_0);
       else if (canonicalize == null || load == null)
         A.jsThrow(new self.Error(string$.An_impu));
       else {
@@ -21046,7 +23203,9 @@ self.util = _cliPkgRequires.util;
       }
     },
     _parseImporter0(importer) {
-      var t1, canonicalize, load, _0_0, findFileUrl, t2;
+      var t1, canonicalize, load, _0_0;
+      if (importer instanceof A.NodePackageImporter0)
+        return importer;
       if (importer == null)
         A.jsThrow(new self.Error("Importers may not be null."));
       type$.JSImporter._as(importer);
@@ -21054,18 +23213,11 @@ self.util = _cliPkgRequires.util;
       canonicalize = t1.get$canonicalize(importer);
       load = t1.get$load(importer);
       _0_0 = t1.get$findFileUrl(importer);
-      if (_0_0 != null) {
-        findFileUrl = _0_0;
-        t2 = true;
-      } else {
-        findFileUrl = null;
-        t2 = false;
-      }
-      if (t2)
+      if (_0_0 != null)
         if (canonicalize != null || load != null)
           A.jsThrow(new self.Error(string$.An_impa));
         else
-          return new A.JSToDartFileImporter(findFileUrl);
+          return new A.JSToDartFileImporter(_0_0);
       else if (canonicalize == null || load == null)
         A.jsThrow(new self.Error(string$.An_impu));
       else {
@@ -21076,28 +23228,14 @@ self.util = _cliPkgRequires.util;
       }
     },
     _normalizeNonCanonicalSchemes(schemes) {
-      var scheme, t1, schemes0;
+      var t1;
       $label0$0: {
         if (typeof schemes == "string") {
-          scheme = schemes;
-          t1 = true;
-        } else {
-          scheme = null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = A._setArrayType([scheme], type$.JSArray_String);
+          t1 = A._setArrayType([schemes], type$.JSArray_String);
           break $label0$0;
         }
         if (type$.List_dynamic._is(schemes)) {
-          schemes0 = schemes;
-          t1 = true;
-        } else {
-          schemes0 = null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = J.cast$1$0$ax(schemes0, type$.String);
+          t1 = J.cast$1$0$ax(schemes, type$.String);
           break $label0$0;
         }
         if (schemes == null) {
@@ -21109,86 +23247,81 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     _simplifyValue(value) {
-      var t1, t2, _0_0, _0_1, _0_3, _0_4, _0_5, _0_8, _0_10, first, min, max, args, _null = null;
+      var _0_1, t1, t2, _0_4, _0_3, _0_4_isSet, _0_5, _0_40, _0_8, first, _0_10, min, _null = null;
       $label1$1: {
         if (value instanceof A.SassCalculation0) {
+          _0_1 = value.name;
           t1 = value.$arguments;
           t2 = A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,Object>");
-          _0_0 = new A._Record_2(value.name, A.List_List$of(new A.MappedListIterable(t1, A.compile___simplifyCalcArg$closure(), t2), true, t2._eval$1("ListIterable.E")));
-          _0_1 = A._InitializedCell$(new A._simplifyValue_closure(_0_0));
-          _0_3 = A._InitializedCell$(new A._simplifyValue_closure0(_0_1));
-          _0_4 = A._InitializedCell$(new A._simplifyValue_closure1(_0_0));
-          _0_5 = A._InitializedCell$(new A._simplifyValue_closure2(_0_4));
-          _0_8 = A._InitializedCell$(new A._simplifyValue_closure3(_0_4));
-          _0_10 = A._InitializedCell$(new A._simplifyValue_closure4(_0_1));
+          _0_4 = A.List_List$of(new A.MappedListIterable(t1, A.compile___simplifyCalcArg$closure(), t2), true, t2._eval$1("ListIterable.E"));
           $label0$0: {
-            if (_0_3._readFinal$0())
-              if (J.$eq$(_0_5._readFinal$0(), 1)) {
-                first = _0_8._readFinal$0();
-                t1 = true;
-              } else {
-                first = _null;
-                t1 = false;
-              }
-            else {
-              first = _null;
+            _0_3 = "calc" === _0_1;
+            _0_4_isSet = _0_3;
+            if (_0_4_isSet) {
+              _0_5 = _0_4.length;
+              t1 = _0_5;
+              _0_40 = _0_4;
+              t1 = t1 === 1;
+            } else {
+              _0_40 = _null;
+              _0_5 = _0_40;
               t1 = false;
             }
             if (t1) {
+              _0_8 = (_0_4_isSet ? _0_40 : _0_4)[0];
+              first = _0_8;
               type$.Value_2._as(first);
               t1 = first;
               break $label0$0;
             }
-            if (_0_3._readFinal$0())
+            if (_0_3)
               A.throwExpression(A.ArgumentError$("calc() requires exactly one argument.", _null));
-            if (_0_10._readFinal$0())
-              if (J.$eq$(_0_5._readFinal$0(), 3)) {
-                min = _0_8._readFinal$0();
-                value = J.$index$asx(_0_4._readFinal$0(), 1);
-                max = J.$index$asx(_0_4._readFinal$0(), 2);
-                max = max;
-                t1 = true;
-              } else {
-                max = _null;
-                value = max;
-                min = value;
-                t1 = false;
+            _0_10 = "clamp" === _0_1;
+            t1 = _0_10;
+            if (t1) {
+              if (_0_4_isSet)
+                t1 = _0_5;
+              else {
+                _0_5 = _0_4.length;
+                t1 = _0_5;
+                _0_40 = _0_4;
+                _0_4_isSet = true;
               }
-            else {
-              max = _null;
-              value = max;
-              min = value;
+              t1 = t1 === 3;
+            } else
               t1 = false;
-            }
             if (t1) {
-              t1 = A.SassCalculation_clamp0(min, value, max);
+              if (_0_4_isSet)
+                t1 = _0_40;
+              else {
+                t1 = _0_4;
+                _0_40 = t1;
+                _0_4_isSet = true;
+              }
+              _0_8 = t1[0];
+              min = _0_8;
+              if (_0_4_isSet)
+                t1 = _0_40;
+              else {
+                t1 = _0_4;
+                _0_40 = t1;
+                _0_4_isSet = true;
+              }
+              value = t1[1];
+              t1 = A.SassCalculation_clamp0(min, value, (_0_4_isSet ? _0_40 : _0_4)[2]);
               break $label0$0;
             }
-            if (_0_10._readFinal$0())
+            if (_0_10)
               A.throwExpression(A.ArgumentError$("clamp() requires exactly 3 arguments.", _null));
-            if ("min" === _0_1._readFinal$0()) {
-              args = _0_4._readFinal$0();
-              t1 = true;
-            } else {
-              args = _null;
-              t1 = false;
-            }
-            if (t1) {
-              t1 = A.SassCalculation_min0(args);
+            if ("min" === _0_1) {
+              t1 = A.SassCalculation_min0(_0_4_isSet ? _0_40 : _0_4);
               break $label0$0;
             }
-            if ("max" === _0_1._readFinal$0()) {
-              args = _0_4._readFinal$0();
-              t1 = true;
-            } else {
-              args = _null;
-              t1 = false;
-            }
-            if (t1) {
-              t1 = A.SassCalculation_max0(args);
+            if ("max" === _0_1) {
+              t1 = A.SassCalculation_max0(_0_4_isSet ? _0_40 : _0_4);
               break $label0$0;
             }
-            t1 = A.throwExpression(A.ArgumentError$('"' + _0_1._readFinal$0() + '" is not a recognized calculation type.', _null));
+            t1 = A.throwExpression(A.ArgumentError$('"' + _0_1 + '" is not a recognized calculation type.', _null));
           }
           break $label1$1;
         }
@@ -21221,12 +23354,17 @@ self.util = _cliPkgRequires.util;
       A.jsForEach(functions, new A._parseFunctions_closure0(asynch, result));
       return result;
     },
+    _parseDeprecations(logger, deprecations, supportVersions) {
+      if (deprecations == null)
+        return null;
+      return new A._parseDeprecations_closure(deprecations, logger, supportVersions).call$0();
+    },
     compileAsync_closure: function compileAsync_closure(t0, t1, t2, t3) {
       var _ = this;
       _.path = t0;
       _.color = t1;
       _.options = t2;
-      _.ascii = t3;
+      _.logger = t3;
     },
     compileAsync__closure: function compileAsync__closure() {
     },
@@ -21235,7 +23373,7 @@ self.util = _cliPkgRequires.util;
       _.text = t0;
       _.options = t1;
       _.color = t2;
-      _.ascii = t3;
+      _.logger = t3;
     },
     compileStringAsync__closure: function compileStringAsync__closure() {
     },
@@ -21245,24 +23383,6 @@ self.util = _cliPkgRequires.util;
       this.color = t0;
       this.ascii = t1;
     },
-    _simplifyValue_closure: function _simplifyValue_closure(t0) {
-      this._0_0 = t0;
-    },
-    _simplifyValue_closure0: function _simplifyValue_closure0(t0) {
-      this._0_1 = t0;
-    },
-    _simplifyValue_closure1: function _simplifyValue_closure1(t0) {
-      this._0_0 = t0;
-    },
-    _simplifyValue_closure2: function _simplifyValue_closure2(t0) {
-      this._0_4 = t0;
-    },
-    _simplifyValue_closure3: function _simplifyValue_closure3(t0) {
-      this._0_4 = t0;
-    },
-    _simplifyValue_closure4: function _simplifyValue_closure4(t0) {
-      this._0_1 = t0;
-    },
     _parseFunctions_closure0: function _parseFunctions_closure0(t0, t1) {
       this.asynch = t0;
       this.result = t1;
@@ -21283,10 +23403,28 @@ self.util = _cliPkgRequires.util;
       this.callback = t0;
       this.$arguments = t1;
     },
-    compile(path, charset, fatalDeprecations, functions, futureDeprecations, importCache, indentWidth, lineFeed, logger, nodeImporter, quietDeps, sourceMap, style, syntax, useSpaces, verbose) {
-      var t2, t3, t4, t0, stylesheet, result, _null = null,
-        t1 = type$.Deprecation_2;
-      logger = new A.DeprecationHandlingLogger0(A.LinkedHashMap_LinkedHashMap$_empty(t1, type$.int), logger, A.LinkedHashSet_LinkedHashSet$_empty(t1), A.LinkedHashSet_LinkedHashSet$_empty(t1), !verbose);
+    _parseDeprecations_closure: function _parseDeprecations_closure(t0, t1, t2) {
+      this.deprecations = t0;
+      this.logger = t1;
+      this.supportVersions = t2;
+    },
+    nodePackageImporterClass_closure: function nodePackageImporterClass_closure() {
+    },
+    nodePackageImporterClass__closure: function nodePackageImporterClass__closure() {
+    },
+    compile(path, charset, fatalDeprecations, functions, futureDeprecations, importCache, indentWidth, lineFeed, logger, nodeImporter, quietDeps, silenceDeprecations, sourceMap, style, syntax, useSpaces, verbose) {
+      var t3, t4, t0, stylesheet, result, _null = null,
+        t1 = type$.Deprecation_3,
+        t2 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
+      if (silenceDeprecations != null)
+        t2.addAll$1(0, silenceDeprecations);
+      t3 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
+      if (fatalDeprecations != null)
+        t3.addAll$1(0, fatalDeprecations);
+      t1 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
+      if (futureDeprecations != null)
+        t1.addAll$1(0, futureDeprecations);
+      logger = A.DeprecationProcessingLogger$0(logger, t3, t1, !verbose, t2);
       t1 = nodeImporter == null;
       if (t1)
         t2 = syntax == null || syntax === A.Syntax_forPath0(path);
@@ -21295,7 +23433,7 @@ self.util = _cliPkgRequires.util;
       if (t2) {
         if (importCache == null)
           importCache = A.ImportCache$none(logger);
-        t2 = A.absolute(".", _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null);
+        t2 = $.$get$FilesystemImporter_cwd0();
         t3 = A.isNodeJs() ? self.process : _null;
         if (!J.$eq$(t3 == null ? _null : J.get$platform$x(t3), "win32")) {
           t3 = A.isNodeJs() ? self.process : _null;
@@ -21315,7 +23453,7 @@ self.util = _cliPkgRequires.util;
           t4 = t3;
           t3 = t0;
         }
-        t4 = importCache.importCanonical$3$originalUrl(new A.FilesystemImporter0(t2), t4.toUri$1(t3), t4.toUri$1(path));
+        t4 = importCache.importCanonical$3$originalUrl(t2, t4.toUri$1(t3), t4.toUri$1(path));
         t4.toString;
         stylesheet = t4;
       } else {
@@ -21323,17 +23461,26 @@ self.util = _cliPkgRequires.util;
         t3 = syntax == null ? A.Syntax_forPath0(path) : syntax;
         stylesheet = A.Stylesheet_Stylesheet$parse0(t2, t3, logger, $.$get$context().toUri$1(path));
       }
-      result = A._compileStylesheet1(stylesheet, logger, importCache, nodeImporter, new A.FilesystemImporter0(A.absolute(".", _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null)), functions, style, useSpaces, indentWidth, lineFeed, quietDeps, sourceMap, charset);
+      result = A._compileStylesheet1(stylesheet, logger, importCache, nodeImporter, $.$get$FilesystemImporter_cwd0(), functions, style, useSpaces, indentWidth, lineFeed, quietDeps, sourceMap, charset);
       logger.summarize$1$js(!t1);
       return result;
     },
-    compileString(source, charset, fatalDeprecations, functions, futureDeprecations, importCache, importer, indentWidth, lineFeed, logger, nodeImporter, quietDeps, sourceMap, style, syntax, url, useSpaces, verbose) {
-      var stylesheet, result, _null = null,
-        t1 = type$.Deprecation_2;
-      logger = new A.DeprecationHandlingLogger0(A.LinkedHashMap_LinkedHashMap$_empty(t1, type$.int), logger, A.LinkedHashSet_LinkedHashSet$_empty(t1), A.LinkedHashSet_LinkedHashSet$_empty(t1), !verbose);
+    compileString(source, charset, fatalDeprecations, functions, futureDeprecations, importCache, importer, indentWidth, lineFeed, logger, nodeImporter, quietDeps, silenceDeprecations, sourceMap, style, syntax, url, useSpaces, verbose) {
+      var t3, stylesheet, result,
+        t1 = type$.Deprecation_3,
+        t2 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
+      if (silenceDeprecations != null)
+        t2.addAll$1(0, silenceDeprecations);
+      t3 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
+      if (fatalDeprecations != null)
+        t3.addAll$1(0, fatalDeprecations);
+      t1 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
+      if (futureDeprecations != null)
+        t1.addAll$1(0, futureDeprecations);
+      logger = A.DeprecationProcessingLogger$0(logger, t3, t1, !verbose, t2);
       stylesheet = A.Stylesheet_Stylesheet$parse0(source, syntax == null ? B.Syntax_SCSS_scss0 : syntax, logger, url);
       if (importer == null)
-        t1 = A.isBrowser() ? new A.NoOpImporter0() : new A.FilesystemImporter0(A.absolute(".", _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null));
+        t1 = A.isBrowser() ? new A.NoOpImporter0() : $.$get$FilesystemImporter_cwd0();
       else
         t1 = importer;
       result = A._compileStylesheet1(stylesheet, logger, importCache, nodeImporter, t1, functions, style, useSpaces, indentWidth, lineFeed, quietDeps, sourceMap, charset);
@@ -21362,6 +23509,46 @@ self.util = _cliPkgRequires.util;
       this._evaluate = t0;
       this._compile_result$_serialize = t1;
     },
+    initCompiler() {
+      return new A.Compiler();
+    },
+    initAsyncCompiler() {
+      return A.futureToPromise0(new A.initAsyncCompiler_closure().call$0());
+    },
+    Compiler: function Compiler() {
+      this._disposed = false;
+    },
+    AsyncCompiler: function AsyncCompiler(t0) {
+      this.compilations = t0;
+      this._disposed = false;
+    },
+    AsyncCompiler_addCompilation_closure: function AsyncCompiler_addCompilation_closure() {
+    },
+    compilerClass_closure: function compilerClass_closure() {
+    },
+    compilerClass__closure: function compilerClass__closure() {
+    },
+    compilerClass__closure0: function compilerClass__closure0() {
+    },
+    compilerClass__closure1: function compilerClass__closure1() {
+    },
+    compilerClass__closure2: function compilerClass__closure2() {
+    },
+    asyncCompilerClass_closure: function asyncCompilerClass_closure() {
+    },
+    asyncCompilerClass__closure: function asyncCompilerClass__closure() {
+    },
+    asyncCompilerClass__closure0: function asyncCompilerClass__closure0() {
+    },
+    asyncCompilerClass__closure1: function asyncCompilerClass__closure1() {
+    },
+    asyncCompilerClass__closure2: function asyncCompilerClass__closure2() {
+    },
+    asyncCompilerClass___closure: function asyncCompilerClass___closure(t0) {
+      this.self = t0;
+    },
+    initAsyncCompiler_closure: function initAsyncCompiler_closure() {
+    },
     ComplexSassNumber0: function ComplexSassNumber0(t0, t1, t2, t3) {
       var _ = this;
       _._complex0$_numeratorUnits = t0;
@@ -21387,15 +23574,6 @@ self.util = _cliPkgRequires.util;
     },
     ComplexSelector_specificity_closure0: function ComplexSelector_specificity_closure0() {
     },
-    ComplexSelector_singleCompound_closure0: function ComplexSelector_singleCompound_closure0(t0) {
-      this._0_0 = t0;
-    },
-    ComplexSelector_withAdditionalCombinators_closure0: function ComplexSelector_withAdditionalCombinators_closure0(t0) {
-      this._0_0 = t0;
-    },
-    ComplexSelector_concatenate_closure0: function ComplexSelector_concatenate_closure0(t0) {
-      this._0_0 = t0;
-    },
     ComplexSelectorComponent0: function ComplexSelectorComponent0(t0, t1, t2) {
       this.selector = t0;
       this.combinators = t1;
@@ -21410,12 +23588,15 @@ self.util = _cliPkgRequires.util;
       return new A.CompoundSelector0(t1, span);
     },
     CompoundSelector0: function CompoundSelector0(t0, t1) {
-      this.components = t0;
-      this._compound$__CompoundSelector_specificity_FI = $;
-      this.span = t1;
+      var _ = this;
+      _.components = t0;
+      _._compound$__CompoundSelector_hasComplicatedSuperselectorSemantics_FI = _._compound$__CompoundSelector_specificity_FI = $;
+      _.span = t1;
     },
     CompoundSelector_specificity_closure0: function CompoundSelector_specificity_closure0() {
     },
+    CompoundSelector_hasComplicatedSuperselectorSemantics_closure0: function CompoundSelector_hasComplicatedSuperselectorSemantics_closure0() {
+    },
     Configuration0: function Configuration0(t0, t1) {
       this._configuration0$_values = t0;
       this._configuration0$__originalConfiguration = t1;
@@ -21438,17 +23619,20 @@ self.util = _cliPkgRequires.util;
       _.span = t3;
     },
     ContentBlock$0($arguments, children, span) {
-      var t1 = A.List_List$unmodifiable(children, type$.Statement_2),
-        t2 = B.JSArray_methods.any$1(t1, new A.ParentStatement_closure0());
-      return new A.ContentBlock0("@content", $arguments, span, t1, t2);
+      var _s8_ = "@content",
+        t1 = A.stringReplaceAllUnchecked(_s8_, "_", "-"),
+        t2 = A.List_List$unmodifiable(children, type$.Statement_2),
+        t3 = B.JSArray_methods.any$1(t2, new A.ParentStatement_closure0());
+      return new A.ContentBlock0(t1, _s8_, $arguments, span, t2, t3);
     },
-    ContentBlock0: function ContentBlock0(t0, t1, t2, t3, t4) {
+    ContentBlock0: function ContentBlock0(t0, t1, t2, t3, t4, t5) {
       var _ = this;
       _.name = t0;
-      _.$arguments = t1;
-      _.span = t2;
-      _.children = t3;
-      _.hasDeclarations = t4;
+      _.originalName = t1;
+      _.$arguments = t2;
+      _.span = t3;
+      _.children = t4;
+      _.hasDeclarations = t5;
     },
     ContentRule0: function ContentRule0(t0, t1) {
       this.$arguments = t0;
@@ -21459,7 +23643,7 @@ self.util = _cliPkgRequires.util;
     CssParser0: function CssParser0(t0, t1, t2, t3) {
       var _ = this;
       _._stylesheet0$_isUseAllowed = true;
-      _._stylesheet0$_inParentheses = _._stylesheet0$_inStyleRule = _._stylesheet0$_inUnknownAtRule = _._stylesheet0$_inControlDirective = _._stylesheet0$_inContentBlock = _._stylesheet0$_inMixin = false;
+      _._stylesheet0$_inExpression = _._stylesheet0$_inParentheses = _._stylesheet0$_inStyleRule = _._stylesheet0$_inUnknownAtRule = _._stylesheet0$_inControlDirective = _._stylesheet0$_inContentBlock = _._stylesheet0$_inMixin = false;
       _._stylesheet0$_globalVariables = t0;
       _.lastSilentComment = null;
       _.scanner = t1;
@@ -21514,28 +23698,61 @@ self.util = _cliPkgRequires.util;
       this.value = t1;
       this.span = t2;
     },
-    Deprecation0: function Deprecation0(t0, t1, t2) {
-      this.id = t0;
-      this.isFuture = t1;
-      this._name = t2;
+    Deprecation_fromId0(id) {
+      return A.IterableExtension_firstWhereOrNull(B.List_wIq, new A.Deprecation_fromId_closure0(id));
     },
-    DeprecationHandlingLogger0: function DeprecationHandlingLogger0(t0, t1, t2, t3, t4) {
+    Deprecation_forVersion0(version) {
+      var t2, _i, deprecation, $self, t3,
+        t1 = A.LinkedHashSet_LinkedHashSet$_empty(type$.Deprecation_3);
+      for (t2 = A.VersionRange_VersionRange(true, version).get$allows(), _i = 0; _i < 19; ++_i) {
+        deprecation = B.List_wIq[_i];
+        $self = deprecation._deprecation$_deprecatedIn;
+        t3 = $self == null ? null : A.Version___parse_tearOff($self);
+        t3 = t3 == null ? null : t2.call$1(t3);
+        if (t3 == null ? false : t3)
+          t1.add$1(0, deprecation);
+      }
+      return t1;
+    },
+    Deprecation0: function Deprecation0(t0, t1, t2, t3, t4) {
       var _ = this;
-      _._deprecation_handling$_warningCounts = t0;
-      _._deprecation_handling$_inner = t1;
-      _.fatalDeprecations = t2;
-      _.futureDeprecations = t3;
-      _.limitRepetition = t4;
+      _.id = t0;
+      _._deprecation$_deprecatedIn = t1;
+      _.description = t2;
+      _.isFuture = t3;
+      _._name = t4;
     },
-    DeprecationHandlingLogger_warnForDeprecation_closure1: function DeprecationHandlingLogger_warnForDeprecation_closure1(t0) {
-      this._0_0 = t0;
+    Deprecation_fromId_closure0: function Deprecation_fromId_closure0(t0) {
+      this.id = t0;
     },
-    DeprecationHandlingLogger_warnForDeprecation_closure2: function DeprecationHandlingLogger_warnForDeprecation_closure2(t0) {
-      this._0_0 = t0;
+    DeprecationProcessingLogger$0(_inner, fatalDeprecations, futureDeprecations, limitRepetition, silenceDeprecations) {
+      var t1 = new A.DeprecationProcessingLogger0(A.LinkedHashMap_LinkedHashMap$_empty(type$.Deprecation_3, type$.int), _inner, silenceDeprecations, fatalDeprecations, futureDeprecations, limitRepetition);
+      t1.DeprecationProcessingLogger$5$fatalDeprecations$futureDeprecations$limitRepetition$silenceDeprecations0(_inner, fatalDeprecations, futureDeprecations, limitRepetition, silenceDeprecations);
+      return t1;
     },
-    DeprecationHandlingLogger_summarize_closure1: function DeprecationHandlingLogger_summarize_closure1() {
+    DeprecationProcessingLogger0: function DeprecationProcessingLogger0(t0, t1, t2, t3, t4, t5) {
+      var _ = this;
+      _._deprecation_processing$_warningCounts = t0;
+      _._deprecation_processing$_inner = t1;
+      _.silenceDeprecations = t2;
+      _.fatalDeprecations = t3;
+      _.futureDeprecations = t4;
+      _.limitRepetition = t5;
     },
-    DeprecationHandlingLogger_summarize_closure2: function DeprecationHandlingLogger_summarize_closure2() {
+    DeprecationProcessingLogger_summarize_closure1: function DeprecationProcessingLogger_summarize_closure1() {
+    },
+    DeprecationProcessingLogger_summarize_closure2: function DeprecationProcessingLogger_summarize_closure2() {
+    },
+    Deprecation1: function Deprecation1() {
+    },
+    deprecations_closure: function deprecations_closure(t0) {
+      this.deprecation = t0;
+    },
+    versionClass_closure: function versionClass_closure() {
+    },
+    versionClass__closure: function versionClass__closure() {
+    },
+    versionClass__closure0: function versionClass__closure0() {
     },
     DynamicImport0: function DynamicImport0(t0, t1) {
       this.urlString = t0;
@@ -21574,7 +23791,7 @@ self.util = _cliPkgRequires.util;
       return new A.Environment0(_modules, _namespaceNodes, _globalModules, _importedModules, _forwardedModules, _nestedForwardedModules, _allModules, _variables, _variableNodes, A.LinkedHashMap_LinkedHashMap$_empty(t1, t2), _functions, A.LinkedHashMap_LinkedHashMap$_empty(t1, t2), _mixins, A.LinkedHashMap_LinkedHashMap$_empty(t1, t2), _content);
     },
     _EnvironmentModule__EnvironmentModule1(environment, css, preModuleComments, extensionStore, forwarded) {
-      var t1, t2, t3, t4, t5, t6, module, comments, result, t7;
+      var t1, t2, t3, t4, t5, t6, module, result, t7;
       if (forwarded == null)
         forwarded = B.Set_empty4;
       t1 = type$.dynamic;
@@ -21582,8 +23799,7 @@ self.util = _cliPkgRequires.util;
       for (t2 = type$.Module_Callable_2, t3 = type$.List_CssComment_2, t4 = A.MapExtensions_get_pairs0(preModuleComments, t2, t3), t4 = t4.get$iterator(t4), t5 = type$.CssComment_2; t4.moveNext$0();) {
         t6 = t4.get$current(t4);
         module = t6._0;
-        comments = t6._1;
-        result = A.List_List$from(comments, false, t5);
+        result = A.List_List$from(t6._1, false, t5);
         result.fixed$length = Array;
         result.immutable$list = Array;
         t1.$indexSet(0, module, result);
@@ -21720,10 +23936,10 @@ self.util = _cliPkgRequires.util;
         t1 = type$.Uri,
         t2 = type$.Module_Callable_2,
         t3 = A._setArrayType([], type$.JSArray_Record_2_String_and_AstNode_2);
-      if (nodeImporter == null)
-        t4 = importCache == null ? A.ImportCache$none(logger) : importCache;
+      if (importCache == null)
+        t4 = nodeImporter == null ? A.ImportCache$none(logger) : null;
       else
-        t4 = null;
+        t4 = importCache;
       t1 = new A._EvaluateVisitor1(t4, nodeImporter, A.LinkedHashMap_LinkedHashMap$_empty(type$.String, type$.Callable_2), A.LinkedHashMap_LinkedHashMap$_empty(t1, t2), A.LinkedHashMap_LinkedHashMap$_empty(t1, t2), A.LinkedHashMap_LinkedHashMap$_empty(t1, type$.Configuration_2), A.LinkedHashMap_LinkedHashMap$_empty(t1, type$.AstNode_2), logger, A.LinkedHashSet_LinkedHashSet$_empty(type$.Record_2_String_and_SourceSpan), quietDeps, sourceMap, A.Environment$0(), A.LinkedHashSet_LinkedHashSet$_empty(t1), A.LinkedHashMap_LinkedHashMap$_empty(t1, type$.nullable_AstNode_2), t3, B.Configuration_Map_empty_null0);
       t1._EvaluateVisitor$6$functions$importCache$logger$nodeImporter$quietDeps$sourceMap1(functions, importCache, logger, nodeImporter, quietDeps, sourceMap);
       return t1;
@@ -21731,7 +23947,7 @@ self.util = _cliPkgRequires.util;
     _EvaluateVisitor1: function _EvaluateVisitor1(t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15) {
       var _ = this;
       _._evaluate0$_importCache = t0;
-      _._evaluate0$_nodeImporter = t1;
+      _._nodeImporter = t1;
       _._evaluate0$_builtInFunctions = t2;
       _._evaluate0$_builtInModules = t3;
       _._evaluate0$_modules = t4;
@@ -22021,7 +24237,7 @@ self.util = _cliPkgRequires.util;
       _.environment = t3;
       _.children = t4;
     },
-    _EvaluateVisitor__applyMixin_closure6: function _EvaluateVisitor__applyMixin_closure6(t0, t1, t2, t3) {
+    _EvaluateVisitor__applyMixin_closure3: function _EvaluateVisitor__applyMixin_closure3(t0, t1, t2, t3) {
       var _ = this;
       _.$this = t0;
       _.$arguments = t1;
@@ -22035,10 +24251,7 @@ self.util = _cliPkgRequires.util;
       _.mixin = t2;
       _.nodeWithSpanWithoutContent = t3;
     },
-    _EvaluateVisitor__applyMixin_closure5: function _EvaluateVisitor__applyMixin_closure5(t0) {
-      this._1_0 = t0;
-    },
-    _EvaluateVisitor__applyMixin_closure7: function _EvaluateVisitor__applyMixin_closure7(t0, t1, t2, t3) {
+    _EvaluateVisitor__applyMixin_closure4: function _EvaluateVisitor__applyMixin_closure4(t0, t1, t2, t3) {
       var _ = this;
       _.$this = t0;
       _.contentCallable = t1;
@@ -22092,13 +24305,13 @@ self.util = _cliPkgRequires.util;
     _EvaluateVisitor_visitMediaRule_closure7: function _EvaluateVisitor_visitMediaRule_closure7(t0) {
       this.mergedSources = t0;
     },
-    _EvaluateVisitor_visitStyleRule_closure9: function _EvaluateVisitor_visitStyleRule_closure9(t0, t1) {
+    _EvaluateVisitor_visitStyleRule_closure7: function _EvaluateVisitor_visitStyleRule_closure7(t0, t1) {
       this.$this = t0;
       this.node = t1;
     },
-    _EvaluateVisitor_visitStyleRule_closure10: function _EvaluateVisitor_visitStyleRule_closure10() {
+    _EvaluateVisitor_visitStyleRule_closure8: function _EvaluateVisitor_visitStyleRule_closure8() {
     },
-    _EvaluateVisitor_visitStyleRule_closure11: function _EvaluateVisitor_visitStyleRule_closure11(t0, t1, t2) {
+    _EvaluateVisitor_visitStyleRule_closure10: function _EvaluateVisitor_visitStyleRule_closure10(t0, t1, t2) {
       this.$this = t0;
       this.rule = t1;
       this.node = t2;
@@ -22107,9 +24320,9 @@ self.util = _cliPkgRequires.util;
       this.$this = t0;
       this.node = t1;
     },
-    _EvaluateVisitor_visitStyleRule_closure12: function _EvaluateVisitor_visitStyleRule_closure12() {
+    _EvaluateVisitor_visitStyleRule_closure9: function _EvaluateVisitor_visitStyleRule_closure9() {
     },
-    _EvaluateVisitor_visitStyleRule_closure13: function _EvaluateVisitor_visitStyleRule_closure13() {
+    _EvaluateVisitor__warnForBogusCombinators_closure1: function _EvaluateVisitor__warnForBogusCombinators_closure1() {
     },
     _EvaluateVisitor_visitSupportsRule_closure3: function _EvaluateVisitor_visitSupportsRule_closure3(t0, t1) {
       this.$this = t0;
@@ -22158,12 +24371,6 @@ self.util = _cliPkgRequires.util;
       this.$this = t0;
       this.node = t1;
     },
-    _EvaluateVisitor__slash_closure3: function _EvaluateVisitor__slash_closure3(t0) {
-      this._1_0 = t0;
-    },
-    _EvaluateVisitor__slash_closure4: function _EvaluateVisitor__slash_closure4(t0) {
-      this._1_0 = t0;
-    },
     _EvaluateVisitor__slash_recommendation1: function _EvaluateVisitor__slash_recommendation1() {
     },
     _EvaluateVisitor_visitVariableExpression_closure1: function _EvaluateVisitor_visitVariableExpression_closure1(t0, t1) {
@@ -22199,9 +24406,6 @@ self.util = _cliPkgRequires.util;
       _.node = t2;
       _.inLegacySassFunction = t3;
     },
-    _EvaluateVisitor__checkAdjacentCalculationValues_closure1: function _EvaluateVisitor__checkAdjacentCalculationValues_closure1(t0) {
-      this._0_0 = t0;
-    },
     _EvaluateVisitor_visitInterpolatedFunctionExpression_closure1: function _EvaluateVisitor_visitInterpolatedFunctionExpression_closure1(t0, t1, t2) {
       this.$this = t0;
       this.node = t1;
@@ -22334,7 +24538,7 @@ self.util = _cliPkgRequires.util;
     _EvaluateVisitor_visitCssMediaRule_closure7: function _EvaluateVisitor_visitCssMediaRule_closure7(t0) {
       this.mergedSources = t0;
     },
-    _EvaluateVisitor_visitCssStyleRule_closure5: function _EvaluateVisitor_visitCssStyleRule_closure5(t0, t1, t2) {
+    _EvaluateVisitor_visitCssStyleRule_closure4: function _EvaluateVisitor_visitCssStyleRule_closure4(t0, t1, t2) {
       this.$this = t0;
       this.rule = t1;
       this.node = t2;
@@ -22343,10 +24547,7 @@ self.util = _cliPkgRequires.util;
       this.$this = t0;
       this.node = t1;
     },
-    _EvaluateVisitor_visitCssStyleRule_closure6: function _EvaluateVisitor_visitCssStyleRule_closure6() {
-    },
-    _EvaluateVisitor_visitCssStyleRule_closure7: function _EvaluateVisitor_visitCssStyleRule_closure7(t0) {
-      this._0_0 = t0;
+    _EvaluateVisitor_visitCssStyleRule_closure3: function _EvaluateVisitor_visitCssStyleRule_closure3() {
     },
     _EvaluateVisitor_visitCssSupportsRule_closure3: function _EvaluateVisitor_visitCssSupportsRule_closure3(t0, t1) {
       this.$this = t0;
@@ -22525,10 +24726,14 @@ self.util = _cliPkgRequires.util;
       this.$this = t0;
     },
     expressionToCalc0(expression) {
-      var t1 = A._setArrayType([B.C__MakeExpressionCalculationSafe0.visitBinaryOperationExpression$1(expression)], type$.JSArray_Expression_2),
-        t2 = expression.get$span(expression),
+      var t4,
+        t1 = A._setArrayType([B.C__MakeExpressionCalculationSafe0.visitBinaryOperationExpression$1(expression)], type$.JSArray_Expression_2),
+        t2 = expression.get$span(0),
         t3 = type$.Expression_2;
-      return new A.FunctionExpression0(null, "calc", new A.ArgumentInvocation0(A.List_List$unmodifiable(t1, t3), A.ConstantMap_ConstantMap$from(B.Map_empty14, type$.String, t3), null, null, t2), expression.get$span(expression));
+      t1 = A.List_List$unmodifiable(t1, t3);
+      t3 = A.ConstantMap_ConstantMap$from(B.Map_empty14, type$.String, t3);
+      t4 = expression.get$span(0);
+      return new A.FunctionExpression0(null, A.stringReplaceAllUnchecked("calc", "_", "-"), "calc", new A.ArgumentInvocation0(t1, t3, null, null, t2), t4);
     },
     _MakeExpressionCalculationSafe0: function _MakeExpressionCalculationSafe0() {
     },
@@ -22600,10 +24805,7 @@ self.util = _cliPkgRequires.util;
     },
     ExtensionStore_extensionsWhereTarget_closure0: function ExtensionStore_extensionsWhereTarget_closure0() {
     },
-    ExtensionStore__registerSelector_closure1: function ExtensionStore__registerSelector_closure1() {
-    },
-    ExtensionStore__registerSelector_closure2: function ExtensionStore__registerSelector_closure2(t0) {
-      this._0_0 = t0;
+    ExtensionStore__registerSelector_closure0: function ExtensionStore__registerSelector_closure0() {
     },
     ExtensionStore_addExtension_closure2: function ExtensionStore_addExtension_closure2() {
     },
@@ -22612,9 +24814,6 @@ self.util = _cliPkgRequires.util;
     ExtensionStore_addExtension_closure4: function ExtensionStore_addExtension_closure4(t0) {
       this.complex = t0;
     },
-    ExtensionStore__simpleSelectors_closure0: function ExtensionStore__simpleSelectors_closure0(t0) {
-      this._0_0 = t0;
-    },
     ExtensionStore__extendExistingExtensions_closure1: function ExtensionStore__extendExistingExtensions_closure1() {
     },
     ExtensionStore__extendExistingExtensions_closure2: function ExtensionStore__extendExistingExtensions_closure2() {
@@ -22688,12 +24887,9 @@ self.util = _cliPkgRequires.util;
       this.$this = t0;
       this.url = t1;
     },
-    FilesystemImporter$(loadPath) {
-      var _null = null;
-      return new A.FilesystemImporter0(A.absolute(loadPath, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null));
-    },
-    FilesystemImporter0: function FilesystemImporter0(t0) {
+    FilesystemImporter0: function FilesystemImporter0(t0, t1) {
       this._filesystem$_loadPath = t0;
+      this._filesystem$_loadPathDeprecated = t1;
     },
     FilesystemImporter_canonicalize_closure0: function FilesystemImporter_canonicalize_closure0() {
     },
@@ -22729,20 +24925,10 @@ self.util = _cliPkgRequires.util;
         if (rule.shownMixinsAndFunctions == null)
           if (rule.shownVariables == null) {
             t1 = rule.hiddenMixinsAndFunctions;
-            if (t1 == null)
-              t1 = null;
-            else {
-              t1 = t1._base;
-              t1 = t1.get$isEmpty(t1);
-            }
+            t1 = t1 == null ? null : t1._base.get$isEmpty(0);
             if (t1 === true) {
               t1 = rule.hiddenVariables;
-              if (t1 == null)
-                t1 = null;
-              else {
-                t1 = t1._base;
-                t1 = t1.get$isEmpty(t1);
-              }
+              t1 = t1 == null ? null : t1._base.get$isEmpty(0);
               t1 = t1 === true;
             } else
               t1 = false;
@@ -22770,11 +24956,7 @@ self.util = _cliPkgRequires.util;
         t1 = prefix == null;
       if (t1)
         if (safelist == null)
-          if (blocklist != null) {
-            t2 = blocklist._base;
-            t2 = t2.get$isEmpty(t2);
-          } else
-            t2 = true;
+          t2 = blocklist == null || blocklist._base.get$isEmpty(0);
         else
           t2 = false;
       else
@@ -22785,15 +24967,8 @@ self.util = _cliPkgRequires.util;
         map = new A.PrefixedMapView0(map, prefix, $V._eval$1("PrefixedMapView0<0>"));
       if (safelist != null)
         map = new A.LimitedMapView0(map, safelist._base.intersection$1(new A.MapKeySet(map, type$.MapKeySet_nullable_Object)), type$.$env_1_1_String._bind$1($V)._eval$1("LimitedMapView0<1,2>"));
-      else {
-        if (blocklist != null) {
-          t1 = blocklist._base;
-          t1 = t1.get$isNotEmpty(t1);
-        } else
-          t1 = false;
-        if (t1)
-          map = A.LimitedMapView$blocklist0(map, blocklist, type$.String, $V);
-      }
+      else if (blocklist != null && blocklist._base.get$isNotEmpty(0))
+        map = A.LimitedMapView$blocklist0(map, blocklist, type$.String, $V);
       return map;
     },
     ForwardedModuleView0: function ForwardedModuleView0(t0, t1, t2, t3, t4, t5, t6) {
@@ -22806,12 +24981,13 @@ self.util = _cliPkgRequires.util;
       _.mixins = t5;
       _.$ti = t6;
     },
-    FunctionExpression0: function FunctionExpression0(t0, t1, t2, t3) {
+    FunctionExpression0: function FunctionExpression0(t0, t1, t2, t3, t4) {
       var _ = this;
       _.namespace = t0;
-      _.originalName = t1;
-      _.$arguments = t2;
-      _.span = t3;
+      _.name = t1;
+      _.originalName = t2;
+      _.$arguments = t3;
+      _.span = t4;
     },
     JSFunction0: function JSFunction0() {
     },
@@ -22830,20 +25006,22 @@ self.util = _cliPkgRequires.util;
       this.callable = t0;
     },
     FunctionRule$0($name, $arguments, children, span, comment) {
-      var t1 = A.List_List$unmodifiable(children, type$.Statement_2),
-        t2 = B.JSArray_methods.any$1(t1, new A.ParentStatement_closure0());
-      return new A.FunctionRule0($name, $arguments, span, t1, t2);
+      var t1 = A.stringReplaceAllUnchecked($name, "_", "-"),
+        t2 = A.List_List$unmodifiable(children, type$.Statement_2),
+        t3 = B.JSArray_methods.any$1(t2, new A.ParentStatement_closure0());
+      return new A.FunctionRule0(t1, $name, $arguments, span, t2, t3);
     },
-    FunctionRule0: function FunctionRule0(t0, t1, t2, t3, t4) {
+    FunctionRule0: function FunctionRule0(t0, t1, t2, t3, t4, t5) {
       var _ = this;
       _.name = t0;
-      _.$arguments = t1;
-      _.span = t2;
-      _.children = t3;
-      _.hasDeclarations = t4;
+      _.originalName = t1;
+      _.$arguments = t2;
+      _.span = t3;
+      _.children = t4;
+      _.hasDeclarations = t5;
     },
     unifyComplex0(complexes, span) {
-      var t2, trailingCombinator, leadingCombinator, unifiedBase, t3, _0_6, newLeadingCombinator, t4, base, _1_1, newTrailingCombinator, _i, t5, t6, t7, t8, _null = null,
+      var t2, trailingCombinator, leadingCombinator, unifiedBase, t3, t4, _0_6_isSet, _0_6, t5, newLeadingCombinator, base, _1_1, newTrailingCombinator, _i, t6, t7, t8, _null = null,
         t1 = J.getInterceptor$asx(complexes);
       if (t1.get$length(complexes) === 1)
         return complexes;
@@ -22851,36 +25029,31 @@ self.util = _cliPkgRequires.util;
         t3 = t2.get$current(t2);
         if (t3.accept$1(B.C__IsUselessVisitor0))
           return _null;
-        _0_6 = A._InitializedCell$(new A.unifyComplex_closure2(t3));
-        t3 = t3.components;
-        if (t3.length === 1)
-          if (J.get$length$asx(_0_6._readFinal$0()) === 1) {
-            newLeadingCombinator = J.$index$asx(_0_6._readFinal$0(), 0);
-            t4 = true;
-          } else {
-            newLeadingCombinator = _null;
-            t4 = false;
-          }
-        else {
-          newLeadingCombinator = _null;
-          t4 = false;
+        t4 = t3.components;
+        _0_6_isSet = t4.length === 1;
+        if (_0_6_isSet) {
+          _0_6 = t3.leadingCombinators;
+          t5 = _0_6.length === 1;
+        } else {
+          _0_6 = _null;
+          t5 = false;
         }
-        if (t4)
+        if (t5) {
+          newLeadingCombinator = (_0_6_isSet ? _0_6 : t3.leadingCombinators)[0];
           if (leadingCombinator == null)
             leadingCombinator = newLeadingCombinator;
-          else if (!leadingCombinator.$eq(0, newLeadingCombinator))
+          else if (!(leadingCombinator.$ti._is(newLeadingCombinator) && J.$eq$(newLeadingCombinator.value, leadingCombinator.value)))
             return _null;
-        base = B.JSArray_methods.get$last(t3);
-        _1_1 = A._InitializedCell$(new A.unifyComplex_closure3(base));
-        if (J.get$length$asx(_1_1._readFinal$0()) === 1) {
-          newTrailingCombinator = J.$index$asx(_1_1._readFinal$0(), 0);
-          t3 = true;
-        } else {
-          newTrailingCombinator = _null;
-          t3 = false;
         }
-        if (t3) {
-          if (trailingCombinator != null && !trailingCombinator.$eq(0, newTrailingCombinator))
+        base = B.JSArray_methods.get$last(t4);
+        _1_1 = base.combinators;
+        if (_1_1.length === 1) {
+          newTrailingCombinator = _1_1[0];
+          if (trailingCombinator != null)
+            t3 = !(trailingCombinator.$ti._is(newTrailingCombinator) && J.$eq$(newTrailingCombinator.value, trailingCombinator.value));
+          else
+            t3 = false;
+          if (t3)
             return _null;
           trailingCombinator = newTrailingCombinator;
         }
@@ -22904,11 +25077,11 @@ self.util = _cliPkgRequires.util;
           t3.push(A.ComplexSelector$0(t8, B.JSArray_methods.take$1(t6, t7 - 1), t5.span, t5.lineBreak));
         }
       }
-      t4 = leadingCombinator == null ? B.List_empty14 : A._setArrayType([leadingCombinator], type$.JSArray_CssValue_Combinator_2);
+      t4 = leadingCombinator == null ? B.List_empty13 : A._setArrayType([leadingCombinator], type$.JSArray_CssValue_Combinator_2);
       unifiedBase.toString;
       t5 = A.CompoundSelector$0(unifiedBase, span);
-      t6 = trailingCombinator == null ? B.List_empty14 : A._setArrayType([trailingCombinator], type$.JSArray_CssValue_Combinator_2);
-      base = A.ComplexSelector$0(t4, A._setArrayType([new A.ComplexSelectorComponent0(t5, A.List_List$unmodifiable(t6, type$.CssValue_Combinator_2), span)], type$.JSArray_ComplexSelectorComponent_2), span, t1.any$1(complexes, new A.unifyComplex_closure4()));
+      t6 = trailingCombinator == null ? B.List_empty13 : A._setArrayType([trailingCombinator], type$.JSArray_CssValue_Combinator_2);
+      base = A.ComplexSelector$0(t4, A._setArrayType([new A.ComplexSelectorComponent0(t5, A.List_List$unmodifiable(t6, type$.CssValue_Combinator_2), span)], type$.JSArray_ComplexSelectorComponent_2), span, t1.any$1(complexes, new A.unifyComplex_closure0()));
       if (t3.length === 0)
         t1 = A._setArrayType([base], t2);
       else {
@@ -22953,31 +25126,15 @@ self.util = _cliPkgRequires.util;
       return $name == null ? new A.UniversalSelector0(namespace, t1) : new A.TypeSelector0(new A.QualifiedName0($name, namespace), t1);
     },
     _namespaceAndName0(selector, $name) {
-      var namespace, t1, name0, _null = null,
-        _0_4 = A._InitializedCell$(new A._namespaceAndName_closure0(selector));
+      var t1, _0_4;
       $label0$0: {
         if (selector instanceof A.UniversalSelector0) {
-          namespace = selector.namespace;
-          t1 = true;
-        } else {
-          namespace = _null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = new A._Record_2(namespace, _null);
+          t1 = new A._Record_2(selector.namespace, null);
           break $label0$0;
         }
         if (selector instanceof A.TypeSelector0) {
-          name0 = _0_4._readFinal$0().name;
-          namespace = _0_4._readFinal$0().namespace;
-          t1 = true;
-        } else {
-          namespace = _null;
-          name0 = namespace;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = new A._Record_2(namespace, name0);
+          _0_4 = selector.name;
+          t1 = new A._Record_2(_0_4.namespace, _0_4.name);
           break $label0$0;
         }
         t1 = A.throwExpression(A.ArgumentError$value(selector, $name, string$.must_b));
@@ -22989,22 +25146,16 @@ self.util = _cliPkgRequires.util;
         t1 = J.getInterceptor$asx(complexes);
       if (t1.get$length(complexes) === 1) {
         complex = t1.$index(complexes, 0);
-        t2 = true;
-      } else {
-        complex = null;
-        t2 = false;
-      }
-      if (t2) {
         if (!forceLineBreak || complex.lineBreak)
           return complexes;
         return A._setArrayType([A.ComplexSelector$0(complex.leadingCombinators, complex.components, complex.span, true)], type$.JSArray_ComplexSelector_2);
       }
       t2 = type$.JSArray_ComplexSelector_2;
       prefixes = A._setArrayType([t1.get$first(complexes)], t2);
-      for (t1 = t1.skip$1(complexes, 1), t1 = new A.ListIterator(t1, t1.get$length(t1)), t3 = type$.ComplexSelectorComponent_2, t4 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = t1.skip$1(complexes, 1), t3 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t3._eval$1("ListIterator<ListIterable.E>")), t4 = type$.ComplexSelectorComponent_2, t3 = t3._eval$1("ListIterable.E"); t1.moveNext$0();) {
         t5 = t1.__internal$_current;
         if (t5 == null)
-          t5 = t4._as(t5);
+          t5 = t3._as(t5);
         t6 = t5.components;
         if (t6.length === 1) {
           for (i = 0; i < prefixes.length; ++i)
@@ -23015,13 +25166,13 @@ self.util = _cliPkgRequires.util;
         for (t8 = prefixes.length, _i = 0; _i < prefixes.length; prefixes.length === t8 || (0, A.throwConcurrentModificationError)(prefixes), ++_i) {
           t9 = A._weaveParents0(prefixes[_i], t5, span);
           if (t9 == null)
-            t9 = B.List_empty15;
+            t9 = B.List_empty14;
           t10 = t9.length;
           _i0 = 0;
           for (; _i0 < t9.length; t9.length === t10 || (0, A.throwConcurrentModificationError)(t9), ++_i0) {
             parentPrefix = t9[_i0];
             t11 = B.JSArray_methods.get$last(t6);
-            t12 = A.List_List$of(parentPrefix.components, true, t3);
+            t12 = A.List_List$of(parentPrefix.components, true, t4);
             t12.push(t11);
             t11 = parentPrefix.lineBreak || forceLineBreak;
             t7.push(A.ComplexSelector$0(parentPrefix.leadingCombinators, t12, span, t11));
@@ -23032,7 +25183,7 @@ self.util = _cliPkgRequires.util;
       return prefixes;
     },
     _weaveParents0(prefix, base, span) {
-      var t1, queue1, queue2, trailingCombinators, _0_0, _0_1, _0_3, rootish1, rootish2, rootish, t2, t3, rootish_case_0, rootish_case_1, groups1, groups2, lcs, choices, t4, _i, group, t5, t6, t7, _i0, chunk, t8, t9, _null = null,
+      var t1, queue1, queue2, trailingCombinators, _0_1, _0_3, _0_3_isSet, rootish1, t2, rootish2, _0_30, rootish, t3, rootish_case_0, t0, rootish_case_1, groups1, groups2, lcs, choices, t4, _i, group, t5, t6, t7, _i0, chunk, t8, t9, _null = null,
         leadingCombinators = A._mergeLeadingCombinators0(prefix.leadingCombinators, base.leadingCombinators);
       if (leadingCombinators == null)
         return _null;
@@ -23043,29 +25194,24 @@ self.util = _cliPkgRequires.util;
       if (trailingCombinators == null)
         return _null;
       $label0$0: {
-        _0_0 = new A._Record_2(A._firstIfRootish0(queue1), A._firstIfRootish0(queue2));
-        _0_1 = A._InitializedCell$(new A._weaveParents_closure5(_0_0));
-        _0_3 = A._InitializedCell$(new A._weaveParents_closure6(_0_0));
-        if (_0_1._readFinal$0() != null) {
-          rootish1 = _0_1._readFinal$0();
-          t1 = true;
-        } else {
-          rootish1 = _null;
-          t1 = false;
-        }
-        if (t1)
-          if (_0_3._readFinal$0() != null) {
-            rootish2 = _0_3._readFinal$0();
-            t1 = true;
-          } else {
+        _0_1 = A._firstIfRootish0(queue1);
+        _0_3 = A._firstIfRootish0(queue2);
+        _0_3_isSet = _0_1 != null;
+        if (_0_3_isSet) {
+          rootish1 = _0_1 == null ? t1._as(_0_1) : _0_1;
+          t2 = _0_3 != null;
+          if (t2)
+            rootish2 = _0_3 == null ? t1._as(_0_3) : _0_3;
+          else
             rootish2 = _null;
-            t1 = false;
-          }
-        else {
+          _0_30 = _0_3;
+        } else {
           rootish2 = _null;
-          t1 = false;
+          rootish1 = rootish2;
+          _0_30 = rootish1;
+          t2 = false;
         }
-        if (t1) {
+        if (t2) {
           rootish = A.unifyCompound0(rootish1.selector, rootish2.selector);
           if (rootish == null)
             return _null;
@@ -23076,43 +25222,50 @@ self.util = _cliPkgRequires.util;
           queue2.addFirst$1(new A.ComplexSelectorComponent0(rootish, A.List_List$unmodifiable(rootish2.combinators, t3), t2));
           break $label0$0;
         }
-        if (_0_1._readFinal$0() != null) {
-          rootish_case_0 = _0_1._readFinal$0();
-          t1 = true;
+        if (_0_1 != null) {
+          rootish_case_0 = _0_1;
+          if (_0_3_isSet)
+            t2 = _0_30;
+          else {
+            t2 = _0_3;
+            _0_30 = t2;
+            _0_3_isSet = true;
+          }
+          t2 = t2 == null;
+          t3 = t2 ? rootish_case_0 : _null;
+          t0 = t3;
+          t3 = t2;
+          t2 = t0;
         } else {
-          rootish_case_0 = _null;
-          t1 = false;
+          t2 = _null;
+          t3 = false;
         }
-        if (t1)
-          if (_0_3._readFinal$0() == null) {
-            t1 = rootish_case_0;
-            t2 = true;
+        if (!t3)
+          if (_0_1 == null) {
+            if (_0_3_isSet)
+              t3 = _0_30;
+            else {
+              t3 = _0_3;
+              _0_30 = t3;
+              _0_3_isSet = true;
+            }
+            t3 = t3 != null;
+            if (t3) {
+              rootish_case_1 = _0_3_isSet ? _0_30 : _0_3;
+              if (rootish_case_1 == null)
+                rootish_case_1 = t1._as(rootish_case_1);
+              t1 = rootish_case_1;
+            } else
+              t1 = t2;
+            t2 = t3;
           } else {
-            t1 = _null;
+            t1 = t2;
             t2 = false;
           }
         else {
-          t1 = _null;
-          t2 = false;
-        }
-        if (!t2)
-          if (_0_1._readFinal$0() == null) {
-            if (_0_3._readFinal$0() != null) {
-              rootish_case_1 = _0_3._readFinal$0();
-              t2 = true;
-            } else {
-              rootish_case_1 = _null;
-              t2 = false;
-            }
-            if (t2) {
-              t1 = rootish_case_1;
-              t2 = true;
-            } else
-              t2 = false;
-          } else
-            t2 = false;
-        else
+          t1 = t2;
           t2 = true;
+        }
         if (t2) {
           queue1.addFirst$1(t1);
           queue2.addFirst$1(t1);
@@ -23121,16 +25274,16 @@ self.util = _cliPkgRequires.util;
       groups1 = A._groupSelectors0(queue1);
       groups2 = A._groupSelectors0(queue2);
       t1 = type$.List_ComplexSelectorComponent_2;
-      lcs = A.longestCommonSubsequence0(groups2, groups1, new A._weaveParents_closure7(span), t1);
+      lcs = A.longestCommonSubsequence0(groups2, groups1, new A._weaveParents_closure3(span), t1);
       choices = A._setArrayType([], type$.JSArray_List_Iterable_ComplexSelectorComponent_2);
       for (t2 = lcs.length, t3 = type$.JSArray_Iterable_ComplexSelectorComponent_2, t4 = type$.JSArray_ComplexSelectorComponent_2, _i = 0; _i < lcs.length; lcs.length === t2 || (0, A.throwConcurrentModificationError)(lcs), ++_i) {
         group = lcs[_i];
         t5 = A._setArrayType([], t3);
-        for (t6 = A._chunks0(groups1, groups2, new A._weaveParents_closure8(group), t1), t7 = t6.length, _i0 = 0; _i0 < t6.length; t6.length === t7 || (0, A.throwConcurrentModificationError)(t6), ++_i0) {
+        for (t6 = A._chunks0(groups1, groups2, new A._weaveParents_closure4(group), t1), t7 = t6.length, _i0 = 0; _i0 < t6.length; t6.length === t7 || (0, A.throwConcurrentModificationError)(t6), ++_i0) {
           chunk = t6[_i0];
           t8 = A._setArrayType([], t4);
-          for (t9 = J.get$iterator$ax(chunk); t9.moveNext$0();)
-            B.JSArray_methods.addAll$1(t8, t9.get$current(t9));
+          for (t9 = B.JSArray_methods.get$iterator(chunk); t9.moveNext$0();)
+            B.JSArray_methods.addAll$1(t8, t9.get$current(0));
           t5.push(t8);
         }
         choices.push(t5);
@@ -23139,17 +25292,17 @@ self.util = _cliPkgRequires.util;
         groups2.removeFirst$0();
       }
       t2 = A._setArrayType([], t3);
-      for (t1 = A._chunks0(groups1, groups2, new A._weaveParents_closure9(), t1), t3 = t1.length, _i = 0; _i < t1.length; t1.length === t3 || (0, A.throwConcurrentModificationError)(t1), ++_i) {
+      for (t1 = A._chunks0(groups1, groups2, new A._weaveParents_closure5(), t1), t3 = t1.length, _i = 0; _i < t1.length; t1.length === t3 || (0, A.throwConcurrentModificationError)(t1), ++_i) {
         chunk = t1[_i];
         t5 = A._setArrayType([], t4);
-        for (t6 = J.get$iterator$ax(chunk); t6.moveNext$0();)
-          B.JSArray_methods.addAll$1(t5, t6.get$current(t6));
+        for (t6 = B.JSArray_methods.get$iterator(chunk); t6.moveNext$0();)
+          B.JSArray_methods.addAll$1(t5, t6.get$current(0));
         t2.push(t5);
       }
       choices.push(t2);
       B.JSArray_methods.addAll$1(choices, trailingCombinators);
       t1 = A._setArrayType([], type$.JSArray_ComplexSelector_2);
-      for (t2 = J.get$iterator$ax(A.paths0(new A.WhereIterable(choices, new A._weaveParents_closure10(), type$.WhereIterable_List_Iterable_ComplexSelectorComponent_2), type$.Iterable_ComplexSelectorComponent_2)), t3 = !prefix.lineBreak, t5 = base.lineBreak; t2.moveNext$0();) {
+      for (t2 = J.get$iterator$ax(A.paths0(new A.WhereIterable(choices, new A._weaveParents_closure6(), type$.WhereIterable_List_Iterable_ComplexSelectorComponent_2), type$.Iterable_ComplexSelectorComponent_2)), t3 = !prefix.lineBreak, t5 = base.lineBreak; t2.moveNext$0();) {
         t6 = t2.get$current(t2);
         t7 = A._setArrayType([], t4);
         for (t6 = J.get$iterator$ax(t6); t6.moveNext$0();)
@@ -23160,14 +25313,8 @@ self.util = _cliPkgRequires.util;
     },
     _firstIfRootish0(queue) {
       var first, t1, t2, _i, simple, t3;
-      if (queue.get$length(queue) >= 1) {
+      if (queue.get$length(0) >= 1) {
         first = queue.$index(0, 0);
-        t1 = true;
-      } else {
-        first = null;
-        t1 = false;
-      }
-      if (t1)
         for (t1 = first.selector.components, t2 = t1.length, _i = 0; _i < t2; ++_i) {
           simple = t1[_i];
           if (simple instanceof A.PseudoSelector0)
@@ -23182,44 +25329,89 @@ self.util = _cliPkgRequires.util;
             return first;
           }
         }
+      }
       return null;
     },
     _mergeLeadingCombinators0(combinators1, combinators2) {
-      var t1, t2, combinators, _null = null,
-        _0_0 = new A._Record_2(combinators1, combinators2),
-        _0_1 = A._InitializedCell$(new A._mergeLeadingCombinators_closure3(_0_0)),
-        _0_4 = A._InitializedCell$(new A._mergeLeadingCombinators_closure4(_0_0)),
-        _0_7 = A._InitializedCell$(new A._mergeLeadingCombinators_closure5(_0_1)),
-        _0_11 = A._InitializedCell$(new A._mergeLeadingCombinators_closure6(_0_4));
+      var _0_4, t1, _0_7_isSet, _0_7, t2, _0_11_isSet, _0_11, _0_4_isSet, combinators, _null = null;
       $label0$0: {
-        if (_0_1._readFinal$0() == null || _0_4._readFinal$0() == null) {
-          t1 = _null;
-          break $label0$0;
-        }
+        _0_4 = combinators2;
         t1 = type$.List_CssValue_Combinator_2;
-        if (!(t1._is(_0_1._readFinal$0()) && _0_7._readFinal$0() > 1))
-          t2 = t1._is(_0_4._readFinal$0()) && _0_11._readFinal$0() > 1;
-        else
+        _0_7_isSet = t1._is(combinators1);
+        if (_0_7_isSet) {
+          _0_7 = combinators1.length;
+          t2 = _0_7;
+          t2 = t2 > 1;
+        } else {
+          _0_7 = _null;
+          t2 = false;
+        }
+        if (!t2) {
+          t2 = _0_4;
+          _0_11_isSet = t1._is(t2);
+          if (_0_11_isSet) {
+            t2 = _0_4;
+            _0_11 = (t2 == null ? t1._as(t2) : t2).length;
+            t2 = _0_11;
+            _0_4_isSet = true;
+            t2 = t2 > 1;
+          } else {
+            _0_11 = _null;
+            _0_4_isSet = true;
+            t2 = false;
+          }
+        } else {
+          _0_11 = _null;
+          _0_4_isSet = true;
+          _0_11_isSet = false;
           t2 = true;
+        }
         if (t2) {
           t1 = _null;
           break $label0$0;
         }
-        if (t1._is(_0_1._readFinal$0()))
-          if (_0_7._readFinal$0() <= 0) {
-            combinators = _0_4._readFinal$0();
-            t2 = true;
-          } else {
-            combinators = _null;
-            t2 = false;
+        if (t1._is(combinators1)) {
+          if (_0_7_isSet)
+            t2 = _0_7;
+          else {
+            _0_7 = combinators1.length;
+            t2 = _0_7;
           }
-        else {
+          t2 = t2 <= 0;
+          if (t2)
+            if (_0_4_isSet)
+              combinators = _0_4;
+            else {
+              combinators = combinators2;
+              _0_4 = combinators;
+              _0_4_isSet = true;
+            }
+          else
+            combinators = _null;
+        } else {
           combinators = _null;
           t2 = false;
         }
         if (!t2) {
-          combinators = _0_1._readFinal$0();
-          t1 = t1._is(_0_4._readFinal$0()) && _0_11._readFinal$0() <= 0;
+          if (_0_4_isSet)
+            t2 = _0_4;
+          else {
+            t2 = combinators2;
+            _0_4 = t2;
+            _0_4_isSet = true;
+          }
+          if (t1._is(t2)) {
+            if (_0_11_isSet)
+              t1 = _0_11;
+            else {
+              t2 = _0_4_isSet ? _0_4 : combinators2;
+              _0_11 = (t2 == null ? t1._as(t2) : t2).length;
+              t1 = _0_11;
+            }
+            t1 = t1 <= 0;
+          } else
+            t1 = false;
+          combinators = combinators1;
         } else
           t1 = true;
         if (t1) {
@@ -23232,39 +25424,25 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     _mergeTrailingCombinators0(components1, components2, span, result) {
-      var _0_1, last, t1, _1_1, t2, t3, _4_0, _4_1, _4_3, _4_4, _4_5, _4_9, _4_6, _4_7, _4_10, component1, component2, t4, t5, choices, _2_0, unified, followingComponents, nextComponents, followingComponents0, next, following, _3_0, siblingComponents_case_0, siblingComponents_case_1, combinator1, combinator2, combinator_case_0, combinatorComponents_case_0, descendantComponents_case_0, combinator_case_1, descendantComponents_case_1, combinatorComponents_case_1, _null = null;
+      var _0_1, t1, _1_1, t2, t3, _4_1, _4_3, _4_4_isSet, _4_4, _4_5, component1, component2, t4, t5, choices, _2_0, _4_4_isSet0, _4_9, _4_6_isSet, _4_6, _4_7, nextComponents, followingComponents, _4_7_isSet, _4_10_isSet, _4_10, _4_5_isSet, next, following, _3_0, siblingComponents_case_0, t0, siblingComponents_case_1, combinator1, combinator2, unified, combinator_case_0, combinatorComponents_case_0, descendantComponents_case_0, t6, combinator_case_1, descendantComponents_case_1, combinatorComponents_case_1, _null = null;
       if (result == null)
         result = A.QueueList$(_null, type$.List_List_ComplexSelectorComponent_2);
-      _0_1 = A._InitializedCell$(new A._mergeTrailingCombinators_closure9(components1));
       $label0$0: {
-        if (_0_1._readFinal$0() >= 1) {
-          last = components1.$index(0, _0_1._readFinal$0() - 1);
-          t1 = true;
-        } else {
-          last = _null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = last.combinators;
+        _0_1 = components1.get$length(0);
+        if (_0_1 >= 1) {
+          t1 = components1.$index(0, _0_1 - 1).combinators;
           break $label0$0;
         }
-        t1 = B.List_empty14;
+        t1 = B.List_empty13;
         break $label0$0;
       }
-      _1_1 = A._InitializedCell$(new A._mergeTrailingCombinators_closure10(components2));
       $label1$1: {
-        if (_1_1._readFinal$0() >= 1) {
-          last = components2.$index(0, _1_1._readFinal$0() - 1);
-          t2 = true;
-        } else {
-          last = _null;
-          t2 = false;
-        }
-        if (t2) {
-          t2 = last.combinators;
+        _1_1 = components2.get$length(0);
+        if (_1_1 >= 1) {
+          t2 = components2.$index(0, _1_1 - 1).combinators;
           break $label1$1;
         }
-        t2 = B.List_empty14;
+        t2 = B.List_empty13;
         break $label1$1;
       }
       t3 = t1.length;
@@ -23276,16 +25454,20 @@ self.util = _cliPkgRequires.util;
         t3 = A.IterableExtension_get_firstOrNull(t1);
         t3 = t3 == null ? _null : t3.value;
         t2 = A.IterableExtension_get_firstOrNull(t2);
-        _4_0 = new A._Record_4([t3, t2 == null ? _null : t2.value, components1, components2]);
-        _4_1 = A._InitializedCell$(new A._mergeTrailingCombinators_closure11(_4_0));
-        _4_3 = A._InitializedCell$(new A._mergeTrailingCombinators_closure12(_4_1));
-        _4_4 = A._InitializedCell$(new A._mergeTrailingCombinators_closure13(_4_0));
-        _4_5 = A._InitializedCell$(new A._mergeTrailingCombinators_closure14(_4_4));
-        _4_9 = A._InitializedCell$(new A._mergeTrailingCombinators_closure15(_4_4));
-        _4_6 = A._InitializedCell$(new A._mergeTrailingCombinators_closure16(_4_0));
-        _4_7 = A._InitializedCell$(new A._mergeTrailingCombinators_closure17(_4_0));
-        _4_10 = A._InitializedCell$(new A._mergeTrailingCombinators_closure18(_4_1));
-        if (_4_3._readFinal$0() && _4_5._readFinal$0()) {
+        t2 = [t3, t2 == null ? _null : t2.value, components1, components2];
+        _4_1 = t2[0];
+        _4_3 = B.Combinator_y180 === _4_1;
+        _4_4_isSet = _4_3;
+        if (_4_4_isSet) {
+          _4_4 = t2[1];
+          _4_5 = B.Combinator_y180 === _4_4;
+          t3 = _4_5;
+        } else {
+          _4_4 = _null;
+          _4_5 = _4_4;
+          t3 = false;
+        }
+        if (t3) {
           component1 = components1.removeLast$0(0);
           component2 = components2.removeLast$0(0);
           t2 = component1.selector;
@@ -23300,50 +25482,98 @@ self.util = _cliPkgRequires.util;
             else {
               choices = A._setArrayType([A._setArrayType([component1, component2], t4), A._setArrayType([component2, component1], t4)], t5);
               _2_0 = A.unifyCompound0(t2, t3);
-              if (_2_0 != null) {
-                unified = _2_0;
-                t2 = true;
-              } else {
-                unified = _null;
-                t2 = false;
-              }
-              if (t2)
-                choices.push(A._setArrayType([new A.ComplexSelectorComponent0(unified, A.List_List$unmodifiable(A._setArrayType([B.JSArray_methods.get$first(t1)], type$.JSArray_CssValue_Combinator_2), type$.CssValue_Combinator_2), span)], t4));
+              if (_2_0 != null)
+                choices.push(A._setArrayType([new A.ComplexSelectorComponent0(_2_0, A.List_List$unmodifiable(A._setArrayType([B.JSArray_methods.get$first(t1)], type$.JSArray_CssValue_Combinator_2), type$.CssValue_Combinator_2), span)], t4));
               result.addFirst$1(choices);
             }
           }
           break $label2$2;
         }
-        if (_4_3._readFinal$0())
-          if (_4_9._readFinal$0()) {
-            followingComponents = _4_6._readFinal$0();
-            nextComponents = _4_7._readFinal$0();
-            nextComponents = nextComponents;
-            t2 = true;
+        if (_4_3) {
+          if (_4_4_isSet) {
+            t3 = _4_4;
+            _4_4_isSet0 = _4_4_isSet;
+          } else {
+            _4_4 = t2[1];
+            t3 = _4_4;
+            _4_4_isSet0 = true;
+          }
+          _4_9 = B.Combinator_gRV0 === t3;
+          _4_6_isSet = _4_9;
+          if (_4_6_isSet) {
+            _4_6 = t2[2];
+            _4_7 = t2[3];
+            nextComponents = _4_7;
+            followingComponents = _4_6;
           } else {
             nextComponents = _null;
             followingComponents = nextComponents;
-            t2 = false;
+            _4_7 = followingComponents;
+            _4_6 = _4_7;
           }
-        else {
+          t3 = _4_6_isSet;
+          _4_7_isSet = t3;
+        } else {
           nextComponents = _null;
           followingComponents = nextComponents;
-          t2 = false;
+          _4_7 = followingComponents;
+          _4_6 = _4_7;
+          _4_9 = _4_6;
+          _4_4_isSet0 = _4_4_isSet;
+          _4_6_isSet = false;
+          _4_7_isSet = false;
+          t3 = false;
         }
-        if (!t2)
-          if (_4_10._readFinal$0())
-            if (_4_5._readFinal$0()) {
-              nextComponents = _4_6._readFinal$0();
-              followingComponents0 = _4_7._readFinal$0();
-              followingComponents = followingComponents0;
-              t2 = true;
-            } else
-              t2 = false;
-          else
-            t2 = false;
-        else
-          t2 = true;
-        if (t2) {
+        _4_10_isSet = !t3;
+        if (_4_10_isSet) {
+          _4_10 = B.Combinator_gRV0 === _4_1;
+          t3 = _4_10;
+          if (t3) {
+            if (_4_4_isSet) {
+              t3 = _4_5;
+              _4_5_isSet = _4_4_isSet;
+              _4_4_isSet = _4_4_isSet0;
+            } else {
+              if (_4_4_isSet0) {
+                t3 = _4_4;
+                _4_4_isSet = _4_4_isSet0;
+              } else {
+                _4_4 = t2[1];
+                t3 = _4_4;
+                _4_4_isSet = true;
+              }
+              _4_5 = B.Combinator_y180 === t3;
+              t3 = _4_5;
+              _4_5_isSet = true;
+            }
+            if (t3) {
+              if (_4_6_isSet)
+                nextComponents = _4_6;
+              else {
+                _4_6 = t2[2];
+                nextComponents = _4_6;
+                _4_6_isSet = true;
+              }
+              if (_4_7_isSet)
+                followingComponents = _4_7;
+              else {
+                _4_7 = t2[3];
+                followingComponents = _4_7;
+                _4_7_isSet = true;
+              }
+            }
+          } else {
+            _4_5_isSet = _4_4_isSet;
+            _4_4_isSet = _4_4_isSet0;
+            t3 = false;
+          }
+        } else {
+          _4_10 = _null;
+          _4_5_isSet = _4_4_isSet;
+          _4_4_isSet = _4_4_isSet0;
+          t3 = true;
+        }
+        if (t3) {
           next = nextComponents.removeLast$0(0);
           following = followingComponents.removeLast$0(0);
           t1 = following.selector;
@@ -23355,128 +25585,214 @@ self.util = _cliPkgRequires.util;
           else {
             t4 = A._setArrayType([A._setArrayType([following, next], t3)], t4);
             _3_0 = A.unifyCompound0(t1, t2);
-            if (_3_0 != null) {
-              unified = _3_0;
-              t1 = true;
-            } else {
-              unified = _null;
-              t1 = false;
-            }
-            if (t1)
-              t4.push(A._setArrayType([new A.ComplexSelectorComponent0(unified, A.List_List$unmodifiable(next.combinators, type$.CssValue_Combinator_2), span)], t3));
+            if (_3_0 != null)
+              t4.push(A._setArrayType([new A.ComplexSelectorComponent0(_3_0, A.List_List$unmodifiable(next.combinators, type$.CssValue_Combinator_2), span)], t3));
             result.addFirst$1(t4);
           }
           break $label2$2;
         }
-        if (B.Combinator_Cht0 === _4_1._readFinal$0())
-          if (_4_9._readFinal$0() || _4_5._readFinal$0()) {
-            siblingComponents_case_0 = _4_7._readFinal$0();
-            t2 = siblingComponents_case_0;
-            t3 = true;
-          } else {
-            t2 = _null;
-            t3 = false;
+        if (B.Combinator_8I80 === _4_1) {
+          if (_4_3)
+            t3 = _4_9;
+          else {
+            if (_4_4_isSet)
+              t3 = _4_4;
+            else {
+              _4_4 = t2[1];
+              t3 = _4_4;
+              _4_4_isSet = true;
+            }
+            _4_9 = B.Combinator_gRV0 === t3;
+            t3 = _4_9;
           }
-        else {
-          t2 = _null;
-          t3 = false;
-        }
-        if (!t3)
-          if (_4_10._readFinal$0() || _4_3._readFinal$0())
-            if (B.Combinator_Cht0 === _4_4._readFinal$0()) {
-              siblingComponents_case_1 = _4_6._readFinal$0();
-              t2 = siblingComponents_case_1;
-              t3 = true;
-            } else
-              t3 = false;
+          if (!t3)
+            if (_4_5_isSet)
+              t3 = _4_5;
+            else {
+              if (_4_4_isSet)
+                t3 = _4_4;
+              else {
+                _4_4 = t2[1];
+                t3 = _4_4;
+                _4_4_isSet = true;
+              }
+              _4_5 = B.Combinator_y180 === t3;
+              t3 = _4_5;
+            }
           else
-            t3 = false;
-        else
-          t3 = true;
-        if (t3) {
-          result.addFirst$1(A._setArrayType([A._setArrayType([t2.removeLast$0(0)], type$.JSArray_ComplexSelectorComponent_2)], type$.JSArray_List_ComplexSelectorComponent_2));
+            t3 = true;
+          if (t3) {
+            if (_4_7_isSet)
+              siblingComponents_case_0 = _4_7;
+            else {
+              _4_7 = t2[3];
+              siblingComponents_case_0 = _4_7;
+              _4_7_isSet = true;
+            }
+            t4 = siblingComponents_case_0;
+          } else
+            t4 = _null;
+          t0 = t4;
+          t4 = t3;
+          t3 = t0;
+        } else {
+          t3 = _null;
+          t4 = false;
+        }
+        if (!t4) {
+          if (_4_10_isSet)
+            t4 = _4_10;
+          else {
+            _4_10 = B.Combinator_gRV0 === _4_1;
+            t4 = _4_10;
+          }
+          if (!t4)
+            t4 = _4_3;
+          else
+            t4 = true;
+          if (t4) {
+            if (_4_4_isSet)
+              t4 = _4_4;
+            else {
+              _4_4 = t2[1];
+              t4 = _4_4;
+              _4_4_isSet = true;
+            }
+            t4 = B.Combinator_8I80 === t4;
+            if (t4) {
+              if (_4_6_isSet)
+                siblingComponents_case_1 = _4_6;
+              else {
+                _4_6 = t2[2];
+                siblingComponents_case_1 = _4_6;
+                _4_6_isSet = true;
+              }
+              t3 = siblingComponents_case_1;
+            }
+          } else
+            t4 = false;
+        } else
+          t4 = true;
+        if (t4) {
+          result.addFirst$1(A._setArrayType([A._setArrayType([t3.removeLast$0(0)], type$.JSArray_ComplexSelectorComponent_2)], type$.JSArray_List_ComplexSelectorComponent_2));
           break $label2$2;
         }
-        if (_4_1._readFinal$0() != null) {
-          combinator1 = _4_1._readFinal$0();
-          t2 = true;
-        } else {
-          combinator1 = _null;
-          t2 = false;
-        }
-        if (t2) {
-          if (_4_4._readFinal$0() != null) {
-            combinator2 = _4_4._readFinal$0();
-            t2 = true;
-          } else {
-            combinator2 = _null;
-            t2 = false;
+        t3 = _4_1 == null;
+        t4 = !t3;
+        if (t4) {
+          combinator1 = _4_1;
+          if (_4_4_isSet)
+            t5 = _4_4;
+          else {
+            _4_4 = t2[1];
+            t5 = _4_4;
+            _4_4_isSet = true;
           }
-          t2 = t2 && combinator1 == combinator2;
+          if (t5 != null) {
+            if (_4_4_isSet)
+              combinator2 = _4_4;
+            else {
+              _4_4 = t2[1];
+              combinator2 = _4_4;
+              _4_4_isSet = true;
+            }
+            t5 = combinator1 === (combinator2 == null ? type$.Combinator_2._as(combinator2) : combinator2);
+          } else
+            t5 = false;
         } else
-          t2 = false;
-        if (t2) {
+          t5 = false;
+        if (t5) {
           unified = A.unifyCompound0(components1.removeLast$0(0).selector, components2.removeLast$0(0).selector);
           if (unified == null)
             return _null;
           result.addFirst$1(A._setArrayType([A._setArrayType([new A.ComplexSelectorComponent0(unified, A.List_List$unmodifiable(A._setArrayType([B.JSArray_methods.get$first(t1)], type$.JSArray_CssValue_Combinator_2), type$.CssValue_Combinator_2), span)], type$.JSArray_ComplexSelectorComponent_2)], type$.JSArray_List_ComplexSelectorComponent_2));
           break $label2$2;
         }
-        if (_4_1._readFinal$0() != null) {
-          combinator_case_0 = _4_1._readFinal$0();
-          t1 = true;
-        } else {
-          combinator_case_0 = _null;
-          t1 = false;
-        }
-        if (t1)
-          if (_4_4._readFinal$0() == null) {
-            combinatorComponents_case_0 = _4_6._readFinal$0();
-            descendantComponents_case_0 = _4_7._readFinal$0();
-            t1 = descendantComponents_case_0;
-            t2 = true;
-            t4 = t2;
-            t2 = combinatorComponents_case_0;
-            t3 = t1;
-            t1 = combinator_case_0;
-          } else {
-            t3 = _null;
-            t2 = t3;
-            t1 = t2;
-            t4 = false;
+        if (t4) {
+          combinator_case_0 = _4_1;
+          if (_4_4_isSet)
+            t1 = _4_4;
+          else {
+            _4_4 = t2[1];
+            t1 = _4_4;
+            _4_4_isSet = true;
           }
-        else {
-          t3 = _null;
-          t2 = t3;
-          t1 = t2;
-          t4 = false;
-        }
-        if (!t4)
-          if (_4_1._readFinal$0() == null) {
-            if (_4_4._readFinal$0() != null) {
-              combinator_case_1 = _4_4._readFinal$0();
-              t4 = true;
-            } else {
-              combinator_case_1 = _null;
-              t4 = false;
+          t1 = t1 == null;
+          if (t1) {
+            if (_4_6_isSet)
+              combinatorComponents_case_0 = _4_6;
+            else {
+              _4_6 = t2[2];
+              combinatorComponents_case_0 = _4_6;
+              _4_6_isSet = true;
             }
-            if (t4) {
-              descendantComponents_case_1 = _4_6._readFinal$0();
-              combinatorComponents_case_1 = _4_7._readFinal$0();
+            if (_4_7_isSet)
+              descendantComponents_case_0 = _4_7;
+            else {
+              _4_7 = t2[3];
+              descendantComponents_case_0 = _4_7;
+              _4_7_isSet = true;
+            }
+            t4 = descendantComponents_case_0;
+            t6 = t4;
+            t4 = combinator_case_0;
+            t5 = combinatorComponents_case_0;
+          } else {
+            t6 = _null;
+            t5 = t6;
+            t4 = t5;
+          }
+          t0 = t6;
+          t6 = t1;
+          t1 = t4;
+          t4 = t5;
+          t5 = t0;
+        } else {
+          t5 = _null;
+          t4 = t5;
+          t1 = t4;
+          t6 = false;
+        }
+        if (!t6)
+          if (t3) {
+            if (_4_4_isSet)
+              t3 = _4_4;
+            else {
+              _4_4 = t2[1];
+              t3 = _4_4;
+              _4_4_isSet = true;
+            }
+            t3 = t3 != null;
+            if (t3) {
+              combinator_case_1 = _4_4_isSet ? _4_4 : t2[1];
+              if (combinator_case_1 == null)
+                combinator_case_1 = type$.Combinator_2._as(combinator_case_1);
+              descendantComponents_case_1 = _4_6_isSet ? _4_6 : t2[2];
+              combinatorComponents_case_1 = _4_7_isSet ? _4_7 : t2[3];
               t1 = combinatorComponents_case_1;
-              t2 = true;
+              t2 = descendantComponents_case_1;
               t4 = t2;
               t2 = t1;
               t1 = combinator_case_1;
-              t3 = descendantComponents_case_1;
-            } else
-              t4 = false;
-          } else
+            } else {
+              t2 = t4;
+              t4 = t5;
+            }
+            t0 = t4;
+            t4 = t3;
+            t3 = t0;
+          } else {
+            t3 = t5;
+            t2 = t4;
             t4 = false;
-        else
+          }
+        else {
+          t3 = t5;
+          t2 = t4;
           t4 = true;
+        }
         if (t4) {
-          if (t1 === B.Combinator_Cht0) {
+          if (t1 === B.Combinator_8I80) {
             t1 = A.IterableExtension_get_lastOrNull(t3);
             t1 = t1 == null ? _null : A.compoundIsSuperselector0(t1.selector, t2.get$last(t2).selector, _null);
             t1 = t1 === true;
@@ -23496,7 +25812,7 @@ self.util = _cliPkgRequires.util;
         t1 = A.LinkedHashSet_LinkedHashSet$_empty(type$.SimpleSelector_2);
       for (t2 = J.get$iterator$ax(complex1); t2.moveNext$0();)
         for (t3 = B.JSArray_methods.get$iterator(t2.get$current(t2).selector.components), t4 = new A.WhereIterator(t3, A.functions0___isUnique$closure()); t4.moveNext$0();)
-          t1.add$1(0, t3.get$current(t3));
+          t1.add$1(0, t3.get$current(0));
       if (t1._collection$_length === 0)
         return false;
       return J.any$1$ax(complex2, new A._mustUnify_closure0(t1));
@@ -23510,7 +25826,7 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     _chunks0(queue1, queue2, done, $T) {
-      var chunk2, _0_0, _0_1, _0_4, _0_5, _0_7, chunk, t2,
+      var chunk2, _0_4, _0_5_isSet, _0_1, _0_7, _0_5, chunk, _0_5_isSet0, t2, _null = null,
         t1 = $T._eval$1("JSArray<0>"),
         chunk1 = A._setArrayType([], t1);
       for (; !done.call$1(queue1);)
@@ -23518,27 +25834,44 @@ self.util = _cliPkgRequires.util;
       chunk2 = A._setArrayType([], t1);
       for (; !done.call$1(queue2);)
         chunk2.push(queue2.removeFirst$0());
-      _0_0 = new A._Record_2(chunk1, chunk2);
-      _0_1 = A._InitializedCell$(new A._chunks_closure3(_0_0, $T));
-      _0_4 = A._InitializedCell$(new A._chunks_closure4(_0_1));
-      _0_5 = A._InitializedCell$(new A._chunks_closure5(_0_0, $T));
-      _0_7 = A._InitializedCell$(new A._chunks_closure6(_0_5));
       $label0$0: {
-        if (_0_4._readFinal$0() && _0_7._readFinal$0()) {
+        _0_4 = chunk1.length <= 0;
+        _0_5_isSet = _0_4;
+        _0_1 = chunk1;
+        if (_0_5_isSet) {
+          _0_7 = chunk2.length <= 0;
+          t1 = _0_7;
+          _0_5 = chunk2;
+        } else {
+          _0_5 = _null;
+          _0_7 = _0_5;
+          t1 = false;
+        }
+        if (t1) {
           t1 = A._setArrayType([], $T._eval$1("JSArray<List<0>>"));
           break $label0$0;
         }
-        if (_0_4._readFinal$0()) {
-          chunk = _0_5._readFinal$0();
-          t1 = true;
-        } else {
-          chunk = null;
-          t1 = false;
+        if (_0_4)
+          if (_0_5_isSet) {
+            chunk = _0_5;
+            _0_5_isSet0 = _0_5_isSet;
+          } else {
+            chunk = chunk2;
+            _0_5 = chunk;
+            _0_5_isSet0 = true;
+          }
+        else {
+          chunk = _null;
+          _0_5_isSet0 = _0_5_isSet;
         }
-        if (!t1) {
-          chunk = _0_1._readFinal$0();
-          t1 = _0_7._readFinal$0();
-          t1 = t1;
+        if (!_0_4) {
+          if (_0_5_isSet)
+            t1 = _0_7;
+          else {
+            _0_7 = (_0_5_isSet0 ? _0_5 : chunk2).length <= 0;
+            t1 = _0_7;
+          }
+          chunk = _0_1;
         } else
           t1 = true;
         if (t1) {
@@ -23563,10 +25896,10 @@ self.util = _cliPkgRequires.util;
         groups = A.QueueList$(null, type$.List_ComplexSelectorComponent_2),
         t1 = type$.JSArray_ComplexSelectorComponent_2,
         group = A._setArrayType([], t1);
-      for (t2 = new A.ListIterator(complex, complex.get$length(complex)), t3 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
-        t4 = t2.__internal$_current;
+      for (t2 = complex.$ti, t3 = new A.ListIterator(complex, complex.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t2 = t2._eval$1("ListBase.E"); t3.moveNext$0();) {
+        t4 = t3.__internal$_current;
         if (t4 == null)
-          t4 = t3._as(t4);
+          t4 = t2._as(t4);
         group.push(t4);
         if (t4.combinators.length === 0) {
           groups._queue_list$_add$1(group);
@@ -23585,7 +25918,7 @@ self.util = _cliPkgRequires.util;
       if (J.get$length$asx(complex1) > J.get$length$asx(complex2))
         return false;
       t1 = $.$get$bogusSpan0();
-      base = new A.ComplexSelectorComponent0(A.CompoundSelector$0(A._setArrayType([new A.PlaceholderSelector0("<temp>", t1)], type$.JSArray_SimpleSelector_2), t1), A.List_List$unmodifiable(B.List_empty14, type$.CssValue_Combinator_2), t1);
+      base = new A.ComplexSelectorComponent0(A.CompoundSelector$0(A._setArrayType([new A.PlaceholderSelector0("<temp>", t1)], type$.JSArray_SimpleSelector_2), t1), A.List_List$unmodifiable(B.List_empty13, type$.CssValue_Combinator_2), t1);
       t1 = type$.ComplexSelectorComponent_2;
       t2 = A.List_List$of(complex1, true, t1);
       t2.push(base);
@@ -23594,84 +25927,85 @@ self.util = _cliPkgRequires.util;
       return A.complexIsSuperselector0(t2, t1);
     },
     complexIsSuperselector0(complex1, complex2) {
-      var t1, t2, t3, i1, i2, previousCombinator, remaining1, t4, remaining2, component1, t5, parents, endOfSubselector, component2, combinator1;
+      var t1, t2, previousCombinator, i1, i2, remaining1, remaining2, component1, t3, t4, endOfSubselector, component2, t5, combinator1, _null = null;
       if (B.JSArray_methods.get$last(complex1).combinators.length !== 0)
         return false;
       if (B.JSArray_methods.get$last(complex2).combinators.length !== 0)
         return false;
-      for (t1 = type$.JSArray_ComplexSelectorComponent_2, t2 = A._arrayInstanceType(complex2), t3 = t2._precomputed1, t2 = t2._eval$1("SubListIterable<1>"), i1 = 0, i2 = 0, previousCombinator = null; true; previousCombinator = combinator1) {
+      for (t1 = A._arrayInstanceType(complex2), t2 = t1._precomputed1, t1 = t1._eval$1("SubListIterable<1>"), previousCombinator = _null, i1 = 0, i2 = 0; true; previousCombinator = combinator1) {
         remaining1 = complex1.length - i1;
-        t4 = complex2.length;
-        remaining2 = t4 - i2;
+        remaining2 = complex2.length - i2;
         if (remaining1 === 0 || remaining2 === 0)
           return false;
         if (remaining1 > remaining2)
           return false;
         component1 = complex1[i1];
-        t5 = component1.combinators;
-        if (t5.length > 1)
+        t3 = component1.combinators;
+        if (t3.length > 1)
           return false;
-        if (remaining1 === 1) {
-          parents = B.JSArray_methods.sublist$2(complex2, i2, t4 - 1);
-          if (B.JSArray_methods.any$1(parents, new A.complexIsSuperselector_closure1()))
+        if (remaining1 === 1)
+          if (B.JSArray_methods.any$1(complex2, new A.complexIsSuperselector_closure1()))
             return false;
-          return A.compoundIsSuperselector0(component1.selector, B.JSArray_methods.get$last(complex2).selector, parents);
-        }
-        for (t4 = component1.selector, endOfSubselector = i2, parents = null; true;) {
+          else {
+            t1 = component1.selector;
+            t2 = B.JSArray_methods.get$last(complex2).selector;
+            return A.compoundIsSuperselector0(t1, t2, t1.get$hasComplicatedSuperselectorSemantics() ? B.JSArray_methods.sublist$2(complex2, i2, complex2.length - 1) : _null);
+          }
+        for (t4 = component1.selector, endOfSubselector = i2; true;) {
           component2 = complex2[endOfSubselector];
           if (component2.combinators.length > 1)
             return false;
-          if (A.compoundIsSuperselector0(t4, component2.selector, parents))
+          t5 = component2.selector;
+          if (A.compoundIsSuperselector0(t4, t5, t4.get$hasComplicatedSuperselectorSemantics() ? B.JSArray_methods.sublist$2(complex2, i2, endOfSubselector) : _null))
             break;
           ++endOfSubselector;
           if (endOfSubselector === complex2.length - 1)
             return false;
-          if (parents == null)
-            parents = A._setArrayType([], t1);
-          parents.push(component2);
         }
-        if (!A._compatibleWithPreviousCombinator0(previousCombinator, parents == null ? B.List_empty13 : parents))
+        t4 = new A.SubListIterable(complex2, 0, endOfSubselector, t1);
+        t4.SubListIterable$3(complex2, 0, endOfSubselector, t2);
+        if (!A._compatibleWithPreviousCombinator0(previousCombinator, t4.skip$1(0, i2)))
           return false;
         component2 = complex2[endOfSubselector];
-        combinator1 = A.IterableExtension_get_firstOrNull(t5);
+        combinator1 = A.IterableExtension_get_firstOrNull(t3);
         if (!A._isSupercombinator0(combinator1, A.IterableExtension_get_firstOrNull(component2.combinators)))
           return false;
         ++i1;
         i2 = endOfSubselector + 1;
         if (complex1.length - i1 === 1) {
-          t4 = combinator1 == null;
-          if (J.$eq$(t4 ? null : combinator1.value, B.Combinator_Htt0)) {
-            t4 = complex2.length - 1;
-            t5 = new A.SubListIterable(complex2, 0, t4, t2);
-            t5.SubListIterable$3(complex2, 0, t4, t3);
-            if (!t5.skip$1(0, i2).every$1(0, new A.complexIsSuperselector_closure2(combinator1)))
+          t3 = combinator1 == null;
+          if (J.$eq$(t3 ? _null : combinator1.value, B.Combinator_y180)) {
+            t3 = complex2.length - 1;
+            t4 = new A.SubListIterable(complex2, 0, t3, t1);
+            t4.SubListIterable$3(complex2, 0, t3, t2);
+            if (!t4.skip$1(0, i2).every$1(0, new A.complexIsSuperselector_closure2(combinator1)))
               return false;
-          } else if (!t4)
+          } else if (!t3)
             if (complex2.length - i2 > 1)
               return false;
         }
       }
     },
     _compatibleWithPreviousCombinator0(previous, parents) {
-      if (parents.length === 0)
+      if (parents.get$isEmpty(parents))
         return true;
       if (previous == null)
         return true;
-      if (previous.value !== B.Combinator_Htt0)
+      if (previous.value !== B.Combinator_y180)
         return false;
-      return B.JSArray_methods.every$1(parents, new A._compatibleWithPreviousCombinator_closure0());
+      return parents.every$1(0, new A._compatibleWithPreviousCombinator_closure0());
     },
     _isSupercombinator0(combinator1, combinator2) {
       var t1, t2;
       if (!J.$eq$(combinator1, combinator2)) {
         t1 = combinator1 == null;
         if (t1)
-          t2 = J.$eq$(combinator2 == null ? null : combinator2.value, B.Combinator_Cht0);
+          t2 = J.$eq$(combinator2 == null ? null : combinator2.value, B.Combinator_8I80);
         else
           t2 = false;
         if (!t2)
-          if (J.$eq$(t1 ? null : combinator1.value, B.Combinator_Htt0))
-            t1 = J.$eq$(combinator2 == null ? null : combinator2.value, B.Combinator_4QF0);
+          if (J.$eq$(t1 ? null : combinator1.value, B.Combinator_y180))
+            t1 = J.$eq$(combinator2 == null ? null : combinator2.value, B.Combinator_gRV0);
           else
             t1 = false;
         else
@@ -23681,29 +26015,38 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     compoundIsSuperselector0(compound1, compound2, parents) {
-      var t2, pseudo1, index1, pseudo2, index2, t3, t4, t5, _i, simple1, _null = null,
-        _0_0 = new A._Record_2(A._findPseudoElementIndexed0(compound1), A._findPseudoElementIndexed0(compound2)),
-        _0_1 = A._InitializedCell$(new A.compoundIsSuperselector_closure1(_0_0)),
-        _0_5 = A._InitializedCell$(new A.compoundIsSuperselector_closure2(_0_0)),
-        t1 = type$.Record_2_nullable_Object_and_nullable_Object;
-      if (t1._is(_0_1._readFinal$0())) {
-        t2 = type$.PseudoSelector_2;
-        pseudo1 = t2._as(_0_1._readFinal$0()._0);
-        index1 = A._asInt(_0_1._readFinal$0()._1);
-        if (t1._is(_0_5._readFinal$0())) {
-          pseudo2 = t2._as(_0_5._readFinal$0()._0);
-          index2 = A._asInt(_0_5._readFinal$0()._1);
-          t1 = true;
+      var t1, _0_1, _0_5, _0_5_isSet, t2, pseudo1, index1, t3, pseudo2, index2, _0_50, t4, t5, _i, simple1, _null = null;
+      if (!compound1.get$hasComplicatedSuperselectorSemantics() && !compound2.get$hasComplicatedSuperselectorSemantics()) {
+        t1 = compound1.components;
+        if (t1.length > compound2.components.length)
+          return false;
+        return B.JSArray_methods.every$1(t1, new A.compoundIsSuperselector_closure0(compound2));
+      }
+      _0_1 = A._findPseudoElementIndexed0(compound1);
+      _0_5 = A._findPseudoElementIndexed0(compound2);
+      t1 = type$.Record_2_nullable_Object_and_nullable_Object;
+      _0_5_isSet = t1._is(_0_1);
+      if (_0_5_isSet) {
+        t2 = _0_1 == null;
+        pseudo1 = (t2 ? t1._as(_0_1) : _0_1)._0;
+        index1 = (t2 ? t1._as(_0_1) : _0_1)._1;
+        t2 = t1._is(_0_5);
+        if (t2) {
+          t3 = _0_5 == null;
+          pseudo2 = (t3 ? t1._as(_0_5) : _0_5)._0;
+          index2 = (t3 ? t1._as(_0_5) : _0_5)._1;
         } else {
           index2 = _null;
           pseudo2 = index2;
-          t1 = false;
         }
+        t1 = t2;
+        _0_50 = _0_5;
       } else {
         index2 = _null;
         pseudo2 = index2;
         index1 = pseudo2;
         pseudo1 = index1;
+        _0_50 = pseudo1;
         t1 = false;
       }
       if (t1) {
@@ -23718,15 +26061,19 @@ self.util = _cliPkgRequires.util;
           t1 = false;
         return t1;
       }
-      if (!(_0_1._readFinal$0() != null && true))
-        t1 = _0_5._readFinal$0() != null && true;
+      if (_0_1 == null)
+        t1 = (_0_5_isSet ? _0_50 : _0_5) != null;
       else
         t1 = true;
       if (t1)
         return false;
       for (t1 = compound1.components, t2 = t1.length, t3 = compound2.components, _i = 0; _i < t2; ++_i) {
         simple1 = t1[_i];
-        if (simple1 instanceof A.PseudoSelector0 && simple1.selector != null && true) {
+        if (simple1 instanceof A.PseudoSelector0)
+          t4 = simple1.selector != null;
+        else
+          t4 = false;
+        if (t4) {
           if (!A._selectorPseudoIsSuperselector0(simple1, compound2, parents))
             return false;
         } else if (!B.JSArray_methods.any$1(t3, simple1.get$isSuperselector()))
@@ -23745,9 +26092,9 @@ self.util = _cliPkgRequires.util;
     },
     _compoundComponentsIsSuperselector0(compound1, compound2, parents) {
       var t1;
-      if (compound1.get$length(compound1) === 0)
+      if (compound1.get$length(0) === 0)
         return true;
-      if (compound2.get$length(compound2) === 0)
+      if (compound2.get$length(0) === 0)
         compound2 = A._setArrayType([new A.UniversalSelector0("*", $.$get$bogusSpan0())], type$.JSArray_SimpleSelector_2);
       t1 = $.$get$bogusSpan0();
       return A.compoundIsSuperselector0(A.CompoundSelector$0(compound1, t1), A.CompoundSelector$0(compound2, t1), parents);
@@ -23783,74 +26130,17 @@ self.util = _cliPkgRequires.util;
       var t1 = type$.WhereTypeIterable_PseudoSelector_2;
       return A.IterableNullableExtension_whereNotNull(new A.MappedIterable(new A.WhereIterable(new A.WhereTypeIterable(compound.components, t1), new A._selectorPseudoArgs_closure1(isClass, $name), t1._eval$1("WhereIterable<Iterable.E>")), new A._selectorPseudoArgs_closure2(), t1._eval$1("MappedIterable<Iterable.E,SelectorList0?>")), type$.SelectorList_2);
     },
-    unifyComplex_closure2: function unifyComplex_closure2(t0) {
-      this._0_0 = t0;
+    unifyComplex_closure0: function unifyComplex_closure0() {
     },
-    unifyComplex_closure3: function unifyComplex_closure3(t0) {
-      this._1_0 = t0;
-    },
-    unifyComplex_closure4: function unifyComplex_closure4() {
-    },
-    _namespaceAndName_closure0: function _namespaceAndName_closure0(t0) {
-      this._0_0 = t0;
-    },
-    _weaveParents_closure5: function _weaveParents_closure5(t0) {
-      this._0_0 = t0;
-    },
-    _weaveParents_closure6: function _weaveParents_closure6(t0) {
-      this._0_0 = t0;
-    },
-    _weaveParents_closure7: function _weaveParents_closure7(t0) {
+    _weaveParents_closure3: function _weaveParents_closure3(t0) {
       this.span = t0;
     },
-    _weaveParents_closure8: function _weaveParents_closure8(t0) {
+    _weaveParents_closure4: function _weaveParents_closure4(t0) {
       this.group = t0;
     },
-    _weaveParents_closure9: function _weaveParents_closure9() {
+    _weaveParents_closure5: function _weaveParents_closure5() {
     },
-    _weaveParents_closure10: function _weaveParents_closure10() {
-    },
-    _mergeLeadingCombinators_closure3: function _mergeLeadingCombinators_closure3(t0) {
-      this._0_0 = t0;
-    },
-    _mergeLeadingCombinators_closure4: function _mergeLeadingCombinators_closure4(t0) {
-      this._0_0 = t0;
-    },
-    _mergeLeadingCombinators_closure5: function _mergeLeadingCombinators_closure5(t0) {
-      this._0_1 = t0;
-    },
-    _mergeLeadingCombinators_closure6: function _mergeLeadingCombinators_closure6(t0) {
-      this._0_4 = t0;
-    },
-    _mergeTrailingCombinators_closure9: function _mergeTrailingCombinators_closure9(t0) {
-      this._0_0 = t0;
-    },
-    _mergeTrailingCombinators_closure10: function _mergeTrailingCombinators_closure10(t0) {
-      this._1_0 = t0;
-    },
-    _mergeTrailingCombinators_closure11: function _mergeTrailingCombinators_closure11(t0) {
-      this._4_0 = t0;
-    },
-    _mergeTrailingCombinators_closure12: function _mergeTrailingCombinators_closure12(t0) {
-      this._4_1 = t0;
-    },
-    _mergeTrailingCombinators_closure13: function _mergeTrailingCombinators_closure13(t0) {
-      this._4_0 = t0;
-    },
-    _mergeTrailingCombinators_closure14: function _mergeTrailingCombinators_closure14(t0) {
-      this._4_4 = t0;
-    },
-    _mergeTrailingCombinators_closure16: function _mergeTrailingCombinators_closure16(t0) {
-      this._4_0 = t0;
-    },
-    _mergeTrailingCombinators_closure17: function _mergeTrailingCombinators_closure17(t0) {
-      this._4_0 = t0;
-    },
-    _mergeTrailingCombinators_closure15: function _mergeTrailingCombinators_closure15(t0) {
-      this._4_4 = t0;
-    },
-    _mergeTrailingCombinators_closure18: function _mergeTrailingCombinators_closure18(t0) {
-      this._4_1 = t0;
+    _weaveParents_closure6: function _weaveParents_closure6() {
     },
     _mustUnify_closure0: function _mustUnify_closure0(t0) {
       this.uniqueSelectors = t0;
@@ -23858,20 +26148,6 @@ self.util = _cliPkgRequires.util;
     _mustUnify__closure0: function _mustUnify__closure0(t0) {
       this.uniqueSelectors = t0;
     },
-    _chunks_closure3: function _chunks_closure3(t0, t1) {
-      this._0_0 = t0;
-      this.T = t1;
-    },
-    _chunks_closure4: function _chunks_closure4(t0) {
-      this._0_1 = t0;
-    },
-    _chunks_closure5: function _chunks_closure5(t0, t1) {
-      this._0_0 = t0;
-      this.T = t1;
-    },
-    _chunks_closure6: function _chunks_closure6(t0) {
-      this._0_5 = t0;
-    },
     paths_closure0: function paths_closure0(t0) {
       this.T = t0;
     },
@@ -23896,11 +26172,8 @@ self.util = _cliPkgRequires.util;
     },
     _compatibleWithPreviousCombinator_closure0: function _compatibleWithPreviousCombinator_closure0() {
     },
-    compoundIsSuperselector_closure1: function compoundIsSuperselector_closure1(t0) {
-      this._0_0 = t0;
-    },
-    compoundIsSuperselector_closure2: function compoundIsSuperselector_closure2(t0) {
-      this._0_0 = t0;
+    compoundIsSuperselector_closure0: function compoundIsSuperselector_closure0(t0) {
+      this.compound2 = t0;
     },
     _selectorPseudoIsSuperselector_closure6: function _selectorPseudoIsSuperselector_closure6(t0) {
       this.selector1 = t0;
@@ -23923,14 +26196,11 @@ self.util = _cliPkgRequires.util;
       this.complex = t0;
       this.pseudo1 = t1;
     },
-    _selectorPseudoIsSuperselector___closure3: function _selectorPseudoIsSuperselector___closure3(t0) {
-      this.simple2 = t0;
-    },
-    _selectorPseudoIsSuperselector___closure4: function _selectorPseudoIsSuperselector___closure4(t0) {
+    _selectorPseudoIsSuperselector___closure1: function _selectorPseudoIsSuperselector___closure1(t0) {
       this.simple2 = t0;
     },
     _selectorPseudoIsSuperselector___closure2: function _selectorPseudoIsSuperselector___closure2(t0) {
-      this._0_0 = t0;
+      this.simple2 = t0;
     },
     _selectorPseudoIsSuperselector_closure11: function _selectorPseudoIsSuperselector_closure11(t0) {
       this.selector1 = t0;
@@ -23992,13 +26262,11 @@ self.util = _cliPkgRequires.util;
       return self.immutable.isOrderedMap(list) ? J.toArray$0$x(type$.ImmutableList._as(list)) : type$.List_dynamic._as(list);
     },
     dartMapToImmutableMap(dartMap) {
-      var t1, t2, key, value,
+      var t1, t2,
         immutableMap = J.asMutable$0$x(new self.immutable.OrderedMap());
       for (t1 = A.MapExtensions_get_pairs0(dartMap, type$.Object, type$.nullable_Object), t1 = t1.get$iterator(t1); t1.moveNext$0();) {
         t2 = t1.get$current(t1);
-        key = t2._0;
-        value = t2._1;
-        immutableMap = J.$set$2$x(immutableMap, key, value);
+        immutableMap = J.$set$2$x(immutableMap, t2._0, t2._1);
       }
       return J.asImmutable$0$x(immutableMap);
     },
@@ -24092,31 +26360,33 @@ self.util = _cliPkgRequires.util;
     },
     ImportCache$0(importers, loadPaths, logger, packageConfig) {
       var t1 = type$.nullable_Record_3_Importer_and_Uri_and_Uri_originalUrl_2,
-        t2 = type$.Uri,
-        t3 = A.ImportCache__toImporters0(importers, loadPaths, packageConfig);
-      return new A.ImportCache0(t3, logger, A.LinkedHashMap_LinkedHashMap$_empty(type$.Record_2_Uri_and_bool_forImport, t1), A.LinkedHashMap_LinkedHashMap$_empty(type$.Record_4_Uri_and_Importer_baseImporter_and_nullable_Uri_baseUrl_and_bool_forImport_2, t1), A.LinkedHashMap_LinkedHashMap$_empty(t2, type$.nullable_Stylesheet_2), A.LinkedHashMap_LinkedHashMap$_empty(t2, type$.ImporterResult_2));
+        t2 = type$.Record_3_Importer_and_Uri_and_bool_forImport_2,
+        t3 = type$.Uri,
+        t4 = A.ImportCache__toImporters0(importers, loadPaths, packageConfig);
+      return new A.ImportCache0(t4, logger, A.LinkedHashMap_LinkedHashMap$_empty(type$.Record_2_Uri_and_bool_forImport, t1), A.LinkedHashMap_LinkedHashMap$_empty(t2, t1), A.LinkedHashMap_LinkedHashMap$_empty(t2, t3), A.LinkedHashMap_LinkedHashMap$_empty(t3, type$.nullable_Stylesheet_2), A.LinkedHashMap_LinkedHashMap$_empty(t3, type$.ImporterResult_2));
     },
     ImportCache$none(logger) {
       var t1 = type$.nullable_Record_3_Importer_and_Uri_and_Uri_originalUrl_2,
-        t2 = type$.Uri;
-      return new A.ImportCache0(B.List_empty23, logger, A.LinkedHashMap_LinkedHashMap$_empty(type$.Record_2_Uri_and_bool_forImport, t1), A.LinkedHashMap_LinkedHashMap$_empty(type$.Record_4_Uri_and_Importer_baseImporter_and_nullable_Uri_baseUrl_and_bool_forImport_2, t1), A.LinkedHashMap_LinkedHashMap$_empty(t2, type$.nullable_Stylesheet_2), A.LinkedHashMap_LinkedHashMap$_empty(t2, type$.ImporterResult_2));
+        t2 = type$.Record_3_Importer_and_Uri_and_bool_forImport_2,
+        t3 = type$.Uri;
+      return new A.ImportCache0(B.List_empty23, logger, A.LinkedHashMap_LinkedHashMap$_empty(type$.Record_2_Uri_and_bool_forImport, t1), A.LinkedHashMap_LinkedHashMap$_empty(t2, t1), A.LinkedHashMap_LinkedHashMap$_empty(t2, t3), A.LinkedHashMap_LinkedHashMap$_empty(t3, type$.nullable_Stylesheet_2), A.LinkedHashMap_LinkedHashMap$_empty(t3, type$.ImporterResult_2));
     },
     ImportCache__toImporters0(importers, loadPaths, packageConfig) {
       var t1, t2, t3, t4, _i, path, _null = null,
         sassPath = A.getEnvironmentVariable0("SASS_PATH");
       if (A.isBrowser()) {
-        t1 = A._setArrayType([], type$.JSArray_Importer);
+        t1 = A._setArrayType([], type$.JSArray_Importer_2);
         if (importers != null)
           B.JSArray_methods.addAll$1(t1, importers);
         return t1;
       }
-      t1 = A._setArrayType([], type$.JSArray_Importer);
+      t1 = A._setArrayType([], type$.JSArray_Importer_2);
       if (importers != null)
         B.JSArray_methods.addAll$1(t1, importers);
       if (loadPaths != null)
         for (t2 = J.get$iterator$ax(loadPaths); t2.moveNext$0();) {
           t3 = t2.get$current(t2);
-          t1.push(new A.FilesystemImporter0($.$get$context().absolute$15(t3, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null)));
+          t1.push(new A.FilesystemImporter0($.$get$context().absolute$15(t3, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null), false));
         }
       if (sassPath != null) {
         t2 = A.isNodeJs() ? self.process : _null;
@@ -24125,46 +26395,34 @@ self.util = _cliPkgRequires.util;
         _i = 0;
         for (; _i < t4; ++_i) {
           path = t3[_i];
-          t1.push(new A.FilesystemImporter0($.$get$context().absolute$15(path, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null)));
+          t1.push(new A.FilesystemImporter0($.$get$context().absolute$15(path, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null), false));
         }
       }
       return t1;
     },
-    ImportCache0: function ImportCache0(t0, t1, t2, t3, t4, t5) {
+    ImportCache0: function ImportCache0(t0, t1, t2, t3, t4, t5, t6) {
       var _ = this;
       _._import_cache$_importers = t0;
       _._import_cache$_logger = t1;
       _._import_cache$_canonicalizeCache = t2;
-      _._import_cache$_relativeCanonicalizeCache = t3;
-      _._import_cache$_importCache = t4;
-      _._import_cache$_resultsCache = t5;
+      _._import_cache$_perImporterCanonicalizeCache = t3;
+      _._import_cache$_nonCanonicalRelativeUrls = t4;
+      _._import_cache$_importCache = t5;
+      _._import_cache$_resultsCache = t6;
     },
-    ImportCache_canonicalize_closure1: function ImportCache_canonicalize_closure1(t0, t1, t2, t3, t4) {
+    ImportCache_canonicalize_closure0: function ImportCache_canonicalize_closure0(t0, t1, t2, t3, t4, t5, t6) {
       var _ = this;
       _.$this = t0;
       _.baseImporter = t1;
-      _.baseUrl = t2;
-      _.url = t3;
+      _.resolvedUrl = t2;
+      _.baseUrl = t3;
       _.forImport = t4;
+      _.key = t5;
+      _.url = t6;
     },
-    ImportCache_canonicalize_closure2: function ImportCache_canonicalize_closure2(t0, t1, t2, t3) {
-      var _ = this;
-      _.$this = t0;
-      _.url = t1;
-      _.baseUrl = t2;
-      _.forImport = t3;
-    },
-    ImportCache__canonicalize_closure1: function ImportCache__canonicalize_closure1(t0, t1) {
+    ImportCache__canonicalize_closure0: function ImportCache__canonicalize_closure0(t0, t1) {
       this.importer = t0;
-      this.resolved = t1;
-    },
-    ImportCache__canonicalize__closure0: function ImportCache__canonicalize__closure0(t0, t1) {
-      this.importer = t0;
-      this.resolved = t1;
-    },
-    ImportCache__canonicalize_closure2: function ImportCache__canonicalize_closure2(t0, t1) {
-      this.importer = t0;
-      this.resolved = t1;
+      this.url = t1;
     },
     ImportCache_importCanonical_closure0: function ImportCache_importCanonical_closure0(t0, t1, t2, t3, t4) {
       var _ = this;
@@ -24190,21 +26448,20 @@ self.util = _cliPkgRequires.util;
     },
     JSImporter: function JSImporter() {
     },
-    CanonicalizeContext: function CanonicalizeContext() {
-    },
     JSImporterResult: function JSImporterResult() {
     },
     Importer0: function Importer0() {
     },
     NodeImporterResult0: function NodeImporterResult0() {
     },
-    IncludeRule0: function IncludeRule0(t0, t1, t2, t3, t4) {
+    IncludeRule0: function IncludeRule0(t0, t1, t2, t3, t4, t5) {
       var _ = this;
       _.namespace = t0;
       _.name = t1;
-      _.$arguments = t2;
-      _.content = t3;
-      _.span = t4;
+      _.originalName = t2;
+      _.$arguments = t3;
+      _.content = t4;
+      _.span = t5;
     },
     InterpolatedFunctionExpression0: function InterpolatedFunctionExpression0(t0, t1, t2) {
       this.name = t0;
@@ -24220,15 +26477,6 @@ self.util = _cliPkgRequires.util;
       this.contents = t0;
       this.span = t1;
     },
-    Interpolation_asPlain_closure1: function Interpolation_asPlain_closure1(t0) {
-      this._0_0 = t0;
-    },
-    Interpolation_asPlain_closure2: function Interpolation_asPlain_closure2(t0) {
-      this._0_0 = t0;
-    },
-    Interpolation_initialPlain_closure0: function Interpolation_initialPlain_closure0(t0) {
-      this._0_0 = t0;
-    },
     Interpolation_toString_closure0: function Interpolation_toString_closure0() {
     },
     SupportsInterpolation0: function SupportsInterpolation0(t0, t1) {
@@ -24239,9 +26487,6 @@ self.util = _cliPkgRequires.util;
       this._interpolation_buffer0$_text = t0;
       this._interpolation_buffer0$_contents = t1;
     },
-    InterpolationBuffer_addInterpolation_closure0: function InterpolationBuffer_addInterpolation_closure0(t0) {
-      this._0_0 = t0;
-    },
     InterpolationMap$0(_interpolation, targetLocations) {
       var t1 = A.List_List$unmodifiable(targetLocations, type$.SourceLocation),
         t2 = _interpolation.contents.length,
@@ -24256,12 +26501,6 @@ self.util = _cliPkgRequires.util;
     },
     InterpolationMap_mapException_closure0: function InterpolationMap_mapException_closure0() {
     },
-    InterpolationMap_mapSpan_closure1: function InterpolationMap_mapSpan_closure1(t0) {
-      this._0_0 = t0;
-    },
-    InterpolationMap_mapSpan_closure2: function InterpolationMap_mapSpan_closure2(t0) {
-      this._0_0 = t0;
-    },
     _realCasePath0(path) {
       var prefix, _null = null,
         t1 = A.isNodeJs() ? self.process : _null;
@@ -24292,16 +26531,9 @@ self.util = _cliPkgRequires.util;
       this.basename = t0;
     },
     printError0(message) {
-      var t1,
-        process = A.isNodeJs() ? self.process : null;
-      if (process != null)
-        t1 = true;
-      else {
-        process = null;
-        t1 = false;
-      }
-      if (t1) {
-        t1 = J.get$stderr$x(process);
+      var t1 = A.isNodeJs() ? self.process : null;
+      if (t1 != null) {
+        t1 = J.get$stderr$x(t1);
         J.write$1$x(t1, A.S(message) + "\n");
       } else {
         t1 = self.console;
@@ -24402,6 +26634,10 @@ self.util = _cliPkgRequires.util;
       J.set$compileString$x(self.exports, A.allowInteropNamed("sass.compileString", A.compile__compileString$closure()));
       J.set$compileAsync$x(self.exports, A.allowInteropNamed("sass.compileAsync", A.compile__compileAsync$closure()));
       J.set$compileStringAsync$x(self.exports, A.allowInteropNamed("sass.compileStringAsync", A.compile__compileStringAsync$closure()));
+      J.set$initCompiler$x(self.exports, A.allowInteropNamed("sass.initCompiler", A.compiler__initCompiler$closure()));
+      J.set$initAsyncCompiler$x(self.exports, A.allowInteropNamed("sass.initAsyncCompiler", A.compiler__initAsyncCompiler$closure()));
+      J.set$Compiler$x(self.exports, $.$get$compilerClass());
+      J.set$AsyncCompiler$x(self.exports, $.$get$asyncCompilerClass());
       J.set$Value$x(self.exports, $.$get$valueClass());
       J.set$SassBoolean$x(self.exports, $.$get$booleanClass());
       J.set$SassArgumentList$x(self.exports, $.$get$argumentListClass());
@@ -24420,7 +26656,11 @@ self.util = _cliPkgRequires.util;
       J.set$sassFalse$x(self.exports, B.SassBoolean_false0);
       J.set$Exception$x(self.exports, $.$get$exceptionClass());
       J.set$Logger$x(self.exports, {silent: {warn: A.allowInteropNamed("sass.Logger.silent.warn", new A.main_closure()), debug: A.allowInteropNamed("sass.Logger.silent.debug", new A.main_closure0())}});
-      J.set$info$x(self.exports, "dart-sass\t1.69.5\t(Sass Compiler)\t[Dart]\ndart2js\t3.1.5\t(Dart Compiler)\t[Dart]");
+      J.set$NodePackageImporter$x(self.exports, $.$get$nodePackageImporterClass());
+      J.set$deprecations$x(self.exports, A.jsify($.$get$deprecations()));
+      J.set$Version$x(self.exports, $.$get$versionClass());
+      J.set$info$x(self.exports, "dart-sass\t1.77.8\t(Sass Compiler)\t[Dart]\ndart2js\t3.4.4\t(Dart Compiler)\t[Dart]");
+      A.updateCanonicalizeContextPrototype();
       A.updateSourceSpanPrototype();
       J.set$render$x(self.exports, A.allowInteropNamed("sass.render", A.legacy__render$closure()));
       J.set$renderSync$x(self.exports, A.allowInteropNamed("sass.renderSync", A.legacy__renderSync$closure()));
@@ -24438,7 +26678,7 @@ self.util = _cliPkgRequires.util;
       this._fallback = t1;
       this._ascii = t2;
     },
-    JSToDartLogger_warn_closure: function JSToDartLogger_warn_closure(t0, t1, t2, t3, t4) {
+    JSToDartLogger_internalWarn_closure: function JSToDartLogger_internalWarn_closure(t0, t1, t2, t3, t4) {
       var _ = this;
       _.$this = t0;
       _.message = t1;
@@ -24481,26 +26721,19 @@ self.util = _cliPkgRequires.util;
       this._lazy_file_span0$_span = null;
     },
     render(options, callback) {
-      var _0_0, fiber, t1;
+      var _0_0;
       if (!A.isNodeJs())
         A.jsThrow(new self.Error("The render() method is only available in Node.js."));
       _0_0 = J.get$fiber$x(options);
-      if (_0_0 != null) {
-        fiber = _0_0;
-        t1 = true;
-      } else {
-        fiber = null;
-        t1 = false;
-      }
-      if (t1)
-        J.run$0$x(fiber.call$1(A.allowInterop(new A.render_closure(callback, options))));
+      if (_0_0 != null)
+        J.run$0$x(_0_0.call$1(A.allowInterop(new A.render_closure(callback, options))));
       else
         A._renderAsync(options).then$1$2$onError(0, new A.render_closure0(callback), new A.render_closure1(callback), type$.Null);
     },
     _renderAsync(options) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.RenderResult),
-        $async$returnValue, data, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, result, start, t1, file, _0_0;
+        $async$returnValue, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, result, start, t1, file, _0_0;
       var $async$_renderAsync = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -24512,41 +26745,35 @@ self.util = _cliPkgRequires.util;
               t1 = J.getInterceptor$x(options);
               file = A.NullableExtension_andThen0(t1.get$file(options), A.path__absolute$closure());
               _0_0 = t1.get$data(options);
-              if (_0_0 != null) {
-                data = _0_0;
-                t2 = true;
-              } else {
-                data = null;
-                t2 = false;
-              }
-              $async$goto = t2 ? 3 : 5;
+              $async$goto = _0_0 != null ? 3 : 5;
               break;
             case 3:
               // then
               t2 = A._parseImporter(options, start);
-              t3 = A._parseFunctions(options, start, true);
-              t4 = t1.get$indentedSyntax(options);
-              t4 = !J.$eq$(t4, false) && t4 != null ? B.Syntax_Sass_sass0 : null;
-              t5 = A._parseOutputStyle(t1.get$outputStyle(options));
-              t6 = J.$eq$(t1.get$indentType(options), "tab");
-              t7 = A._parseIndentWidth(t1.get$indentWidth(options));
-              t8 = A._parseLineFeed(t1.get$linefeed(options));
-              t9 = file == null ? "stdin" : $.$get$context().toUri$1(file).toString$0(0);
-              t10 = t1.get$quietDeps(options);
-              if (t10 == null)
-                t10 = false;
-              t11 = t1.get$verbose(options);
+              t3 = A._parsePackageImportersAsync(options, start);
+              t4 = A._parseFunctions(options, start, true);
+              t5 = t1.get$indentedSyntax(options);
+              t5 = !J.$eq$(t5, false) && t5 != null ? B.Syntax_Sass_sass0 : null;
+              t6 = A._parseOutputStyle(t1.get$outputStyle(options));
+              t7 = J.$eq$(t1.get$indentType(options), "tab");
+              t8 = A._parseIndentWidth(t1.get$indentWidth(options));
+              t9 = A._parseLineFeed(t1.get$linefeed(options));
+              t10 = file == null ? "stdin" : $.$get$context().toUri$1(file).toString$0(0);
+              t11 = t1.get$quietDeps(options);
               if (t11 == null)
                 t11 = false;
-              t12 = t1.get$charset(options);
+              t12 = t1.get$verbose(options);
               if (t12 == null)
-                t12 = true;
-              t13 = A._enableSourceMaps(options);
+                t12 = false;
+              t13 = t1.get$charset(options);
+              if (t13 == null)
+                t13 = true;
+              t14 = A._enableSourceMaps(options);
               t1 = t1.get$logger(options);
-              t14 = A.hasTerminal0();
-              t15 = $._glyphs;
+              t15 = A.hasTerminal0();
+              t16 = $._glyphs;
               $async$goto = 6;
-              return A._asyncAwait(A.compileStringAsync0(data, t12, t3, null, null, t7, t8, new A.JSToDartLogger(t1, new A.StderrLogger0(t14), t15 === B.C_AsciiGlyphSet), t2, t10, t13, t5, t4, t9, !t6, t11), $async$_renderAsync);
+              return A._asyncAwait(A.compileStringAsync0(_0_0, t13, null, t4, null, t3, null, t8, t9, new A.JSToDartLogger(t1, new A.StderrLogger0(t15), t16 === B.C_AsciiGlyphSet), t2, t11, null, t14, t6, t5, t10, !t7, t12), $async$_renderAsync);
             case 6:
               // returning from await.
               result = $async$result;
@@ -24560,28 +26787,29 @@ self.util = _cliPkgRequires.util;
             case 7:
               // then
               t2 = A._parseImporter(options, start);
-              t3 = A._parseFunctions(options, start, true);
-              t4 = t1.get$indentedSyntax(options);
-              t4 = !J.$eq$(t4, false) && t4 != null ? B.Syntax_Sass_sass0 : null;
-              t5 = A._parseOutputStyle(t1.get$outputStyle(options));
-              t6 = J.$eq$(t1.get$indentType(options), "tab");
-              t7 = A._parseIndentWidth(t1.get$indentWidth(options));
-              t8 = A._parseLineFeed(t1.get$linefeed(options));
-              t9 = t1.get$quietDeps(options);
-              if (t9 == null)
-                t9 = false;
-              t10 = t1.get$verbose(options);
+              t3 = A._parsePackageImportersAsync(options, start);
+              t4 = A._parseFunctions(options, start, true);
+              t5 = t1.get$indentedSyntax(options);
+              t5 = !J.$eq$(t5, false) && t5 != null ? B.Syntax_Sass_sass0 : null;
+              t6 = A._parseOutputStyle(t1.get$outputStyle(options));
+              t7 = J.$eq$(t1.get$indentType(options), "tab");
+              t8 = A._parseIndentWidth(t1.get$indentWidth(options));
+              t9 = A._parseLineFeed(t1.get$linefeed(options));
+              t10 = t1.get$quietDeps(options);
               if (t10 == null)
                 t10 = false;
-              t11 = t1.get$charset(options);
+              t11 = t1.get$verbose(options);
               if (t11 == null)
-                t11 = true;
-              t12 = A._enableSourceMaps(options);
+                t11 = false;
+              t12 = t1.get$charset(options);
+              if (t12 == null)
+                t12 = true;
+              t13 = A._enableSourceMaps(options);
               t1 = t1.get$logger(options);
-              t13 = A.hasTerminal0();
-              t14 = $._glyphs;
+              t14 = A.hasTerminal0();
+              t15 = $._glyphs;
               $async$goto = 10;
-              return A._asyncAwait(A.compileAsync0(file, t11, null, t3, null, null, t7, t8, new A.JSToDartLogger(t1, new A.StderrLogger0(t13), t14 === B.C_AsciiGlyphSet), t2, t9, t12, t5, t4, !t6, t10), $async$_renderAsync);
+              return A._asyncAwait(A.compileAsync0(file, t12, null, t4, null, t3, t8, t9, new A.JSToDartLogger(t1, new A.StderrLogger0(t14), t15 === B.C_AsciiGlyphSet), t2, t10, null, t13, t6, t5, !t7, t11), $async$_renderAsync);
             case 10:
               // returning from await.
               result = $async$result;
@@ -24607,7 +26835,7 @@ self.util = _cliPkgRequires.util;
       return A._asyncStartSync($async$_renderAsync, $async$completer);
     },
     renderSync(options) {
-      var start, result, file, data, _0_0, error, stackTrace, error0, stackTrace0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, exception, _null = null;
+      var start, result, file, _0_0, data, error, stackTrace, error0, stackTrace0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, exception, _null = null;
       if (!A.isNodeJs())
         A.jsThrow(new self.Error("The renderSync() method is only available in Node.js."));
       try {
@@ -24615,16 +26843,38 @@ self.util = _cliPkgRequires.util;
         result = null;
         t1 = J.getInterceptor$x(options);
         file = A.NullableExtension_andThen0(t1.get$file(options), A.path__absolute$closure());
-        data = null;
         _0_0 = t1.get$data(options);
+        data = null;
         if (_0_0 != null) {
           data = _0_0;
-          t2 = true;
-        } else
-          t2 = false;
-        if (t2) {
           t2 = data;
           t3 = A._parseImporter(options, start);
+          t4 = A._parsePackageImporters(options, start);
+          t5 = A._parseFunctions(options, start, false);
+          t6 = t1.get$indentedSyntax(options);
+          t6 = !J.$eq$(t6, false) && t6 != null ? B.Syntax_Sass_sass0 : _null;
+          t7 = A._parseOutputStyle(t1.get$outputStyle(options));
+          t8 = J.$eq$(t1.get$indentType(options), "tab");
+          t9 = A._parseIndentWidth(t1.get$indentWidth(options));
+          t10 = A._parseLineFeed(t1.get$linefeed(options));
+          t11 = file == null ? "stdin" : $.$get$context().toUri$1(file).toString$0(0);
+          t12 = t1.get$quietDeps(options);
+          if (t12 == null)
+            t12 = false;
+          t13 = t1.get$verbose(options);
+          if (t13 == null)
+            t13 = false;
+          t14 = t1.get$charset(options);
+          if (t14 == null)
+            t14 = true;
+          t15 = A._enableSourceMaps(options);
+          t1 = t1.get$logger(options);
+          t16 = A.hasTerminal0();
+          t17 = $._glyphs;
+          result = A.compileString(t2, t14, _null, new A.CastList(t5, A._arrayInstanceType(t5)._eval$1("CastList<1,Callable>")), _null, t4, _null, t9, t10, new A.JSToDartLogger(t1, new A.StderrLogger0(t16), t17 === B.C_AsciiGlyphSet), t3, t12, _null, t15, t7, t6, t11, !t8, t13);
+        } else if (file != null) {
+          t2 = A._parseImporter(options, start);
+          t3 = A._parsePackageImporters(options, start);
           t4 = A._parseFunctions(options, start, false);
           t5 = t1.get$indentedSyntax(options);
           t5 = !J.$eq$(t5, false) && t5 != null ? B.Syntax_Sass_sass0 : _null;
@@ -24632,44 +26882,20 @@ self.util = _cliPkgRequires.util;
           t7 = J.$eq$(t1.get$indentType(options), "tab");
           t8 = A._parseIndentWidth(t1.get$indentWidth(options));
           t9 = A._parseLineFeed(t1.get$linefeed(options));
-          t10 = file == null ? "stdin" : $.$get$context().toUri$1(file).toString$0(0);
-          t11 = t1.get$quietDeps(options);
-          if (t11 == null)
-            t11 = false;
-          t12 = t1.get$verbose(options);
-          if (t12 == null)
-            t12 = false;
-          t13 = t1.get$charset(options);
-          if (t13 == null)
-            t13 = true;
-          t14 = A._enableSourceMaps(options);
-          t1 = t1.get$logger(options);
-          t15 = A.hasTerminal0();
-          t16 = $._glyphs;
-          result = A.compileString(t2, t13, _null, new A.CastList(t4, A._arrayInstanceType(t4)._eval$1("CastList<1,Callable>")), _null, _null, _null, t8, t9, new A.JSToDartLogger(t1, new A.StderrLogger0(t15), t16 === B.C_AsciiGlyphSet), t3, t11, t14, t6, t5, t10, !t7, t12);
-        } else if (file != null) {
-          t2 = A._parseImporter(options, start);
-          t3 = A._parseFunctions(options, start, false);
-          t4 = t1.get$indentedSyntax(options);
-          t4 = !J.$eq$(t4, false) && t4 != null ? B.Syntax_Sass_sass0 : _null;
-          t5 = A._parseOutputStyle(t1.get$outputStyle(options));
-          t6 = J.$eq$(t1.get$indentType(options), "tab");
-          t7 = A._parseIndentWidth(t1.get$indentWidth(options));
-          t8 = A._parseLineFeed(t1.get$linefeed(options));
-          t9 = t1.get$quietDeps(options);
-          if (t9 == null)
-            t9 = false;
-          t10 = t1.get$verbose(options);
+          t10 = t1.get$quietDeps(options);
           if (t10 == null)
             t10 = false;
-          t11 = t1.get$charset(options);
+          t11 = t1.get$verbose(options);
           if (t11 == null)
-            t11 = true;
-          t12 = A._enableSourceMaps(options);
+            t11 = false;
+          t12 = t1.get$charset(options);
+          if (t12 == null)
+            t12 = true;
+          t13 = A._enableSourceMaps(options);
           t1 = t1.get$logger(options);
-          t13 = A.hasTerminal0();
-          t14 = $._glyphs;
-          result = A.compile(file, t11, _null, new A.CastList(t3, A._arrayInstanceType(t3)._eval$1("CastList<1,Callable>")), _null, _null, t7, t8, new A.JSToDartLogger(t1, new A.StderrLogger0(t13), t14 === B.C_AsciiGlyphSet), t2, t9, t12, t5, t4, !t6, t10);
+          t14 = A.hasTerminal0();
+          t15 = $._glyphs;
+          result = A.compile(file, t12, _null, new A.CastList(t4, A._arrayInstanceType(t4)._eval$1("CastList<1,Callable>")), _null, t3, t8, t9, new A.JSToDartLogger(t1, new A.StderrLogger0(t14), t15 === B.C_AsciiGlyphSet), t2, t10, _null, t13, t6, t5, !t7, t11);
         } else {
           t1 = A.ArgumentError$(string$.Either, _null);
           throw A.wrapException(t1);
@@ -24692,8 +26918,8 @@ self.util = _cliPkgRequires.util;
       }
     },
     _wrapException(exception, stackTrace) {
-      var url, t2, t3, t4, t5,
-        t1 = A.SourceSpanException.prototype.get$span.call(exception, exception),
+      var t2, t3, t4, t5,
+        t1 = A.SourceSpanException.prototype.get$span.call(exception, 0),
         _0_0 = t1.get$sourceUrl(t1);
       $label0$0: {
         if (_0_0 == null) {
@@ -24701,14 +26927,7 @@ self.util = _cliPkgRequires.util;
           break $label0$0;
         }
         if ("file" === _0_0.get$scheme()) {
-          url = _0_0;
-          t1 = true;
-        } else {
-          url = null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = $.$get$context().style.pathFromUri$1(A._parseUri(url));
+          t1 = $.$get$context().style.pathFromUri$1(A._parseUri(_0_0));
           break $label0$0;
         }
         t1 = _0_0.toString$0(0);
@@ -24718,10 +26937,10 @@ self.util = _cliPkgRequires.util;
       t3 = A.getTrace0(exception);
       if (t3 == null)
         t3 = stackTrace;
-      t4 = A.SourceSpanException.prototype.get$span.call(exception, exception);
+      t4 = A.SourceSpanException.prototype.get$span.call(exception, 0);
       t4 = t4.get$start(t4);
       t4 = t4.file.getLine$1(t4.offset);
-      t5 = A.SourceSpanException.prototype.get$span.call(exception, exception);
+      t5 = A.SourceSpanException.prototype.get$span.call(exception, 0);
       t5 = t5.get$start(t5);
       return A._newRenderError(t2, t3, t5.file.getColumn$1(t5.offset) + 1, t1, t4 + 1, 1);
     },
@@ -24735,7 +26954,7 @@ self.util = _cliPkgRequires.util;
       return result;
     },
     _parseImporter(options, start) {
-      var t2, importers, t3, contextOptions, _1_0, t4, _box_0 = {},
+      var t2, t3, contextOptions, _1_0, importers, _box_0 = {},
         t1 = J.getInterceptor$x(options),
         _0_0 = t1.get$importer(options);
       $label0$0: {
@@ -24744,14 +26963,7 @@ self.util = _cliPkgRequires.util;
           break $label0$0;
         }
         if (type$.List_nullable_Object._is(_0_0)) {
-          importers = _0_0;
-          t2 = true;
-        } else {
-          importers = null;
-          t2 = false;
-        }
-        if (t2) {
-          t2 = J.cast$1$0$ax(importers, type$.JSFunction);
+          t2 = J.cast$1$0$ax(_0_0, type$.JSFunction);
           break $label0$0;
         }
         t2 = A._setArrayType([type$.JSFunction._as(_0_0)], type$.JSArray_JSFunction);
@@ -24759,14 +26971,10 @@ self.util = _cliPkgRequires.util;
       }
       t3 = J.getInterceptor$asx(t2);
       contextOptions = t3.get$isNotEmpty(t2) ? A._contextOptions(options, start) : new A.Object();
-      _box_0.fiber = null;
       _1_0 = t1.get$fiber(options);
+      _box_0.fiber = null;
       if (_1_0 != null) {
         _box_0.fiber = _1_0;
-        t4 = true;
-      } else
-        t4 = false;
-      if (t4) {
         t2 = t3.map$1$1(t2, new A._parseImporter_closure(_box_0), type$.JSFunction);
         importers = A.List_List$of(t2, true, t2.$ti._eval$1("ListIterable.E"));
       } else
@@ -24777,6 +26985,34 @@ self.util = _cliPkgRequires.util;
       t2 = type$.String;
       return new A.NodeImporter(contextOptions, A.List_List$unmodifiable(A.NodeImporter__addSassPath(A.List_List$from(t1, true, t2)), t2), A.List_List$unmodifiable(J.cast$1$0$ax(importers, type$.dynamic), type$.JSFunction));
     },
+    _parsePackageImportersAsync(options, start) {
+      var t2, t3, t4,
+        t1 = J.getInterceptor$x(options);
+      if (t1.get$pkgImporter(options) instanceof A.NodePackageImporter0) {
+        t1 = t1.get$pkgImporter(options);
+        t1.toString;
+        t2 = type$.nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl_2;
+        t3 = type$.Record_3_AsyncImporter_and_Uri_and_bool_forImport_2;
+        t4 = type$.Uri;
+        t1 = A.List_List$unmodifiable(A._setArrayType([t1], type$.JSArray_AsyncImporter), type$.AsyncImporter);
+        return new A.AsyncImportCache0(t1, B.StderrLogger_false0, A.LinkedHashMap_LinkedHashMap$_empty(type$.Record_2_Uri_and_bool_forImport, t2), A.LinkedHashMap_LinkedHashMap$_empty(t3, t2), A.LinkedHashMap_LinkedHashMap$_empty(t3, t4), A.LinkedHashMap_LinkedHashMap$_empty(t4, type$.nullable_Stylesheet_2), A.LinkedHashMap_LinkedHashMap$_empty(t4, type$.ImporterResult_2));
+      }
+      return null;
+    },
+    _parsePackageImporters(options, start) {
+      var t2, t3, t4,
+        t1 = J.getInterceptor$x(options);
+      if (t1.get$pkgImporter(options) instanceof A.NodePackageImporter0) {
+        t1 = t1.get$pkgImporter(options);
+        t1.toString;
+        t2 = type$.nullable_Record_3_Importer_and_Uri_and_Uri_originalUrl_2;
+        t3 = type$.Record_3_Importer_and_Uri_and_bool_forImport_2;
+        t4 = type$.Uri;
+        t1 = A.List_List$unmodifiable(A._setArrayType([t1], type$.JSArray_Importer_2), type$.Importer);
+        return new A.ImportCache0(t1, B.StderrLogger_false0, A.LinkedHashMap_LinkedHashMap$_empty(type$.Record_2_Uri_and_bool_forImport, t2), A.LinkedHashMap_LinkedHashMap$_empty(t3, t2), A.LinkedHashMap_LinkedHashMap$_empty(t3, t4), A.LinkedHashMap_LinkedHashMap$_empty(t4, type$.nullable_Stylesheet_2), A.LinkedHashMap_LinkedHashMap$_empty(t4, type$.ImporterResult_2));
+      }
+      return null;
+    },
     _contextOptions(options, start) {
       var includePaths, t3, t4, t5, t6, t7,
         t1 = J.getInterceptor$x(options),
@@ -24798,7 +27034,7 @@ self.util = _cliPkgRequires.util;
       t1 = t1.get$file(options);
       if (t1 == null)
         t1 = "data";
-      return {file: t2, data: t3, includePaths: t4, precision: 10, style: 1, indentType: t5, indentWidth: t6, linefeed: t7.text, result: {stats: {start: start._core$_value, entry: t1}}};
+      return {file: t2, data: t3, includePaths: t4, precision: 10, style: 1, indentType: t5, indentWidth: t6, linefeed: t7.text, result: {stats: {start: start._value, entry: t1}}};
     },
     _parseOutputStyle(style) {
       var t1;
@@ -24835,24 +27071,24 @@ self.util = _cliPkgRequires.util;
       var t1;
       $label0$0: {
         if ("cr" === str) {
-          t1 = B.LineFeed_oyU;
+          t1 = B.LineFeed_89t;
           break $label0$0;
         }
         if ("crlf" === str) {
-          t1 = B.LineFeed_gg4;
+          t1 = B.LineFeed_A4L;
           break $label0$0;
         }
         if ("lfcr" === str) {
-          t1 = B.LineFeed_t2a;
+          t1 = B.LineFeed_75j;
           break $label0$0;
         }
-        t1 = B.LineFeed_SsD;
+        t1 = B.LineFeed_LvD;
         break $label0$0;
       }
       return t1;
     },
     _newRenderResult(options, result, start) {
-      var t3, sourceMapOption, sourceMapPath, t4, sourceMapDir, outFile, _0_0, file, t5, sourceMapDirUrl, i, source, t6, buffer, indices, url, t7, t8, _null = null,
+      var t3, sourceMapOption, sourceMapPath, t4, sourceMapDir, outFile, _0_0, t5, sourceMapDirUrl, i, source, t6, buffer, indices, url, t7, t8, _null = null,
         t1 = Date.now(),
         t2 = result._compile_result$_serialize,
         css = t2._0,
@@ -24877,14 +27113,7 @@ self.util = _cliPkgRequires.util;
           _0_0 = t3.get$file(options);
           $label0$0: {
             if (_0_0 != null) {
-              file = _0_0;
-              t5 = true;
-            } else {
-              file = _null;
-              t5 = false;
-            }
-            if (t5) {
-              t5 = t4.toUri$1(t4.withoutExtension$1(file) + ".css").toString$0(0);
+              t5 = t4.toUri$1(t4.withoutExtension$1(_0_0) + ".css").toString$0(0);
               break $label0$0;
             }
             t5 = t2.targetUrl = "stdin.css";
@@ -24939,8 +27168,8 @@ self.util = _cliPkgRequires.util;
       t3 = J.get$file$x(options);
       if (t3 == null)
         t3 = "data";
-      t4 = start._core$_value;
-      t1 = new A.DateTime(t1, false)._core$_value;
+      t4 = start._value;
+      t1 = new A.DateTime(t1, false)._value;
       t5 = B.JSInt_methods._tdivFast$1(A.Duration$(t1 - t4)._duration, 1000);
       t6 = A._setArrayType([], type$.JSArray_String);
       for (t7 = result._evaluate._0, t7 = t7.get$iterator(t7); t7.moveNext$0();) {
@@ -25072,9 +27301,6 @@ self.util = _cliPkgRequires.util;
     ListExpression_toString_closure0: function ListExpression_toString_closure0(t0) {
       this.$this = t0;
     },
-    ListExpression__elementNeedsParens_closure0: function ListExpression__elementNeedsParens_closure0(t0) {
-      this._0_0 = t0;
-    },
     _function10($name, $arguments, callback) {
       return A.BuiltInCallable$function0($name, $arguments, callback, "sass:list");
     },
@@ -25086,15 +27312,6 @@ self.util = _cliPkgRequires.util;
     },
     _join_closure0: function _join_closure0() {
     },
-    _join__closure2: function _join__closure2(t0) {
-      this._0_0 = t0;
-    },
-    _join__closure3: function _join__closure3(t0) {
-      this._0_1 = t0;
-    },
-    _join__closure4: function _join__closure4(t0) {
-      this._0_0 = t0;
-    },
     _append_closure2: function _append_closure2() {
     },
     _zip_closure0: function _zip_closure0() {
@@ -25121,8 +27338,8 @@ self.util = _cliPkgRequires.util;
         A.throwExpression(A.ArgumentError$("components may not be empty.", null));
       return new A.SelectorList0(t1, span);
     },
-    SelectorList_SelectorList$parse0(contents, allowParent, allowPlaceholder, interpolationMap, logger) {
-      return A.SelectorParser$0(contents, allowParent, allowPlaceholder, interpolationMap, logger, null).parse$0();
+    SelectorList_SelectorList$parse0(contents, allowParent, interpolationMap, logger, plainCss) {
+      return A.SelectorParser$0(contents, allowParent, interpolationMap, logger, plainCss, null).parse$0();
     },
     SelectorList0: function SelectorList0(t0, t1) {
       this.components = t0;
@@ -25130,26 +27347,25 @@ self.util = _cliPkgRequires.util;
     },
     SelectorList_asSassList_closure0: function SelectorList_asSassList_closure0() {
     },
-    SelectorList_resolveParentSelectors_closure0: function SelectorList_resolveParentSelectors_closure0(t0, t1, t2) {
-      this.$this = t0;
-      this.implicitParent = t1;
-      this.parent = t2;
+    SelectorList_nestWithin_closure0: function SelectorList_nestWithin_closure0(t0, t1, t2, t3) {
+      var _ = this;
+      _.$this = t0;
+      _.preserveParentSelectors = t1;
+      _.implicitParent = t2;
+      _.parent = t3;
     },
-    SelectorList_resolveParentSelectors__closure1: function SelectorList_resolveParentSelectors__closure1(t0) {
+    SelectorList_nestWithin__closure1: function SelectorList_nestWithin__closure1(t0) {
       this.complex = t0;
     },
-    SelectorList_resolveParentSelectors__closure2: function SelectorList_resolveParentSelectors__closure2(t0) {
+    SelectorList_nestWithin__closure2: function SelectorList_nestWithin__closure2(t0) {
       this.complex = t0;
     },
-    SelectorList__resolveParentSelectorsCompound_closure2: function SelectorList__resolveParentSelectorsCompound_closure2() {
+    SelectorList__nestWithinCompound_closure2: function SelectorList__nestWithinCompound_closure2() {
     },
-    SelectorList__resolveParentSelectorsCompound_closure3: function SelectorList__resolveParentSelectorsCompound_closure3(t0) {
+    SelectorList__nestWithinCompound_closure3: function SelectorList__nestWithinCompound_closure3(t0) {
       this.parent = t0;
     },
-    SelectorList__resolveParentSelectorsCompound__closure0: function SelectorList__resolveParentSelectorsCompound__closure0(t0) {
-      this._0_0 = t0;
-    },
-    SelectorList__resolveParentSelectorsCompound_closure4: function SelectorList__resolveParentSelectorsCompound_closure4(t0, t1, t2) {
+    SelectorList__nestWithinCompound_closure4: function SelectorList__nestWithinCompound_closure4(t0, t1, t2) {
       this.parentSelector = t0;
       this.resolvedSimples = t1;
       this.component = t2;
@@ -25209,19 +27425,15 @@ self.util = _cliPkgRequires.util;
     DebugOptions: function DebugOptions() {
     },
     WarnForDeprecation_warnForDeprecation0(_this, deprecation, message, span, trace) {
-      var $self, t1;
-      if (_this instanceof A.DeprecationHandlingLogger0) {
-        $self = _this;
-        t1 = true;
-      } else {
-        $self = null;
-        t1 = false;
-      }
-      if (t1)
-        $self.warnForDeprecation$4$span$trace(deprecation, message, span, trace);
-      else if (!deprecation.isFuture)
+      if (deprecation.isFuture && !(_this instanceof A.DeprecationProcessingLogger0))
+        return;
+      if (_this instanceof A.LoggerWithDeprecationType)
+        _this.internalWarn$4$deprecation$span$trace(message, deprecation, span, trace);
+      else
         _this.warn$4$deprecation$span$trace(0, message, true, span, trace);
     },
+    LoggerWithDeprecationType: function LoggerWithDeprecationType() {
+    },
     _QuietLogger0: function _QuietLogger0() {
     },
     LoudComment0: function LoudComment0(t0) {
@@ -25236,7 +27448,7 @@ self.util = _cliPkgRequires.util;
       return keyIterator.moveNext$0() ? new A._modify_modifyNestedMap0(keyIterator, modify, addNesting).call$1(map) : modify.call$1(map);
     },
     _deepMergeImpl0(map1, map2) {
-      var t2, t3, result, key, value, _1_0, _1_1, _1_3, resultMap, valueMap, merged, _null = null,
+      var t2, t3, result, t4, key, value, _1_1, _1_3, _1_3_isSet, resultMap, _1_30, valueMap, merged, _null = null,
         t1 = map1._map0$_contents;
       if (t1.get$isEmpty(t1))
         return map2;
@@ -25245,36 +27457,26 @@ self.util = _cliPkgRequires.util;
         return map1;
       t3 = type$.Value_2;
       result = A.LinkedHashMap_LinkedHashMap$of(t1, t3, t3);
-      for (t1 = A.MapExtensions_get_pairs0(t2, t3, t3), t1 = t1.get$iterator(t1); t1.moveNext$0();) {
-        t2 = t1.get$current(t1);
-        key = t2._0;
-        value = t2._1;
-        t2 = result.$index(0, key);
-        t2 = t2 == null ? _null : t2.tryMap$0();
-        _1_0 = new A._Record_2(t2, value.tryMap$0());
-        _1_1 = A._InitializedCell$(new A._deepMergeImpl_closure1(_1_0));
-        _1_3 = A._InitializedCell$(new A._deepMergeImpl_closure2(_1_0));
-        if (_1_1._readFinal$0() != null) {
-          resultMap = _1_1._readFinal$0();
-          t2 = true;
+      for (t1 = A.MapExtensions_get_pairs0(t2, t3, t3), t1 = t1.get$iterator(t1), t2 = type$.SassMap_2; t1.moveNext$0();) {
+        t4 = t1.get$current(t1);
+        key = t4._0;
+        value = t4._1;
+        t4 = result.$index(0, key);
+        _1_1 = t4 == null ? _null : t4.tryMap$0();
+        _1_3 = value.tryMap$0();
+        _1_3_isSet = _1_1 != null;
+        if (_1_3_isSet) {
+          resultMap = _1_1 == null ? t2._as(_1_1) : _1_1;
+          t4 = _1_3 != null;
+          _1_30 = _1_3;
         } else {
           resultMap = _null;
-          t2 = false;
+          _1_30 = resultMap;
+          t4 = false;
         }
-        if (t2)
-          if (_1_3._readFinal$0() != null) {
-            valueMap = _1_3._readFinal$0();
-            t2 = true;
-          } else {
-            valueMap = _null;
-            t2 = false;
-          }
-        else {
-          valueMap = _null;
-          t2 = false;
-        }
-        if (t2) {
-          merged = A._deepMergeImpl0(resultMap, valueMap);
+        if (t4) {
+          valueMap = _1_3_isSet ? _1_30 : _1_3;
+          merged = A._deepMergeImpl0(resultMap, valueMap == null ? t2._as(valueMap) : valueMap);
           if (merged === resultMap)
             continue;
           result.$indexSet(0, key, merged);
@@ -25290,25 +27492,19 @@ self.util = _cliPkgRequires.util;
     },
     _set_closure1: function _set_closure1() {
     },
-    _set__closure4: function _set__closure4(t0) {
+    _set__closure2: function _set__closure2(t0) {
       this.$arguments = t0;
     },
     _set_closure2: function _set_closure2() {
     },
-    _set__closure2: function _set__closure2(t0) {
-      this._0_0 = t0;
-    },
-    _set__closure3: function _set__closure3(t0) {
+    _set__closure1: function _set__closure1(t0) {
       this._box_0 = t0;
     },
     _merge_closure1: function _merge_closure1() {
     },
     _merge_closure2: function _merge_closure2() {
     },
-    _merge__closure1: function _merge__closure1(t0) {
-      this._0_0 = t0;
-    },
-    _merge__closure2: function _merge__closure2(t0) {
+    _merge__closure0: function _merge__closure0(t0) {
       this.map2 = t0;
     },
     _deepMerge_closure0: function _deepMerge_closure0() {
@@ -25333,12 +27529,6 @@ self.util = _cliPkgRequires.util;
       this.modify = t1;
       this.addNesting = t2;
     },
-    _deepMergeImpl_closure1: function _deepMergeImpl_closure1(t0) {
-      this._1_0 = t0;
-    },
-    _deepMergeImpl_closure2: function _deepMergeImpl_closure2(t0) {
-      this._1_0 = t0;
-    },
     MapExtensions_get_pairs0(_this, $K, $V) {
       return _this.get$entries(_this).map$1$1(0, new A.MapExtensions_get_pairs_closure0($K, $V), $K._eval$1("@<0>")._bind$1($V)._eval$1("+(1,2)"));
     },
@@ -25549,13 +27739,10 @@ self.util = _cliPkgRequires.util;
     },
     local_closure3: function local_closure3() {
     },
-    local__closure2: function local__closure2() {
+    local__closure0: function local__closure0() {
     },
     local_closure4: function local_closure4() {
     },
-    local__closure1: function local__closure1(t0) {
-      this._0_0 = t0;
-    },
     mixinClass_closure: function mixinClass_closure() {
     },
     mixinClass__closure: function mixinClass__closure() {
@@ -25566,18 +27753,20 @@ self.util = _cliPkgRequires.util;
       this.callable = t0;
     },
     MixinRule$0($name, $arguments, children, span, comment) {
-      var t1 = A.List_List$unmodifiable(children, type$.Statement_2),
-        t2 = B.JSArray_methods.any$1(t1, new A.ParentStatement_closure0());
-      return new A.MixinRule0($name, $arguments, span, t1, t2);
+      var t1 = A.stringReplaceAllUnchecked($name, "_", "-"),
+        t2 = A.List_List$unmodifiable(children, type$.Statement_2),
+        t3 = B.JSArray_methods.any$1(t2, new A.ParentStatement_closure0());
+      return new A.MixinRule0(t1, $name, $arguments, span, t2, t3);
     },
-    MixinRule0: function MixinRule0(t0, t1, t2, t3, t4) {
+    MixinRule0: function MixinRule0(t0, t1, t2, t3, t4, t5) {
       var _ = this;
       _._mixin_rule$__MixinRule_hasContent_FI = $;
       _.name = t0;
-      _.$arguments = t1;
-      _.span = t2;
-      _.children = t3;
-      _.hasDeclarations = t4;
+      _.originalName = t1;
+      _.$arguments = t2;
+      _.span = t3;
+      _.children = t4;
+      _.hasDeclarations = t5;
     },
     _HasContentVisitor0: function _HasContentVisitor0() {
     },
@@ -25587,6 +27776,10 @@ self.util = _cliPkgRequires.util;
       this.name = t0;
       this._name = t1;
     },
+    JSModule0: function JSModule0() {
+    },
+    JSModuleRequire0: function JSModuleRequire0() {
+    },
     MultiSpan0: function MultiSpan0(t0, t1, t2) {
       this._multi_span0$_primary = t0;
       this.primaryLabel = t1;
@@ -25620,6 +27813,29 @@ self.util = _cliPkgRequires.util;
     },
     ModifiableCssParentNode0: function ModifiableCssParentNode0() {
     },
+    NodePackageImporter0: function NodePackageImporter0() {
+      this._node_package$__NodePackageImporter__entryPointDirectory_F = $;
+    },
+    NodePackageImporter__nodePackageExportsResolve_closure3: function NodePackageImporter__nodePackageExportsResolve_closure3() {
+    },
+    NodePackageImporter__nodePackageExportsResolve_closure4: function NodePackageImporter__nodePackageExportsResolve_closure4() {
+    },
+    NodePackageImporter__nodePackageExportsResolve_closure5: function NodePackageImporter__nodePackageExportsResolve_closure5() {
+    },
+    NodePackageImporter__nodePackageExportsResolve_closure6: function NodePackageImporter__nodePackageExportsResolve_closure6(t0, t1, t2) {
+      this.$this = t0;
+      this.exports = t1;
+      this.packageRoot = t2;
+    },
+    NodePackageImporter__nodePackageExportsResolve__closure1: function NodePackageImporter__nodePackageExportsResolve__closure1(t0, t1, t2) {
+      this.$this = t0;
+      this.variant = t1;
+      this.packageRoot = t2;
+    },
+    NodePackageImporter__nodePackageExportsResolve__closure2: function NodePackageImporter__nodePackageExportsResolve__closure2() {
+    },
+    NodePackageImporter__getMainExport_closure0: function NodePackageImporter__getMainExport_closure0() {
+    },
     NullExpression0: function NullExpression0(t0) {
       this.span = t0;
     },
@@ -25719,76 +27935,175 @@ self.util = _cliPkgRequires.util;
     _parseNumber_closure0: function _parseNumber_closure0() {
     },
     conversionFactor0(unit1, unit2) {
-      var _0_0, innerMap, t1;
+      var _0_0;
       if (unit1 === unit2)
         return 1;
-      _0_0 = B.Map_nfuzN.$index(0, unit1);
-      if (_0_0 != null) {
-        innerMap = _0_0;
-        t1 = true;
-      } else {
-        innerMap = null;
-        t1 = false;
-      }
-      if (t1)
-        return innerMap.$index(0, unit2);
+      _0_0 = B.Map_gQqJO.$index(0, unit1);
+      if (_0_0 != null)
+        return _0_0.$index(0, unit2);
       return null;
     },
     SassNumber_SassNumber0(value, unit) {
       return unit == null ? new A.UnitlessSassNumber0(value, null) : new A.SingleUnitSassNumber0(unit, value, null);
     },
     SassNumber_SassNumber$withUnits0(value, denominatorUnits, numeratorUnits) {
-      var t1, unit, numerators, denominators, unsimplifiedDenominators, valueDouble, _i, denominator, simplifiedAway, i, factor, _1_0, _1_1, _1_2, _1_7, _null = null,
-        _0_0 = new A._Record_2(numeratorUnits, denominatorUnits),
-        _0_1 = A._InitializedCell$(new A.SassNumber_SassNumber$withUnits_closure9(_0_0)),
-        _0_3 = A._InitializedCell$(new A.SassNumber_SassNumber$withUnits_closure10(_0_1)),
-        _0_4 = A._InitializedCell$(new A.SassNumber_SassNumber$withUnits_closure11(_0_1)),
-        _0_6 = A._InitializedCell$(new A.SassNumber_SassNumber$withUnits_closure12(_0_4)),
-        _0_7 = A._InitializedCell$(new A.SassNumber_SassNumber$withUnits_closure13(_0_0)),
-        _0_8 = A._InitializedCell$(new A.SassNumber_SassNumber$withUnits_closure14(_0_7)),
-        _0_10 = A._InitializedCell$(new A.SassNumber_SassNumber$withUnits_closure15(_0_7));
-      if (_0_3._readFinal$0() || _0_6._readFinal$0())
-        t1 = _0_8._readFinal$0() || _0_10._readFinal$0();
-      else
+      var _0_4, _0_6, _0_8_isSet, _0_8, _0_10_isSet, _0_10, _0_7, t2, _0_4_isSet, unit, _0_7_isSet, numerators, t3, denominators, unsimplifiedDenominators, valueDouble, _i, denominator, simplifiedAway, i, factor, _1_2, _1_7_isSet, _1_7, _null = null,
+        _0_3 = numeratorUnits == null,
+        t1 = _0_3,
+        _0_6_isSet = !t1;
+      if (_0_6_isSet) {
+        _0_4 = J.get$length$asx(numeratorUnits == null ? type$.List_String._as(numeratorUnits) : numeratorUnits);
+        t1 = _0_4;
+        _0_6 = t1 <= 0;
+        _0_8_isSet = _0_6;
+      } else {
+        _0_4 = _null;
+        _0_6 = _0_4;
+        _0_8_isSet = true;
+      }
+      if (_0_8_isSet) {
+        _0_8 = denominatorUnits == null;
+        t1 = _0_8;
+        _0_10_isSet = !t1;
+        if (_0_10_isSet) {
+          _0_10 = J.get$length$asx(denominatorUnits == null ? type$.List_String._as(denominatorUnits) : denominatorUnits) <= 0;
+          t1 = _0_10;
+        } else {
+          _0_10 = _null;
+          t1 = true;
+        }
+        _0_7 = denominatorUnits;
+      } else {
+        _0_10 = _null;
+        _0_7 = _0_10;
+        _0_8 = _0_7;
+        _0_10_isSet = false;
         t1 = false;
+      }
       if (t1)
         return new A.UnitlessSassNumber0(value, _null);
-      if (type$.List_String._is(_0_1._readFinal$0()))
-        if (J.$eq$(_0_4._readFinal$0(), 1)) {
-          unit = J.$index$asx(_0_1._readFinal$0(), 0);
-          t1 = _0_8._readFinal$0() || _0_10._readFinal$0();
+      t1 = type$.List_String;
+      if (t1._is(numeratorUnits)) {
+        if (_0_6_isSet) {
+          t2 = _0_4;
+          _0_4_isSet = _0_6_isSet;
+        } else {
+          _0_4 = J.get$length$asx(numeratorUnits);
+          t2 = _0_4;
+          _0_4_isSet = true;
+        }
+        if (t2 === 1) {
+          unit = J.$index$asx(numeratorUnits, 0);
+          if (_0_8_isSet) {
+            t2 = _0_8;
+            _0_7_isSet = _0_8_isSet;
+          } else {
+            _0_8 = denominatorUnits == null;
+            t2 = _0_8;
+            _0_7 = denominatorUnits;
+            _0_8_isSet = true;
+            _0_7_isSet = true;
+          }
+          if (!t2)
+            if (_0_10_isSet)
+              t2 = _0_10;
+            else {
+              if (_0_7_isSet)
+                t2 = _0_7;
+              else {
+                t2 = denominatorUnits;
+                _0_7 = t2;
+                _0_7_isSet = true;
+              }
+              _0_10 = J.get$length$asx(t2 == null ? t1._as(t2) : t2) <= 0;
+              t2 = _0_10;
+              _0_10_isSet = true;
+            }
+          else
+            t2 = true;
         } else {
           unit = _null;
-          t1 = false;
+          _0_7_isSet = _0_8_isSet;
+          t2 = false;
         }
-      else {
+      } else {
         unit = _null;
-        t1 = false;
+        _0_7_isSet = _0_8_isSet;
+        _0_4_isSet = _0_6_isSet;
+        t2 = false;
       }
-      if (t1)
+      if (t2)
         return new A.SingleUnitSassNumber0(unit, value, _null);
-      if (_0_1._readFinal$0() != null) {
-        numerators = _0_1._readFinal$0();
-        t1 = true;
+      t2 = numeratorUnits == null;
+      if (!t2) {
+        numerators = numeratorUnits;
+        if (_0_8_isSet)
+          t3 = _0_8;
+        else {
+          if (_0_7_isSet)
+            t3 = _0_7;
+          else {
+            t3 = denominatorUnits;
+            _0_7 = t3;
+            _0_7_isSet = true;
+          }
+          _0_8 = t3 == null;
+          t3 = _0_8;
+        }
+        if (!t3)
+          if (_0_10_isSet)
+            t3 = _0_10;
+          else {
+            if (_0_7_isSet)
+              t3 = _0_7;
+            else {
+              t3 = denominatorUnits;
+              _0_7 = t3;
+              _0_7_isSet = true;
+            }
+            _0_10 = J.get$length$asx(t3 == null ? t1._as(t3) : t3) <= 0;
+            t3 = _0_10;
+          }
+        else
+          t3 = true;
       } else {
         numerators = _null;
-        t1 = false;
+        t3 = false;
       }
-      if (t1)
-        t1 = _0_8._readFinal$0() || _0_10._readFinal$0();
-      else
-        t1 = false;
-      if (t1)
+      if (t3)
         return new A.ComplexSassNumber0(A.List_List$unmodifiable(numerators, type$.String), B.List_empty, value, _null);
-      if (_0_3._readFinal$0() || _0_6._readFinal$0())
-        if (_0_7._readFinal$0() != null) {
-          denominators = _0_7._readFinal$0();
-          t1 = true;
-        } else {
-          denominators = _null;
-          t1 = false;
+      if (!_0_3)
+        if (_0_6_isSet)
+          t2 = _0_6;
+        else {
+          if (_0_4_isSet)
+            t2 = _0_4;
+          else {
+            _0_4 = J.get$length$asx(t2 ? t1._as(numeratorUnits) : numeratorUnits);
+            t2 = _0_4;
+          }
+          _0_6 = t2 <= 0;
+          t2 = _0_6;
         }
-      else {
+      else
+        t2 = true;
+      if (t2) {
+        if (_0_7_isSet)
+          t2 = _0_7;
+        else {
+          t2 = denominatorUnits;
+          _0_7 = t2;
+          _0_7_isSet = true;
+        }
+        t2 = t2 != null;
+        if (t2) {
+          denominators = _0_7_isSet ? _0_7 : denominatorUnits;
+          if (denominators == null)
+            denominators = t1._as(denominators);
+        } else
+          denominators = _null;
+        t1 = t2;
+      } else {
         denominators = _null;
         t1 = false;
       }
@@ -25821,19 +28136,24 @@ self.util = _cliPkgRequires.util;
         if (!simplifiedAway)
           denominators.push(denominator);
       }
-      _1_0 = new A._Record_2(numerators, denominators);
-      _1_1 = A._InitializedCell$(new A.SassNumber_SassNumber$withUnits_closure16(_1_0));
-      _1_2 = A._InitializedCell$(new A.SassNumber_SassNumber$withUnits_closure17(_1_1));
-      _1_7 = A._InitializedCell$(new A.SassNumber_SassNumber$withUnits_closure18(_1_0));
       $label0$1: {
-        if (_1_2._readFinal$0() <= 0 && _1_7._readFinal$0()) {
+        _1_2 = numerators.length;
+        t1 = _1_2;
+        _1_7_isSet = t1 <= 0;
+        if (_1_7_isSet) {
+          _1_7 = denominators.length <= 0;
+          t1 = _1_7;
+        } else {
+          _1_7 = _null;
+          t1 = false;
+        }
+        if (t1) {
           t1 = new A.UnitlessSassNumber0(valueDouble, _null);
           break $label0$1;
         }
-        if (J.$eq$(_1_2._readFinal$0(), 1)) {
-          unit = J.$index$asx(_1_1._readFinal$0(), 0);
-          t1 = _1_7._readFinal$0();
-          t1 = t1;
+        if (_1_2 === 1) {
+          unit = numerators[0];
+          t1 = _1_7_isSet ? _1_7 : denominators.length <= 0;
         } else {
           unit = _null;
           t1 = false;
@@ -25850,36 +28170,6 @@ self.util = _cliPkgRequires.util;
     },
     SassNumber0: function SassNumber0() {
     },
-    SassNumber_SassNumber$withUnits_closure10: function SassNumber_SassNumber$withUnits_closure10(t0) {
-      this._0_1 = t0;
-    },
-    SassNumber_SassNumber$withUnits_closure9: function SassNumber_SassNumber$withUnits_closure9(t0) {
-      this._0_0 = t0;
-    },
-    SassNumber_SassNumber$withUnits_closure11: function SassNumber_SassNumber$withUnits_closure11(t0) {
-      this._0_1 = t0;
-    },
-    SassNumber_SassNumber$withUnits_closure12: function SassNumber_SassNumber$withUnits_closure12(t0) {
-      this._0_4 = t0;
-    },
-    SassNumber_SassNumber$withUnits_closure14: function SassNumber_SassNumber$withUnits_closure14(t0) {
-      this._0_7 = t0;
-    },
-    SassNumber_SassNumber$withUnits_closure13: function SassNumber_SassNumber$withUnits_closure13(t0) {
-      this._0_0 = t0;
-    },
-    SassNumber_SassNumber$withUnits_closure15: function SassNumber_SassNumber$withUnits_closure15(t0) {
-      this._0_7 = t0;
-    },
-    SassNumber_SassNumber$withUnits_closure16: function SassNumber_SassNumber$withUnits_closure16(t0) {
-      this._1_0 = t0;
-    },
-    SassNumber_SassNumber$withUnits_closure17: function SassNumber_SassNumber$withUnits_closure17(t0) {
-      this._1_1 = t0;
-    },
-    SassNumber_SassNumber$withUnits_closure18: function SassNumber_SassNumber$withUnits_closure18(t0) {
-      this._1_0 = t0;
-    },
     SassNumber__coerceOrConvertValue_compatibilityException0: function SassNumber__coerceOrConvertValue_compatibilityException0(t0, t1, t2, t3, t4, t5, t6) {
       var _ = this;
       _.$this = t0;
@@ -25908,61 +28198,25 @@ self.util = _cliPkgRequires.util;
     },
     SassNumber_minus_closure0: function SassNumber_minus_closure0() {
     },
-    SassNumber_multiplyUnits_closure11: function SassNumber_multiplyUnits_closure11(t0) {
-      this._0_0 = t0;
-    },
-    SassNumber_multiplyUnits_closure12: function SassNumber_multiplyUnits_closure12(t0) {
-      this._0_0 = t0;
-    },
-    SassNumber_multiplyUnits_closure13: function SassNumber_multiplyUnits_closure13(t0) {
-      this._0_0 = t0;
-    },
-    SassNumber_multiplyUnits_closure14: function SassNumber_multiplyUnits_closure14(t0) {
-      this._0_3 = t0;
-    },
-    SassNumber_multiplyUnits_closure15: function SassNumber_multiplyUnits_closure15(t0) {
-      this._0_0 = t0;
-    },
-    SassNumber_multiplyUnits_closure16: function SassNumber_multiplyUnits_closure16(t0) {
-      this._0_7 = t0;
-    },
-    SassNumber_multiplyUnits_closure17: function SassNumber_multiplyUnits_closure17(t0) {
-      this._0_1 = t0;
-    },
-    SassNumber_multiplyUnits_closure18: function SassNumber_multiplyUnits_closure18(t0) {
-      this._0_2 = t0;
-    },
-    SassNumber_multiplyUnits_closure19: function SassNumber_multiplyUnits_closure19(t0, t1) {
+    SassNumber_multiplyUnits_closure3: function SassNumber_multiplyUnits_closure3(t0, t1) {
       this._box_0 = t0;
       this.numerator = t1;
     },
-    SassNumber_multiplyUnits_closure20: function SassNumber_multiplyUnits_closure20(t0, t1) {
+    SassNumber_multiplyUnits_closure4: function SassNumber_multiplyUnits_closure4(t0, t1) {
       this.newNumerators = t0;
       this.numerator = t1;
     },
-    SassNumber_multiplyUnits_closure21: function SassNumber_multiplyUnits_closure21(t0, t1) {
+    SassNumber_multiplyUnits_closure5: function SassNumber_multiplyUnits_closure5(t0, t1) {
       this._box_0 = t0;
       this.numerator = t1;
     },
-    SassNumber_multiplyUnits_closure22: function SassNumber_multiplyUnits_closure22(t0, t1) {
+    SassNumber_multiplyUnits_closure6: function SassNumber_multiplyUnits_closure6(t0, t1) {
       this.newNumerators = t0;
       this.numerator = t1;
     },
     SassNumber__areAnyConvertible_closure0: function SassNumber__areAnyConvertible_closure0(t0) {
       this.units2 = t0;
     },
-    SassNumber__unitString_closure3: function SassNumber__unitString_closure3(t0) {
-      this._0_0 = t0;
-    },
-    SassNumber__unitString_closure4: function SassNumber__unitString_closure4(t0) {
-      this._0_0 = t0;
-    },
-    SassNumber__unitString_closure5: function SassNumber__unitString_closure5(t0) {
-      this._0_5 = t0;
-    },
-    SassNumber__unitString_closure6: function SassNumber__unitString_closure6(t0) {
-      this._0_6 = t0;
-    },
     SassNumber__canonicalizeUnitList_closure0: function SassNumber__canonicalizeUnitList_closure0() {
     },
     SassNumber__canonicalMultiplier_closure0: function SassNumber__canonicalMultiplier_closure0(t0) {
@@ -26181,7 +28435,7 @@ self.util = _cliPkgRequires.util;
       _._sass0$_currentIndentation = 0;
       _._sass0$_spaces = _._sass0$_nextIndentationEnd = _._sass0$_nextIndentation = null;
       _._stylesheet0$_isUseAllowed = true;
-      _._stylesheet0$_inParentheses = _._stylesheet0$_inStyleRule = _._stylesheet0$_inUnknownAtRule = _._stylesheet0$_inControlDirective = _._stylesheet0$_inContentBlock = _._stylesheet0$_inMixin = false;
+      _._stylesheet0$_inExpression = _._stylesheet0$_inParentheses = _._stylesheet0$_inStyleRule = _._stylesheet0$_inUnknownAtRule = _._stylesheet0$_inControlDirective = _._stylesheet0$_inContentBlock = _._stylesheet0$_inMixin = false;
       _._stylesheet0$_globalVariables = t0;
       _.lastSilentComment = null;
       _.scanner = t1;
@@ -26232,7 +28486,7 @@ self.util = _cliPkgRequires.util;
     ScssParser0: function ScssParser0(t0, t1, t2, t3) {
       var _ = this;
       _._stylesheet0$_isUseAllowed = true;
-      _._stylesheet0$_inParentheses = _._stylesheet0$_inStyleRule = _._stylesheet0$_inUnknownAtRule = _._stylesheet0$_inControlDirective = _._stylesheet0$_inContentBlock = _._stylesheet0$_inMixin = false;
+      _._stylesheet0$_inExpression = _._stylesheet0$_inParentheses = _._stylesheet0$_inStyleRule = _._stylesheet0$_inUnknownAtRule = _._stylesheet0$_inControlDirective = _._stylesheet0$_inContentBlock = _._stylesheet0$_inMixin = false;
       _._stylesheet0$_globalVariables = t0;
       _.lastSilentComment = null;
       _.scanner = t1;
@@ -26265,44 +28519,58 @@ self.util = _cliPkgRequires.util;
       this.span = t0;
     },
     _prependParent0(compound) {
-      var t1, type, rest, _null = null,
-        span = A.EvaluationContext_current0().get$currentCallableSpan(),
-        _0_0 = compound.components,
-        _0_3 = A._InitializedCell$(new A._prependParent_closure1(_0_0)),
-        _0_4 = A._InitializedCell$(new A._prependParent_closure2(_0_0));
+      var _0_3, _0_4, _0_4_isSet, rest, _null = null,
+        t1 = A.EvaluationContext_currentOrNull0(),
+        span = (t1 == null ? A.throwExpression(A.StateError$(string$.No_Sass)) : t1).get$currentCallableSpan(),
+        _0_0 = compound.components;
       $label0$0: {
-        if (_0_3._readFinal$0() && _0_4._readFinal$0() instanceof A.UniversalSelector0) {
-          t1 = _null;
-          break $label0$0;
-        }
-        if (_0_3._readFinal$0())
-          if (_0_4._readFinal$0() instanceof A.TypeSelector0)
-            t1 = _0_4._readFinal$0().name.namespace != null;
-          else
-            t1 = false;
-        else
+        _0_3 = _0_0.length >= 1;
+        if (_0_3) {
+          _0_4 = _0_0[0];
+          t1 = _0_4;
+          t1 = t1 instanceof A.UniversalSelector0;
+        } else {
+          _0_4 = _null;
           t1 = false;
+        }
         if (t1) {
           t1 = _null;
           break $label0$0;
         }
-        if (_0_3._readFinal$0())
-          if (_0_4._readFinal$0() instanceof A.TypeSelector0) {
-            type = _0_4._readFinal$0();
-            rest = B.JSArray_methods.sublist$1(_0_0, 1);
-            t1 = true;
+        if (_0_3) {
+          t1 = _0_4;
+          if (t1 instanceof A.TypeSelector0) {
+            t1 = _0_4;
+            t1 = type$.TypeSelector_2._as(t1).name.namespace != null;
+            _0_4_isSet = true;
           } else {
-            rest = _null;
-            type = rest;
+            _0_4_isSet = true;
             t1 = false;
           }
-        else {
-          rest = _null;
-          type = rest;
+        } else {
+          _0_4_isSet = _0_3;
           t1 = false;
         }
         if (t1) {
-          t1 = A._setArrayType([new A.ParentSelector0(type.name.name, span)], type$.JSArray_SimpleSelector_2);
+          t1 = _null;
+          break $label0$0;
+        }
+        if (_0_3) {
+          if (_0_4_isSet)
+            t1 = _0_4;
+          else {
+            _0_4 = _0_0[0];
+            t1 = _0_4;
+            _0_4_isSet = true;
+          }
+          t1 = t1 instanceof A.TypeSelector0;
+        } else
+          t1 = false;
+        if (t1) {
+          t1 = _0_4_isSet ? _0_4 : _0_0[0];
+          type$.TypeSelector_2._as(t1);
+          rest = B.JSArray_methods.sublist$1(_0_0, 1);
+          t1 = A._setArrayType([new A.ParentSelector0(t1.name.name, span)], type$.JSArray_SimpleSelector_2);
           B.JSArray_methods.addAll$1(t1, rest);
           t1 = A.CompoundSelector$0(t1, span);
           break $label0$0;
@@ -26349,20 +28617,14 @@ self.util = _cliPkgRequires.util;
     },
     _parse_closure0: function _parse_closure0() {
     },
-    _prependParent_closure1: function _prependParent_closure1(t0) {
-      this._0_0 = t0;
-    },
-    _prependParent_closure2: function _prependParent_closure2(t0) {
-      this._0_0 = t0;
-    },
-    SelectorParser$0(contents, allowParent, allowPlaceholder, interpolationMap, logger, url) {
+    SelectorParser$0(contents, allowParent, interpolationMap, logger, plainCss, url) {
       var t1 = A.SpanScanner$(contents, url);
-      return new A.SelectorParser0(allowParent, allowPlaceholder, t1, logger == null ? B.StderrLogger_false0 : logger, interpolationMap);
+      return new A.SelectorParser0(allowParent, plainCss, t1, logger == null ? B.StderrLogger_false0 : logger, interpolationMap);
     },
     SelectorParser0: function SelectorParser0(t0, t1, t2, t3, t4) {
       var _ = this;
       _._selector$_allowParent = t0;
-      _._selector$_allowPlaceholder = t1;
+      _._selector$_plainCss = t1;
       _.scanner = t2;
       _.logger = t3;
       _._parser0$_interpolationMap = t4;
@@ -26414,7 +28676,7 @@ self.util = _cliPkgRequires.util;
         t2 = style == null ? B.OutputStyle_00 : style,
         t3 = useSpaces ? 32 : 9,
         t4 = indentWidth == null ? 2 : indentWidth,
-        t5 = lineFeed == null ? B.LineFeed_SsD : lineFeed;
+        t5 = lineFeed == null ? B.LineFeed_LvD : lineFeed;
       A.RangeError_checkValueInInterval(t4, 0, 10, "indentWidth");
       return new A._SerializeVisitor0(t1, t2, inspect, quote, t3, t4, t5);
     },
@@ -26471,9 +28733,6 @@ self.util = _cliPkgRequires.util;
       this.$this = t0;
       this.node = t1;
     },
-    _SerializeVisitor__writeCalculationValue_closure0: function _SerializeVisitor__writeCalculationValue_closure0(t0) {
-      this._2_0 = t0;
-    },
     _SerializeVisitor_visitList_closure2: function _SerializeVisitor_visitList_closure2() {
     },
     _SerializeVisitor_visitList_closure3: function _SerializeVisitor_visitList_closure3(t0, t1) {
@@ -26486,17 +28745,8 @@ self.util = _cliPkgRequires.util;
     _SerializeVisitor_visitMap_closure0: function _SerializeVisitor_visitMap_closure0(t0) {
       this.$this = t0;
     },
-    _SerializeVisitor__visitQuotedString_closure1: function _SerializeVisitor__visitQuotedString_closure1(t0) {
-      this._1_0 = t0;
-    },
-    _SerializeVisitor__visitQuotedString_closure2: function _SerializeVisitor__visitQuotedString_closure2(t0) {
-      this._1_0 = t0;
-    },
     _SerializeVisitor_visitSelectorList_closure0: function _SerializeVisitor_visitSelectorList_closure0() {
     },
-    _SerializeVisitor_visitPseudoSelector_closure0: function _SerializeVisitor_visitPseudoSelector_closure0(t0) {
-      this._0_0 = t0;
-    },
     _SerializeVisitor__write_closure0: function _SerializeVisitor__write_closure0(t0, t1) {
       this.$this = t0;
       this.value = t1;
@@ -26586,14 +28836,15 @@ self.util = _cliPkgRequires.util;
         span = A.SourceFile$fromString("", null).span$1(0, 0),
         t1 = type$.SourceSpan,
         t2 = type$.String;
-      for (t1 = [span, new A.MultiSpan0(span, "", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_empty(t1, t2), t1, t2))], t3 = type$.JSClass, t4 = type$.Function, _i = 0; _i < 2; ++_i) {
+      for (t1 = [span, new A.MultiSpan0(span, "", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_empty(t1, t2), t1, t2)), new A.LazyFileSpan0(new A.updateSourceSpanPrototype_closure(span))], t3 = type$.JSClass, t4 = type$.Function, _i = 0; _i < 3; ++_i) {
         t5 = t3._as(t1[_i].constructor);
-        A.LinkedHashMap_LinkedHashMap$_literal(["start", new A.updateSourceSpanPrototype_closure(), "end", new A.updateSourceSpanPrototype_closure0(), "url", new A.updateSourceSpanPrototype_closure1(), "text", new A.updateSourceSpanPrototype_closure2(), "context", new A.updateSourceSpanPrototype_closure3()], t2, t4).forEach$1(0, A.JSClassExtension_get_defineGetter(t5));
+        A.LinkedHashMap_LinkedHashMap$_literal(["start", new A.updateSourceSpanPrototype_closure0(), "end", new A.updateSourceSpanPrototype_closure1(), "url", new A.updateSourceSpanPrototype_closure2(), "text", new A.updateSourceSpanPrototype_closure3(), "context", new A.updateSourceSpanPrototype_closure4()], t2, t4).forEach$1(0, A.JSClassExtension_get_defineGetter(t5));
       }
       t1 = t3._as(A.FileLocation$_(span.file, span._file$_start).constructor);
-      A.LinkedHashMap_LinkedHashMap$_literal(["line", new A.updateSourceSpanPrototype_closure4(), "column", new A.updateSourceSpanPrototype_closure5()], t2, t4).forEach$1(0, A.JSClassExtension_get_defineGetter(t1));
+      A.LinkedHashMap_LinkedHashMap$_literal(["line", new A.updateSourceSpanPrototype_closure5(), "column", new A.updateSourceSpanPrototype_closure6()], t2, t4).forEach$1(0, A.JSClassExtension_get_defineGetter(t1));
     },
-    updateSourceSpanPrototype_closure: function updateSourceSpanPrototype_closure() {
+    updateSourceSpanPrototype_closure: function updateSourceSpanPrototype_closure(t0) {
+      this.span = t0;
     },
     updateSourceSpanPrototype_closure0: function updateSourceSpanPrototype_closure0() {
     },
@@ -26607,6 +28858,8 @@ self.util = _cliPkgRequires.util;
     },
     updateSourceSpanPrototype_closure5: function updateSourceSpanPrototype_closure5() {
     },
+    updateSourceSpanPrototype_closure6: function updateSourceSpanPrototype_closure6() {
+    },
     StatementSearchVisitor0: function StatementSearchVisitor0() {
     },
     StatementSearchVisitor_visitIfRule_closure1: function StatementSearchVisitor_visitIfRule_closure1(t0) {
@@ -26638,11 +28891,12 @@ self.util = _cliPkgRequires.util;
         buffer = new A.StringBuffer("");
       buffer._contents = "" + A.Primitives_stringFromCharCode(quote);
       A.StringExpression__quoteInnerText0(text, quote, buffer, true);
-      t1 = buffer._contents += A.Primitives_stringFromCharCode(quote);
+      t1 = A.Primitives_stringFromCharCode(quote);
+      t1 = buffer._contents += t1;
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     },
     StringExpression__quoteInnerText0(text, quote, buffer, $static) {
-      var t1, t2, i, _1_0, _0_0, t3, t4;
+      var t1, t2, i, _1_0, _0_0, t3, t4, t0;
       for (t1 = text.length, t2 = t1 - 1, i = 0; i < t1; ++i) {
         _1_0 = text.charCodeAt(i);
         if (_1_0 === 10 || _1_0 === 13 || _1_0 === 12) {
@@ -26665,29 +28919,26 @@ self.util = _cliPkgRequires.util;
           }
           continue;
         }
-        if (92 === _1_0) {
-          t3 = _1_0;
-          t4 = true;
-        } else {
-          t3 = null;
-          t4 = false;
-        }
-        if (!t4) {
-          if (_1_0 === quote) {
-            t3 = _1_0;
-            t4 = true;
-          } else
-            t4 = false;
+        t3 = 92 === _1_0;
+        if (t3)
+          t4 = _1_0;
+        else
+          t4 = null;
+        if (!t3) {
+          t3 = _1_0 === quote;
+          if (t3)
+            t4 = _1_0;
+          t0 = t4;
+          t4 = t3;
+          t3 = t0;
           if (!t4)
             if (35 === _1_0)
               if ($static)
-                if (i < t2)
-                  if (text.charCodeAt(i + 1) === 123) {
+                if (i < t2) {
+                  t4 = text.charCodeAt(i + 1) === 123;
+                  if (t4)
                     t3 = _1_0;
-                    t4 = true;
-                  } else
-                    t4 = false;
-                else
+                } else
                   t4 = false;
               else
                 t4 = false;
@@ -26695,8 +28946,10 @@ self.util = _cliPkgRequires.util;
               t4 = false;
           else
             t4 = true;
-        } else
+        } else {
+          t3 = t4;
           t4 = true;
+        }
         if (t4) {
           buffer.writeCharCode$1(92);
           buffer.writeCharCode$1(t3);
@@ -26706,15 +28959,15 @@ self.util = _cliPkgRequires.util;
       }
     },
     StringExpression__bestQuote0(strings) {
-      var t1, containsDoubleQuote, t2, t3, t4;
-      for (t1 = J.get$iterator$ax(strings), containsDoubleQuote = false; t1.moveNext$0();)
-        for (t2 = new A.CodeUnits(t1.get$current(t1)), t2 = new A.ListIterator(t2, t2.get$length(t2)), t3 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
-          t4 = t2.__internal$_current;
-          if (t4 == null)
-            t4 = t3._as(t4);
-          if (t4 === 39)
+      var t1, t2, t3, containsDoubleQuote, t4, t5;
+      for (t1 = J.get$iterator$ax(strings), t2 = type$.CodeUnits, t3 = t2._eval$1("ListIterator<ListBase.E>"), t2 = t2._eval$1("ListBase.E"), containsDoubleQuote = false; t1.moveNext$0();)
+        for (t4 = new A.CodeUnits(t1.get$current(t1)), t4 = new A.ListIterator(t4, t4.get$length(0), t3); t4.moveNext$0();) {
+          t5 = t4.__internal$_current;
+          if (t5 == null)
+            t5 = t2._as(t5);
+          if (t5 === 39)
             return 34;
-          if (t4 === 34)
+          if (t5 === 34)
             containsDoubleQuote = true;
         }
       return containsDoubleQuote ? 39 : 34;
@@ -26795,17 +29048,18 @@ self.util = _cliPkgRequires.util;
       _._string0$__SassString__sassLength_FI = $;
       _._string0$_hashCache = null;
     },
-    ModifiableCssStyleRule$0(_selector, span, originalSelector) {
+    ModifiableCssStyleRule$0(_selector, span, fromPlainCss, originalSelector) {
       var t1 = A._setArrayType([], type$.JSArray_ModifiableCssNode_2);
-      return new A.ModifiableCssStyleRule0(_selector, originalSelector, span, new A.UnmodifiableListView(t1, type$.UnmodifiableListView_ModifiableCssNode_2), t1);
+      return new A.ModifiableCssStyleRule0(_selector, originalSelector, span, fromPlainCss, new A.UnmodifiableListView(t1, type$.UnmodifiableListView_ModifiableCssNode_2), t1);
     },
-    ModifiableCssStyleRule0: function ModifiableCssStyleRule0(t0, t1, t2, t3, t4) {
+    ModifiableCssStyleRule0: function ModifiableCssStyleRule0(t0, t1, t2, t3, t4, t5) {
       var _ = this;
       _._style_rule0$_selector = t0;
       _.originalSelector = t1;
       _.span = t2;
-      _.children = t3;
-      _._node$_children = t4;
+      _.fromPlainCss = t3;
+      _.children = t4;
+      _._node$_children = t5;
       _._node$_indexInParent = _._node$_parent = null;
       _.isGroupEnd = false;
     },
@@ -26869,13 +29123,6 @@ self.util = _cliPkgRequires.util;
     StylesheetParser_variableDeclarationWithoutNamespace_closure2: function StylesheetParser_variableDeclarationWithoutNamespace_closure2(t0) {
       this.declaration = t0;
     },
-    StylesheetParser__declarationOrBuffer_closure1: function StylesheetParser__declarationOrBuffer_closure1(t0) {
-      this.name = t0;
-    },
-    StylesheetParser__declarationOrBuffer_closure2: function StylesheetParser__declarationOrBuffer_closure2(t0, t1) {
-      this._box_0 = t0;
-      this.name = t1;
-    },
     StylesheetParser__styleRule_closure0: function StylesheetParser__styleRule_closure0(t0, t1, t2, t3) {
       var _ = this;
       _._box_0 = t0;
@@ -26883,11 +29130,8 @@ self.util = _cliPkgRequires.util;
       _.wasInStyleRule = t2;
       _.start = t3;
     },
-    StylesheetParser__propertyOrVariableDeclaration_closure1: function StylesheetParser__propertyOrVariableDeclaration_closure1(t0) {
-      this._box_0 = t0;
-    },
-    StylesheetParser__propertyOrVariableDeclaration_closure2: function StylesheetParser__propertyOrVariableDeclaration_closure2(t0, t1) {
-      this._box_0 = t0;
+    StylesheetParser__tryDeclarationChildren_closure0: function StylesheetParser__tryDeclarationChildren_closure0(t0, t1) {
+      this.name = t0;
       this.value = t1;
     },
     StylesheetParser__atRootRule_closure1: function StylesheetParser__atRootRule_closure1(t0) {
@@ -26987,63 +29231,24 @@ self.util = _cliPkgRequires.util;
       this.$this = t1;
       this.resolveOperations = t2;
     },
-    StylesheetParser__expression_closure2: function StylesheetParser__expression_closure2(t0) {
-      this._3_0 = t0;
-    },
-    StylesheetParser__expression_closure3: function StylesheetParser__expression_closure3(t0) {
-      this._3_0 = t0;
-    },
-    StylesheetParser__expression_closure4: function StylesheetParser__expression_closure4(t0) {
-      this._3_0 = t0;
-    },
     StylesheetParser_expressionUntilComma_closure0: function StylesheetParser_expressionUntilComma_closure0(t0) {
       this.$this = t0;
     },
-    StylesheetParser__isHexColor_closure1: function StylesheetParser__isHexColor_closure1(t0) {
-      this._0_0 = t0;
-    },
-    StylesheetParser__isHexColor_closure2: function StylesheetParser__isHexColor_closure2() {
+    StylesheetParser__isHexColor_closure0: function StylesheetParser__isHexColor_closure0() {
     },
     StylesheetParser__unicodeRange_closure1: function StylesheetParser__unicodeRange_closure1() {
     },
     StylesheetParser__unicodeRange_closure2: function StylesheetParser__unicodeRange_closure2() {
     },
-    StylesheetParser_identifierLike_closure1: function StylesheetParser_identifierLike_closure1(t0) {
-      this._2_0 = t0;
-    },
-    StylesheetParser_identifierLike_closure2: function StylesheetParser_identifierLike_closure2(t0) {
-      this._2_0 = t0;
-    },
     StylesheetParser_namespacedExpression_closure0: function StylesheetParser_namespacedExpression_closure0(t0, t1) {
       this.$this = t0;
       this.start = t1;
     },
     StylesheetParser_trySpecialFunction_closure0: function StylesheetParser_trySpecialFunction_closure0() {
     },
-    StylesheetParser__tryUrlContents_closure0: function StylesheetParser__tryUrlContents_closure0(t0) {
-      this._0_0 = t0;
-    },
-    StylesheetParser__interpolatedDeclarationValue_closure4: function StylesheetParser__interpolatedDeclarationValue_closure4(t0) {
-      this._1_0 = t0;
-    },
-    StylesheetParser__interpolatedDeclarationValue_closure5: function StylesheetParser__interpolatedDeclarationValue_closure5(t0) {
-      this._1_0 = t0;
-    },
-    StylesheetParser__interpolatedDeclarationValue_closure6: function StylesheetParser__interpolatedDeclarationValue_closure6(t0) {
-      this._1_0 = t0;
-    },
-    StylesheetParser__interpolatedDeclarationValue_closure7: function StylesheetParser__interpolatedDeclarationValue_closure7(t0) {
-      this._1_0 = t0;
-    },
-    StylesheetParser__interpolatedDeclarationValue_closure8: function StylesheetParser__interpolatedDeclarationValue_closure8(t0) {
-      this._1_0 = t0;
-    },
     StylesheetParser__expressionUntilComparison_closure0: function StylesheetParser__expressionUntilComparison_closure0(t0) {
       this.$this = t0;
     },
-    StylesheetParser__supportsConditionInParens_closure0: function StylesheetParser__supportsConditionInParens_closure0(t0) {
-      this._0_0 = t0;
-    },
     StylesheetParser__publicIdentifier_closure0: function StylesheetParser__publicIdentifier_closure0(t0, t1) {
       this.$this = t0;
       this.start = t1;
@@ -27189,12 +29394,6 @@ self.util = _cliPkgRequires.util;
       this.namespace = t0;
       this.span = t1;
     },
-    UniversalSelector_unify_closure1: function UniversalSelector_unify_closure1(t0) {
-      this._0_0 = t0;
-    },
-    UniversalSelector_unify_closure2: function UniversalSelector_unify_closure2(t0) {
-      this._0_0 = t0;
-    },
     UnprefixedMapView0: function UnprefixedMapView0(t0, t1, t2) {
       this._unprefixed_map_view0$_map = t0;
       this._unprefixed_map_view0$_prefix = t1;
@@ -27226,38 +29425,40 @@ self.util = _cliPkgRequires.util;
       _.$ti = t3;
     },
     fromImport0() {
-      var t1 = A._asBoolQ($.Zone__current.$index(0, B.Symbol__inImportRule));
+      var t1 = type$.nullable_CanonicalizeContext_2._as($.Zone__current.$index(0, B.Symbol__canonicalizeContext));
+      t1 = t1 == null ? null : t1._canonicalize_context$_fromImport;
       return t1 === true;
     },
-    containingUrl() {
-      var t1, url,
-        _0_0 = $.Zone__current.$index(0, B.Symbol__containingUrl);
+    canonicalizeContext0() {
+      var t1,
+        _0_0 = $.Zone__current.$index(0, B.Symbol__canonicalizeContext);
       $label0$0: {
         if (_0_0 == null)
-          A.throwExpression(A.StateError$("containingUrl may only be accessed within a call to canonicalize()."));
-        if (B.Symbol__none.$eq(0, _0_0)) {
-          t1 = null;
+          A.throwExpression(A.StateError$(string$.canoni));
+        if (_0_0 instanceof A.CanonicalizeContext0) {
+          t1 = _0_0;
           break $label0$0;
         }
-        if (type$.Uri._is(_0_0)) {
-          url = _0_0;
-          t1 = true;
-        } else {
-          url = null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = url;
-          break $label0$0;
-        }
-        t1 = A.throwExpression(A.StateError$("Unexpected Zone.current[#_containingUrl] value " + A.S(_0_0) + "."));
+        t1 = A.throwExpression(A.StateError$(string$.Unexpe + A.S(_0_0) + "."));
       }
       return t1;
     },
-    withContainingUrl0(url, callback, $T) {
-      var t1 = url == null ? B.Symbol__none : url,
-        t2 = type$.nullable_Object;
-      return A.runZoned(callback, A.LinkedHashMap_LinkedHashMap$_literal([B.Symbol__containingUrl, t1], t2, t2), $T);
+    inImportRule(callback, $T) {
+      var t1,
+        _0_0 = $.Zone__current.$index(0, B.Symbol__canonicalizeContext);
+      $label0$0: {
+        if (_0_0 == null) {
+          t1 = type$.nullable_Object;
+          t1 = A.runZoned(callback, A.LinkedHashMap_LinkedHashMap$_literal([B.Symbol__canonicalizeContext, new A.CanonicalizeContext0(true, null)], t1, t1), $T);
+          break $label0$0;
+        }
+        if (_0_0 instanceof A.CanonicalizeContext0) {
+          t1 = _0_0.withFromImport$2(true, callback);
+          break $label0$0;
+        }
+        t1 = A.throwExpression(A.StateError$(string$.Unexpe + A.S(_0_0) + "."));
+      }
+      return t1;
     },
     resolveImportPath0(path) {
       var t1,
@@ -27294,25 +29495,19 @@ self.util = _cliPkgRequires.util;
       return t1 == null ? A._exactlyOne0(A._tryPathWithExtensions0(A.join(path, "index", null))) : t1;
     },
     _exactlyOne0(paths) {
-      var t1, path,
-        _0_1 = A._InitializedCell$(new A._exactlyOne_closure1(paths));
+      var _0_1, t1, path;
       $label0$0: {
-        if (_0_1._readFinal$0() <= 0) {
+        _0_1 = paths.length;
+        if (_0_1 <= 0) {
           t1 = null;
           break $label0$0;
         }
-        if (J.$eq$(_0_1._readFinal$0(), 1)) {
+        if (_0_1 === 1) {
           path = paths[0];
-          t1 = true;
-        } else {
-          path = null;
-          t1 = false;
-        }
-        if (t1) {
           t1 = path;
           break $label0$0;
         }
-        t1 = A.throwExpression(string$.It_s_n + B.JSArray_methods.map$1$1(paths, new A._exactlyOne_closure2(), type$.String).join$1(0, "\n"));
+        t1 = A.throwExpression(string$.It_s_n + B.JSArray_methods.map$1$1(paths, new A._exactlyOne_closure0(), type$.String).join$1(0, "\n"));
       }
       return t1;
     },
@@ -27326,10 +29521,7 @@ self.util = _cliPkgRequires.util;
     _tryPathAsDirectory_closure0: function _tryPathAsDirectory_closure0(t0) {
       this.path = t0;
     },
-    _exactlyOne_closure1: function _exactlyOne_closure1(t0) {
-      this._0_0 = t0;
-    },
-    _exactlyOne_closure2: function _exactlyOne_closure2() {
+    _exactlyOne_closure0: function _exactlyOne_closure0() {
     },
     jsThrow(error) {
       return type$.Never._as($.$get$_jsThrow().call$1(error));
@@ -27369,7 +29561,7 @@ self.util = _cliPkgRequires.util;
     },
     _hideDartProperties(object) {
       var t1, t2, t3, t4;
-      for (t1 = J.cast$1$0$ax(self.Object.getOwnPropertyNames(object), type$.String), t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = J.cast$1$0$ax(self.Object.getOwnPropertyNames(object), type$.String), t2 = A._instanceType(t1), t1 = new A.ListIterator(t1, t1.get$length(t1), t2._eval$1("ListIterator<ListBase.E>")), t2 = t2._eval$1("ListBase.E"); t1.moveNext$0();) {
         t3 = t1.__internal$_current;
         if (t3 == null)
           t3 = t2._as(t3);
@@ -27404,15 +29596,15 @@ self.util = _cliPkgRequires.util;
       var t1;
       $label0$0: {
         if (" " === separator) {
-          t1 = B.ListSeparator_EVt0;
+          t1 = B.ListSeparator_nbm0;
           break $label0$0;
         }
         if ("," === separator) {
-          t1 = B.ListSeparator_rXA0;
+          t1 = B.ListSeparator_ECn0;
           break $label0$0;
         }
         if ("/" === separator) {
-          t1 = B.ListSeparator_zg90;
+          t1 = B.ListSeparator_cQA0;
           break $label0$0;
         }
         if (separator == null) {
@@ -27442,6 +29634,30 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
+    entrypointFilename() {
+      var _1_0, _1_5_isSet, _1_5, t2, path,
+        t1 = self.require.main,
+        _0_0 = t1 == null ? null : J.get$filename$x(t1);
+      if (_0_0 != null)
+        return _0_0;
+      else {
+        _1_0 = J.get$argv$x(self.process);
+        t1 = J.getInterceptor$asx(_1_0);
+        _1_5_isSet = t1.get$length(_1_0) >= 2;
+        if (_1_5_isSet) {
+          _1_5 = t1.$index(_1_0, 1);
+          t2 = typeof _1_5 == "string";
+        } else {
+          _1_5 = null;
+          t2 = false;
+        }
+        if (t2) {
+          path = A._asString(_1_5_isSet ? _1_5 : t1.$index(_1_0, 1));
+          return J.resolve$1$x(J.createRequire$1$x(self.nodeModule, path), path);
+        } else
+          return null;
+      }
+    },
     _PropertyDescriptor0: function _PropertyDescriptor0() {
     },
     futureToPromise_closure0: function futureToPromise_closure0(t0) {
@@ -27456,6 +29672,8 @@ self.util = _cliPkgRequires.util;
     objectToMap_closure: function objectToMap_closure(t0) {
       this.map = t0;
     },
+    _RequireMain0: function _RequireMain0() {
+    },
     toSentence0(iter, conjunction) {
       if (iter.get$length(iter) === 1)
         return J.toString$0$(iter.get$first(iter));
@@ -27572,7 +29790,7 @@ self.util = _cliPkgRequires.util;
       var t1, i;
       if (string1 === string2)
         return true;
-      if (string1 == null || false)
+      if (string1 == null)
         return false;
       t1 = string1.length;
       if (t1 !== string2.length)
@@ -27599,11 +29817,11 @@ self.util = _cliPkgRequires.util;
     },
     longestCommonSubsequence0(list1, list2, select, $T) {
       var t1, _i, selections, i, i0, j, selection, j0,
-        _length = list1.get$length(list1) + 1,
+        _length = list1.get$length(0) + 1,
         lengths = J.JSArray_JSArray$allocateFixed(_length, type$.List_int);
       for (t1 = type$.int, _i = 0; _i < _length; ++_i)
         lengths[_i] = A.List_List$filled(((list2._queue_list$_tail - list2._queue_list$_head & J.get$length$asx(list2._queue_list$_table) - 1) >>> 0) + 1, 0, false, t1);
-      _length = list1.get$length(list1);
+      _length = list1.get$length(0);
       selections = J.JSArray_JSArray$allocateFixed(_length, $T._eval$1("List<0?>"));
       for (t1 = $T._eval$1("0?"), _i = 0; _i < _length; ++_i)
         selections[_i] = A.List_List$filled((list2._queue_list$_tail - list2._queue_list$_head & J.get$length$asx(list2._queue_list$_table) - 1) >>> 0, null, false, t1);
@@ -27615,7 +29833,7 @@ self.util = _cliPkgRequires.util;
           j0 = j + 1;
           t1[j0] = selection == null ? Math.max(t1[j], lengths[i][j0]) : lengths[i][j] + 1;
         }
-      return new A.longestCommonSubsequence_backtrack0(selections, lengths, $T).call$2(list1.get$length(list1) - 1, list2.get$length(list2) - 1);
+      return new A.longestCommonSubsequence_backtrack0(selections, lengths, $T).call$2(list1.get$length(0) - 1, list2.get$length(0) - 1);
     },
     removeFirstWhere0(list, test, orElse) {
       var i;
@@ -27744,14 +29962,12 @@ self.util = _cliPkgRequires.util;
       return t2;
     },
     copyMapOfList0(map, $K, $E) {
-      var t3, key, list,
+      var t3,
         t1 = $E._eval$1("List<0>"),
         t2 = A.LinkedHashMap_LinkedHashMap$_empty($K, t1);
       for (t1 = A.MapExtensions_get_pairs0(map, $K, t1), t1 = t1.get$iterator(t1); t1.moveNext$0();) {
         t3 = t1.get$current(t1);
-        key = t3._0;
-        list = t3._1;
-        t2.$indexSet(0, key, J.toList$0$ax(list));
+        t2.$indexSet(0, t3._0, J.toList$0$ax(t3._1));
       }
       return t2;
     },
@@ -27921,7 +30137,7 @@ self.util = _cliPkgRequires.util;
       var error, stackTrace, t1, exception,
         string = _this._value$_selectorString$1($name);
       try {
-        t1 = A.SelectorList_SelectorList$parse0(string, allowParent, true, null, null);
+        t1 = A.SelectorList_SelectorList$parse0(string, allowParent, null, null, false);
         return t1;
       } catch (exception) {
         t1 = A.unwrapException(exception);
@@ -27939,7 +30155,7 @@ self.util = _cliPkgRequires.util;
         allowParent = false,
         string = _this._value$_selectorString$1($name);
       try {
-        t1 = A.SelectorParser$0(string, allowParent, true, null, null, null).parseCompoundSelector$0();
+        t1 = A.SelectorParser$0(string, allowParent, null, null, false, null).parseCompoundSelector$0();
         return t1;
       } catch (exception) {
         t1 = A.unwrapException(exception);
@@ -28036,10 +30252,10 @@ self.util = _cliPkgRequires.util;
     },
     minBy(values, orderBy) {
       var t1, t2, minValue, minOrderBy, element, elementOrderBy;
-      for (t1 = new A.MappedIterator(J.get$iterator$ax(values.__internal$_iterable), values._f), t2 = A._instanceType(t1)._rest[1], minValue = null, minOrderBy = null; t1.moveNext$0();) {
-        element = t1.__internal$_current;
+      for (t1 = values.$ti, t1 = t1._eval$1("@<1>")._bind$1(t1._rest[1]), t2 = new A.MappedIterator(J.get$iterator$ax(values.__internal$_iterable), values._f, t1._eval$1("MappedIterator<1,2>")), t1 = t1._rest[1], minValue = null, minOrderBy = null; t2.moveNext$0();) {
+        element = t2.__internal$_current;
         if (element == null)
-          element = t2._as(element);
+          element = t1._as(element);
         elementOrderBy = orderBy.call$1(element);
         if (minOrderBy == null || A.defaultCompare(elementOrderBy, minOrderBy) < 0) {
           minOrderBy = elementOrderBy;
@@ -28064,7 +30280,7 @@ self.util = _cliPkgRequires.util;
       return null;
     },
     IterableExtension_get_lastOrNull(_this) {
-      if (_this.get$length(_this) === 0)
+      if (_this.get$length(0) === 0)
         return null;
       return _this.get$last(_this);
     },
@@ -28129,13 +30345,14 @@ self.util = _cliPkgRequires.util;
       };
     },
     IterableIntegerExtension_get_maxOrNull(_this) {
-      var value, t1, newValue,
-        iterator = new A.ListIterator(_this, _this.get$length(_this));
+      var value, newValue,
+        t1 = _this.$ti,
+        iterator = new A.ListIterator(_this, _this.get$length(0), t1._eval$1("ListIterator<ListIterable.E>"));
       if (iterator.moveNext$0()) {
         value = iterator.__internal$_current;
         if (value == null)
-          value = A._instanceType(iterator)._precomputed1._as(value);
-        for (t1 = A._instanceType(iterator)._precomputed1; iterator.moveNext$0();) {
+          value = t1._eval$1("ListIterable.E")._as(value);
+        for (t1 = t1._eval$1("ListIterable.E"); iterator.moveNext$0();) {
           newValue = iterator.__internal$_current;
           if (newValue == null)
             newValue = t1._as(newValue);
@@ -28152,9 +30369,9 @@ self.util = _cliPkgRequires.util;
     },
     IterableIntegerExtension_get_sum(_this) {
       var t1, t2, result, t3;
-      for (t1 = new A.MappedIterator(J.get$iterator$ax(_this.__internal$_iterable), _this._f), t2 = A._instanceType(t1)._rest[1], result = 0; t1.moveNext$0();) {
-        t3 = t1.__internal$_current;
-        result += t3 == null ? t2._as(t3) : t3;
+      for (t1 = _this.$ti, t1 = t1._eval$1("@<1>")._bind$1(t1._rest[1]), t2 = new A.MappedIterator(J.get$iterator$ax(_this.__internal$_iterable), _this._f, t1._eval$1("MappedIterator<1,2>")), t1 = t1._rest[1], result = 0; t2.moveNext$0();) {
+        t3 = t2.__internal$_current;
+        result += t3 == null ? t1._as(t3) : t3;
       }
       return result;
     },
@@ -28233,7 +30450,7 @@ self.util = _cliPkgRequires.util;
       }
       $._currentUriBase = uri;
       if ($.$get$Style_platform() === $.$get$Style_url())
-        t1 = $._current = uri.resolve$1(".").toString$0(0);
+        t1 = $._current = J.resolve$1$x(uri, ".").toString$0(0);
       else {
         path = uri.toFilePath$0();
         lastIndex = path.length - 1;
@@ -28249,7 +30466,9 @@ self.util = _cliPkgRequires.util;
       return $.$get$context().join$16(0, part1, part2, part3, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null);
     },
     prettyUri(uri) {
-      return $.$get$context().prettyUri$1(uri);
+      var t1 = $.$get$context();
+      uri.toString;
+      return t1.prettyUri$1(uri);
     },
     isAlphabetic(char) {
       var t1;
@@ -28259,22 +30478,33 @@ self.util = _cliPkgRequires.util;
         t1 = true;
       return t1;
     },
-    isDriveLetter(path, index) {
-      var t1 = path.length,
-        t2 = index + 2;
-      if (t1 < t2)
-        return false;
+    driveLetterEnd(path, index) {
+      var t2, t3, _null = null,
+        t1 = path.length,
+        index0 = index + 2;
+      if (t1 < index0)
+        return _null;
       if (!A.isAlphabetic(path.charCodeAt(index)))
-        return false;
-      if (path.charCodeAt(index + 1) !== 58)
-        return false;
+        return _null;
+      t2 = index + 1;
+      if (path.charCodeAt(t2) !== 58) {
+        t3 = index + 4;
+        if (t1 < t3)
+          return _null;
+        if (B.JSString_methods.substring$2(path, t2, t3).toLowerCase() !== "%3a")
+          return _null;
+        index = index0;
+      }
+      t2 = index + 2;
       if (t1 === t2)
-        return true;
-      return path.charCodeAt(t2) === 47;
+        return t2;
+      if (path.charCodeAt(t2) !== 47)
+        return _null;
+      return index + 3;
     },
     main0(args) {
       var $async$goto = 0,
-        $async$completer = A._makeAsyncAwaitCompleter(type$.dynamic),
+        $async$completer = A._makeAsyncAwaitCompleter(type$.void),
         t1;
       var $async$main0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
@@ -28293,20 +30523,143 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$main0, $async$completer);
     },
-    EvaluationContext_current() {
-      var context, t1,
+    EvaluationContext_currentOrNull() {
+      var t1,
         _0_0 = $.Zone__current.$index(0, B.Symbol__evaluationContext);
-      if (type$.EvaluationContext._is(_0_0)) {
-        context = _0_0;
-        t1 = true;
-      } else {
-        context = null;
-        t1 = false;
+      $label0$0: {
+        if (type$.EvaluationContext._is(_0_0)) {
+          t1 = _0_0;
+          break $label0$0;
+        }
+        t1 = null;
+        break $label0$0;
       }
-      if (t1)
-        return context;
-      else
-        throw A.wrapException(A.StateError$(string$.No_Sass));
+      return t1;
+    },
+    warn(message) {
+      var t1,
+        _0_0 = A.EvaluationContext_currentOrNull();
+      $label0$0: {
+        if (_0_0 != null) {
+          t1 = _0_0.warn$2(0, message, null);
+          break $label0$0;
+        }
+        t1 = B.StderrLogger_false.warn$1(0, message);
+        break $label0$0;
+      }
+      return t1;
+    },
+    warnForDeprecation(message, deprecation) {
+      var t1,
+        _0_0 = A.EvaluationContext_currentOrNull();
+      $label0$0: {
+        if (_0_0 != null) {
+          t1 = _0_0.warn$2(0, message, deprecation);
+          break $label0$0;
+        }
+        t1 = A.WarnForDeprecation_warnForDeprecation(B.StderrLogger_false, deprecation, message, null, null);
+        break $label0$0;
+      }
+      return t1;
+    },
+    compileStylesheets(options, graph, sourcesToDestinations, ifModified) {
+      var $async$goto = 0,
+        $async$completer = A._makeAsyncAwaitCompleter(type$.bool),
+        $async$returnValue, t2, _1_4, source, t3, _i, t4, printedError, errorWithStackTrace, code, error, stackTrace, buffer, t1, $async$temp1;
+      var $async$compileStylesheets = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
+        if ($async$errorCode === 1)
+          return A._asyncRethrow($async$result, $async$completer);
+        while (true)
+          switch ($async$goto) {
+            case 0:
+              // Function start
+              t1 = type$.nullable_String;
+              t1 = A.List_List$of(A.MapExtensions_get_pairs(sourcesToDestinations, t1, t1), true, type$.Record_2_nullable_String_and_nullable_String);
+              t2 = t1.length;
+              $async$goto = t2 === 1 ? 4 : 5;
+              break;
+            case 4:
+              // then
+              _1_4 = t1[0];
+              source = _1_4._0;
+              $async$temp1 = A;
+              $async$goto = 6;
+              return A._asyncAwait(A.compileStylesheet(options, graph, source, _1_4._1, ifModified), $async$compileStylesheets);
+            case 6:
+              // returning from await.
+              t1 = $async$temp1._setArrayType([$async$result], type$.JSArray_nullable_Record_3_int_and_String_and_nullable_String);
+              // goto break $label0$0
+              $async$goto = 3;
+              break;
+            case 5:
+              // join
+              t3 = A._setArrayType([], type$.JSArray_Future_nullable_Record_3_int_and_String_and_nullable_String);
+              for (_i = 0; _i < t2; ++_i) {
+                t4 = t1[_i];
+                t3.push(A.compileStylesheet(options, graph, t4._0, t4._1, ifModified));
+              }
+              $async$goto = 7;
+              return A._asyncAwait(A.Future_wait(t3, A._asBool(options._options.$index(0, "stop-on-error")), type$.nullable_Record_3_int_and_String_and_nullable_String), $async$compileStylesheets);
+            case 7:
+              // returning from await.
+              t1 = $async$result;
+              // goto break $label0$0
+              $async$goto = 3;
+              break;
+            case 3:
+              // break $label0$0
+              for (t1 = J.get$iterator$ax(t1), printedError = false; t1.moveNext$0();) {
+                errorWithStackTrace = t1.get$current(t1);
+                if (errorWithStackTrace == null)
+                  continue;
+                code = errorWithStackTrace._0;
+                error = errorWithStackTrace._1;
+                stackTrace = errorWithStackTrace._2;
+                t2 = self.process;
+                if (t2 == null)
+                  t2 = null;
+                else {
+                  t2 = J.get$release$x(t2);
+                  t2 = t2 == null ? null : J.get$name$x(t2);
+                }
+                t2 = J.$eq$(t2, "node") ? self.process : null;
+                t2 = t2 == null ? null : J.get$exitCode$x(t2);
+                if (t2 == null)
+                  t2 = 0;
+                t2 = Math.max(t2, code);
+                t3 = self.process;
+                if (t3 == null)
+                  t3 = null;
+                else {
+                  t3 = J.get$release$x(t3);
+                  t3 = t3 == null ? null : J.get$name$x(t3);
+                }
+                t3 = J.$eq$(t3, "node") ? self.process : null;
+                if (t3 != null)
+                  J.set$exitCode$x(t3, t2);
+                buffer = new A.StringBuffer("");
+                t2 = (printedError ? buffer._contents = "" + "\n" : "") + error;
+                buffer._contents = t2;
+                if (stackTrace != null) {
+                  t2 += "\n";
+                  buffer._contents = t2;
+                  t2 += "\n";
+                  buffer._contents = t2;
+                  buffer._contents = t2 + stackTrace;
+                }
+                A.printError(buffer);
+                printedError = true;
+              }
+              $async$returnValue = !printedError;
+              // goto return
+              $async$goto = 1;
+              break;
+            case 1:
+              // return
+              return A._asyncReturn($async$returnValue, $async$completer);
+          }
+      });
+      return A._asyncStartSync($async$compileStylesheets, $async$completer);
     },
     repl(options) {
       return A.repl$body(options);
@@ -28314,7 +30667,7 @@ self.util = _cliPkgRequires.util;
     repl$body(options) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.void),
-        $async$handler = 1, $async$currentError, $async$next = [], repl, logger, evaluator, line, declaration, error, stackTrace, t4, t5, t6, t7, t8, line0, toZone, exception, t1, t2, t3, repl0;
+        $async$handler = 1, $async$currentError, $async$next = [], repl, trackingLogger, logger, evaluator, line, declaration, error, stackTrace, t4, t5, t6, t7, t8, line0, toZone, exception, t1, t2, t3, repl0;
       var $async$repl = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1) {
           $async$currentError = $async$result;
@@ -28331,9 +30684,11 @@ self.util = _cliPkgRequires.util;
               repl0.__Repl__adapter_A = new A.ReplAdapter(repl0);
               repl = repl0;
               t1 = options._options;
-              logger = new A.TrackingLogger(A._asBool(t1.$index(0, "quiet")) ? $.$get$Logger_quiet() : new A.StderrLogger(options.get$color()));
-              t2 = A.absolute(".", null, null, null, null, null, null, null, null, null, null, null, null, null, null);
-              evaluator = new A.Evaluator(A._EvaluateVisitor$(null, A.ImportCache$(type$.List_String._as(t1.$index(0, "load-path")), logger), logger, null, false, false), new A.FilesystemImporter(t2));
+              trackingLogger = new A.TrackingLogger(A._asBool(t1.$index(0, "quiet")) ? $.$get$Logger_quiet() : new A.StderrLogger(options.get$color()));
+              t2 = options.get$silenceDeprecations(0);
+              logger = A.DeprecationProcessingLogger$(trackingLogger, options.get$fatalDeprecations(0), options.get$futureDeprecations(0), !A._asBool(t1.$index(0, "verbose")), t2);
+              t2 = $.$get$FilesystemImporter_cwd();
+              evaluator = new A.Evaluator(A._EvaluateVisitor$(null, A.ImportCache$(options.get$pkgImporters(), type$.List_String._as(t1.$index(0, "load-path")), logger), logger, null, false, false), t2);
               t2 = repl.__Repl__adapter_A;
               t2 === $ && A.throwUnnamedLateFieldNI();
               t2 = new A._StreamIterator(A.checkNotNullable(t2.runAsync$0(), "stream", type$.Object));
@@ -28350,7 +30705,7 @@ self.util = _cliPkgRequires.util;
                 $async$goto = 6;
                 break;
               }
-              line = t2.get$current(t2);
+              line = t2.get$current(0);
               if (J.trim$0$s(line).length === 0) {
                 // goto for condition
                 $async$goto = 5;
@@ -28420,7 +30775,7 @@ self.util = _cliPkgRequires.util;
                   }
                   if (t5 == null)
                     t5 = stackTrace;
-                  A._logError(error, t5, line, repl, options, logger);
+                  A._logError(error, t5, line, repl, options, trackingLogger);
                 } else
                   throw exception;
               }
@@ -28459,7 +30814,7 @@ self.util = _cliPkgRequires.util;
     },
     _logError(error, stackTrace, line, repl, options, logger) {
       var t2, spacesBeforeError, t3,
-        t1 = A.SourceSpanException.prototype.get$span.call(error, error);
+        t1 = A.SourceSpanException.prototype.get$span.call(error, 0);
       if (t1.get$sourceUrl(t1) == null)
         if (!A._asBool(options._options.$index(0, "quiet")))
           t1 = logger._emittedDebug || logger._emittedWarning;
@@ -28472,19 +30827,19 @@ self.util = _cliPkgRequires.util;
         return;
       }
       t1 = options.get$color() ? "" + "\x1b[31m" : "";
-      t2 = A.SourceSpanException.prototype.get$span.call(error, error);
+      t2 = A.SourceSpanException.prototype.get$span.call(error, 0);
       t2 = t2.get$start(t2);
       spacesBeforeError = repl.prompt.length + t2.file.getColumn$1(t2.offset);
       if (options.get$color()) {
-        t2 = A.SourceSpanException.prototype.get$span.call(error, error);
+        t2 = A.SourceSpanException.prototype.get$span.call(error, 0);
         t2 = t2.get$start(t2);
         t2 = t2.file.getColumn$1(t2.offset) < line.length;
       } else
         t2 = false;
       if (t2)
-        t1 = t1 + ("\x1b[1F\x1b[" + spacesBeforeError + "C") + (A.SourceSpanException.prototype.get$span.call(error, error).get$text() + "\n");
+        t1 = t1 + ("\x1b[1F\x1b[" + spacesBeforeError + "C") + (A.SourceSpanException.prototype.get$span.call(error, 0).get$text() + "\n");
       t2 = B.JSString_methods.$mul(" ", spacesBeforeError);
-      t3 = A.SourceSpanException.prototype.get$span.call(error, error);
+      t3 = A.SourceSpanException.prototype.get$span.call(error, 0);
       t3 = t1 + t2 + (B.JSString_methods.$mul("^", Math.max(1, t3.get$length(t3))) + "\n");
       t1 = options.get$color() ? t3 + "\x1b[0m" : t3;
       t1 += "Error: " + error._span_exception$_message + "\n";
@@ -28559,18 +30914,11 @@ self.util = _cliPkgRequires.util;
       return upperCase1 >= 65 && upperCase1 <= 90;
     },
     IterableExtension_search(_this, callback) {
-      var t1, _0_0, value, t2;
+      var t1, _0_0;
       for (t1 = J.get$iterator$ax(_this); t1.moveNext$0();) {
         _0_0 = callback.call$1(t1.get$current(t1));
-        if (_0_0 != null) {
-          value = _0_0;
-          t2 = true;
-        } else {
-          value = null;
-          t2 = false;
-        }
-        if (t2)
-          return value;
+        if (_0_0 != null)
+          return _0_0;
       }
       return null;
     },
@@ -28704,15 +31052,10 @@ self.util = _cliPkgRequires.util;
       return J.get$sign$in(_this);
     },
     SpanExtensions_trimLeft(_this) {
-      var t5,
-        t1 = _this._file$_start,
-        t2 = _this._end,
-        t3 = _this.file._decodedChars,
-        t4 = t3.length,
-        start = 0;
+      var t1, start = 0;
       while (true) {
-        t5 = A.String_String$fromCharCodes(new Uint32Array(t3.subarray(t1, A._checkValidRange(t1, t2, t4))), 0, null).charCodeAt(start);
-        if (!(t5 === 32 || t5 === 9 || t5 === 10 || t5 === 13 || t5 === 12))
+        t1 = _this.get$text().charCodeAt(start);
+        if (!(t1 === 32 || t1 === 9 || t1 === 10 || t1 === 13 || t1 === 12))
           break;
         ++start;
       }
@@ -28729,6 +31072,49 @@ self.util = _cliPkgRequires.util;
       }
       return A.FileSpanExtension_subspan(_this, 0, end + 1);
     },
+    SpanExtensions_initialIdentifier(_this) {
+      var i,
+        scanner = A.StringScanner$(_this.get$text(), null, null);
+      for (i = 0; false; ++i)
+        scanner.readChar$0();
+      A._scanIdentifier(scanner);
+      return A.FileSpanExtension_subspan(_this, 0, scanner._string_scanner$_position);
+    },
+    SpanExtensions_withoutInitialIdentifier(_this) {
+      var scanner = A.StringScanner$(_this.get$text(), null, null);
+      A._scanIdentifier(scanner);
+      return A.FileSpanExtension_subspan(_this, scanner._string_scanner$_position, null);
+    },
+    _scanIdentifier(scanner) {
+      var t1, _0_0, t2;
+      for (t1 = scanner.string.length; scanner._string_scanner$_position !== t1;) {
+        _0_0 = scanner.peekChar$0();
+        if (92 === _0_0) {
+          A.consumeEscapedCharacter(scanner);
+          continue;
+        }
+        if (A._isInt(_0_0)) {
+          if (_0_0 !== 95) {
+            if (!(_0_0 >= 97 && _0_0 <= 122))
+              t2 = _0_0 >= 65 && _0_0 <= 90;
+            else
+              t2 = true;
+            t2 = t2 || _0_0 >= 128;
+          } else
+            t2 = true;
+          if (!t2)
+            t2 = _0_0 >= 48 && _0_0 <= 57 || _0_0 === 45;
+          else
+            t2 = true;
+        } else
+          t2 = false;
+        if (t2) {
+          scanner.readChar$0();
+          continue;
+        }
+        break;
+      }
+    },
     encodeVlq(value) {
       var res, signBit, digit, t1;
       if (value < $.$get$minInt32() || value > $.$get$maxInt32())
@@ -28750,10 +31136,10 @@ self.util = _cliPkgRequires.util;
     },
     isAllTheSame(iter) {
       var firstValue, t1, t2, value;
-      if (iter.get$length(iter) === 0)
+      if (iter.get$length(0) === 0)
         return true;
-      firstValue = iter.get$first(iter);
-      for (t1 = A.SubListIterable$(iter, 1, null, iter.$ti._eval$1("ListIterable.E")), t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      firstValue = iter.get$first(0);
+      for (t1 = A.SubListIterable$(iter, 1, null, iter.$ti._eval$1("ListIterable.E")), t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListIterable.E>")), t2 = t2._eval$1("ListIterable.E"); t1.moveNext$0();) {
         value = t1.__internal$_current;
         if (!J.$eq$(value == null ? t2._as(value) : value, firstValue))
           return false;
@@ -28774,7 +31160,7 @@ self.util = _cliPkgRequires.util;
     },
     countCodeUnits(string, codeUnit) {
       var t1, t2, count, t3;
-      for (t1 = new A.CodeUnits(string), t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1, count = 0; t1.moveNext$0();) {
+      for (t1 = new A.CodeUnits(string), t2 = type$.CodeUnits, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t2 = t2._eval$1("ListBase.E"), count = 0; t1.moveNext$0();) {
         t3 = t1.__internal$_current;
         if ((t3 == null ? t2._as(t3) : t3) === codeUnit)
           ++count;
@@ -28881,34 +31267,51 @@ self.util = _cliPkgRequires.util;
       upperCase1 = (character1 & 4294967263) >>> 0;
       return upperCase1 >= 65 && upperCase1 <= 90;
     },
-    EvaluationContext_current0() {
-      var context, t1,
+    EvaluationContext_currentOrNull0() {
+      var t1,
         _0_0 = $.Zone__current.$index(0, B.Symbol__evaluationContext);
-      if (type$.EvaluationContext_2._is(_0_0)) {
-        context = _0_0;
-        t1 = true;
-      } else {
-        context = null;
-        t1 = false;
+      $label0$0: {
+        if (type$.EvaluationContext_2._is(_0_0)) {
+          t1 = _0_0;
+          break $label0$0;
+        }
+        t1 = null;
+        break $label0$0;
       }
-      if (t1)
-        return context;
-      else
-        throw A.wrapException(A.StateError$(string$.No_Sass));
+      return t1;
+    },
+    warn0(message) {
+      var t1,
+        _0_0 = A.EvaluationContext_currentOrNull0();
+      $label0$0: {
+        if (_0_0 != null) {
+          t1 = _0_0.warn$2(0, message, null);
+          break $label0$0;
+        }
+        t1 = B.StderrLogger_false0.warn$1(0, message);
+        break $label0$0;
+      }
+      return t1;
+    },
+    warnForDeprecation0(message, deprecation) {
+      var t1,
+        _0_0 = A.EvaluationContext_currentOrNull0();
+      $label0$0: {
+        if (_0_0 != null) {
+          t1 = _0_0.warn$2(0, message, deprecation);
+          break $label0$0;
+        }
+        t1 = A.WarnForDeprecation_warnForDeprecation0(B.StderrLogger_false0, deprecation, message, null, null);
+        break $label0$0;
+      }
+      return t1;
     },
     IterableExtension_search0(_this, callback) {
-      var t1, _0_0, value, t2;
+      var t1, _0_0;
       for (t1 = J.get$iterator$ax(_this); t1.moveNext$0();) {
         _0_0 = callback.call$1(t1.get$current(t1));
-        if (_0_0 != null) {
-          value = _0_0;
-          t2 = true;
-        } else {
-          value = null;
-          t2 = false;
-        }
-        if (t2)
-          return value;
+        if (_0_0 != null)
+          return _0_0;
       }
       return null;
     },
@@ -29048,7 +31451,7 @@ self.util = _cliPkgRequires.util;
     main$body(args) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.void),
-        $async$returnValue, $async$handler = 2, $async$currentError, options, graph, error, error0, stackTrace, buffer, rest, t1, t2, t3, exception, $async$exception, $async$temp1;
+        $async$returnValue, $async$handler = 2, $async$currentError, options, t1, graph, error, error0, stackTrace, buffer, t2, t3, t4, t5, exception, $async$exception, $async$temp1;
       var $async$main1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1) {
           $async$currentError = $async$result;
@@ -29058,20 +31461,8 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              if (args.length >= 1)
-                if ("--embedded" === args[0]) {
-                  rest = B.JSArray_methods.sublist$1(args, 1);
-                  t1 = true;
-                } else {
-                  rest = null;
-                  t1 = false;
-                }
-              else {
-                rest = null;
-                t1 = false;
-              }
-              if (t1) {
-                A.main0(rest);
+              if (args.length >= 1 && "--embedded" === args[0]) {
+                A.main0(B.JSArray_methods.sublist$1(args, 1));
                 // goto return
                 $async$goto = 1;
                 break;
@@ -29079,8 +31470,8 @@ self.util = _cliPkgRequires.util;
               options = null;
               $async$handler = 4;
               options = A.ExecutableOptions_ExecutableOptions$parse(args);
-              t1 = options._options;
-              $._glyphs = !(t1.wasParsed$1("unicode") ? A._asBool(t1.$index(0, "unicode")) : $._glyphs !== B.C_AsciiGlyphSet) ? B.C_AsciiGlyphSet : B.C_UnicodeGlyphSet;
+              t2 = options._options;
+              $._glyphs = !(t2.wasParsed$1("unicode") ? A._asBool(t2.$index(0, "unicode")) : $._glyphs !== B.C_AsciiGlyphSet) ? B.C_AsciiGlyphSet : B.C_UnicodeGlyphSet;
               $async$goto = A._asBool(options._options.$index(0, "version")) ? 7 : 8;
               break;
             case 7:
@@ -29112,11 +31503,14 @@ self.util = _cliPkgRequires.util;
               break;
             case 11:
               // join
-              t1 = type$.List_String._as(options._options.$index(0, "load-path"));
-              t2 = options;
-              t2 = A._asBool(t2._options.$index(0, "quiet")) ? $.$get$Logger_quiet() : new A.StderrLogger(t2.get$color());
-              t3 = type$.Uri;
-              graph = new A.StylesheetGraph(A.LinkedHashMap_LinkedHashMap$_empty(t3, type$.StylesheetNode), A.ImportCache$(t1, new A.DeprecationHandlingLogger(A.LinkedHashMap_LinkedHashMap$_empty(type$.Deprecation, type$.int), t2, options.get$fatalDeprecations(), options.get$futureDeprecations(), false)), A.LinkedHashMap_LinkedHashMap$_empty(t3, type$.DateTime));
+              t1 = A.List_List$of(options.get$pkgImporters(), true, type$.Importer_2);
+              J.add$1$ax(t1, $.$get$FilesystemImporter_noLoadPath());
+              t2 = type$.List_String._as(options._options.$index(0, "load-path"));
+              t3 = options;
+              t3 = A._asBool(t3._options.$index(0, "quiet")) ? $.$get$Logger_quiet() : new A.StderrLogger(t3.get$color());
+              t4 = J.get$silenceDeprecations$x(options);
+              t5 = type$.Uri;
+              graph = new A.StylesheetGraph(A.LinkedHashMap_LinkedHashMap$_empty(t5, type$.StylesheetNode), A.ImportCache$(t1, t2, A.DeprecationProcessingLogger$(t3, J.get$fatalDeprecations$x(options), J.get$futureDeprecations$x(options), false, t4)), A.LinkedHashMap_LinkedHashMap$_empty(t5, type$.DateTime));
               $async$goto = A._asBool(options._options.$index(0, "watch")) ? 13 : 14;
               break;
             case 13:
@@ -29171,11 +31565,15 @@ self.util = _cliPkgRequires.util;
                 if (t1 === true)
                   buffer._contents += "\x1b[0m";
                 buffer._contents += "\n";
-                buffer._contents += A.S(error0) + "\n";
+                t1 = buffer;
+                t2 = A.S(error0) + "\n";
+                t1._contents += t2;
                 buffer._contents += "\n";
                 buffer._contents += "\n";
+                t2 = buffer;
                 t1 = A.getTrace(error0);
-                buffer._contents += B.JSString_methods.trimRight$0(A.Trace_Trace$from(t1 == null ? stackTrace : t1).get$terse().toString$0(0));
+                t1 = B.JSString_methods.trimRight$0(A.Trace_Trace$from(t1 == null ? stackTrace : t1).get$terse().toString$0(0));
+                t2._contents += t1;
                 A.printError(buffer);
                 t1 = A.isNodeJs() ? self.process : null;
                 if (t1 != null)
@@ -29212,7 +31610,7 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              $async$returnValue = "1.69.5 compiled with dart2js 3.1.5";
+              $async$returnValue = "1.77.8 compiled with dart2js 3.4.4";
               // goto return
               $async$goto = 1;
               break;
@@ -29224,15 +31622,10 @@ self.util = _cliPkgRequires.util;
       return A._asyncStartSync($async$_loadVersion, $async$completer);
     },
     SpanExtensions_trimLeft0(_this) {
-      var t5,
-        t1 = _this._file$_start,
-        t2 = _this._end,
-        t3 = _this.file._decodedChars,
-        t4 = t3.length,
-        start = 0;
+      var t1, start = 0;
       while (true) {
-        t5 = A.String_String$fromCharCodes(new Uint32Array(t3.subarray(t1, A._checkValidRange(t1, t2, t4))), 0, null).charCodeAt(start);
-        if (!(t5 === 32 || t5 === 9 || t5 === 10 || t5 === 13 || t5 === 12))
+        t1 = _this.get$text().charCodeAt(start);
+        if (!(t1 === 32 || t1 === 9 || t1 === 10 || t1 === 13 || t1 === 12))
           break;
         ++start;
       }
@@ -29249,6 +31642,49 @@ self.util = _cliPkgRequires.util;
       }
       return A.FileSpanExtension_subspan(_this, 0, end + 1);
     },
+    SpanExtensions_initialIdentifier0(_this) {
+      var i,
+        scanner = A.StringScanner$(_this.get$text(), null, null);
+      for (i = 0; false; ++i)
+        scanner.readChar$0();
+      A._scanIdentifier0(scanner);
+      return A.FileSpanExtension_subspan(_this, 0, scanner._string_scanner$_position);
+    },
+    SpanExtensions_withoutInitialIdentifier0(_this) {
+      var scanner = A.StringScanner$(_this.get$text(), null, null);
+      A._scanIdentifier0(scanner);
+      return A.FileSpanExtension_subspan(_this, scanner._string_scanner$_position, null);
+    },
+    _scanIdentifier0(scanner) {
+      var t1, _0_0, t2;
+      for (t1 = scanner.string.length; scanner._string_scanner$_position !== t1;) {
+        _0_0 = scanner.peekChar$0();
+        if (92 === _0_0) {
+          A.consumeEscapedCharacter0(scanner);
+          continue;
+        }
+        if (A._isInt(_0_0)) {
+          if (_0_0 !== 95) {
+            if (!(_0_0 >= 97 && _0_0 <= 122))
+              t2 = _0_0 >= 65 && _0_0 <= 90;
+            else
+              t2 = true;
+            t2 = t2 || _0_0 >= 128;
+          } else
+            t2 = true;
+          if (!t2)
+            t2 = _0_0 >= 48 && _0_0 <= 57 || _0_0 === 45;
+          else
+            t2 = true;
+        } else
+          t2 = false;
+        if (t2) {
+          scanner.readChar$0();
+          continue;
+        }
+        break;
+      }
+    },
     validateUrlScheme(scheme) {
       var t1 = $.$get$_urlSchemeRegExp();
       if (!t1._nativeRegExp.test(scheme))
@@ -29296,839 +31732,6 @@ self.util = _cliPkgRequires.util;
       return t1;
     }
   },
-  J = {
-    makeDispatchRecord(interceptor, proto, extension, indexability) {
-      return {i: interceptor, p: proto, e: extension, x: indexability};
-    },
-    getNativeInterceptor(object) {
-      var proto, objectProto, $constructor, interceptor, t1,
-        record = object[init.dispatchPropertyName];
-      if (record == null)
-        if ($.initNativeDispatchFlag == null) {
-          A.initNativeDispatch();
-          record = object[init.dispatchPropertyName];
-        }
-      if (record != null) {
-        proto = record.p;
-        if (false === proto)
-          return record.i;
-        if (true === proto)
-          return object;
-        objectProto = Object.getPrototypeOf(object);
-        if (proto === objectProto)
-          return record.i;
-        if (record.e === objectProto)
-          throw A.wrapException(A.UnimplementedError$("Return interceptor for " + A.S(proto(object, record))));
-      }
-      $constructor = object.constructor;
-      if ($constructor == null)
-        interceptor = null;
-      else {
-        t1 = $._JS_INTEROP_INTERCEPTOR_TAG;
-        if (t1 == null)
-          t1 = $._JS_INTEROP_INTERCEPTOR_TAG = init.getIsolateTag("_$dart_js");
-        interceptor = $constructor[t1];
-      }
-      if (interceptor != null)
-        return interceptor;
-      interceptor = A.lookupAndCacheInterceptor(object);
-      if (interceptor != null)
-        return interceptor;
-      if (typeof object == "function")
-        return B.JavaScriptFunction_methods;
-      proto = Object.getPrototypeOf(object);
-      if (proto == null)
-        return B.PlainJavaScriptObject_methods;
-      if (proto === Object.prototype)
-        return B.PlainJavaScriptObject_methods;
-      if (typeof $constructor == "function") {
-        t1 = $._JS_INTEROP_INTERCEPTOR_TAG;
-        if (t1 == null)
-          t1 = $._JS_INTEROP_INTERCEPTOR_TAG = init.getIsolateTag("_$dart_js");
-        Object.defineProperty($constructor, t1, {value: B.UnknownJavaScriptObject_methods, enumerable: false, writable: true, configurable: true});
-        return B.UnknownJavaScriptObject_methods;
-      }
-      return B.UnknownJavaScriptObject_methods;
-    },
-    JSArray_JSArray$fixed($length, $E) {
-      if ($length < 0 || $length > 4294967295)
-        throw A.wrapException(A.RangeError$range($length, 0, 4294967295, "length", null));
-      return J.JSArray_JSArray$markFixed(new Array($length), $E);
-    },
-    JSArray_JSArray$allocateFixed($length, $E) {
-      if ($length > 4294967295)
-        throw A.wrapException(A.RangeError$range($length, 0, 4294967295, "length", null));
-      return J.JSArray_JSArray$markFixed(new Array($length), $E);
-    },
-    JSArray_JSArray$growable($length, $E) {
-      if ($length < 0)
-        throw A.wrapException(A.ArgumentError$("Length must be a non-negative integer: " + $length, null));
-      return A._setArrayType(new Array($length), $E._eval$1("JSArray<0>"));
-    },
-    JSArray_JSArray$allocateGrowable($length, $E) {
-      if ($length < 0)
-        throw A.wrapException(A.ArgumentError$("Length must be a non-negative integer: " + $length, null));
-      return A._setArrayType(new Array($length), $E._eval$1("JSArray<0>"));
-    },
-    JSArray_JSArray$markFixed(allocation, $E) {
-      return J.JSArray_markFixedList(A._setArrayType(allocation, $E._eval$1("JSArray<0>")));
-    },
-    JSArray_markFixedList(list) {
-      list.fixed$length = Array;
-      return list;
-    },
-    JSArray_markUnmodifiableList(list) {
-      list.fixed$length = Array;
-      list.immutable$list = Array;
-      return list;
-    },
-    JSArray__compareAny(a, b) {
-      return J.compareTo$1$ns(a, b);
-    },
-    JSString__isWhitespace(codeUnit) {
-      if (codeUnit < 256)
-        switch (codeUnit) {
-          case 9:
-          case 10:
-          case 11:
-          case 12:
-          case 13:
-          case 32:
-          case 133:
-          case 160:
-            return true;
-          default:
-            return false;
-        }
-      switch (codeUnit) {
-        case 5760:
-        case 8192:
-        case 8193:
-        case 8194:
-        case 8195:
-        case 8196:
-        case 8197:
-        case 8198:
-        case 8199:
-        case 8200:
-        case 8201:
-        case 8202:
-        case 8232:
-        case 8233:
-        case 8239:
-        case 8287:
-        case 12288:
-        case 65279:
-          return true;
-        default:
-          return false;
-      }
-    },
-    JSString__skipLeadingWhitespace(string, index) {
-      var t1, codeUnit;
-      for (t1 = string.length; index < t1;) {
-        codeUnit = string.charCodeAt(index);
-        if (codeUnit !== 32 && codeUnit !== 13 && !J.JSString__isWhitespace(codeUnit))
-          break;
-        ++index;
-      }
-      return index;
-    },
-    JSString__skipTrailingWhitespace(string, index) {
-      var index0, codeUnit;
-      for (; index > 0; index = index0) {
-        index0 = index - 1;
-        codeUnit = string.charCodeAt(index0);
-        if (codeUnit !== 32 && codeUnit !== 13 && !J.JSString__isWhitespace(codeUnit))
-          break;
-      }
-      return index;
-    },
-    getInterceptor$(receiver) {
-      if (typeof receiver == "number") {
-        if (Math.floor(receiver) == receiver)
-          return J.JSInt.prototype;
-        return J.JSNumNotInt.prototype;
-      }
-      if (typeof receiver == "string")
-        return J.JSString.prototype;
-      if (receiver == null)
-        return J.JSNull.prototype;
-      if (typeof receiver == "boolean")
-        return J.JSBool.prototype;
-      if (Array.isArray(receiver))
-        return J.JSArray.prototype;
-      if (typeof receiver != "object") {
-        if (typeof receiver == "function")
-          return J.JavaScriptFunction.prototype;
-        return receiver;
-      }
-      if (receiver instanceof A.Object)
-        return receiver;
-      return J.getNativeInterceptor(receiver);
-    },
-    getInterceptor$ansx(receiver) {
-      if (typeof receiver == "number")
-        return J.JSNumber.prototype;
-      if (typeof receiver == "string")
-        return J.JSString.prototype;
-      if (receiver == null)
-        return receiver;
-      if (Array.isArray(receiver))
-        return J.JSArray.prototype;
-      if (typeof receiver != "object") {
-        if (typeof receiver == "function")
-          return J.JavaScriptFunction.prototype;
-        return receiver;
-      }
-      if (receiver instanceof A.Object)
-        return receiver;
-      return J.getNativeInterceptor(receiver);
-    },
-    getInterceptor$asx(receiver) {
-      if (typeof receiver == "string")
-        return J.JSString.prototype;
-      if (receiver == null)
-        return receiver;
-      if (Array.isArray(receiver))
-        return J.JSArray.prototype;
-      if (typeof receiver != "object") {
-        if (typeof receiver == "function")
-          return J.JavaScriptFunction.prototype;
-        return receiver;
-      }
-      if (receiver instanceof A.Object)
-        return receiver;
-      return J.getNativeInterceptor(receiver);
-    },
-    getInterceptor$ax(receiver) {
-      if (receiver == null)
-        return receiver;
-      if (Array.isArray(receiver))
-        return J.JSArray.prototype;
-      if (typeof receiver != "object") {
-        if (typeof receiver == "function")
-          return J.JavaScriptFunction.prototype;
-        return receiver;
-      }
-      if (receiver instanceof A.Object)
-        return receiver;
-      return J.getNativeInterceptor(receiver);
-    },
-    getInterceptor$in(receiver) {
-      if (typeof receiver == "number") {
-        if (Math.floor(receiver) == receiver)
-          return J.JSInt.prototype;
-        return J.JSNumNotInt.prototype;
-      }
-      if (receiver == null)
-        return receiver;
-      if (!(receiver instanceof A.Object))
-        return J.UnknownJavaScriptObject.prototype;
-      return receiver;
-    },
-    getInterceptor$n(receiver) {
-      if (typeof receiver == "number")
-        return J.JSNumber.prototype;
-      if (receiver == null)
-        return receiver;
-      if (!(receiver instanceof A.Object))
-        return J.UnknownJavaScriptObject.prototype;
-      return receiver;
-    },
-    getInterceptor$ns(receiver) {
-      if (typeof receiver == "number")
-        return J.JSNumber.prototype;
-      if (typeof receiver == "string")
-        return J.JSString.prototype;
-      if (receiver == null)
-        return receiver;
-      if (!(receiver instanceof A.Object))
-        return J.UnknownJavaScriptObject.prototype;
-      return receiver;
-    },
-    getInterceptor$s(receiver) {
-      if (typeof receiver == "string")
-        return J.JSString.prototype;
-      if (receiver == null)
-        return receiver;
-      if (!(receiver instanceof A.Object))
-        return J.UnknownJavaScriptObject.prototype;
-      return receiver;
-    },
-    getInterceptor$x(receiver) {
-      if (receiver == null)
-        return receiver;
-      if (typeof receiver != "object") {
-        if (typeof receiver == "function")
-          return J.JavaScriptFunction.prototype;
-        return receiver;
-      }
-      if (receiver instanceof A.Object)
-        return receiver;
-      return J.getNativeInterceptor(receiver);
-    },
-    getInterceptor$z(receiver) {
-      if (receiver == null)
-        return receiver;
-      if (!(receiver instanceof A.Object))
-        return J.UnknownJavaScriptObject.prototype;
-      return receiver;
-    },
-    set$CalculationInterpolation$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$CalculationInterpolation(receiver, value);
-    },
-    set$CalculationOperation$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$CalculationOperation(receiver, value);
-    },
-    set$Exception$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$Exception(receiver, value);
-    },
-    set$FALSE$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$FALSE(receiver, value);
-    },
-    set$Logger$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$Logger(receiver, value);
-    },
-    set$NULL$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$NULL(receiver, value);
-    },
-    set$SassArgumentList$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$SassArgumentList(receiver, value);
-    },
-    set$SassBoolean$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$SassBoolean(receiver, value);
-    },
-    set$SassCalculation$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$SassCalculation(receiver, value);
-    },
-    set$SassColor$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$SassColor(receiver, value);
-    },
-    set$SassFunction$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$SassFunction(receiver, value);
-    },
-    set$SassList$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$SassList(receiver, value);
-    },
-    set$SassMap$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$SassMap(receiver, value);
-    },
-    set$SassMixin$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$SassMixin(receiver, value);
-    },
-    set$SassNumber$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$SassNumber(receiver, value);
-    },
-    set$SassString$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$SassString(receiver, value);
-    },
-    set$TRUE$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$TRUE(receiver, value);
-    },
-    set$Value$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$Value(receiver, value);
-    },
-    set$cli_pkg_main_0_$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$cli_pkg_main_0_(receiver, value);
-    },
-    set$compile$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$compile(receiver, value);
-    },
-    set$compileAsync$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$compileAsync(receiver, value);
-    },
-    set$compileString$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$compileString(receiver, value);
-    },
-    set$compileStringAsync$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$compileStringAsync(receiver, value);
-    },
-    set$context$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$context(receiver, value);
-    },
-    set$dartValue$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$dartValue(receiver, value);
-    },
-    set$exitCode$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$exitCode(receiver, value);
-    },
-    set$info$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$info(receiver, value);
-    },
-    set$length$asx(receiver, value) {
-      return J.getInterceptor$asx(receiver).set$length(receiver, value);
-    },
-    set$render$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$render(receiver, value);
-    },
-    set$renderSync$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$renderSync(receiver, value);
-    },
-    set$sassFalse$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$sassFalse(receiver, value);
-    },
-    set$sassNull$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$sassNull(receiver, value);
-    },
-    set$sassTrue$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$sassTrue(receiver, value);
-    },
-    set$types$x(receiver, value) {
-      return J.getInterceptor$x(receiver).set$types(receiver, value);
-    },
-    get$$prototype$x(receiver) {
-      return J.getInterceptor$x(receiver).get$$prototype(receiver);
-    },
-    get$_dartException$x(receiver) {
-      return J.getInterceptor$x(receiver).get$_dartException(receiver);
-    },
-    get$alertAscii$x(receiver) {
-      return J.getInterceptor$x(receiver).get$alertAscii(receiver);
-    },
-    get$alertColor$x(receiver) {
-      return J.getInterceptor$x(receiver).get$alertColor(receiver);
-    },
-    get$blue$x(receiver) {
-      return J.getInterceptor$x(receiver).get$blue(receiver);
-    },
-    get$brackets$x(receiver) {
-      return J.getInterceptor$x(receiver).get$brackets(receiver);
-    },
-    get$charset$x(receiver) {
-      return J.getInterceptor$x(receiver).get$charset(receiver);
-    },
-    get$code$x(receiver) {
-      return J.getInterceptor$x(receiver).get$code(receiver);
-    },
-    get$current$x(receiver) {
-      return J.getInterceptor$x(receiver).get$current(receiver);
-    },
-    get$dartValue$x(receiver) {
-      return J.getInterceptor$x(receiver).get$dartValue(receiver);
-    },
-    get$debug$x(receiver) {
-      return J.getInterceptor$x(receiver).get$debug(receiver);
-    },
-    get$denominatorUnits$x(receiver) {
-      return J.getInterceptor$x(receiver).get$denominatorUnits(receiver);
-    },
-    get$end$z(receiver) {
-      return J.getInterceptor$z(receiver).get$end(receiver);
-    },
-    get$env$x(receiver) {
-      return J.getInterceptor$x(receiver).get$env(receiver);
-    },
-    get$exitCode$x(receiver) {
-      return J.getInterceptor$x(receiver).get$exitCode(receiver);
-    },
-    get$fiber$x(receiver) {
-      return J.getInterceptor$x(receiver).get$fiber(receiver);
-    },
-    get$file$x(receiver) {
-      return J.getInterceptor$x(receiver).get$file(receiver);
-    },
-    get$first$ax(receiver) {
-      return J.getInterceptor$ax(receiver).get$first(receiver);
-    },
-    get$functions$x(receiver) {
-      return J.getInterceptor$x(receiver).get$functions(receiver);
-    },
-    get$green$x(receiver) {
-      return J.getInterceptor$x(receiver).get$green(receiver);
-    },
-    get$hashCode$(receiver) {
-      return J.getInterceptor$(receiver).get$hashCode(receiver);
-    },
-    get$importer$x(receiver) {
-      return J.getInterceptor$x(receiver).get$importer(receiver);
-    },
-    get$importers$x(receiver) {
-      return J.getInterceptor$x(receiver).get$importers(receiver);
-    },
-    get$isEmpty$asx(receiver) {
-      return J.getInterceptor$asx(receiver).get$isEmpty(receiver);
-    },
-    get$isNotEmpty$asx(receiver) {
-      return J.getInterceptor$asx(receiver).get$isNotEmpty(receiver);
-    },
-    get$isTTY$x(receiver) {
-      return J.getInterceptor$x(receiver).get$isTTY(receiver);
-    },
-    get$iterator$ax(receiver) {
-      return J.getInterceptor$ax(receiver).get$iterator(receiver);
-    },
-    get$keys$z(receiver) {
-      return J.getInterceptor$z(receiver).get$keys(receiver);
-    },
-    get$last$ax(receiver) {
-      return J.getInterceptor$ax(receiver).get$last(receiver);
-    },
-    get$length$asx(receiver) {
-      return J.getInterceptor$asx(receiver).get$length(receiver);
-    },
-    get$loadPaths$x(receiver) {
-      return J.getInterceptor$x(receiver).get$loadPaths(receiver);
-    },
-    get$logger$x(receiver) {
-      return J.getInterceptor$x(receiver).get$logger(receiver);
-    },
-    get$message$x(receiver) {
-      return J.getInterceptor$x(receiver).get$message(receiver);
-    },
-    get$mtime$x(receiver) {
-      return J.getInterceptor$x(receiver).get$mtime(receiver);
-    },
-    get$name$x(receiver) {
-      return J.getInterceptor$x(receiver).get$name(receiver);
-    },
-    get$numeratorUnits$x(receiver) {
-      return J.getInterceptor$x(receiver).get$numeratorUnits(receiver);
-    },
-    get$options$x(receiver) {
-      return J.getInterceptor$x(receiver).get$options(receiver);
-    },
-    get$parent$z(receiver) {
-      return J.getInterceptor$z(receiver).get$parent(receiver);
-    },
-    get$path$x(receiver) {
-      return J.getInterceptor$x(receiver).get$path(receiver);
-    },
-    get$platform$x(receiver) {
-      return J.getInterceptor$x(receiver).get$platform(receiver);
-    },
-    get$quietDeps$x(receiver) {
-      return J.getInterceptor$x(receiver).get$quietDeps(receiver);
-    },
-    get$quotes$x(receiver) {
-      return J.getInterceptor$x(receiver).get$quotes(receiver);
-    },
-    get$red$x(receiver) {
-      return J.getInterceptor$x(receiver).get$red(receiver);
-    },
-    get$release$x(receiver) {
-      return J.getInterceptor$x(receiver).get$release(receiver);
-    },
-    get$reversed$ax(receiver) {
-      return J.getInterceptor$ax(receiver).get$reversed(receiver);
-    },
-    get$runtimeType$(receiver) {
-      return J.getInterceptor$(receiver).get$runtimeType(receiver);
-    },
-    get$separator$x(receiver) {
-      return J.getInterceptor$x(receiver).get$separator(receiver);
-    },
-    get$sign$in(receiver) {
-      if (typeof receiver === "number")
-        return receiver > 0 ? 1 : receiver < 0 ? -1 : receiver;
-      return J.getInterceptor$in(receiver).get$sign(receiver);
-    },
-    get$single$ax(receiver) {
-      return J.getInterceptor$ax(receiver).get$single(receiver);
-    },
-    get$sourceMap$x(receiver) {
-      return J.getInterceptor$x(receiver).get$sourceMap(receiver);
-    },
-    get$sourceMapIncludeSources$x(receiver) {
-      return J.getInterceptor$x(receiver).get$sourceMapIncludeSources(receiver);
-    },
-    get$span$z(receiver) {
-      return J.getInterceptor$z(receiver).get$span(receiver);
-    },
-    get$stderr$x(receiver) {
-      return J.getInterceptor$x(receiver).get$stderr(receiver);
-    },
-    get$stdout$x(receiver) {
-      return J.getInterceptor$x(receiver).get$stdout(receiver);
-    },
-    get$style$x(receiver) {
-      return J.getInterceptor$x(receiver).get$style(receiver);
-    },
-    get$syntax$x(receiver) {
-      return J.getInterceptor$x(receiver).get$syntax(receiver);
-    },
-    get$trace$z(receiver) {
-      return J.getInterceptor$z(receiver).get$trace(receiver);
-    },
-    get$url$x(receiver) {
-      return J.getInterceptor$x(receiver).get$url(receiver);
-    },
-    get$verbose$x(receiver) {
-      return J.getInterceptor$x(receiver).get$verbose(receiver);
-    },
-    get$warn$x(receiver) {
-      return J.getInterceptor$x(receiver).get$warn(receiver);
-    },
-    $add$ansx(receiver, a0) {
-      if (typeof receiver == "number" && typeof a0 == "number")
-        return receiver + a0;
-      return J.getInterceptor$ansx(receiver).$add(receiver, a0);
-    },
-    $eq$(receiver, a0) {
-      if (receiver == null)
-        return a0 == null;
-      if (typeof receiver != "object")
-        return a0 != null && receiver === a0;
-      return J.getInterceptor$(receiver).$eq(receiver, a0);
-    },
-    $index$asx(receiver, a0) {
-      if (typeof a0 === "number")
-        if (Array.isArray(receiver) || typeof receiver == "string" || A.isJsIndexable(receiver, receiver[init.dispatchPropertyName]))
-          if (a0 >>> 0 === a0 && a0 < receiver.length)
-            return receiver[a0];
-      return J.getInterceptor$asx(receiver).$index(receiver, a0);
-    },
-    $indexSet$ax(receiver, a0, a1) {
-      if (typeof a0 === "number")
-        if ((Array.isArray(receiver) || A.isJsIndexable(receiver, receiver[init.dispatchPropertyName])) && !receiver.immutable$list && a0 >>> 0 === a0 && a0 < receiver.length)
-          return receiver[a0] = a1;
-      return J.getInterceptor$ax(receiver).$indexSet(receiver, a0, a1);
-    },
-    $set$2$x(receiver, a0, a1) {
-      return J.getInterceptor$x(receiver).$set$2(receiver, a0, a1);
-    },
-    add$1$ax(receiver, a0) {
-      return J.getInterceptor$ax(receiver).add$1(receiver, a0);
-    },
-    addAll$1$ax(receiver, a0) {
-      return J.getInterceptor$ax(receiver).addAll$1(receiver, a0);
-    },
-    allMatches$1$s(receiver, a0) {
-      return J.getInterceptor$s(receiver).allMatches$1(receiver, a0);
-    },
-    allMatches$2$s(receiver, a0, a1) {
-      return J.getInterceptor$s(receiver).allMatches$2(receiver, a0, a1);
-    },
-    any$1$ax(receiver, a0) {
-      return J.getInterceptor$ax(receiver).any$1(receiver, a0);
-    },
-    apply$2$x(receiver, a0, a1) {
-      return J.getInterceptor$x(receiver).apply$2(receiver, a0, a1);
-    },
-    asImmutable$0$x(receiver) {
-      return J.getInterceptor$x(receiver).asImmutable$0(receiver);
-    },
-    asMutable$0$x(receiver) {
-      return J.getInterceptor$x(receiver).asMutable$0(receiver);
-    },
-    canonicalize$4$baseImporter$baseUrl$forImport$x(receiver, a0, a1, a2, a3) {
-      return J.getInterceptor$x(receiver).canonicalize$4$baseImporter$baseUrl$forImport(receiver, a0, a1, a2, a3);
-    },
-    cast$1$0$ax(receiver, $T1) {
-      return J.getInterceptor$ax(receiver).cast$1$0(receiver, $T1);
-    },
-    close$0$x(receiver) {
-      return J.getInterceptor$x(receiver).close$0(receiver);
-    },
-    codeUnitAt$1$s(receiver, a0) {
-      return J.getInterceptor$s(receiver).codeUnitAt$1(receiver, a0);
-    },
-    compareTo$1$ns(receiver, a0) {
-      return J.getInterceptor$ns(receiver).compareTo$1(receiver, a0);
-    },
-    contains$1$asx(receiver, a0) {
-      return J.getInterceptor$asx(receiver).contains$1(receiver, a0);
-    },
-    createInterface$1$x(receiver, a0) {
-      return J.getInterceptor$x(receiver).createInterface$1(receiver, a0);
-    },
-    elementAt$1$ax(receiver, a0) {
-      return J.getInterceptor$ax(receiver).elementAt$1(receiver, a0);
-    },
-    endsWith$1$s(receiver, a0) {
-      return J.getInterceptor$s(receiver).endsWith$1(receiver, a0);
-    },
-    error$1$x(receiver, a0) {
-      return J.getInterceptor$x(receiver).error$1(receiver, a0);
-    },
-    every$1$ax(receiver, a0) {
-      return J.getInterceptor$ax(receiver).every$1(receiver, a0);
-    },
-    existsSync$1$x(receiver, a0) {
-      return J.getInterceptor$x(receiver).existsSync$1(receiver, a0);
-    },
-    expand$1$1$ax(receiver, a0, $T1) {
-      return J.getInterceptor$ax(receiver).expand$1$1(receiver, a0, $T1);
-    },
-    fillRange$3$ax(receiver, a0, a1, a2) {
-      return J.getInterceptor$ax(receiver).fillRange$3(receiver, a0, a1, a2);
-    },
-    fold$2$ax(receiver, a0, a1) {
-      return J.getInterceptor$ax(receiver).fold$2(receiver, a0, a1);
-    },
-    forEach$1$ax(receiver, a0) {
-      return J.getInterceptor$ax(receiver).forEach$1(receiver, a0);
-    },
-    getRange$2$ax(receiver, a0, a1) {
-      return J.getInterceptor$ax(receiver).getRange$2(receiver, a0, a1);
-    },
-    getTime$0$x(receiver) {
-      return J.getInterceptor$x(receiver).getTime$0(receiver);
-    },
-    isDirectory$0$x(receiver) {
-      return J.getInterceptor$x(receiver).isDirectory$0(receiver);
-    },
-    isFile$0$x(receiver) {
-      return J.getInterceptor$x(receiver).isFile$0(receiver);
-    },
-    join$1$ax(receiver, a0) {
-      return J.getInterceptor$ax(receiver).join$1(receiver, a0);
-    },
-    listen$1$z(receiver, a0) {
-      return J.getInterceptor$z(receiver).listen$1(receiver, a0);
-    },
-    log$1$x(receiver, a0) {
-      return J.getInterceptor$x(receiver).log$1(receiver, a0);
-    },
-    map$1$1$ax(receiver, a0, $T1) {
-      return J.getInterceptor$ax(receiver).map$1$1(receiver, a0, $T1);
-    },
-    matchAsPrefix$2$s(receiver, a0, a1) {
-      return J.getInterceptor$s(receiver).matchAsPrefix$2(receiver, a0, a1);
-    },
-    mkdirSync$1$x(receiver, a0) {
-      return J.getInterceptor$x(receiver).mkdirSync$1(receiver, a0);
-    },
-    noSuchMethod$1$(receiver, a0) {
-      return J.getInterceptor$(receiver).noSuchMethod$1(receiver, a0);
-    },
-    on$2$x(receiver, a0, a1) {
-      return J.getInterceptor$x(receiver).on$2(receiver, a0, a1);
-    },
-    readFileSync$2$x(receiver, a0, a1) {
-      return J.getInterceptor$x(receiver).readFileSync$2(receiver, a0, a1);
-    },
-    readdirSync$1$x(receiver, a0) {
-      return J.getInterceptor$x(receiver).readdirSync$1(receiver, a0);
-    },
-    remove$1$z(receiver, a0) {
-      return J.getInterceptor$z(receiver).remove$1(receiver, a0);
-    },
-    removeRange$2$ax(receiver, a0, a1) {
-      return J.getInterceptor$ax(receiver).removeRange$2(receiver, a0, a1);
-    },
-    run$0$x(receiver) {
-      return J.getInterceptor$x(receiver).run$0(receiver);
-    },
-    run$1$x(receiver, a0) {
-      return J.getInterceptor$x(receiver).run$1(receiver, a0);
-    },
-    setRange$4$ax(receiver, a0, a1, a2, a3) {
-      return J.getInterceptor$ax(receiver).setRange$4(receiver, a0, a1, a2, a3);
-    },
-    skip$1$ax(receiver, a0) {
-      return J.getInterceptor$ax(receiver).skip$1(receiver, a0);
-    },
-    sort$1$ax(receiver, a0) {
-      return J.getInterceptor$ax(receiver).sort$1(receiver, a0);
-    },
-    startsWith$1$s(receiver, a0) {
-      return J.getInterceptor$s(receiver).startsWith$1(receiver, a0);
-    },
-    statSync$1$x(receiver, a0) {
-      return J.getInterceptor$x(receiver).statSync$1(receiver, a0);
-    },
-    sublist$1$ax(receiver, a0) {
-      return J.getInterceptor$ax(receiver).sublist$1(receiver, a0);
-    },
-    substring$1$s(receiver, a0) {
-      return J.getInterceptor$s(receiver).substring$1(receiver, a0);
-    },
-    substring$2$s(receiver, a0, a1) {
-      return J.getInterceptor$s(receiver).substring$2(receiver, a0, a1);
-    },
-    take$1$ax(receiver, a0) {
-      return J.getInterceptor$ax(receiver).take$1(receiver, a0);
-    },
-    then$1$1$x(receiver, a0, $T1) {
-      return J.getInterceptor$x(receiver).then$1$1(receiver, a0, $T1);
-    },
-    then$1$2$onError$x(receiver, a0, a1, $T1) {
-      return J.getInterceptor$x(receiver).then$1$2$onError(receiver, a0, a1, $T1);
-    },
-    then$2$x(receiver, a0, a1) {
-      return J.getInterceptor$x(receiver).then$2(receiver, a0, a1);
-    },
-    toArray$0$x(receiver) {
-      return J.getInterceptor$x(receiver).toArray$0(receiver);
-    },
-    toList$0$ax(receiver) {
-      return J.getInterceptor$ax(receiver).toList$0(receiver);
-    },
-    toList$1$growable$ax(receiver, a0) {
-      return J.getInterceptor$ax(receiver).toList$1$growable(receiver, a0);
-    },
-    toRadixString$1$n(receiver, a0) {
-      return J.getInterceptor$n(receiver).toRadixString$1(receiver, a0);
-    },
-    toSet$0$ax(receiver) {
-      return J.getInterceptor$ax(receiver).toSet$0(receiver);
-    },
-    toString$0$(receiver) {
-      return J.getInterceptor$(receiver).toString$0(receiver);
-    },
-    toString$1$color$(receiver, a0) {
-      return J.getInterceptor$(receiver).toString$1$color(receiver, a0);
-    },
-    trim$0$s(receiver) {
-      return J.getInterceptor$s(receiver).trim$0(receiver);
-    },
-    unlinkSync$1$x(receiver, a0) {
-      return J.getInterceptor$x(receiver).unlinkSync$1(receiver, a0);
-    },
-    watch$2$x(receiver, a0, a1) {
-      return J.getInterceptor$x(receiver).watch$2(receiver, a0, a1);
-    },
-    where$1$ax(receiver, a0) {
-      return J.getInterceptor$ax(receiver).where$1(receiver, a0);
-    },
-    write$1$x(receiver, a0) {
-      return J.getInterceptor$x(receiver).write$1(receiver, a0);
-    },
-    writeFileSync$2$x(receiver, a0, a1) {
-      return J.getInterceptor$x(receiver).writeFileSync$2(receiver, a0, a1);
-    },
-    yield$0$x(receiver) {
-      return J.getInterceptor$x(receiver).yield$0(receiver);
-    },
-    Interceptor: function Interceptor() {
-    },
-    JSBool: function JSBool() {
-    },
-    JSNull: function JSNull() {
-    },
-    JavaScriptObject: function JavaScriptObject() {
-    },
-    LegacyJavaScriptObject: function LegacyJavaScriptObject() {
-    },
-    PlainJavaScriptObject: function PlainJavaScriptObject() {
-    },
-    UnknownJavaScriptObject: function UnknownJavaScriptObject() {
-    },
-    JavaScriptFunction: function JavaScriptFunction() {
-    },
-    JSArray: function JSArray(t0) {
-      this.$ti = t0;
-    },
-    JSUnmodifiableArray: function JSUnmodifiableArray(t0) {
-      this.$ti = t0;
-    },
-    ArrayIterator: function ArrayIterator(t0, t1) {
-      var _ = this;
-      _._iterable = t0;
-      _._length = t1;
-      _._index = 0;
-      _._current = null;
-    },
-    JSNumber: function JSNumber() {
-    },
-    JSInt: function JSInt() {
-    },
-    JSNumNotInt: function JSNumNotInt() {
-    },
-    JSString: function JSString() {
-    }
-  },
   B = {};
   var holders = [A, J, B];
   var $ = {};
@@ -30195,6 +31798,7 @@ self.util = _cliPkgRequires.util;
     $isCompileOptions: 1,
     $isCompileStringOptions: 1,
     $isNodeCompileResult: 1,
+    $isDeprecation1: 1,
     $is_NodeException: 1,
     $isFiber: 1,
     $isJSFunction0: 1,
@@ -30325,12 +31929,21 @@ self.util = _cliPkgRequires.util;
     message$1(receiver, p0) {
       return receiver.message(p0);
     },
+    get$filename(obj) {
+      return obj.filename;
+    },
+    get$id(obj) {
+      return obj.id;
+    },
     get$code(obj) {
       return obj.code;
     },
     get$syscall(obj) {
       return obj.syscall;
     },
+    get$argv(obj) {
+      return obj.argv;
+    },
     get$env(obj) {
       return obj.env;
     },
@@ -30448,6 +32061,12 @@ self.util = _cliPkgRequires.util;
     set$context(obj, v) {
       return obj.context = v;
     },
+    createRequire$1(receiver, p0) {
+      return receiver.createRequire(p0);
+    },
+    resolve$1(receiver, p0) {
+      return receiver.resolve(p0);
+    },
     get$$prototype(obj) {
       return obj.prototype;
     },
@@ -30517,6 +32136,15 @@ self.util = _cliPkgRequires.util;
     get$functions(obj) {
       return obj.functions;
     },
+    get$fatalDeprecations(obj) {
+      return obj.fatalDeprecations;
+    },
+    get$silenceDeprecations(obj) {
+      return obj.silenceDeprecations;
+    },
+    get$futureDeprecations(obj) {
+      return obj.futureDeprecations;
+    },
     get$syntax(obj) {
       return obj.syntax;
     },
@@ -30544,6 +32172,18 @@ self.util = _cliPkgRequires.util;
     set$compileAsync(obj, v) {
       return obj.compileAsync = v;
     },
+    set$initCompiler(obj, v) {
+      return obj.initCompiler = v;
+    },
+    set$initAsyncCompiler(obj, v) {
+      return obj.initAsyncCompiler = v;
+    },
+    set$Compiler(obj, v) {
+      return obj.Compiler = v;
+    },
+    set$AsyncCompiler(obj, v) {
+      return obj.AsyncCompiler = v;
+    },
     set$info(obj, v) {
       return obj.info = v;
     },
@@ -30553,6 +32193,15 @@ self.util = _cliPkgRequires.util;
     set$Logger(obj, v) {
       return obj.Logger = v;
     },
+    set$NodePackageImporter(obj, v) {
+      return obj.NodePackageImporter = v;
+    },
+    set$deprecations(obj, v) {
+      return obj.deprecations = v;
+    },
+    set$Version(obj, v) {
+      return obj.Version = v;
+    },
     set$Value(obj, v) {
       return obj.Value = v;
     },
@@ -30664,6 +32313,9 @@ self.util = _cliPkgRequires.util;
     get$denominatorUnits(obj) {
       return obj.denominatorUnits;
     },
+    get$pkgImporter(obj) {
+      return obj.pkgImporter;
+    },
     get$indentedSyntax(obj) {
       return obj.indentedSyntax;
     },
@@ -30706,6 +32358,22 @@ self.util = _cliPkgRequires.util;
     },
     $isFunction: 1
   };
+  J.JavaScriptBigInt.prototype = {
+    get$hashCode(receiver) {
+      return 0;
+    },
+    toString$0(receiver) {
+      return String(receiver);
+    }
+  };
+  J.JavaScriptSymbol.prototype = {
+    get$hashCode(receiver) {
+      return 0;
+    },
+    toString$0(receiver) {
+      return String(receiver);
+    }
+  };
   J.JSArray.prototype = {
     cast$1$0(receiver, $R) {
       return new A.CastList(receiver, A._arrayInstanceType(receiver)._eval$1("@<1>")._bind$1($R)._eval$1("CastList<1,2>"));
@@ -30812,8 +32480,8 @@ self.util = _cliPkgRequires.util;
         list[i] = A.S(receiver[i]);
       return list.join(separator);
     },
-    join$0($receiver) {
-      return this.join$1($receiver, "");
+    join$0(receiver) {
+      return this.join$1(receiver, "");
     },
     take$1(receiver, n) {
       return A.SubListIterable$(receiver, 0, A.checkNotNullable(n, "count", type$.int), A._arrayInstanceType(receiver)._precomputed1);
@@ -30831,8 +32499,8 @@ self.util = _cliPkgRequires.util;
       }
       return value;
     },
-    fold$2($receiver, initialValue, combine) {
-      return this.fold$1$2($receiver, initialValue, combine, type$.dynamic);
+    fold$2(receiver, initialValue, combine) {
+      return this.fold$1$2(receiver, initialValue, combine, type$.dynamic);
     },
     elementAt$1(receiver, index) {
       return receiver[index];
@@ -30849,8 +32517,8 @@ self.util = _cliPkgRequires.util;
         return A._setArrayType([], A._arrayInstanceType(receiver));
       return A._setArrayType(receiver.slice(start, end), A._arrayInstanceType(receiver));
     },
-    sublist$1($receiver, start) {
-      return this.sublist$2($receiver, start, null);
+    sublist$1(receiver, start) {
+      return this.sublist$2(receiver, start, null);
     },
     getRange$2(receiver, start, end) {
       A.RangeError_checkValidRange(start, end, receiver.length);
@@ -30907,8 +32575,8 @@ self.util = _cliPkgRequires.util;
         for (i = 0; i < $length; ++i)
           receiver[start + i] = t1.$index(otherList, otherStart + i);
     },
-    setRange$3($receiver, start, end, iterable) {
-      return this.setRange$4($receiver, start, end, iterable, 0);
+    setRange$3(receiver, start, end, iterable) {
+      return this.setRange$4(receiver, start, end, iterable, 0);
     },
     fillRange$3(receiver, start, end, fillValue) {
       var i;
@@ -30945,12 +32613,48 @@ self.util = _cliPkgRequires.util;
       return new A.ReversedListIterable(receiver, A._arrayInstanceType(receiver)._eval$1("ReversedListIterable<1>"));
     },
     sort$1(receiver, compare) {
+      var len, a, b, undefineds, i;
       if (!!receiver.immutable$list)
         A.throwExpression(A.UnsupportedError$("sort"));
-      A.Sort_sort(receiver, compare == null ? J._interceptors_JSArray__compareAny$closure() : compare);
+      len = receiver.length;
+      if (len < 2)
+        return;
+      if (compare == null)
+        compare = J._interceptors_JSArray__compareAny$closure();
+      if (len === 2) {
+        a = receiver[0];
+        b = receiver[1];
+        if (compare.call$2(a, b) > 0) {
+          receiver[0] = b;
+          receiver[1] = a;
+        }
+        return;
+      }
+      if (A._arrayInstanceType(receiver)._precomputed1._is(null)) {
+        for (undefineds = 0, i = 0; i < receiver.length; ++i)
+          if (receiver[i] === void 0) {
+            receiver[i] = null;
+            ++undefineds;
+          }
+      } else
+        undefineds = 0;
+      receiver.sort(A.convertDartClosureToJS(compare, 2));
+      if (undefineds > 0)
+        this._replaceSomeNullsWithUndefined$1(receiver, undefineds);
     },
-    sort$0($receiver) {
-      return this.sort$1($receiver, null);
+    sort$0(receiver) {
+      return this.sort$1(receiver, null);
+    },
+    _replaceSomeNullsWithUndefined$1(receiver, count) {
+      var i0,
+        i = receiver.length;
+      for (; i0 = i - 1, i > 0; i = i0)
+        if (receiver[i0] === null) {
+          receiver[i0] = void 0;
+          --count;
+          if (count === 0)
+            break;
+        }
     },
     indexOf$1(receiver, element) {
       var i,
@@ -30982,14 +32686,14 @@ self.util = _cliPkgRequires.util;
       var t1 = A._setArrayType(receiver.slice(0), A._arrayInstanceType(receiver));
       return t1;
     },
-    toList$0($receiver) {
-      return this.toList$1$growable($receiver, true);
+    toList$0(receiver) {
+      return this.toList$1$growable(receiver, true);
     },
     toSet$0(receiver) {
       return A.LinkedHashSet_LinkedHashSet$from(receiver, A._arrayInstanceType(receiver)._precomputed1);
     },
     get$iterator(receiver) {
-      return new J.ArrayIterator(receiver, receiver.length);
+      return new J.ArrayIterator(receiver, receiver.length, A._arrayInstanceType(receiver)._eval$1("ArrayIterator<1>"));
     },
     get$hashCode(receiver) {
       return A.Primitives_objectHashCode(receiver);
@@ -31040,7 +32744,7 @@ self.util = _cliPkgRequires.util;
   J.ArrayIterator.prototype = {
     get$current(_) {
       var t1 = this._current;
-      return t1 == null ? A._instanceType(this)._precomputed1._as(t1) : t1;
+      return t1 == null ? this.$ti._precomputed1._as(t1) : t1;
     },
     moveNext$0() {
       var t2, _this = this,
@@ -31265,8 +32969,8 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException(A.RangeError$range(start, 0, t1, null, null));
       return new A._StringAllMatchesIterable(string, receiver, start);
     },
-    allMatches$1($receiver, string) {
-      return this.allMatches$2($receiver, string, 0);
+    allMatches$1(receiver, string) {
+      return this.allMatches$2(receiver, string, 0);
     },
     matchAsPrefix$2(receiver, string, start) {
       var t1, i, _null = null;
@@ -31335,14 +33039,14 @@ self.util = _cliPkgRequires.util;
       }
       return J.matchAsPrefix$2$s(pattern, receiver, index) != null;
     },
-    startsWith$1($receiver, pattern) {
-      return this.startsWith$2($receiver, pattern, 0);
+    startsWith$1(receiver, pattern) {
+      return this.startsWith$2(receiver, pattern, 0);
     },
     substring$2(receiver, start, end) {
       return receiver.substring(start, A.RangeError_checkValidRange(start, end, receiver.length));
     },
-    substring$1($receiver, start) {
-      return this.substring$2($receiver, start, null);
+    substring$1(receiver, start) {
+      return this.substring$2(receiver, start, null);
     },
     trim$0(receiver) {
       var startIndex, t1, endIndex0,
@@ -31363,41 +33067,23 @@ self.util = _cliPkgRequires.util;
       return result.substring(startIndex, endIndex0);
     },
     trimLeft$0(receiver) {
-      var result, startIndex;
-      if (typeof receiver.trimLeft != "undefined") {
-        result = receiver.trimLeft();
-        if (result.length === 0)
-          return result;
-        startIndex = result.charCodeAt(0) === 133 ? J.JSString__skipLeadingWhitespace(result, 1) : 0;
-      } else {
-        startIndex = J.JSString__skipLeadingWhitespace(receiver, 0);
-        result = receiver;
-      }
-      if (startIndex === 0)
+      var result = receiver.trimStart();
+      if (result.length === 0)
         return result;
-      if (startIndex === result.length)
-        return "";
-      return result.substring(startIndex);
+      if (result.charCodeAt(0) !== 133)
+        return result;
+      return result.substring(J.JSString__skipLeadingWhitespace(result, 1));
     },
     trimRight$0(receiver) {
-      var result, endIndex, t1;
-      if (typeof receiver.trimRight != "undefined") {
-        result = receiver.trimRight();
+      var t1,
+        result = receiver.trimEnd(),
         endIndex = result.length;
-        if (endIndex === 0)
-          return result;
-        t1 = endIndex - 1;
-        if (result.charCodeAt(t1) === 133)
-          endIndex = J.JSString__skipTrailingWhitespace(result, t1);
-      } else {
-        endIndex = J.JSString__skipTrailingWhitespace(receiver, receiver.length);
-        result = receiver;
-      }
-      if (endIndex === result.length)
-        return result;
       if (endIndex === 0)
-        return "";
-      return result.substring(0, endIndex);
+        return result;
+      t1 = endIndex - 1;
+      if (result.charCodeAt(t1) !== 133)
+        return result;
+      return result.substring(0, J.JSString__skipTrailingWhitespace(result, t1));
     },
     $mul(receiver, times) {
       var s, result;
@@ -31436,8 +33122,8 @@ self.util = _cliPkgRequires.util;
       t1 = receiver.indexOf(pattern, start);
       return t1;
     },
-    indexOf$1($receiver, pattern) {
-      return this.indexOf$2($receiver, pattern, 0);
+    indexOf$1(receiver, pattern) {
+      return this.indexOf$2(receiver, pattern, 0);
     },
     lastIndexOf$2(receiver, pattern, start) {
       var t1, t2, i;
@@ -31457,8 +33143,8 @@ self.util = _cliPkgRequires.util;
           return i;
       return -1;
     },
-    lastIndexOf$1($receiver, pattern) {
-      return this.lastIndexOf$2($receiver, pattern, null);
+    lastIndexOf$1(receiver, pattern) {
+      return this.lastIndexOf$2(receiver, pattern, null);
     },
     contains$2(receiver, other, startIndex) {
       var t1 = receiver.length;
@@ -31466,8 +33152,8 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException(A.RangeError$range(startIndex, 0, t1, null, null));
       return A.stringContainsUnchecked(receiver, other, startIndex);
     },
-    contains$1($receiver, other) {
-      return this.contains$2($receiver, other, 0);
+    contains$1(receiver, other) {
+      return this.contains$2(receiver, other, 0);
     },
     compareTo$1(receiver, other) {
       var t1;
@@ -31729,6 +33415,11 @@ self.util = _cliPkgRequires.util;
       return "LateInitializationError: " + this._message;
     }
   };
+  A.ReachabilityError.prototype = {
+    toString$0(_) {
+      return "ReachabilityError: " + this._message;
+    }
+  };
   A.CodeUnits.prototype = {
     get$length(_) {
       return this._string.length;
@@ -31741,13 +33432,14 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return A.Future_Future$value(null, type$.Null);
     },
-    $signature: 4
+    $signature: 2
   };
   A.SentinelValue.prototype = {};
   A.EfficientLengthIterable.prototype = {};
   A.ListIterable.prototype = {
     get$iterator(_) {
-      return new A.ListIterator(this, this.get$length(this));
+      var _this = this;
+      return new A.ListIterator(_this, _this.get$length(_this), A._instanceType(_this)._eval$1("ListIterator<ListIterable.E>"));
     },
     get$isEmpty(_) {
       return this.get$length(this) === 0;
@@ -31828,8 +33520,8 @@ self.util = _cliPkgRequires.util;
         return t1.charCodeAt(0) == 0 ? t1 : t1;
       }
     },
-    join$0($receiver) {
-      return this.join$1($receiver, "");
+    join$0(_) {
+      return this.join$1(0, "");
     },
     where$1(_, test) {
       return this.super$Iterable$where(0, test);
@@ -31860,8 +33552,8 @@ self.util = _cliPkgRequires.util;
       }
       return value;
     },
-    fold$2($receiver, initialValue, combine) {
-      return this.fold$1$2($receiver, initialValue, combine, type$.dynamic);
+    fold$2(_, initialValue, combine) {
+      return this.fold$1$2(0, initialValue, combine, type$.dynamic);
     },
     skip$1(_, count) {
       return A.SubListIterable$(this, count, null, A._instanceType(this)._eval$1("ListIterable.E"));
@@ -31872,8 +33564,8 @@ self.util = _cliPkgRequires.util;
     toList$1$growable(_, growable) {
       return A.List_List$of(this, true, A._instanceType(this)._eval$1("ListIterable.E"));
     },
-    toList$0($receiver) {
-      return this.toList$1$growable($receiver, true);
+    toList$0(_) {
+      return this.toList$1$growable(0, true);
     },
     toSet$0(_) {
       var i, _this = this,
@@ -31886,7 +33578,7 @@ self.util = _cliPkgRequires.util;
   A.SubListIterable.prototype = {
     SubListIterable$3(_iterable, _start, _endOrLength, $E) {
       var endOrLength,
-        t1 = this.__internal$_start;
+        t1 = this._start;
       A.RangeError_checkNotNegative(t1, "start");
       endOrLength = this._endOrLength;
       if (endOrLength != null) {
@@ -31904,7 +33596,7 @@ self.util = _cliPkgRequires.util;
     },
     get$_startIndex() {
       var $length = J.get$length$asx(this.__internal$_iterable),
-        t1 = this.__internal$_start;
+        t1 = this._start;
       if (t1 > $length)
         return $length;
       return t1;
@@ -31912,7 +33604,7 @@ self.util = _cliPkgRequires.util;
     get$length(_) {
       var endOrLength,
         $length = J.get$length$asx(this.__internal$_iterable),
-        t1 = this.__internal$_start;
+        t1 = this._start;
       if (t1 >= $length)
         return 0;
       endOrLength = this._endOrLength;
@@ -31924,13 +33616,13 @@ self.util = _cliPkgRequires.util;
       var _this = this,
         realIndex = _this.get$_startIndex() + index;
       if (index < 0 || realIndex >= _this.get$_endIndex())
-        throw A.wrapException(A.IndexError$withLength(index, _this.get$length(_this), _this, null, "index"));
+        throw A.wrapException(A.IndexError$withLength(index, _this.get$length(0), _this, null, "index"));
       return J.elementAt$1$ax(_this.__internal$_iterable, realIndex);
     },
     skip$1(_, count) {
       var newStart, endOrLength, _this = this;
       A.RangeError_checkNotNegative(count, "count");
-      newStart = _this.__internal$_start + count;
+      newStart = _this._start + count;
       endOrLength = _this._endOrLength;
       if (endOrLength != null && newStart >= endOrLength)
         return new A.EmptyIterable(_this.$ti._eval$1("EmptyIterable<1>"));
@@ -31940,7 +33632,7 @@ self.util = _cliPkgRequires.util;
       var endOrLength, t1, newEnd, _this = this;
       A.RangeError_checkNotNegative(count, "count");
       endOrLength = _this._endOrLength;
-      t1 = _this.__internal$_start;
+      t1 = _this._start;
       newEnd = t1 + count;
       if (endOrLength == null)
         return A.SubListIterable$(_this.__internal$_iterable, t1, newEnd, _this.$ti._precomputed1);
@@ -31952,7 +33644,7 @@ self.util = _cliPkgRequires.util;
     },
     toList$1$growable(_, growable) {
       var $length, result, i, _this = this,
-        start = _this.__internal$_start,
+        start = _this._start,
         t1 = _this.__internal$_iterable,
         t2 = J.getInterceptor$asx(t1),
         end = t2.get$length(t1),
@@ -31972,14 +33664,14 @@ self.util = _cliPkgRequires.util;
       }
       return result;
     },
-    toList$0($receiver) {
-      return this.toList$1$growable($receiver, true);
+    toList$0(_) {
+      return this.toList$1$growable(0, true);
     }
   };
   A.ListIterator.prototype = {
     get$current(_) {
       var t1 = this.__internal$_current;
-      return t1 == null ? A._instanceType(this)._precomputed1._as(t1) : t1;
+      return t1 == null ? this.$ti._precomputed1._as(t1) : t1;
     },
     moveNext$0() {
       var t3, _this = this,
@@ -32000,7 +33692,8 @@ self.util = _cliPkgRequires.util;
   };
   A.MappedIterable.prototype = {
     get$iterator(_) {
-      return new A.MappedIterator(J.get$iterator$ax(this.__internal$_iterable), this._f);
+      var t1 = A._instanceType(this);
+      return new A.MappedIterator(J.get$iterator$ax(this.__internal$_iterable), this._f, t1._eval$1("@<1>")._bind$1(t1._rest[1])._eval$1("MappedIterator<1,2>"));
     },
     get$length(_) {
       return J.get$length$asx(this.__internal$_iterable);
@@ -32035,7 +33728,7 @@ self.util = _cliPkgRequires.util;
     },
     get$current(_) {
       var t1 = this.__internal$_current;
-      return t1 == null ? A._instanceType(this)._rest[1]._as(t1) : t1;
+      return t1 == null ? this.$ti._rest[1]._as(t1) : t1;
     }
   };
   A.MappedListIterable.prototype = {
@@ -32069,13 +33762,14 @@ self.util = _cliPkgRequires.util;
   };
   A.ExpandIterable.prototype = {
     get$iterator(_) {
-      return new A.ExpandIterator(J.get$iterator$ax(this.__internal$_iterable), this._f, B.C_EmptyIterator);
+      var t1 = this.$ti;
+      return new A.ExpandIterator(J.get$iterator$ax(this.__internal$_iterable), this._f, B.C_EmptyIterator, t1._eval$1("@<1>")._bind$1(t1._rest[1])._eval$1("ExpandIterator<1,2>"));
     }
   };
   A.ExpandIterator.prototype = {
     get$current(_) {
       var t1 = this.__internal$_current;
-      return t1 == null ? A._instanceType(this)._rest[1]._as(t1) : t1;
+      return t1 == null ? this.$ti._rest[1]._as(t1) : t1;
     },
     moveNext$0() {
       var t2, t3, _this = this,
@@ -32098,7 +33792,7 @@ self.util = _cliPkgRequires.util;
   };
   A.TakeIterable.prototype = {
     get$iterator(_) {
-      return new A.TakeIterator(J.get$iterator$ax(this.__internal$_iterable), this._takeCount);
+      return new A.TakeIterator(J.get$iterator$ax(this.__internal$_iterable), this._takeCount, A._instanceType(this)._eval$1("TakeIterator<1>"));
     }
   };
   A.EfficientLengthTakeIterable.prototype = {
@@ -32121,7 +33815,7 @@ self.util = _cliPkgRequires.util;
     get$current(_) {
       var t1;
       if (this._remaining < 0) {
-        A._instanceType(this)._precomputed1._as(null);
+        this.$ti._precomputed1._as(null);
         return null;
       }
       t1 = this._iterator;
@@ -32214,6 +33908,9 @@ self.util = _cliPkgRequires.util;
     every$1(_, test) {
       return true;
     },
+    any$1(_, test) {
+      return false;
+    },
     join$1(_, separator) {
       return "";
     },
@@ -32235,8 +33932,8 @@ self.util = _cliPkgRequires.util;
       var t1 = J.JSArray_JSArray$growable(0, this.$ti._precomputed1);
       return t1;
     },
-    toList$0($receiver) {
-      return this.toList$1$growable($receiver, true);
+    toList$0(_) {
+      return this.toList$1$growable(0, true);
     },
     toSet$0(_) {
       return A.LinkedHashSet_LinkedHashSet(this.$ti._precomputed1);
@@ -32440,17 +34137,17 @@ self.util = _cliPkgRequires.util;
     $isSymbol0: 1
   };
   A.__CastListBase__CastIterableBase_ListMixin.prototype = {};
-  A._Record_2.prototype = {$recipe: "+(1,2)", $shape: 1};
-  A._Record_2_forImport.prototype = {$recipe: "+forImport(1,2)", $shape: 2};
-  A._Record_2_imports_modules.prototype = {$recipe: "+imports,modules(1,2)", $shape: 4};
-  A._Record_2_loadedUrls_stylesheet.prototype = {$recipe: "+loadedUrls,stylesheet(1,2)", $shape: 5};
-  A._Record_2_sourceMap.prototype = {$recipe: "+sourceMap(1,2)", $shape: 3};
-  A._Record_3.prototype = {$recipe: "+(1,2,3)", $shape: 6};
-  A._Record_3_importer_isDependency.prototype = {$recipe: "+importer,isDependency(1,2,3)", $shape: 8};
-  A._Record_3_originalUrl.prototype = {$recipe: "+originalUrl(1,2,3)", $shape: 7};
-  A._Record_4.prototype = {$recipe: "+(1,2,3,4)", $shape: 9};
-  A._Record_4_baseImporter_baseUrl_forImport.prototype = {$recipe: "+baseImporter,baseUrl,forImport(1,2,3,4)", $shape: 10};
-  A._Record_5_named_namedNodes_positional_positionalNodes_separator.prototype = {$recipe: "+named,namedNodes,positional,positionalNodes,separator(1,2,3,4,5)", $shape: 11};
+  A._Record_1.prototype = {$recipe: "+(1)", $shape: 1};
+  A._Record_2.prototype = {$recipe: "+(1,2)", $shape: 2};
+  A._Record_2_forImport.prototype = {$recipe: "+forImport(1,2)", $shape: 3};
+  A._Record_2_imports_modules.prototype = {$recipe: "+imports,modules(1,2)", $shape: 5};
+  A._Record_2_loadedUrls_stylesheet.prototype = {$recipe: "+loadedUrls,stylesheet(1,2)", $shape: 6};
+  A._Record_2_sourceMap.prototype = {$recipe: "+sourceMap(1,2)", $shape: 4};
+  A._Record_3.prototype = {$recipe: "+(1,2,3)", $shape: 7};
+  A._Record_3_forImport.prototype = {$recipe: "+forImport(1,2,3)", $shape: 8};
+  A._Record_3_importer_isDependency.prototype = {$recipe: "+importer,isDependency(1,2,3)", $shape: 10};
+  A._Record_3_originalUrl.prototype = {$recipe: "+originalUrl(1,2,3)", $shape: 9};
+  A._Record_5_named_namedNodes_positional_positionalNodes_separator.prototype = {$recipe: "+named,namedNodes,positional,positionalNodes,separator(1,2,3,4,5)", $shape: 12};
   A.ConstantMapView.prototype = {};
   A.ConstantMap.prototype = {
     cast$2$0(_, RK, RV) {
@@ -32571,13 +34268,13 @@ self.util = _cliPkgRequires.util;
     },
     get$iterator(_) {
       var t1 = this._elements;
-      return new A._KeysOrValuesOrElementsIterator(t1, t1.length);
+      return new A._KeysOrValuesOrElementsIterator(t1, t1.length, this.$ti._eval$1("_KeysOrValuesOrElementsIterator<1>"));
     }
   };
   A._KeysOrValuesOrElementsIterator.prototype = {
     get$current(_) {
       var t1 = this.__js_helper$_current;
-      return t1 == null ? A._instanceType(this)._precomputed1._as(t1) : t1;
+      return t1 == null ? this.$ti._precomputed1._as(t1) : t1;
     },
     moveNext$0() {
       var _this = this,
@@ -32613,14 +34310,14 @@ self.util = _cliPkgRequires.util;
       return this.__js_helper$_length !== 0;
     },
     get$iterator(_) {
-      var t1,
-        keys = this.$keys;
+      var t1, _this = this,
+        keys = _this.$keys;
       if (keys == null) {
-        keys = Object.keys(this._jsIndex);
-        this.$keys = keys;
+        keys = Object.keys(_this._jsIndex);
+        _this.$keys = keys;
       }
       t1 = keys;
-      return new A._KeysOrValuesOrElementsIterator(t1, t1.length);
+      return new A._KeysOrValuesOrElementsIterator(t1, t1.length, _this.$ti._eval$1("_KeysOrValuesOrElementsIterator<1>"));
     },
     contains$1(_, key) {
       if (typeof key != "string")
@@ -32645,7 +34342,7 @@ self.util = _cliPkgRequires.util;
     },
     get$iterator(_) {
       var t1 = this._elements;
-      return new A._KeysOrValuesOrElementsIterator(t1, t1.length);
+      return new A._KeysOrValuesOrElementsIterator(t1, t1.length, this.$ti._eval$1("_KeysOrValuesOrElementsIterator<1>"));
     },
     _getMap$0() {
       var t1, t2, _i, key, _this = this,
@@ -32753,7 +34450,7 @@ self.util = _cliPkgRequires.util;
       this.$arguments.push(argument);
       ++t1.argumentCount;
     },
-    $signature: 208
+    $signature: 114
   };
   A.TypeErrorDecoder.prototype = {
     matchTypeError$1(message) {
@@ -32782,10 +34479,7 @@ self.util = _cliPkgRequires.util;
   };
   A.NullError.prototype = {
     toString$0(_) {
-      var t1 = this._method;
-      if (t1 == null)
-        return "NoSuchMethodError: " + this.__js_helper$_message;
-      return "NoSuchMethodError: method not found: '" + t1 + "' on null";
+      return "Null check operator used on a null value";
     }
   };
   A.JsNoSuchMethodError.prototype = {
@@ -32902,12 +34596,12 @@ self.util = _cliPkgRequires.util;
     containsKey$1(key) {
       var strings, nums;
       if (typeof key == "string") {
-        strings = this._strings;
+        strings = this.__js_helper$_strings;
         if (strings == null)
           return false;
         return strings[key] != null;
       } else if (typeof key == "number" && (key & 0x3fffffff) === key) {
-        nums = this._nums;
+        nums = this.__js_helper$_nums;
         if (nums == null)
           return false;
         return nums[key] != null;
@@ -32926,14 +34620,14 @@ self.util = _cliPkgRequires.util;
     $index(_, key) {
       var strings, cell, t1, nums, _null = null;
       if (typeof key == "string") {
-        strings = this._strings;
+        strings = this.__js_helper$_strings;
         if (strings == null)
           return _null;
         cell = strings[key];
         t1 = cell == null ? _null : cell.hashMapCellValue;
         return t1;
       } else if (typeof key == "number" && (key & 0x3fffffff) === key) {
-        nums = this._nums;
+        nums = this.__js_helper$_nums;
         if (nums == null)
           return _null;
         cell = nums[key];
@@ -32956,11 +34650,11 @@ self.util = _cliPkgRequires.util;
     $indexSet(_, key, value) {
       var strings, nums, _this = this;
       if (typeof key == "string") {
-        strings = _this._strings;
-        _this._addHashTableEntry$3(strings == null ? _this._strings = _this._newHashTable$0() : strings, key, value);
+        strings = _this.__js_helper$_strings;
+        _this.__js_helper$_addHashTableEntry$3(strings == null ? _this.__js_helper$_strings = _this._newHashTable$0() : strings, key, value);
       } else if (typeof key == "number" && (key & 0x3fffffff) === key) {
-        nums = _this._nums;
-        _this._addHashTableEntry$3(nums == null ? _this._nums = _this._newHashTable$0() : nums, key, value);
+        nums = _this.__js_helper$_nums;
+        _this.__js_helper$_addHashTableEntry$3(nums == null ? _this.__js_helper$_nums = _this._newHashTable$0() : nums, key, value);
       } else
         _this.internalSet$2(key, value);
     },
@@ -32972,13 +34666,13 @@ self.util = _cliPkgRequires.util;
       hash = _this.internalComputeHashCode$1(key);
       bucket = rest[hash];
       if (bucket == null)
-        rest[hash] = [_this._newLinkedCell$2(key, value)];
+        rest[hash] = [_this.__js_helper$_newLinkedCell$2(key, value)];
       else {
         index = _this.internalFindBucketIndex$2(bucket, key);
         if (index >= 0)
           bucket[index].hashMapCellValue = value;
         else
-          bucket.push(_this._newLinkedCell$2(key, value));
+          bucket.push(_this.__js_helper$_newLinkedCell$2(key, value));
       }
     },
     putIfAbsent$2(key, ifAbsent) {
@@ -32994,9 +34688,9 @@ self.util = _cliPkgRequires.util;
     remove$1(_, key) {
       var _this = this;
       if (typeof key == "string")
-        return _this.__js_helper$_removeHashTableEntry$2(_this._strings, key);
+        return _this.__js_helper$_removeHashTableEntry$2(_this.__js_helper$_strings, key);
       else if (typeof key == "number" && (key & 0x3fffffff) === key)
-        return _this.__js_helper$_removeHashTableEntry$2(_this._nums, key);
+        return _this.__js_helper$_removeHashTableEntry$2(_this.__js_helper$_nums, key);
       else
         return _this.internalRemove$1(key);
     },
@@ -33019,26 +34713,26 @@ self.util = _cliPkgRequires.util;
     clear$0(_) {
       var _this = this;
       if (_this.__js_helper$_length > 0) {
-        _this._strings = _this._nums = _this.__js_helper$_rest = _this._first = _this._last = null;
+        _this.__js_helper$_strings = _this.__js_helper$_nums = _this.__js_helper$_rest = _this.__js_helper$_first = _this.__js_helper$_last = null;
         _this.__js_helper$_length = 0;
-        _this._modified$0();
+        _this.__js_helper$_modified$0();
       }
     },
     forEach$1(_, action) {
       var _this = this,
-        cell = _this._first,
-        modifications = _this._modifications;
+        cell = _this.__js_helper$_first,
+        modifications = _this.__js_helper$_modifications;
       for (; cell != null;) {
         action.call$2(cell.hashMapCellKey, cell.hashMapCellValue);
-        if (modifications !== _this._modifications)
+        if (modifications !== _this.__js_helper$_modifications)
           throw A.wrapException(A.ConcurrentModificationError$(_this));
-        cell = cell._next;
+        cell = cell.__js_helper$_next;
       }
     },
-    _addHashTableEntry$3(table, key, value) {
+    __js_helper$_addHashTableEntry$3(table, key, value) {
       var cell = table[key];
       if (cell == null)
-        table[key] = this._newLinkedCell$2(key, value);
+        table[key] = this.__js_helper$_newLinkedCell$2(key, value);
       else
         cell.hashMapCellValue = value;
     },
@@ -33053,38 +34747,38 @@ self.util = _cliPkgRequires.util;
       delete table[key];
       return cell.hashMapCellValue;
     },
-    _modified$0() {
-      this._modifications = this._modifications + 1 & 1073741823;
+    __js_helper$_modified$0() {
+      this.__js_helper$_modifications = this.__js_helper$_modifications + 1 & 1073741823;
     },
-    _newLinkedCell$2(key, value) {
+    __js_helper$_newLinkedCell$2(key, value) {
       var t1, _this = this,
         cell = new A.LinkedHashMapCell(key, value);
-      if (_this._first == null)
-        _this._first = _this._last = cell;
+      if (_this.__js_helper$_first == null)
+        _this.__js_helper$_first = _this.__js_helper$_last = cell;
       else {
-        t1 = _this._last;
+        t1 = _this.__js_helper$_last;
         t1.toString;
-        cell._previous = t1;
-        _this._last = t1._next = cell;
+        cell.__js_helper$_previous = t1;
+        _this.__js_helper$_last = t1.__js_helper$_next = cell;
       }
       ++_this.__js_helper$_length;
-      _this._modified$0();
+      _this.__js_helper$_modified$0();
       return cell;
     },
     __js_helper$_unlinkCell$1(cell) {
       var _this = this,
-        previous = cell._previous,
-        next = cell._next;
+        previous = cell.__js_helper$_previous,
+        next = cell.__js_helper$_next;
       if (previous == null)
-        _this._first = next;
+        _this.__js_helper$_first = next;
       else
-        previous._next = next;
+        previous.__js_helper$_next = next;
       if (next == null)
-        _this._last = previous;
+        _this.__js_helper$_last = previous;
       else
-        next._previous = previous;
+        next.__js_helper$_previous = previous;
       --_this.__js_helper$_length;
-      _this._modified$0();
+      _this.__js_helper$_modified$0();
     },
     internalComputeHashCode$1(key) {
       return J.get$hashCode$(key) & 1073741823;
@@ -33137,8 +34831,8 @@ self.util = _cliPkgRequires.util;
     },
     get$iterator(_) {
       var t1 = this.__js_helper$_map,
-        t2 = new A.LinkedHashMapKeyIterator(t1, t1._modifications);
-      t2._cell = t1._first;
+        t2 = new A.LinkedHashMapKeyIterator(t1, t1.__js_helper$_modifications);
+      t2.__js_helper$_cell = t1.__js_helper$_first;
       return t2;
     },
     contains$1(_, element) {
@@ -33152,15 +34846,15 @@ self.util = _cliPkgRequires.util;
     moveNext$0() {
       var cell, _this = this,
         t1 = _this.__js_helper$_map;
-      if (_this._modifications !== t1._modifications)
+      if (_this.__js_helper$_modifications !== t1.__js_helper$_modifications)
         throw A.wrapException(A.ConcurrentModificationError$(t1));
-      cell = _this._cell;
+      cell = _this.__js_helper$_cell;
       if (cell == null) {
         _this.__js_helper$_current = null;
         return false;
       } else {
         _this.__js_helper$_current = cell.hashMapCellKey;
-        _this._cell = cell._next;
+        _this.__js_helper$_cell = cell.__js_helper$_next;
         return true;
       }
     }
@@ -33201,19 +34895,19 @@ self.util = _cliPkgRequires.util;
     call$1(o) {
       return this.getTag(o);
     },
-    $signature: 88
+    $signature: 82
   };
   A.initHooks_closure0.prototype = {
     call$2(o, tag) {
       return this.getUnknownTag(o, tag);
     },
-    $signature: 434
+    $signature: 397
   };
   A.initHooks_closure1.prototype = {
     call$1(tag) {
       return this.prototypeForTag(tag);
     },
-    $signature: 327
+    $signature: 171
   };
   A._Record.prototype = {
     toString$0(_) {
@@ -33283,6 +34977,19 @@ self.util = _cliPkgRequires.util;
       return A.Object_hash(this.$shape, this._0, this._1, B.C_SentinelValue);
     }
   };
+  A._Record1.prototype = {
+    _getFieldValues$0() {
+      return [this._0];
+    },
+    $eq(_, other) {
+      if (other == null)
+        return false;
+      return other instanceof A._Record1 && this.$shape === other.$shape && J.$eq$(this._0, other._0);
+    },
+    get$hashCode(_) {
+      return A.Object_hash(this.$shape, this._0, B.C_SentinelValue, B.C_SentinelValue);
+    }
+  };
   A._Record3.prototype = {
     _getFieldValues$0() {
       return [this._0, this._1, this._2];
@@ -33343,8 +35050,8 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException(A.RangeError$range(start, 0, t1, null, null));
       return new A._AllMatchesIterable(this, string, start);
     },
-    allMatches$1($receiver, string) {
-      return this.allMatches$2($receiver, string, 0);
+    allMatches$1(_, string) {
+      return this.allMatches$2(0, string, 0);
     },
     _execGlobal$2(string, start) {
       var match,
@@ -33385,7 +35092,7 @@ self.util = _cliPkgRequires.util;
   };
   A._AllMatchesIterable.prototype = {
     get$iterator(_) {
-      return new A._AllMatchesIterator(this._re, this.__js_helper$_string, this._start);
+      return new A._AllMatchesIterator(this._re, this.__js_helper$_string, this.__js_helper$_start);
     }
   };
   A._AllMatchesIterator.prototype = {
@@ -33405,7 +35112,7 @@ self.util = _cliPkgRequires.util;
         match = t3._execGlobal$2(string, t1);
         if (match != null) {
           _this.__js_helper$_current = match;
-          nextIndex = match.get$end(match);
+          nextIndex = match.get$end(0);
           if (match._match.index === nextIndex) {
             if (t3._nativeRegExp.unicode) {
               t1 = _this._nextIndex;
@@ -33483,53 +35190,24 @@ self.util = _cliPkgRequires.util;
   };
   A._Cell.prototype = {
     readLocal$1$0() {
-      var t1 = this._value;
+      var t1 = this.__late_helper$_value;
       if (t1 === this)
-        A.throwExpression(new A.LateError("Local '" + this.__late_helper$_name + "' has not been initialized."));
+        A.throwExpression(new A.LateError("Local '' has not been initialized."));
       return t1;
     },
     readLocal$0() {
       return this.readLocal$1$0(type$.dynamic);
     },
     _readLocal$0() {
-      var t1 = this._value;
+      var t1 = this.__late_helper$_value;
       if (t1 === this)
-        throw A.wrapException(new A.LateError("Local '" + this.__late_helper$_name + "' has not been initialized."));
-      return t1;
-    }
-  };
-  A._InitializedCell.prototype = {
-    readFinal$1$0() {
-      var result, _this = this,
-        t1 = _this._value;
-      if (t1 === _this) {
-        result = _this._initializer.call$0();
-        if (_this._value !== _this)
-          A.throwExpression(new A.LateError(string$.Local_));
-        _this._value = result;
-        t1 = result;
-      }
-      return t1;
-    },
-    readFinal$0() {
-      return this.readFinal$1$0(type$.dynamic);
-    },
-    _readFinal$0() {
-      var result, _this = this,
-        t1 = _this._value;
-      if (t1 === _this) {
-        result = _this._initializer.call$0();
-        if (_this._value !== _this)
-          throw A.wrapException(new A.LateError(string$.Local_));
-        _this._value = result;
-        t1 = result;
-      }
+        throw A.wrapException(new A.LateError("Local '' has not been initialized."));
       return t1;
     }
   };
   A.NativeByteBuffer.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_ByteBuffer_RkP;
+      return B.Type_ByteBuffer_EOZ;
     },
     $isTrustedGetRuntimeType: 1,
     $isByteBuffer: 1
@@ -33546,7 +35224,7 @@ self.util = _cliPkgRequires.util;
   };
   A.NativeByteData.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_ByteData_zNC;
+      return B.Type_ByteData_mF8;
     },
     $isTrustedGetRuntimeType: 1,
     $isByteData: 1
@@ -33612,33 +35290,33 @@ self.util = _cliPkgRequires.util;
   };
   A.NativeFloat32List.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_Float32List_LB7;
+      return B.Type_Float32List_Ymk;
     },
     sublist$2(receiver, start, end) {
       return new Float32Array(receiver.subarray(start, A._checkValidRange(start, end, receiver.length)));
     },
-    sublist$1($receiver, start) {
-      return this.sublist$2($receiver, start, null);
+    sublist$1(receiver, start) {
+      return this.sublist$2(receiver, start, null);
     },
     $isTrustedGetRuntimeType: 1,
     $isFloat32List: 1
   };
   A.NativeFloat64List.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_Float64List_LB7;
+      return B.Type_Float64List_Ymk;
     },
     sublist$2(receiver, start, end) {
       return new Float64Array(receiver.subarray(start, A._checkValidRange(start, end, receiver.length)));
     },
-    sublist$1($receiver, start) {
-      return this.sublist$2($receiver, start, null);
+    sublist$1(receiver, start) {
+      return this.sublist$2(receiver, start, null);
     },
     $isTrustedGetRuntimeType: 1,
     $isFloat64List: 1
   };
   A.NativeInt16List.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_Int16List_uXf;
+      return B.Type_Int16List_cot;
     },
     $index(receiver, index) {
       A._checkValidIndex(index, receiver, receiver.length);
@@ -33647,15 +35325,15 @@ self.util = _cliPkgRequires.util;
     sublist$2(receiver, start, end) {
       return new Int16Array(receiver.subarray(start, A._checkValidRange(start, end, receiver.length)));
     },
-    sublist$1($receiver, start) {
-      return this.sublist$2($receiver, start, null);
+    sublist$1(receiver, start) {
+      return this.sublist$2(receiver, start, null);
     },
     $isTrustedGetRuntimeType: 1,
     $isInt16List: 1
   };
   A.NativeInt32List.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_Int32List_O50;
+      return B.Type_Int32List_m1p;
     },
     $index(receiver, index) {
       A._checkValidIndex(index, receiver, receiver.length);
@@ -33664,15 +35342,15 @@ self.util = _cliPkgRequires.util;
     sublist$2(receiver, start, end) {
       return new Int32Array(receiver.subarray(start, A._checkValidRange(start, end, receiver.length)));
     },
-    sublist$1($receiver, start) {
-      return this.sublist$2($receiver, start, null);
+    sublist$1(receiver, start) {
+      return this.sublist$2(receiver, start, null);
     },
     $isTrustedGetRuntimeType: 1,
     $isInt32List: 1
   };
   A.NativeInt8List.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_Int8List_ekJ;
+      return B.Type_Int8List_woc;
     },
     $index(receiver, index) {
       A._checkValidIndex(index, receiver, receiver.length);
@@ -33681,15 +35359,15 @@ self.util = _cliPkgRequires.util;
     sublist$2(receiver, start, end) {
       return new Int8Array(receiver.subarray(start, A._checkValidRange(start, end, receiver.length)));
     },
-    sublist$1($receiver, start) {
-      return this.sublist$2($receiver, start, null);
+    sublist$1(receiver, start) {
+      return this.sublist$2(receiver, start, null);
     },
     $isTrustedGetRuntimeType: 1,
     $isInt8List: 1
   };
   A.NativeUint16List.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_Uint16List_2bx;
+      return B.Type_Uint16List_2mh;
     },
     $index(receiver, index) {
       A._checkValidIndex(index, receiver, receiver.length);
@@ -33698,15 +35376,15 @@ self.util = _cliPkgRequires.util;
     sublist$2(receiver, start, end) {
       return new Uint16Array(receiver.subarray(start, A._checkValidRange(start, end, receiver.length)));
     },
-    sublist$1($receiver, start) {
-      return this.sublist$2($receiver, start, null);
+    sublist$1(receiver, start) {
+      return this.sublist$2(receiver, start, null);
     },
     $isTrustedGetRuntimeType: 1,
     $isUint16List: 1
   };
   A.NativeUint32List.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_Uint32List_2bx;
+      return B.Type_Uint32List_2mh;
     },
     $index(receiver, index) {
       A._checkValidIndex(index, receiver, receiver.length);
@@ -33715,15 +35393,15 @@ self.util = _cliPkgRequires.util;
     sublist$2(receiver, start, end) {
       return new Uint32Array(receiver.subarray(start, A._checkValidRange(start, end, receiver.length)));
     },
-    sublist$1($receiver, start) {
-      return this.sublist$2($receiver, start, null);
+    sublist$1(receiver, start) {
+      return this.sublist$2(receiver, start, null);
     },
     $isTrustedGetRuntimeType: 1,
     $isUint32List: 1
   };
   A.NativeUint8ClampedList.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_Uint8ClampedList_Jik;
+      return B.Type_Uint8ClampedList_9Bb;
     },
     get$length(receiver) {
       return receiver.length;
@@ -33735,15 +35413,15 @@ self.util = _cliPkgRequires.util;
     sublist$2(receiver, start, end) {
       return new Uint8ClampedArray(receiver.subarray(start, A._checkValidRange(start, end, receiver.length)));
     },
-    sublist$1($receiver, start) {
-      return this.sublist$2($receiver, start, null);
+    sublist$1(receiver, start) {
+      return this.sublist$2(receiver, start, null);
     },
     $isTrustedGetRuntimeType: 1,
     $isUint8ClampedList: 1
   };
   A.NativeUint8List.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_Uint8List_WLA;
+      return B.Type_Uint8List_CSc;
     },
     get$length(receiver) {
       return receiver.length;
@@ -33755,8 +35433,8 @@ self.util = _cliPkgRequires.util;
     sublist$2(receiver, start, end) {
       return new Uint8Array(receiver.subarray(start, A._checkValidRange(start, end, receiver.length)));
     },
-    sublist$1($receiver, start) {
-      return this.sublist$2($receiver, start, null);
+    sublist$1(receiver, start) {
+      return this.sublist$2(receiver, start, null);
     },
     $isTrustedGetRuntimeType: 1,
     $isNativeUint8List: 1,
@@ -33798,7 +35476,7 @@ self.util = _cliPkgRequires.util;
       t1.storedCallback = null;
       f.call$0();
     },
-    $signature: 68
+    $signature: 61
   };
   A._AsyncRun__initializeScheduleImmediate_closure.prototype = {
     call$1(callback) {
@@ -33808,19 +35486,19 @@ self.util = _cliPkgRequires.util;
       t2 = this.span;
       t1.firstChild ? t1.removeChild(t2) : t1.appendChild(t2);
     },
-    $signature: 39
+    $signature: 32
   };
   A._AsyncRun__scheduleImmediateJsOverride_internalCallback.prototype = {
     call$0() {
       this.callback.call$0();
     },
-    $signature: 2
+    $signature: 1
   };
   A._AsyncRun__scheduleImmediateWithSetImmediate_internalCallback.prototype = {
     call$0() {
       this.callback.call$0();
     },
-    $signature: 2
+    $signature: 1
   };
   A._TimerImpl.prototype = {
     _TimerImpl$2(milliseconds, callback) {
@@ -33872,7 +35550,7 @@ self.util = _cliPkgRequires.util;
       t1._tick = tick;
       _this.callback.call$1(t1);
     },
-    $signature: 2
+    $signature: 1
   };
   A._AsyncAwaitCompleter.prototype = {
     complete$1(value) {
@@ -33901,19 +35579,19 @@ self.util = _cliPkgRequires.util;
     call$1(result) {
       return this.bodyFunction.call$2(0, result);
     },
-    $signature: 127
+    $signature: 71
   };
   A._awaitOnObject_closure0.prototype = {
     call$2(error, stackTrace) {
       this.bodyFunction.call$2(1, new A.ExceptionAndStackTrace(error, stackTrace));
     },
-    $signature: 436
+    $signature: 626
   };
   A._wrapJsFunctionForAsync_closure.prototype = {
     call$2(errorCode, result) {
       this.$protected(errorCode, result);
     },
-    $signature: 476
+    $signature: 371
   };
   A._SyncStarIterator.prototype = {
     get$current(_) {
@@ -34024,29 +35702,47 @@ self.util = _cliPkgRequires.util;
         t2 = --t1.remaining;
       if (t1.values != null) {
         t1.values = null;
-        if (t1.remaining === 0 || _this.eagerError)
+        t1.error = theError;
+        t1.stackTrace = theStackTrace;
+        if (t2 === 0 || _this.eagerError)
           _this._future._completeError$2(theError, theStackTrace);
-        else {
-          _this.error._value = theError;
-          _this.stackTrace._value = theStackTrace;
-        }
-      } else if (t2 === 0 && !_this.eagerError)
-        _this._future._completeError$2(_this.error._readLocal$0(), _this.stackTrace._readLocal$0());
+      } else if (t2 === 0 && !_this.eagerError) {
+        t2 = t1.error;
+        t2.toString;
+        t1 = t1.stackTrace;
+        t1.toString;
+        _this._future._completeError$2(t2, t1);
+      }
     },
-    $signature: 71
+    $signature: 73
   };
   A.Future_wait_closure.prototype = {
     call$1(value) {
-      var valueList, _this = this,
-        t1 = _this._box_0;
-      --t1.remaining;
-      valueList = t1.values;
+      var t1, value0, t3, t4, _i, t5, _this = this,
+        t2 = _this._box_0,
+        remainingResults = --t2.remaining,
+        valueList = t2.values;
       if (valueList != null) {
         J.$indexSet$ax(valueList, _this.pos, value);
-        if (t1.remaining === 0)
-          _this._future._completeWithValue$1(A.List_List$from(valueList, true, _this.T));
-      } else if (t1.remaining === 0 && !_this.eagerError)
-        _this._future._completeError$2(_this.error._readLocal$0(), _this.stackTrace._readLocal$0());
+        if (J.$eq$(remainingResults, 0)) {
+          t2 = _this.T;
+          t1 = A._setArrayType([], t2._eval$1("JSArray<0>"));
+          for (t3 = valueList, t4 = t3.length, _i = 0; _i < t3.length; t3.length === t4 || (0, A.throwConcurrentModificationError)(t3), ++_i) {
+            value0 = t3[_i];
+            t5 = value0;
+            if (t5 == null)
+              t5 = t2._as(t5);
+            J.add$1$ax(t1, t5);
+          }
+          _this._future._completeWithValue$1(t1);
+        }
+      } else if (J.$eq$(remainingResults, 0) && !_this.eagerError) {
+        t1 = t2.error;
+        t1.toString;
+        t2 = t2.stackTrace;
+        t2.toString;
+        _this._future._completeError$2(t1, t2);
+      }
     },
     $signature() {
       return this.T._eval$1("Null(0)");
@@ -34147,12 +35843,21 @@ self.util = _cliPkgRequires.util;
       this._addListener$1(new A._FutureListener(result, t1, f, onError, this.$ti._eval$1("@<1>")._bind$1($R)._eval$1("_FutureListener<1,2>")));
       return result;
     },
-    then$1$1($receiver, f, $R) {
-      return this.then$1$2$onError($receiver, f, null, $R);
+    then$1$1(_, f, $R) {
+      return this.then$1$2$onError(0, f, null, $R);
     },
     _thenAwait$1$2(f, onError, $E) {
       var result = new A._Future($.Zone__current, $E._eval$1("_Future<0>"));
-      this._addListener$1(new A._FutureListener(result, 3, f, onError, this.$ti._eval$1("@<1>")._bind$1($E)._eval$1("_FutureListener<1,2>")));
+      this._addListener$1(new A._FutureListener(result, 19, f, onError, this.$ti._eval$1("@<1>")._bind$1($E)._eval$1("_FutureListener<1,2>")));
+      return result;
+    },
+    catchError$1(onError) {
+      var t1 = this.$ti,
+        t2 = $.Zone__current,
+        result = new A._Future(t2, t1);
+      if (t2 !== B.C__RootZone)
+        onError = A._registerErrorHandler(onError, t2);
+      this._addListener$1(new A._FutureListener(result, 2, null, onError, t1._eval$1("@<1>")._bind$1(t1._precomputed1)._eval$1("_FutureListener<1,2>")));
       return result;
     },
     whenComplete$1(action) {
@@ -34318,13 +36023,13 @@ self.util = _cliPkgRequires.util;
         t1._completeError$2(error, stackTrace);
       }
     },
-    $signature: 68
+    $signature: 61
   };
   A._Future__chainForeignFuture_closure0.prototype = {
     call$2(error, stackTrace) {
       this.$this._completeError$2(error, stackTrace);
     },
-    $signature: 62
+    $signature: 52
   };
   A._Future__chainForeignFuture_closure1.prototype = {
     call$0() {
@@ -34389,7 +36094,7 @@ self.util = _cliPkgRequires.util;
     call$1(_) {
       return this.originalSource;
     },
-    $signature: 455
+    $signature: 425
   };
   A._Future__propagateToListeners_handleValueCallback.prototype = {
     call$0() {
@@ -34462,7 +36167,7 @@ self.util = _cliPkgRequires.util;
       t1._addError$2(error, stackTrace);
       t1._closeUnchecked$0();
     },
-    $signature: 466
+    $signature: 442
   };
   A.Stream_length_closure.prototype = {
     call$1(_) {
@@ -34485,7 +36190,7 @@ self.util = _cliPkgRequires.util;
     get$_pendingEvents() {
       if ((this._state & 8) === 0)
         return this._varData;
-      return this._varData.varData;
+      return this._varData._varData;
     },
     _ensurePendingEvents$0() {
       var events, state, _this = this;
@@ -34494,12 +36199,12 @@ self.util = _cliPkgRequires.util;
         return events == null ? _this._varData = new A._PendingEvents() : events;
       }
       state = _this._varData;
-      events = state.varData;
-      return events == null ? state.varData = new A._PendingEvents() : events;
+      events = state._varData;
+      return events == null ? state._varData = new A._PendingEvents() : events;
     },
     get$_subscription() {
       var varData = this._varData;
-      return (this._state & 8) !== 0 ? varData.varData : varData;
+      return (this._state & 8) !== 0 ? varData._varData : varData;
     },
     _badEventState$0() {
       if ((this._state & 4) !== 0)
@@ -34588,7 +36293,7 @@ self.util = _cliPkgRequires.util;
     },
     _close$0() {
       var addState = this._varData;
-      this._varData = addState.varData;
+      this._varData = addState._varData;
       this._state &= 4294967287;
       addState.addStreamFuture._asyncComplete$1(null);
     },
@@ -34601,7 +36306,7 @@ self.util = _cliPkgRequires.util;
       t1 = _this._state |= 1;
       if ((t1 & 8) !== 0) {
         addState = _this._varData;
-        addState.varData = subscription;
+        addState._varData = subscription;
         addState.addSubscription.resume$0(0);
       } else
         _this._varData = subscription;
@@ -34732,13 +36437,13 @@ self.util = _cliPkgRequires.util;
       t1._addError$2(e, s);
       t1._close$0();
     },
-    $signature: 62
+    $signature: 52
   };
   A._AddStreamState_cancel_closure.prototype = {
     call$0() {
       this.$this.addStreamFuture._asyncComplete$1(null);
     },
-    $signature: 2
+    $signature: 1
   };
   A._StreamControllerAddStreamState.prototype = {};
   A._BufferingStreamSubscription.prototype = {
@@ -34748,7 +36453,7 @@ self.util = _cliPkgRequires.util;
         return;
       _this._pending = pendingEvents;
       if (pendingEvents.lastPendingEvent != null) {
-        _this._state = (_this._state | 64) >>> 0;
+        _this._state = (_this._state | 128) >>> 0;
         pendingEvents.schedule$1(_this);
       }
     },
@@ -34757,34 +36462,34 @@ self.util = _cliPkgRequires.util;
         t1 = _this._state;
       if ((t1 & 8) !== 0)
         return;
-      t2 = (t1 + 128 | 4) >>> 0;
+      t2 = (t1 + 256 | 4) >>> 0;
       _this._state = t2;
-      if (t1 < 128) {
+      if (t1 < 256) {
         t3 = _this._pending;
         if (t3 != null)
           if (t3._state === 1)
             t3._state = 3;
       }
-      if ((t1 & 4) === 0 && (t2 & 32) === 0)
+      if ((t1 & 4) === 0 && (t2 & 64) === 0)
         _this._guardCallback$1(_this.get$_async$_onPause());
     },
-    pause$0($receiver) {
-      return this.pause$1($receiver, null);
+    pause$0(_) {
+      return this.pause$1(0, null);
     },
     resume$0(_) {
       var _this = this,
         t1 = _this._state;
       if ((t1 & 8) !== 0)
         return;
-      if (t1 >= 128) {
-        t1 = _this._state = t1 - 128;
-        if (t1 < 128)
-          if ((t1 & 64) !== 0 && _this._pending.lastPendingEvent != null)
+      if (t1 >= 256) {
+        t1 = _this._state = t1 - 256;
+        if (t1 < 256)
+          if ((t1 & 128) !== 0 && _this._pending.lastPendingEvent != null)
             _this._pending.schedule$1(_this);
           else {
             t1 = (t1 & 4294967291) >>> 0;
             _this._state = t1;
-            if ((t1 & 32) === 0)
+            if ((t1 & 64) === 0)
               _this._guardCallback$1(_this.get$_async$_onResume());
           }
       }
@@ -34801,12 +36506,12 @@ self.util = _cliPkgRequires.util;
     _cancel$0() {
       var t2, _this = this,
         t1 = _this._state = (_this._state | 8) >>> 0;
-      if ((t1 & 64) !== 0) {
+      if ((t1 & 128) !== 0) {
         t2 = _this._pending;
         if (t2._state === 1)
           t2._state = 3;
       }
-      if ((t1 & 32) === 0)
+      if ((t1 & 64) === 0)
         _this._pending = null;
       _this._cancelFuture = _this._async$_onCancel$0();
     },
@@ -34814,7 +36519,7 @@ self.util = _cliPkgRequires.util;
       var t1 = this._state;
       if ((t1 & 8) !== 0)
         return;
-      if (t1 < 32)
+      if (t1 < 64)
         this._sendData$1(data);
       else
         this._addPending$1(new A._DelayedData(data));
@@ -34823,7 +36528,7 @@ self.util = _cliPkgRequires.util;
       var t1 = this._state;
       if ((t1 & 8) !== 0)
         return;
-      if (t1 < 32)
+      if (t1 < 64)
         this._sendError$2(error, stackTrace);
       else
         this._addPending$1(new A._DelayedError(error, stackTrace));
@@ -34835,7 +36540,7 @@ self.util = _cliPkgRequires.util;
         return;
       t1 = (t1 | 2) >>> 0;
       _this._state = t1;
-      if (t1 < 32)
+      if (t1 < 64)
         _this._sendDone$0();
       else
         _this._addPending$1(B.C__DelayedDone);
@@ -34854,19 +36559,19 @@ self.util = _cliPkgRequires.util;
         pending = _this._pending = new A._PendingEvents();
       pending.add$1(0, $event);
       t1 = _this._state;
-      if ((t1 & 64) === 0) {
-        t1 = (t1 | 64) >>> 0;
+      if ((t1 & 128) === 0) {
+        t1 = (t1 | 128) >>> 0;
         _this._state = t1;
-        if (t1 < 128)
+        if (t1 < 256)
           pending.schedule$1(_this);
       }
     },
     _sendData$1(data) {
       var _this = this,
         t1 = _this._state;
-      _this._state = (t1 | 32) >>> 0;
+      _this._state = (t1 | 64) >>> 0;
       _this._zone.runUnaryGuarded$1$2(_this._onData, data, A._instanceType(_this)._eval$1("_BufferingStreamSubscription.T"));
-      _this._state = (_this._state & 4294967263) >>> 0;
+      _this._state = (_this._state & 4294967231) >>> 0;
       _this._checkState$1((t1 & 4) !== 0);
     },
     _sendError$2(error, stackTrace) {
@@ -34900,18 +36605,18 @@ self.util = _cliPkgRequires.util;
     _guardCallback$1(callback) {
       var _this = this,
         t1 = _this._state;
-      _this._state = (t1 | 32) >>> 0;
+      _this._state = (t1 | 64) >>> 0;
       callback.call$0();
-      _this._state = (_this._state & 4294967263) >>> 0;
+      _this._state = (_this._state & 4294967231) >>> 0;
       _this._checkState$1((t1 & 4) !== 0);
     },
     _checkState$1(wasInputPaused) {
       var t2, isInputPaused, _this = this,
         t1 = _this._state;
-      if ((t1 & 64) !== 0 && _this._pending.lastPendingEvent == null) {
-        t1 = _this._state = (t1 & 4294967231) >>> 0;
+      if ((t1 & 128) !== 0 && _this._pending.lastPendingEvent == null) {
+        t1 = _this._state = (t1 & 4294967167) >>> 0;
         if ((t1 & 4) !== 0)
-          if (t1 < 128) {
+          if (t1 < 256) {
             t2 = _this._pending;
             t2 = t2 == null ? null : t2.lastPendingEvent == null;
             t2 = t2 !== false;
@@ -34932,15 +36637,15 @@ self.util = _cliPkgRequires.util;
         isInputPaused = (t1 & 4) !== 0;
         if (wasInputPaused === isInputPaused)
           break;
-        _this._state = (t1 ^ 32) >>> 0;
+        _this._state = (t1 ^ 64) >>> 0;
         if (isInputPaused)
           _this._async$_onPause$0();
         else
           _this._async$_onResume$0();
-        t1 = (_this._state & 4294967263) >>> 0;
+        t1 = (_this._state & 4294967231) >>> 0;
         _this._state = t1;
       }
-      if ((t1 & 64) !== 0 && t1 < 128)
+      if ((t1 & 128) !== 0 && t1 < 256)
         _this._pending.schedule$1(_this);
     },
     $isStreamSubscription: 1
@@ -34952,7 +36657,7 @@ self.util = _cliPkgRequires.util;
         t2 = t1._state;
       if ((t2 & 8) !== 0 && (t2 & 16) === 0)
         return;
-      t1._state = (t2 | 32) >>> 0;
+      t1._state = (t2 | 64) >>> 0;
       onError = t1._onError;
       t2 = this.error;
       t3 = type$.Object;
@@ -34961,7 +36666,7 @@ self.util = _cliPkgRequires.util;
         t4.runBinaryGuarded$2$3(onError, t2, this.stackTrace, t3, type$.StackTrace);
       else
         t4.runUnaryGuarded$1$2(onError, t2, t3);
-      t1._state = (t1._state & 4294967263) >>> 0;
+      t1._state = (t1._state & 4294967231) >>> 0;
     },
     $signature: 0
   };
@@ -34971,9 +36676,9 @@ self.util = _cliPkgRequires.util;
         t2 = t1._state;
       if ((t2 & 16) === 0)
         return;
-      t1._state = (t2 | 42) >>> 0;
+      t1._state = (t2 | 74) >>> 0;
       t1._zone.runGuarded$1(t1._onDone);
-      t1._state = (t1._state & 4294967263) >>> 0;
+      t1._state = (t1._state & 4294967231) >>> 0;
     },
     $signature: 0
   };
@@ -34981,11 +36686,11 @@ self.util = _cliPkgRequires.util;
     listen$4$cancelOnError$onDone$onError(_, onData, cancelOnError, onDone, onError) {
       return this._controller._subscribe$4(onData, onError, onDone, cancelOnError === true);
     },
-    listen$1($receiver, onData) {
-      return this.listen$4$cancelOnError$onDone$onError($receiver, onData, null, null, null);
+    listen$1(_, onData) {
+      return this.listen$4$cancelOnError$onDone$onError(0, onData, null, null, null);
     },
-    listen$3$onDone$onError($receiver, onData, onDone, onError) {
-      return this.listen$4$cancelOnError$onDone$onError($receiver, onData, null, onDone, onError);
+    listen$3$onDone$onError(_, onData, onDone, onError) {
+      return this.listen$4$cancelOnError$onDone$onError(0, onData, null, onDone, onError);
     }
   };
   A._DelayedEvent.prototype = {
@@ -35151,18 +36856,19 @@ self.util = _cliPkgRequires.util;
         t2 = t1._rest[1],
         t3 = $.Zone__current,
         t4 = cancelOnError === true ? 1 : 0,
-        t5 = A._BufferingStreamSubscription__registerDataHandler(t3, onData, t2),
-        t6 = A._BufferingStreamSubscription__registerErrorHandler(t3, onError),
-        t7 = onDone == null ? A.async___nullDoneHandler$closure() : onDone;
-      t2 = new A._ForwardingStreamSubscription(this, t5, t6, t3.registerCallback$1$1(t7, type$.void), t3, t4, t1._eval$1("@<1>")._bind$1(t2)._eval$1("_ForwardingStreamSubscription<1,2>"));
+        t5 = onError != null ? 32 : 0,
+        t6 = A._BufferingStreamSubscription__registerDataHandler(t3, onData, t2),
+        t7 = A._BufferingStreamSubscription__registerErrorHandler(t3, onError),
+        t8 = onDone == null ? A.async___nullDoneHandler$closure() : onDone;
+      t2 = new A._ForwardingStreamSubscription(this, t6, t7, t3.registerCallback$1$1(t8, type$.void), t3, t4 | t5, t1._eval$1("@<1>")._bind$1(t2)._eval$1("_ForwardingStreamSubscription<1,2>"));
       t2._subscription = this._async$_source.listen$3$onDone$onError(0, t2.get$_handleData(), t2.get$_handleDone(), t2.get$_handleError());
       return t2;
     },
-    listen$1($receiver, onData) {
-      return this.listen$4$cancelOnError$onDone$onError($receiver, onData, null, null, null);
+    listen$1(_, onData) {
+      return this.listen$4$cancelOnError$onDone$onError(0, onData, null, null, null);
     },
-    listen$3$onDone$onError($receiver, onData, onDone, onError) {
-      return this.listen$4$cancelOnError$onDone$onError($receiver, onData, null, onDone, onError);
+    listen$3$onDone$onError(_, onData, onDone, onError) {
+      return this.listen$4$cancelOnError$onDone$onError(0, onData, null, onDone, onError);
     }
   };
   A._ForwardingStreamSubscription.prototype = {
@@ -35470,10 +37176,10 @@ self.util = _cliPkgRequires.util;
       return B._ZoneFunction__RootZone__rootRegisterCallback;
     },
     get$_registerUnaryCallback() {
-      return B._ZoneFunction_Eeh;
+      return B._ZoneFunction_QOa;
     },
     get$_registerBinaryCallback() {
-      return B._ZoneFunction_7G2;
+      return B._ZoneFunction_qxw;
     },
     get$_errorCallback() {
       return B._ZoneFunction__RootZone__rootErrorCallback;
@@ -35485,7 +37191,7 @@ self.util = _cliPkgRequires.util;
       return B._ZoneFunction__RootZone__rootCreateTimer;
     },
     get$_createPeriodicTimer() {
-      return B._ZoneFunction_3bB;
+      return B._ZoneFunction_kWM;
     },
     get$_print() {
       return B._ZoneFunction__RootZone__rootPrint;
@@ -35494,7 +37200,7 @@ self.util = _cliPkgRequires.util;
       return B._ZoneFunction__RootZone__rootFork;
     },
     get$_handleUncaughtError() {
-      return B._ZoneFunction_NMc;
+      return B._ZoneFunction_NIe;
     },
     get$parent(_) {
       return null;
@@ -35653,10 +37359,10 @@ self.util = _cliPkgRequires.util;
     containsKey$1(key) {
       var strings, nums;
       if (typeof key == "string" && key !== "__proto__") {
-        strings = this._collection$_strings;
+        strings = this._strings;
         return strings == null ? false : strings[key] != null;
       } else if (typeof key == "number" && (key & 1073741823) === key) {
-        nums = this._collection$_nums;
+        nums = this._nums;
         return nums == null ? false : nums[key] != null;
       } else
         return this._containsKey$1(key);
@@ -35673,11 +37379,11 @@ self.util = _cliPkgRequires.util;
     $index(_, key) {
       var strings, t1, nums;
       if (typeof key == "string" && key !== "__proto__") {
-        strings = this._collection$_strings;
+        strings = this._strings;
         t1 = strings == null ? null : A._HashMap__getTableEntry(strings, key);
         return t1;
       } else if (typeof key == "number" && (key & 1073741823) === key) {
-        nums = this._collection$_nums;
+        nums = this._nums;
         t1 = nums == null ? null : A._HashMap__getTableEntry(nums, key);
         return t1;
       } else
@@ -35695,11 +37401,11 @@ self.util = _cliPkgRequires.util;
     $indexSet(_, key, value) {
       var strings, nums, _this = this;
       if (typeof key == "string" && key !== "__proto__") {
-        strings = _this._collection$_strings;
-        _this._collection$_addHashTableEntry$3(strings == null ? _this._collection$_strings = A._HashMap__newHashTable() : strings, key, value);
+        strings = _this._strings;
+        _this._addHashTableEntry$3(strings == null ? _this._strings = A._HashMap__newHashTable() : strings, key, value);
       } else if (typeof key == "number" && (key & 1073741823) === key) {
-        nums = _this._collection$_nums;
-        _this._collection$_addHashTableEntry$3(nums == null ? _this._collection$_nums = A._HashMap__newHashTable() : nums, key, value);
+        nums = _this._nums;
+        _this._addHashTableEntry$3(nums == null ? _this._nums = A._HashMap__newHashTable() : nums, key, value);
       } else
         _this._set$2(key, value);
     },
@@ -35728,9 +37434,9 @@ self.util = _cliPkgRequires.util;
     remove$1(_, key) {
       var _this = this;
       if (typeof key == "string" && key !== "__proto__")
-        return _this._removeHashTableEntry$2(_this._collection$_strings, key);
+        return _this._removeHashTableEntry$2(_this._strings, key);
       else if (typeof key == "number" && (key & 1073741823) === key)
-        return _this._removeHashTableEntry$2(_this._collection$_nums, key);
+        return _this._removeHashTableEntry$2(_this._nums, key);
       else
         return _this._remove$1(key);
     },
@@ -35768,7 +37474,7 @@ self.util = _cliPkgRequires.util;
       if (result != null)
         return result;
       result = A.List_List$filled(_this._collection$_length, null, false, type$.dynamic);
-      strings = _this._collection$_strings;
+      strings = _this._strings;
       if (strings != null) {
         names = Object.getOwnPropertyNames(strings);
         entries = names.length;
@@ -35778,7 +37484,7 @@ self.util = _cliPkgRequires.util;
         }
       } else
         index = 0;
-      nums = _this._collection$_nums;
+      nums = _this._nums;
       if (nums != null) {
         names = Object.getOwnPropertyNames(nums);
         entries = names.length;
@@ -35802,7 +37508,7 @@ self.util = _cliPkgRequires.util;
       }
       return _this._collection$_keys = result;
     },
-    _collection$_addHashTableEntry$3(table, key, value) {
+    _addHashTableEntry$3(table, key, value) {
       if (table[key] == null) {
         ++this._collection$_length;
         this._collection$_keys = null;
@@ -35884,7 +37590,7 @@ self.util = _cliPkgRequires.util;
     },
     get$iterator(_) {
       var t1 = this._map;
-      return new A._HashMapKeyIterator(t1, t1._computeKeys$0());
+      return new A._HashMapKeyIterator(t1, t1._computeKeys$0(), this.$ti._eval$1("_HashMapKeyIterator<1>"));
     },
     contains$1(_, element) {
       return this._map.containsKey$1(element);
@@ -35893,7 +37599,7 @@ self.util = _cliPkgRequires.util;
   A._HashMapKeyIterator.prototype = {
     get$current(_) {
       var t1 = this._collection$_current;
-      return t1 == null ? A._instanceType(this)._precomputed1._as(t1) : t1;
+      return t1 == null ? this.$ti._precomputed1._as(t1) : t1;
     },
     moveNext$0() {
       var _this = this,
@@ -35949,7 +37655,7 @@ self.util = _cliPkgRequires.util;
     call$1(v) {
       return this.K._is(v);
     },
-    $signature: 122
+    $signature: 128
   };
   A._LinkedHashSet.prototype = {
     _newSet$0() {
@@ -35962,8 +37668,9 @@ self.util = _cliPkgRequires.util;
       return this._newSimilarSet$1$0(type$.dynamic);
     },
     get$iterator(_) {
-      var t1 = new A._LinkedHashSetIterator(this, this._collection$_modifications);
-      t1._collection$_cell = this._collection$_first;
+      var _this = this,
+        t1 = new A._LinkedHashSetIterator(_this, _this._modifications, A._instanceType(_this)._eval$1("_LinkedHashSetIterator<1>"));
+      t1._cell = _this._first;
       return t1;
     },
     get$length(_) {
@@ -35978,12 +37685,12 @@ self.util = _cliPkgRequires.util;
     contains$1(_, object) {
       var strings, nums;
       if (typeof object == "string" && object !== "__proto__") {
-        strings = this._collection$_strings;
+        strings = this._strings;
         if (strings == null)
           return false;
         return strings[object] != null;
       } else if (typeof object == "number" && (object & 1073741823) === object) {
-        nums = this._collection$_nums;
+        nums = this._nums;
         if (nums == null)
           return false;
         return nums[object] != null;
@@ -35997,13 +37704,13 @@ self.util = _cliPkgRequires.util;
       return this._findBucketIndex$2(rest[this._computeHashCode$1(object)], object) >= 0;
     },
     get$first(_) {
-      var first = this._collection$_first;
+      var first = this._first;
       if (first == null)
         throw A.wrapException(A.StateError$("No elements"));
       return first._element;
     },
     get$last(_) {
-      var last = this._collection$_last;
+      var last = this._last;
       if (last == null)
         throw A.wrapException(A.StateError$("No elements"));
       return last._element;
@@ -36011,11 +37718,11 @@ self.util = _cliPkgRequires.util;
     add$1(_, element) {
       var strings, nums, _this = this;
       if (typeof element == "string" && element !== "__proto__") {
-        strings = _this._collection$_strings;
-        return _this._collection$_addHashTableEntry$2(strings == null ? _this._collection$_strings = A._LinkedHashSet__newHashTable() : strings, element);
+        strings = _this._strings;
+        return _this._addHashTableEntry$2(strings == null ? _this._strings = A._LinkedHashSet__newHashTable() : strings, element);
       } else if (typeof element == "number" && (element & 1073741823) === element) {
-        nums = _this._collection$_nums;
-        return _this._collection$_addHashTableEntry$2(nums == null ? _this._collection$_nums = A._LinkedHashSet__newHashTable() : nums, element);
+        nums = _this._nums;
+        return _this._addHashTableEntry$2(nums == null ? _this._nums = A._LinkedHashSet__newHashTable() : nums, element);
       } else
         return _this._add$1(element);
     },
@@ -36027,20 +37734,20 @@ self.util = _cliPkgRequires.util;
       hash = _this._computeHashCode$1(element);
       bucket = rest[hash];
       if (bucket == null)
-        rest[hash] = [_this._collection$_newLinkedCell$1(element)];
+        rest[hash] = [_this._newLinkedCell$1(element)];
       else {
         if (_this._findBucketIndex$2(bucket, element) >= 0)
           return false;
-        bucket.push(_this._collection$_newLinkedCell$1(element));
+        bucket.push(_this._newLinkedCell$1(element));
       }
       return true;
     },
     remove$1(_, object) {
       var _this = this;
       if (typeof object == "string" && object !== "__proto__")
-        return _this._removeHashTableEntry$2(_this._collection$_strings, object);
+        return _this._removeHashTableEntry$2(_this._strings, object);
       else if (typeof object == "number" && (object & 1073741823) === object)
-        return _this._removeHashTableEntry$2(_this._collection$_nums, object);
+        return _this._removeHashTableEntry$2(_this._nums, object);
       else
         return _this._remove$1(object);
     },
@@ -36060,10 +37767,10 @@ self.util = _cliPkgRequires.util;
       _this._unlinkCell$1(cell);
       return true;
     },
-    _collection$_addHashTableEntry$2(table, element) {
+    _addHashTableEntry$2(table, element) {
       if (table[element] != null)
         return false;
-      table[element] = this._collection$_newLinkedCell$1(element);
+      table[element] = this._newLinkedCell$1(element);
       return true;
     },
     _removeHashTableEntry$2(table, element) {
@@ -36077,38 +37784,38 @@ self.util = _cliPkgRequires.util;
       delete table[element];
       return true;
     },
-    _collection$_modified$0() {
-      this._collection$_modifications = this._collection$_modifications + 1 & 1073741823;
+    _modified$0() {
+      this._modifications = this._modifications + 1 & 1073741823;
     },
-    _collection$_newLinkedCell$1(element) {
+    _newLinkedCell$1(element) {
       var t1, _this = this,
         cell = new A._LinkedHashSetCell(element);
-      if (_this._collection$_first == null)
-        _this._collection$_first = _this._collection$_last = cell;
+      if (_this._first == null)
+        _this._first = _this._last = cell;
       else {
-        t1 = _this._collection$_last;
+        t1 = _this._last;
         t1.toString;
-        cell._collection$_previous = t1;
-        _this._collection$_last = t1._collection$_next = cell;
+        cell._previous = t1;
+        _this._last = t1._next = cell;
       }
       ++_this._collection$_length;
-      _this._collection$_modified$0();
+      _this._modified$0();
       return cell;
     },
     _unlinkCell$1(cell) {
       var _this = this,
-        previous = cell._collection$_previous,
-        next = cell._collection$_next;
+        previous = cell._previous,
+        next = cell._next;
       if (previous == null)
-        _this._collection$_first = next;
+        _this._first = next;
       else
-        previous._collection$_next = next;
+        previous._next = next;
       if (next == null)
-        _this._collection$_last = previous;
+        _this._last = previous;
       else
-        next._collection$_previous = previous;
+        next._previous = previous;
       --_this._collection$_length;
-      _this._collection$_modified$0();
+      _this._modified$0();
     },
     _computeHashCode$1(element) {
       return J.get$hashCode$(element) & 1073741823;
@@ -36154,20 +37861,20 @@ self.util = _cliPkgRequires.util;
   A._LinkedHashSetIterator.prototype = {
     get$current(_) {
       var t1 = this._collection$_current;
-      return t1 == null ? A._instanceType(this)._precomputed1._as(t1) : t1;
+      return t1 == null ? this.$ti._precomputed1._as(t1) : t1;
     },
     moveNext$0() {
       var _this = this,
-        cell = _this._collection$_cell,
+        cell = _this._cell,
         t1 = _this._set;
-      if (_this._collection$_modifications !== t1._collection$_modifications)
+      if (_this._modifications !== t1._modifications)
         throw A.wrapException(A.ConcurrentModificationError$(t1));
       else if (cell == null) {
         _this._collection$_current = null;
         return false;
       } else {
         _this._collection$_current = cell._element;
-        _this._collection$_cell = cell._collection$_next;
+        _this._cell = cell._next;
         return true;
       }
     }
@@ -36187,17 +37894,17 @@ self.util = _cliPkgRequires.util;
     call$2(k, v) {
       this.result.$indexSet(0, this.K._as(k), this.V._as(v));
     },
-    $signature: 256
+    $signature: 168
   };
   A.LinkedHashMap_LinkedHashMap$from_closure.prototype = {
     call$2(k, v) {
       this.result.$indexSet(0, this.K._as(k), this.V._as(v));
     },
-    $signature: 256
+    $signature: 168
   };
   A.ListBase.prototype = {
     get$iterator(receiver) {
-      return new A.ListIterator(receiver, this.get$length(receiver));
+      return new A.ListIterator(receiver, this.get$length(receiver), A.instanceType(receiver)._eval$1("ListIterator<ListBase.E>"));
     },
     elementAt$1(receiver, index) {
       return this.$index(receiver, index);
@@ -36315,8 +38022,8 @@ self.util = _cliPkgRequires.util;
         result[i] = _this.$index(receiver, i);
       return result;
     },
-    toList$0($receiver) {
-      return this.toList$1$growable($receiver, true);
+    toList$0(receiver) {
+      return this.toList$1$growable(receiver, true);
     },
     toSet$0(receiver) {
       var i,
@@ -36350,15 +38057,16 @@ self.util = _cliPkgRequires.util;
       return new A.CastList(receiver, A.instanceType(receiver)._eval$1("@<ListBase.E>")._bind$1($R)._eval$1("CastList<1,2>"));
     },
     sort$1(receiver, compare) {
-      A.Sort_sort(receiver, compare == null ? A.collection_ListBase__compareAny$closure() : compare);
+      var t1 = compare == null ? A.collection_ListBase__compareAny$closure() : compare;
+      A.Sort__doSort(receiver, 0, this.get$length(receiver) - 1, t1);
     },
     sublist$2(receiver, start, end) {
       var listLength = this.get$length(receiver);
       A.RangeError_checkValidRange(start, listLength, listLength);
       return A.List_List$from(this.getRange$2(receiver, start, listLength), true, A.instanceType(receiver)._eval$1("ListBase.E"));
     },
-    sublist$1($receiver, start) {
-      return this.sublist$2($receiver, start, null);
+    sublist$1(receiver, start) {
+      return this.sublist$2(receiver, start, null);
     },
     getRange$2(receiver, start, end) {
       A.RangeError_checkValidRange(start, end, this.get$length(receiver));
@@ -36493,11 +38201,13 @@ self.util = _cliPkgRequires.util;
         this.result._contents += ", ";
       t1.first = false;
       t1 = this.result;
-      t2 = t1._contents += A.S(k);
+      t2 = A.S(k);
+      t2 = t1._contents += t2;
       t1._contents = t2 + ": ";
-      t1._contents += A.S(v);
+      t2 = A.S(v);
+      t1._contents += t2;
     },
-    $signature: 291
+    $signature: 170
   };
   A.UnmodifiableMapBase.prototype = {};
   A._MapBaseValueIterable.prototype = {
@@ -36529,8 +38239,9 @@ self.util = _cliPkgRequires.util;
       return t1 == null ? this.$ti._rest[1]._as(t1) : t1;
     },
     get$iterator(_) {
-      var t1 = this._map;
-      return new A._MapBaseValueIterator(J.get$iterator$ax(t1.get$keys(t1)), t1);
+      var t1 = this._map,
+        t2 = this.$ti;
+      return new A._MapBaseValueIterator(J.get$iterator$ax(t1.get$keys(t1)), t1, t2._eval$1("@<1>")._bind$1(t2._rest[1])._eval$1("_MapBaseValueIterator<1,2>"));
     }
   };
   A._MapBaseValueIterator.prototype = {
@@ -36546,7 +38257,7 @@ self.util = _cliPkgRequires.util;
     },
     get$current(_) {
       var t1 = this._collection$_current;
-      return t1 == null ? A._instanceType(this)._rest[1]._as(t1) : t1;
+      return t1 == null ? this.$ti._rest[1]._as(t1) : t1;
     }
   };
   A._UnmodifiableMapMixin.prototype = {
@@ -36619,7 +38330,7 @@ self.util = _cliPkgRequires.util;
   A.ListQueue.prototype = {
     get$iterator(_) {
       var _this = this;
-      return new A._ListQueueIterator(_this, _this._tail, _this._modificationCount, _this._head);
+      return new A._ListQueueIterator(_this, _this._tail, _this._modificationCount, _this._head, _this.$ti._eval$1("_ListQueueIterator<1>"));
     },
     get$isEmpty(_) {
       return this._head === this._tail;
@@ -36649,14 +38360,14 @@ self.util = _cliPkgRequires.util;
       var t1, _this = this;
       if (_this._head === _this._tail)
         throw A.wrapException(A.IterableElementError_noElement());
-      if (_this.get$length(_this) > 1)
+      if (_this.get$length(0) > 1)
         throw A.wrapException(A.IterableElementError_tooMany());
       t1 = _this._table[_this._head];
       return t1 == null ? _this.$ti._precomputed1._as(t1) : t1;
     },
     elementAt$1(_, index) {
       var t1, _this = this;
-      A.IndexError_check(index, _this.get$length(_this), _this, null, null);
+      A.IndexError_check(index, _this.get$length(0), _this, null, null);
       t1 = _this._table;
       t1 = t1[(_this._head + index & t1.length - 1) >>> 0];
       return t1 == null ? _this.$ti._precomputed1._as(t1) : t1;
@@ -36670,22 +38381,22 @@ self.util = _cliPkgRequires.util;
         return t1;
       }
       t1 = _this.$ti._precomputed1;
-      list = A.List_List$filled($length, _this.get$first(_this), true, t1);
+      list = A.List_List$filled($length, _this.get$first(0), true, t1);
       for (t2 = _this._table, t3 = _this._head, i = 0; i < $length; ++i) {
         t4 = t2[(t3 + i & mask) >>> 0];
         list[i] = t4 == null ? t1._as(t4) : t4;
       }
       return list;
     },
-    toList$0($receiver) {
-      return this.toList$1$growable($receiver, true);
+    toList$0(_) {
+      return this.toList$1$growable(0, true);
     },
     addAll$1(_, elements) {
       var addCount, $length, t2, t3, t4, newTable, endSpace, preSpace, _i, _this = this,
         t1 = _this.$ti;
       if (t1._eval$1("List<1>")._is(elements)) {
         addCount = elements.length;
-        $length = _this.get$length(_this);
+        $length = _this.get$length(0);
         t2 = $length + addCount;
         t3 = _this._table;
         t4 = t3.length;
@@ -36796,7 +38507,7 @@ self.util = _cliPkgRequires.util;
   A._ListQueueIterator.prototype = {
     get$current(_) {
       var t1 = this._collection$_current;
-      return t1 == null ? A._instanceType(this)._precomputed1._as(t1) : t1;
+      return t1 == null ? this.$ti._precomputed1._as(t1) : t1;
     },
     moveNext$0() {
       var t2, _this = this,
@@ -36844,8 +38555,8 @@ self.util = _cliPkgRequires.util;
     toList$1$growable(_, growable) {
       return A.List_List$of(this, true, A._instanceType(this)._precomputed1);
     },
-    toList$0($receiver) {
-      return this.toList$1$growable($receiver, true);
+    toList$0(_) {
+      return this.toList$1$growable(0, true);
     },
     map$1$1(_, f, $T) {
       return new A.EfficientLengthMappedIterable(this, f, A._instanceType(this)._eval$1("@<1>")._bind$1($T)._eval$1("EfficientLengthMappedIterable<1,2>"));
@@ -36870,6 +38581,13 @@ self.util = _cliPkgRequires.util;
       for (t1 = this.get$iterator(this); t1.moveNext$0();)
         f.call$1(t1.get$current(t1));
     },
+    every$1(_, f) {
+      var t1;
+      for (t1 = this.get$iterator(this); t1.moveNext$0();)
+        if (!f.call$1(t1.get$current(t1)))
+          return false;
+      return true;
+    },
     any$1(_, test) {
       var t1;
       for (t1 = this.get$iterator(this); t1.moveNext$0();)
@@ -36916,9 +38634,9 @@ self.util = _cliPkgRequires.util;
   };
   A._SetBase.prototype = {
     difference$1(other) {
-      var t1, t2, t3, element,
-        result = this._newSet$0();
-      for (t1 = A._LinkedHashSetIterator$(this, this._collection$_modifications), t2 = other._source, t3 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      var t1, t2, t3, element, _this = this,
+        result = _this._newSet$0();
+      for (t1 = A._LinkedHashSetIterator$(_this, _this._modifications, A._instanceType(_this)._precomputed1), t2 = other._source, t3 = t1.$ti._precomputed1; t1.moveNext$0();) {
         element = t1._collection$_current;
         if (element == null)
           element = t3._as(element);
@@ -36928,9 +38646,9 @@ self.util = _cliPkgRequires.util;
       return result;
     },
     intersection$1(other) {
-      var t1, t2, t3, element,
-        result = this._newSet$0();
-      for (t1 = A._LinkedHashSetIterator$(this, this._collection$_modifications), t2 = other._baseMap, t3 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      var t1, t2, t3, element, _this = this,
+        result = _this._newSet$0();
+      for (t1 = A._LinkedHashSetIterator$(_this, _this._modifications, A._instanceType(_this)._precomputed1), t2 = other._baseMap, t3 = t1.$ti._precomputed1; t1.moveNext$0();) {
         element = t1._collection$_current;
         if (element == null)
           element = t3._as(element);
@@ -36965,7 +38683,7 @@ self.util = _cliPkgRequires.util;
     },
     get$iterator(_) {
       var t1 = this._collection$_source;
-      return A._LinkedHashSetIterator$(t1, t1._collection$_modifications);
+      return A._LinkedHashSetIterator$(t1, t1._modifications, A._instanceType(t1)._precomputed1);
     },
     toSet$0(_) {
       return this._collection$_source.toSet$0(0);
@@ -36973,7 +38691,154 @@ self.util = _cliPkgRequires.util;
   };
   A._UnmodifiableMapView_MapView__UnmodifiableMapMixin.prototype = {};
   A._UnmodifiableSetView_SetBase__UnmodifiableSetMixin.prototype = {};
-  A.Utf8Decoder__decoder_closure.prototype = {
+  A._JsonMap.prototype = {
+    $index(_, key) {
+      var result,
+        t1 = this._processed;
+      if (t1 == null)
+        return this._data.$index(0, key);
+      else if (typeof key != "string")
+        return null;
+      else {
+        result = t1[key];
+        return typeof result == "undefined" ? this._process$1(key) : result;
+      }
+    },
+    get$length(_) {
+      return this._processed == null ? this._data.__js_helper$_length : this._convert$_computeKeys$0().length;
+    },
+    get$isEmpty(_) {
+      return this.get$length(0) === 0;
+    },
+    get$isNotEmpty(_) {
+      return this.get$length(0) > 0;
+    },
+    get$keys(_) {
+      var t1;
+      if (this._processed == null) {
+        t1 = this._data;
+        return new A.LinkedHashMapKeyIterable(t1, A._instanceType(t1)._eval$1("LinkedHashMapKeyIterable<1>"));
+      }
+      return new A._JsonMapKeyIterable(this);
+    },
+    get$values(_) {
+      var _this = this;
+      if (_this._processed == null)
+        return _this._data.get$values(0);
+      return A.MappedIterable_MappedIterable(_this._convert$_computeKeys$0(), new A._JsonMap_values_closure(_this), type$.String, type$.dynamic);
+    },
+    $indexSet(_, key, value) {
+      var processed, original, _this = this;
+      if (_this._processed == null)
+        _this._data.$indexSet(0, key, value);
+      else if (_this.containsKey$1(key)) {
+        processed = _this._processed;
+        processed[key] = value;
+        original = _this._original;
+        if (original == null ? processed != null : original !== processed)
+          original[key] = null;
+      } else
+        _this._upgrade$0().$indexSet(0, key, value);
+    },
+    addAll$1(_, other) {
+      other.forEach$1(0, new A._JsonMap_addAll_closure(this));
+    },
+    containsKey$1(key) {
+      if (this._processed == null)
+        return this._data.containsKey$1(key);
+      if (typeof key != "string")
+        return false;
+      return Object.prototype.hasOwnProperty.call(this._original, key);
+    },
+    remove$1(_, key) {
+      if (this._processed != null && !this.containsKey$1(key))
+        return null;
+      return this._upgrade$0().remove$1(0, key);
+    },
+    forEach$1(_, f) {
+      var keys, i, key, value, _this = this;
+      if (_this._processed == null)
+        return _this._data.forEach$1(0, f);
+      keys = _this._convert$_computeKeys$0();
+      for (i = 0; i < keys.length; ++i) {
+        key = keys[i];
+        value = _this._processed[key];
+        if (typeof value == "undefined") {
+          value = A._convertJsonToDartLazy(_this._original[key]);
+          _this._processed[key] = value;
+        }
+        f.call$2(key, value);
+        if (keys !== _this._data)
+          throw A.wrapException(A.ConcurrentModificationError$(_this));
+      }
+    },
+    _convert$_computeKeys$0() {
+      var keys = this._data;
+      if (keys == null)
+        keys = this._data = A._setArrayType(Object.keys(this._original), type$.JSArray_String);
+      return keys;
+    },
+    _upgrade$0() {
+      var result, keys, i, t1, key, _this = this;
+      if (_this._processed == null)
+        return _this._data;
+      result = A.LinkedHashMap_LinkedHashMap$_empty(type$.String, type$.dynamic);
+      keys = _this._convert$_computeKeys$0();
+      for (i = 0; t1 = keys.length, i < t1; ++i) {
+        key = keys[i];
+        result.$indexSet(0, key, _this.$index(0, key));
+      }
+      if (t1 === 0)
+        keys.push("");
+      else
+        B.JSArray_methods.clear$0(keys);
+      _this._original = _this._processed = null;
+      return _this._data = result;
+    },
+    _process$1(key) {
+      var result;
+      if (!Object.prototype.hasOwnProperty.call(this._original, key))
+        return null;
+      result = A._convertJsonToDartLazy(this._original[key]);
+      return this._processed[key] = result;
+    }
+  };
+  A._JsonMap_values_closure.prototype = {
+    call$1(each) {
+      return this.$this.$index(0, each);
+    },
+    $signature: 171
+  };
+  A._JsonMap_addAll_closure.prototype = {
+    call$2(key, value) {
+      this.$this.$indexSet(0, key, value);
+    },
+    $signature: 114
+  };
+  A._JsonMapKeyIterable.prototype = {
+    get$length(_) {
+      return this._convert$_parent.get$length(0);
+    },
+    elementAt$1(_, index) {
+      var t1 = this._convert$_parent;
+      return t1._processed == null ? t1.get$keys(0).elementAt$1(0, index) : t1._convert$_computeKeys$0()[index];
+    },
+    get$iterator(_) {
+      var t1 = this._convert$_parent;
+      if (t1._processed == null) {
+        t1 = t1.get$keys(0);
+        t1 = t1.get$iterator(t1);
+      } else {
+        t1 = t1._convert$_computeKeys$0();
+        t1 = new J.ArrayIterator(t1, t1.length, A._arrayInstanceType(t1)._eval$1("ArrayIterator<1>"));
+      }
+      return t1;
+    },
+    contains$1(_, key) {
+      return this._convert$_parent.containsKey$1(key);
+    }
+  };
+  A._Utf8Decoder__decoder_closure.prototype = {
     call$0() {
       var t1, exception;
       try {
@@ -36983,9 +38848,9 @@ self.util = _cliPkgRequires.util;
       }
       return null;
     },
-    $signature: 58
+    $signature: 60
   };
-  A.Utf8Decoder__decoderNonfatal_closure.prototype = {
+  A._Utf8Decoder__decoderNonfatal_closure.prototype = {
     call$0() {
       var t1, exception;
       try {
@@ -36995,14 +38860,11 @@ self.util = _cliPkgRequires.util;
       }
       return null;
     },
-    $signature: 58
+    $signature: 60
   };
   A.AsciiCodec.prototype = {
     encode$1(source) {
       return B.AsciiEncoder_127.convert$1(source);
-    },
-    get$encoder() {
-      return B.AsciiEncoder_127;
     }
   };
   A._UnicodeSubsetEncoder.prototype = {
@@ -37021,9 +38883,6 @@ self.util = _cliPkgRequires.util;
   };
   A.AsciiEncoder.prototype = {};
   A.Base64Codec.prototype = {
-    get$encoder() {
-      return B.C_Base64Encoder;
-    },
     normalize$3(source, start, end) {
       var inverseAlphabet, i, sliceStart, buffer, firstPadding, firstPaddingSourceIndex, paddingCount, i0, char, i1, digit1, digit2, char0, value, t1, t2, endLength, $length,
         _s31_ = "Invalid base64 encoding length ";
@@ -37074,7 +38933,8 @@ self.util = _cliPkgRequires.util;
             } else
               t1 = buffer;
             t1._contents += B.JSString_methods.substring$2(source, sliceStart, i);
-            t1._contents += A.Primitives_stringFromCharCode(char);
+            t2 = A.Primitives_stringFromCharCode(char);
+            t1._contents += t2;
             sliceStart = i0;
             continue;
           }
@@ -37082,7 +38942,8 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException(A.FormatException$("Invalid base64 data", source, i));
       }
       if (buffer != null) {
-        t1 = buffer._contents += B.JSString_methods.substring$2(source, sliceStart, end);
+        t1 = B.JSString_methods.substring$2(source, sliceStart, end);
+        t1 = buffer._contents += t1;
         t2 = t1.length;
         if (firstPadding >= 0)
           A.Base64Codec__checkPadding(source, firstPaddingSourceIndex, end, firstPadding, paddingCount, t2);
@@ -37113,14 +38974,6 @@ self.util = _cliPkgRequires.util;
     }
   };
   A.Base64Encoder.prototype = {
-    convert$1(input) {
-      var t1 = J.getInterceptor$asx(input);
-      if (t1.get$isEmpty(input))
-        return "";
-      t1 = new A._Base64Encoder(string$.ABCDEF).encode$4(input, 0, t1.get$length(input), true);
-      t1.toString;
-      return A.String_String$fromCharCodes(t1, 0, null);
-    },
     startChunkedConversion$1(sink) {
       return new A._Utf8Base64EncoderSink(new A._Utf8StringSinkAdapter(new A._Utf8Decoder(false), sink, sink._stringSink), new A._Base64Encoder(string$.ABCDEF));
     }
@@ -37152,11 +39005,7 @@ self.util = _cliPkgRequires.util;
     }
   };
   A.ByteConversionSink.prototype = {};
-  A.Codec.prototype = {
-    encode$1(input) {
-      return this.get$encoder().convert$1(input);
-    }
-  };
+  A.Codec.prototype = {};
   A.Converter.prototype = {};
   A.Encoding.prototype = {};
   A.JsonUnsupportedObjectError.prototype = {
@@ -37171,24 +39020,23 @@ self.util = _cliPkgRequires.util;
     }
   };
   A.JsonCodec.prototype = {
+    decode$1(source) {
+      var t1 = A._parseJson(source, this.get$decoder()._reviver);
+      return t1;
+    },
     encode$2$toEncodable(value, toEncodable) {
       var t1 = A._JsonStringStringifier_stringify(value, this.get$encoder()._toEncodable, null);
       return t1;
     },
     get$encoder() {
       return B.JsonEncoder_null;
+    },
+    get$decoder() {
+      return B.JsonDecoder_null;
     }
   };
-  A.JsonEncoder.prototype = {
-    convert$1(object) {
-      var t1,
-        output = new A.StringBuffer(""),
-        stringifier = A._JsonStringStringifier$(output, this._toEncodable);
-      stringifier.writeObject$1(object);
-      t1 = output._contents;
-      return t1.charCodeAt(0) == 0 ? t1 : t1;
-    }
-  };
+  A.JsonEncoder.prototype = {};
+  A.JsonDecoder.prototype = {};
   A._JsonStringifier.prototype = {
     writeStringContent$1(s) {
       var offset, i, charCode, t1, t2, _this = this,
@@ -37383,7 +39231,7 @@ self.util = _cliPkgRequires.util;
       t2.i = i + 1;
       t1[i] = value;
     },
-    $signature: 291
+    $signature: 170
   };
   A._JsonStringStringifier.prototype = {
     get$_partialResult() {
@@ -37391,7 +39239,9 @@ self.util = _cliPkgRequires.util;
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     },
     writeNumber$1(number) {
-      this._sink._contents += B.JSNumber_methods.toString$0(number);
+      var t1 = this._sink,
+        t2 = B.JSNumber_methods.toString$0(number);
+      t1._contents += t2;
     },
     writeString$1(string) {
       this._sink._contents += string;
@@ -37400,7 +39250,9 @@ self.util = _cliPkgRequires.util;
       this._sink._contents += B.JSString_methods.substring$2(string, start, end);
     },
     writeCharCode$1(charCode) {
-      this._sink._contents += A.Primitives_stringFromCharCode(charCode);
+      var t1 = this._sink,
+        t2 = A.Primitives_stringFromCharCode(charCode);
+      t1._contents += t2;
     }
   };
   A.StringConversionSink.prototype = {};
@@ -37428,14 +39280,16 @@ self.util = _cliPkgRequires.util;
       this.addSlice$4(chunk, 0, J.get$length$asx(chunk), false);
     },
     addSlice$4(codeUnits, startIndex, endIndex, isLast) {
-      this._stringSink._contents += this._decoder.convertGeneral$4(codeUnits, startIndex, endIndex, false);
+      var t1 = this._stringSink,
+        t2 = this._decoder._convertGeneral$4(codeUnits, startIndex, endIndex, false);
+      t1._contents += t2;
       if (isLast)
         this.close$0(0);
     }
   };
   A.Utf8Codec.prototype = {
-    get$encoder() {
-      return B.C_Utf8Encoder;
+    encode$1(string) {
+      return B.C_Utf8Encoder.convert$1(string);
     }
   };
   A.Utf8Encoder.prototype = {
@@ -37535,29 +39389,36 @@ self.util = _cliPkgRequires.util;
   };
   A.Utf8Decoder.prototype = {
     convert$1(codeUnits) {
-      var t1 = this._allowMalformed,
-        result = A.Utf8Decoder__convertIntercepted(t1, codeUnits, 0, null);
-      if (result != null)
-        return result;
-      return new A._Utf8Decoder(t1).convertGeneral$4(codeUnits, 0, null, true);
+      return new A._Utf8Decoder(this._allowMalformed)._convertGeneral$4(codeUnits, 0, null, true);
     }
   };
   A._Utf8Decoder.prototype = {
-    convertGeneral$4(codeUnits, start, maybeEnd, single) {
-      var bytes, errorOffset, result, t1, message, _this = this,
+    _convertGeneral$4(codeUnits, start, maybeEnd, single) {
+      var casted, bytes, errorOffset, t1, result, message, _this = this,
         end = A.RangeError_checkValidRange(start, maybeEnd, J.get$length$asx(codeUnits));
       if (start === end)
         return "";
-      if (type$.Uint8List._is(codeUnits)) {
-        bytes = codeUnits;
+      if (codeUnits instanceof Uint8Array) {
+        casted = codeUnits;
+        bytes = casted;
         errorOffset = 0;
       } else {
-        bytes = A._Utf8Decoder__makeUint8List(codeUnits, start, end);
+        bytes = A._Utf8Decoder__makeNativeUint8List(codeUnits, start, end);
         end -= start;
         errorOffset = start;
         start = 0;
       }
-      result = _this._convertRecursive$4(bytes, start, end, single);
+      if (single && end - start >= 15) {
+        t1 = _this.allowMalformed;
+        result = A._Utf8Decoder__convertInterceptedUint8List(t1, bytes, start, end);
+        if (result != null) {
+          if (!t1)
+            return result;
+          if (result.indexOf("\ufffd") < 0)
+            return result;
+        }
+      }
+      result = _this._decodeRecursive$4(bytes, start, end, single);
       t1 = _this._convert$_state;
       if ((t1 & 1) !== 0) {
         message = A._Utf8Decoder_errorDescription(t1);
@@ -37566,25 +39427,27 @@ self.util = _cliPkgRequires.util;
       }
       return result;
     },
-    _convertRecursive$4(bytes, start, end, single) {
+    _decodeRecursive$4(bytes, start, end, single) {
       var mid, s1, _this = this;
       if (end - start > 1000) {
         mid = B.JSInt_methods._tdivFast$1(start + end, 2);
-        s1 = _this._convertRecursive$4(bytes, start, mid, false);
+        s1 = _this._decodeRecursive$4(bytes, start, mid, false);
         if ((_this._convert$_state & 1) !== 0)
           return s1;
-        return s1 + _this._convertRecursive$4(bytes, mid, end, single);
+        return s1 + _this._decodeRecursive$4(bytes, mid, end, single);
       }
       return _this.decodeGeneral$4(bytes, start, end, single);
     },
     flush$1(sink) {
-      var state = this._convert$_state;
+      var t1,
+        state = this._convert$_state;
       this._convert$_state = 0;
       if (state <= 32)
         return;
-      if (this.allowMalformed)
-        sink._contents += A.Primitives_stringFromCharCode(65533);
-      else
+      if (this.allowMalformed) {
+        t1 = A.Primitives_stringFromCharCode(65533);
+        sink._contents += t1;
+      } else
         throw A.wrapException(A.FormatException$(A._Utf8Decoder_errorDescription(77), null, null));
     },
     decodeGeneral$4(bytes, start, end, single) {
@@ -37601,7 +39464,8 @@ self.util = _cliPkgRequires.util;
             char = state <= 32 ? byte & 61694 >>> type : (byte & 63 | char << 6) >>> 0;
             state = " \x000:XECCCCCN:lDb \x000:XECCCCCNvlDb \x000:XECCCCCN:lDb AAAAA\x00\x00\x00\x00\x00AAAAA00000AAAAA:::::AAAAAGG000AAAAA00KKKAAAAAG::::AAAAA:IIIIAAAAA000\x800AAAAA\x00\x00\x00\x00 AAAAA".charCodeAt(state + type);
             if (state === 0) {
-              buffer._contents += A.Primitives_stringFromCharCode(char);
+              t2 = A.Primitives_stringFromCharCode(char);
+              buffer._contents += t2;
               if (i === end)
                 break $label0$0;
               break;
@@ -37610,14 +39474,17 @@ self.util = _cliPkgRequires.util;
                 switch (state) {
                   case 69:
                   case 67:
-                    buffer._contents += A.Primitives_stringFromCharCode(_65533);
+                    t2 = A.Primitives_stringFromCharCode(_65533);
+                    buffer._contents += t2;
                     break;
                   case 65:
-                    buffer._contents += A.Primitives_stringFromCharCode(_65533);
+                    t2 = A.Primitives_stringFromCharCode(_65533);
+                    buffer._contents += t2;
                     --i;
                     break;
                   default:
-                    t2 = buffer._contents += A.Primitives_stringFromCharCode(_65533);
+                    t2 = A.Primitives_stringFromCharCode(_65533);
+                    t2 = buffer._contents += t2;
                     buffer._contents = t2 + A.Primitives_stringFromCharCode(_65533);
                     break;
                 }
@@ -37651,10 +39518,14 @@ self.util = _cliPkgRequires.util;
               i0 = i1;
             }
             if (markEnd - i < 20)
-              for (m = i; m < markEnd; ++m)
-                buffer._contents += A.Primitives_stringFromCharCode(bytes[m]);
-            else
-              buffer._contents += A.String_String$fromCharCodes(bytes, i, markEnd);
+              for (m = i; m < markEnd; ++m) {
+                t2 = A.Primitives_stringFromCharCode(bytes[m]);
+                buffer._contents += t2;
+              }
+            else {
+              t2 = A.String_String$fromCharCodes(bytes, i, markEnd);
+              buffer._contents += t2;
+            }
             if (markEnd === end)
               break $label0$0;
             i = i0;
@@ -37662,9 +39533,10 @@ self.util = _cliPkgRequires.util;
             i = i0;
         }
       if (single && state > 32)
-        if (t1)
-          buffer._contents += A.Primitives_stringFromCharCode(_65533);
-        else {
+        if (t1) {
+          t1 = A.Primitives_stringFromCharCode(_65533);
+          buffer._contents += t1;
+        } else {
           _this._convert$_state = 77;
           _this._charOrIndex = end;
           return "";
@@ -37683,22 +39555,28 @@ self.util = _cliPkgRequires.util;
       t3 += key.__internal$_name;
       t1._contents = t3;
       t1._contents = t3 + ": ";
-      t1._contents += A.Error_safeToString(value);
+      t3 = A.Error_safeToString(value);
+      t1._contents += t3;
       t2.comma = ", ";
     },
-    $signature: 547
+    $signature: 325
   };
   A.DateTime.prototype = {
     $eq(_, other) {
+      var t1;
       if (other == null)
         return false;
-      return other instanceof A.DateTime && this._core$_value === other._core$_value && true;
+      if (other instanceof A.DateTime)
+        t1 = this._value === other._value;
+      else
+        t1 = false;
+      return t1;
     },
     compareTo$1(_, other) {
-      return B.JSInt_methods.compareTo$1(this._core$_value, other._core$_value);
+      return B.JSInt_methods.compareTo$1(this._value, other._value);
     },
     get$hashCode(_) {
-      var t1 = this._core$_value;
+      var t1 = this._value;
       return (t1 ^ B.JSInt_methods._shrOtherPositive$1(t1, 30)) & 1073741823;
     },
     toString$0(_) {
@@ -37755,7 +39633,7 @@ self.util = _cliPkgRequires.util;
   };
   A.Error.prototype = {
     get$stackTrace() {
-      return A.getTraceFromException(this.$thrownJsError);
+      return A.Primitives_extractStackTrace(this);
     }
   };
   A.AssertionError.prototype = {
@@ -37846,7 +39724,8 @@ self.util = _cliPkgRequires.util;
       for (t1 = $arguments.length, _i = 0, t2 = "", t3 = ""; _i < t1; ++_i, t3 = ", ") {
         argument = $arguments[_i];
         sb._contents = t2 + t3;
-        t2 = sb._contents += A.Error_safeToString(argument);
+        t2 = A.Error_safeToString(argument);
+        t2 = sb._contents += t2;
         _box_0.comma = ", ";
       }
       _this._namedArguments.forEach$1(0, new A.NoSuchMethodError_toString_closure(_box_0, sb));
@@ -38026,8 +39905,15 @@ self.util = _cliPkgRequires.util;
         value = combine.call$2(value, t1.get$current(t1));
       return value;
     },
-    fold$2($receiver, initialValue, combine) {
-      return this.fold$1$2($receiver, initialValue, combine, type$.dynamic);
+    fold$2(_, initialValue, combine) {
+      return this.fold$1$2(0, initialValue, combine, type$.dynamic);
+    },
+    every$1(_, test) {
+      var t1;
+      for (t1 = this.get$iterator(this); t1.moveNext$0();)
+        if (!test.call$1(t1.get$current(t1)))
+          return false;
+      return true;
     },
     join$1(_, separator) {
       var first, t1,
@@ -38060,8 +39946,8 @@ self.util = _cliPkgRequires.util;
     toList$1$growable(_, growable) {
       return A.List_List$of(this, growable, A._instanceType(this)._eval$1("Iterable.E"));
     },
-    toList$0($receiver) {
-      return this.toList$1$growable($receiver, true);
+    toList$0(_) {
+      return this.toList$1$growable(0, true);
     },
     toSet$0(_) {
       return A.LinkedHashSet_LinkedHashSet$of(this, A._instanceType(this)._eval$1("Iterable.E"));
@@ -38145,7 +40031,7 @@ self.util = _cliPkgRequires.util;
   };
   A.Null.prototype = {
     get$hashCode(_) {
-      return A.Object.prototype.get$hashCode.call(this, this);
+      return A.Object.prototype.get$hashCode.call(this, 0);
     },
     toString$0(_) {
       return "null";
@@ -38229,10 +40115,12 @@ self.util = _cliPkgRequires.util;
       return this._contents.length;
     },
     write$1(_, obj) {
-      this._contents += A.S(obj);
+      var t1 = A.S(obj);
+      this._contents += t1;
     },
     writeCharCode$1(charCode) {
-      this._contents += A.Primitives_stringFromCharCode(charCode);
+      var t1 = A.Primitives_stringFromCharCode(charCode);
+      this._contents += t1;
     },
     toString$0(_) {
       var t1 = this._contents;
@@ -38243,13 +40131,13 @@ self.util = _cliPkgRequires.util;
     call$2(msg, position) {
       throw A.wrapException(A.FormatException$("Illegal IPv4 address, " + msg, this.host, position));
     },
-    $signature: 311
+    $signature: 288
   };
   A.Uri_parseIPv6Address_error.prototype = {
     call$2(msg, position) {
       throw A.wrapException(A.FormatException$("Illegal IPv6 address, " + msg, this.host, position));
     },
-    $signature: 313
+    $signature: 295
   };
   A.Uri_parseIPv6Address_parseHex.prototype = {
     call$2(start, end) {
@@ -38261,7 +40149,7 @@ self.util = _cliPkgRequires.util;
         this.error.call$2("each part must be in the range of `0x0..0xFFFF`", start);
       return value;
     },
-    $signature: 314
+    $signature: 296
   };
   A._Uri.prototype = {
     get$_text() {
@@ -38349,6 +40237,27 @@ self.util = _cliPkgRequires.util;
         return false;
       return A._caseInsensitiveCompareStart(scheme, thisScheme, 0) >= 0;
     },
+    replace$1$scheme(scheme) {
+      var isFile, userInfo, port, host, currentPath, t1, path, _this = this;
+      scheme = A._Uri__makeScheme(scheme, 0, scheme.length);
+      isFile = scheme === "file";
+      userInfo = _this._userInfo;
+      port = _this._port;
+      if (scheme !== _this.scheme)
+        port = A._Uri__makePort(port, scheme);
+      host = _this._host;
+      if (!(host != null))
+        host = userInfo.length !== 0 || port != null || isFile ? "" : null;
+      currentPath = _this.path;
+      if (!isFile)
+        t1 = host != null && currentPath.length !== 0;
+      else
+        t1 = true;
+      if (t1 && !B.JSString_methods.startsWith$1(currentPath, "/"))
+        currentPath = "/" + currentPath;
+      path = currentPath;
+      return A._Uri$_internal(scheme, userInfo, host, port, path, _this._query, _this._fragment);
+    },
     _mergePaths$2(base, reference) {
       var backCount, refStart, baseEnd, newEnd, delta, t1;
       for (backCount = 0, refStart = 0; B.JSString_methods.startsWith$2(reference, "../", refStart);) {
@@ -38378,12 +40287,14 @@ self.util = _cliPkgRequires.util;
       }
       return B.JSString_methods.replaceRange$3(base, baseEnd + 1, null, B.JSString_methods.substring$1(reference, refStart - 3 * backCount));
     },
-    resolve$1(reference) {
+    resolve$1(_, reference) {
       return this.resolveUri$1(A.Uri_parse(reference));
     },
     resolveUri$1(reference) {
-      var targetScheme, targetUserInfo, targetHost, targetPort, targetPath, targetQuery, packageNameEnd, packageName, mergedPath, t1, _this = this, _null = null;
+      var targetScheme, targetUserInfo, targetHost, targetPort, targetPath, targetQuery, split, packageNameEnd, packageName, mergedPath, t1, fragment, _this = this, _null = null;
       if (reference.get$scheme().length !== 0) {
+        if (type$._PlatformUri._is(reference))
+          return reference;
         targetScheme = reference.get$scheme();
         if (reference.get$hasAuthority()) {
           targetUserInfo = reference.get$userInfo();
@@ -38396,21 +40307,31 @@ self.util = _cliPkgRequires.util;
         }
         targetPath = A._Uri__removeDotSegments(reference.get$path(reference));
         targetQuery = reference.get$hasQuery() ? reference.get$query() : _null;
+        split = 0;
       } else {
         targetScheme = _this.scheme;
         if (reference.get$hasAuthority()) {
+          if (type$._PlatformUri._is(reference))
+            return reference.replace$1$scheme(targetScheme);
           targetUserInfo = reference.get$userInfo();
           targetHost = reference.get$host();
           targetPort = A._Uri__makePort(reference.get$hasPort() ? reference.get$port(reference) : _null, targetScheme);
           targetPath = A._Uri__removeDotSegments(reference.get$path(reference));
           targetQuery = reference.get$hasQuery() ? reference.get$query() : _null;
+          split = 1;
         } else {
           targetUserInfo = _this._userInfo;
           targetHost = _this._host;
           targetPort = _this._port;
           targetPath = _this.path;
-          if (reference.get$path(reference) === "")
-            targetQuery = reference.get$hasQuery() ? reference.get$query() : _this._query;
+          if (reference.get$hasEmptyPath())
+            if (reference.get$hasQuery()) {
+              targetQuery = reference.get$query();
+              split = 3;
+            } else {
+              targetQuery = _this._query;
+              split = 4;
+            }
           else {
             packageNameEnd = A._Uri__packageNameEnd(_this, targetPath);
             if (packageNameEnd > 0) {
@@ -38432,10 +40353,30 @@ self.util = _cliPkgRequires.util;
                 targetPath = A._Uri__normalizeRelativePath(mergedPath, !t1 || targetHost != null);
             }
             targetQuery = reference.get$hasQuery() ? reference.get$query() : _null;
+            split = 2;
           }
         }
       }
-      return A._Uri$_internal(targetScheme, targetUserInfo, targetHost, targetPort, targetPath, targetQuery, reference.get$hasFragment() ? reference.get$fragment() : _null);
+      fragment = reference.get$hasFragment() ? reference.get$fragment() : _null;
+      if (!type$._PlatformUri._is(reference)) {
+        if (split === 0)
+          targetScheme = A._Uri__makeScheme(targetScheme, 0, targetScheme.length);
+        if (split <= 1) {
+          targetUserInfo = A._Uri__makeUserInfo(targetUserInfo, 0, targetUserInfo.length);
+          if (targetPort != null)
+            targetPort = A._Uri__makePort(targetPort, targetScheme);
+          if (targetHost != null && targetHost.length !== 0)
+            targetHost = A._Uri__makeHost(targetHost, 0, targetHost.length, false);
+        }
+        t1 = split <= 3;
+        if (t1)
+          targetPath = A._Uri__makePath(targetPath, 0, targetPath.length, _null, targetScheme, targetHost != null);
+        if (t1 && targetQuery != null)
+          targetQuery = A._Uri__makeQuery(targetQuery, 0, targetQuery.length, _null);
+        if (fragment != null)
+          fragment = A._Uri__makeFragment(fragment, 0, fragment.length);
+      }
+      return A._Uri$_internal(targetScheme, targetUserInfo, targetHost, targetPort, targetPath, targetQuery, fragment);
     },
     get$hasAuthority() {
       return this._host != null;
@@ -38449,6 +40390,9 @@ self.util = _cliPkgRequires.util;
     get$hasFragment() {
       return this._fragment != null;
     },
+    get$hasEmptyPath() {
+      return this.path.length === 0;
+    },
     get$hasAbsolutePath() {
       return B.JSString_methods.startsWith$1(this.path, "/");
     },
@@ -38490,7 +40434,7 @@ self.util = _cliPkgRequires.util;
           if (_this._host != null === other.get$hasAuthority())
             if (_this._userInfo === other.get$userInfo())
               if (_this.get$host() === other.get$host())
-                if (_this.get$port(_this) === other.get$port(other))
+                if (_this.get$port(0) === other.get$port(other))
                   if (_this.path === other.get$path(other)) {
                     t1 = _this._query;
                     t2 = t1 == null;
@@ -38527,6 +40471,7 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     $isUri: 1,
+    $is_PlatformUri: 1,
     get$scheme() {
       return this.scheme;
     },
@@ -38536,9 +40481,9 @@ self.util = _cliPkgRequires.util;
   };
   A._Uri__makePath_closure.prototype = {
     call$1(s) {
-      return A._Uri__uriEncode(B.List_XRg0, s, B.C_Utf8Codec, false);
+      return A._Uri__uriEncode(B.List_M2I0, s, B.C_Utf8Codec, false);
     },
-    $signature: 7
+    $signature: 5
   };
   A.UriData.prototype = {
     get$uri() {
@@ -38550,11 +40495,11 @@ self.util = _cliPkgRequires.util;
         queryIndex = B.JSString_methods.indexOf$2(t1, "?", t2);
         end = t1.length;
         if (queryIndex >= 0) {
-          query = A._Uri__normalizeOrSubstring(t1, queryIndex + 1, end, B.List_oFp, false, false);
+          query = A._Uri__normalizeOrSubstring(t1, queryIndex + 1, end, B.List_42A, false, false);
           end = queryIndex;
         } else
           query = _null;
-        t1 = _this._uriCache = new A._DataUri("data", "", _null, _null, A._Uri__normalizeOrSubstring(t1, t2, end, B.List_XRg, false, false), query, _null);
+        t1 = _this._uriCache = new A._DataUri("data", "", _null, _null, A._Uri__normalizeOrSubstring(t1, t2, end, B.List_M2I, false, false), query, _null);
       }
       return t1;
     },
@@ -38569,7 +40514,7 @@ self.util = _cliPkgRequires.util;
       B.NativeUint8List_methods.fillRange$3(t1, 0, 96, defaultTransition);
       return t1;
     },
-    $signature: 330
+    $signature: 328
   };
   A._createTables_setChars.prototype = {
     call$3(target, chars, transition) {
@@ -38577,7 +40522,7 @@ self.util = _cliPkgRequires.util;
       for (t1 = chars.length, i = 0; i < t1; ++i)
         target[chars.charCodeAt(i) ^ 96] = transition;
     },
-    $signature: 183
+    $signature: 221
   };
   A._createTables_setRange.prototype = {
     call$3(target, range, transition) {
@@ -38585,7 +40530,7 @@ self.util = _cliPkgRequires.util;
       for (i = range.charCodeAt(0), n = range.charCodeAt(1); i <= n; ++i)
         target[(i ^ 96) >>> 0] = transition;
     },
-    $signature: 183
+    $signature: 221
   };
   A._SimpleUri.prototype = {
     get$hasAuthority() {
@@ -38603,6 +40548,9 @@ self.util = _cliPkgRequires.util;
     get$hasAbsolutePath() {
       return B.JSString_methods.startsWith$2(this._uri, "/", this._pathStart);
     },
+    get$hasEmptyPath() {
+      return this._pathStart === this._queryStart;
+    },
     get$scheme() {
       var t1 = this._schemeCache;
       return t1 == null ? this._schemeCache = this._computeScheme$0() : t1;
@@ -38686,7 +40634,37 @@ self.util = _cliPkgRequires.util;
         return _this;
       return new A._SimpleUri(B.JSString_methods.substring$2(t2, 0, t1), _this._schemeEnd, _this._hostStart, _this._portStart, _this._pathStart, _this._queryStart, t1, _this._schemeCache);
     },
-    resolve$1(reference) {
+    replace$1$scheme(scheme) {
+      var schemeChanged, isFile, t1, userInfo, port, host, t2, path, t3, query, fragment, _this = this, _null = null;
+      scheme = A._Uri__makeScheme(scheme, 0, scheme.length);
+      schemeChanged = !(_this._schemeEnd === scheme.length && B.JSString_methods.startsWith$1(_this._uri, scheme));
+      isFile = scheme === "file";
+      t1 = _this._hostStart;
+      userInfo = t1 > 0 ? B.JSString_methods.substring$2(_this._uri, _this._schemeEnd + 3, t1) : "";
+      port = _this.get$hasPort() ? _this.get$port(0) : _null;
+      if (schemeChanged)
+        port = A._Uri__makePort(port, scheme);
+      t1 = _this._hostStart;
+      if (t1 > 0)
+        host = B.JSString_methods.substring$2(_this._uri, t1, _this._portStart);
+      else
+        host = userInfo.length !== 0 || port != null || isFile ? "" : _null;
+      t1 = _this._uri;
+      t2 = _this._queryStart;
+      path = B.JSString_methods.substring$2(t1, _this._pathStart, t2);
+      if (!isFile)
+        t3 = host != null && path.length !== 0;
+      else
+        t3 = true;
+      if (t3 && !B.JSString_methods.startsWith$1(path, "/"))
+        path = "/" + path;
+      t3 = _this._fragmentStart;
+      query = t2 < t3 ? B.JSString_methods.substring$2(t1, t2 + 1, t3) : _null;
+      t2 = _this._fragmentStart;
+      fragment = t2 < t1.length ? B.JSString_methods.substring$1(t1, t2 + 1) : _null;
+      return A._Uri$_internal(scheme, userInfo, host, port, path, query, fragment);
+    },
+    resolve$1(_, reference) {
       return this.resolveUri$1(A.Uri_parse(reference));
     },
     resolveUri$1(reference) {
@@ -38825,7 +40803,7 @@ self.util = _cliPkgRequires.util;
         t1 = _this.get$scheme(),
         t2 = _this.get$userInfo(),
         t3 = _this._hostStart > 0 ? _this.get$host() : _null,
-        t4 = _this.get$hasPort() ? _this.get$port(_this) : _null,
+        t4 = _this.get$hasPort() ? _this.get$port(0) : _null,
         t5 = _this._uri,
         t6 = _this._queryStart,
         t7 = B.JSString_methods.substring$2(t5, _this._pathStart, t6),
@@ -38836,7 +40814,8 @@ self.util = _cliPkgRequires.util;
     toString$0(_) {
       return this._uri;
     },
-    $isUri: 1
+    $isUri: 1,
+    $is_PlatformUri: 1
   };
   A._DataUri.prototype = {};
   A.Expando.prototype = {
@@ -38873,7 +40852,27 @@ self.util = _cliPkgRequires.util;
       } else
         return o;
     },
-    $signature: 338
+    $signature: 392
+  };
+  A.promiseToFuture_closure1.prototype = {
+    call$1(r) {
+      return this.completer.complete$1(r);
+    },
+    $signature: 71
+  };
+  A.promiseToFuture_closure2.prototype = {
+    call$1(e) {
+      if (e == null)
+        return this.completer.completeError$1(new A.NullRejectionException(e === undefined));
+      return this.completer.completeError$1(e);
+    },
+    $signature: 71
+  };
+  A.NullRejectionException.prototype = {
+    toString$0(_) {
+      return "Promise was rejected with a value of `" + (this.isUndefined ? "undefined" : "null") + "`.";
+    },
+    $isException: 1
   };
   A._JSRandom.prototype = {
     nextInt$1(max) {
@@ -38888,7 +40887,7 @@ self.util = _cliPkgRequires.util;
   A.ArgParser.prototype = {
     addFlag$6$abbr$defaultsTo$help$hide$negatable($name, abbr, defaultsTo, help, hide, negatable) {
       var _null = null;
-      this._addOption$12$aliases$hide$negatable($name, abbr, help, _null, _null, _null, defaultsTo, _null, B.OptionType_nMZ, B.List_empty, hide, negatable);
+      this._addOption$12$aliases$hide$negatable($name, abbr, help, _null, _null, _null, defaultsTo, _null, B.OptionType_I6i, B.List_empty, hide, negatable);
     },
     addFlag$2$hide($name, hide) {
       return this.addFlag$6$abbr$defaultsTo$help$hide$negatable($name, null, false, null, hide, true);
@@ -38909,10 +40908,11 @@ self.util = _cliPkgRequires.util;
       return this.addFlag$6$abbr$defaultsTo$help$hide$negatable($name, abbr, false, help, false, negatable);
     },
     addOption$7$abbr$allowed$defaultsTo$help$hide$valueHelp($name, abbr, allowed, defaultsTo, help, hide, valueHelp) {
-      this._addOption$12$aliases$hide$mandatory($name, abbr, help, valueHelp, allowed, null, defaultsTo, null, B.OptionType_YwU, B.List_empty, hide, false);
+      this._addOption$12$aliases$hide$mandatory($name, abbr, help, valueHelp, allowed, null, defaultsTo, null, B.OptionType_tew, B.List_empty, hide, false);
     },
     addOption$2$hide($name, hide) {
-      return this.addOption$7$abbr$allowed$defaultsTo$help$hide$valueHelp($name, null, null, null, null, hide, null);
+      var _null = null;
+      return this.addOption$7$abbr$allowed$defaultsTo$help$hide$valueHelp($name, _null, _null, _null, _null, hide, _null);
     },
     addOption$6$abbr$allowed$defaultsTo$help$valueHelp($name, abbr, allowed, defaultsTo, help, valueHelp) {
       return this.addOption$7$abbr$allowed$defaultsTo$help$hide$valueHelp($name, abbr, allowed, defaultsTo, help, false, valueHelp);
@@ -38920,15 +40920,19 @@ self.util = _cliPkgRequires.util;
     addOption$4$allowed$defaultsTo$help($name, allowed, defaultsTo, help) {
       return this.addOption$7$abbr$allowed$defaultsTo$help$hide$valueHelp($name, null, allowed, defaultsTo, help, false, null);
     },
-    addMultiOption$6$abbr$allowedHelp$help$splitCommas$valueHelp($name, abbr, allowedHelp, help, splitCommas, valueHelp) {
+    addMultiOption$7$abbr$allowed$allowedHelp$help$splitCommas$valueHelp($name, abbr, allowed, allowedHelp, help, splitCommas, valueHelp) {
       var t1 = A._setArrayType([], type$.JSArray_String);
-      this._addOption$12$aliases$hide$splitCommas($name, abbr, help, valueHelp, null, allowedHelp, t1, null, B.OptionType_qyr, B.List_empty, false, splitCommas);
+      this._addOption$12$aliases$hide$splitCommas($name, abbr, help, valueHelp, allowed, allowedHelp, t1, null, B.OptionType_yPm, B.List_empty, false, splitCommas);
     },
     addMultiOption$5$abbr$help$splitCommas$valueHelp($name, abbr, help, splitCommas, valueHelp) {
-      return this.addMultiOption$6$abbr$allowedHelp$help$splitCommas$valueHelp($name, abbr, null, help, splitCommas, valueHelp);
+      return this.addMultiOption$7$abbr$allowed$allowedHelp$help$splitCommas$valueHelp($name, abbr, null, null, help, splitCommas, valueHelp);
     },
-    addMultiOption$3$allowedHelp$help($name, allowedHelp, help) {
-      return this.addMultiOption$6$abbr$allowedHelp$help$splitCommas$valueHelp($name, null, allowedHelp, help, true, null);
+    addMultiOption$6$abbr$allowed$allowedHelp$help$valueHelp($name, abbr, allowed, allowedHelp, help, valueHelp) {
+      return this.addMultiOption$7$abbr$allowed$allowedHelp$help$splitCommas$valueHelp($name, abbr, allowed, allowedHelp, help, true, valueHelp);
+    },
+    addMultiOption$2$help($name, help) {
+      var _null = null;
+      return this.addMultiOption$7$abbr$allowed$allowedHelp$help$splitCommas$valueHelp($name, _null, _null, _null, help, true, _null);
     },
     _addOption$14$aliases$hide$mandatory$negatable$splitCommas($name, abbr, help, valueHelp, allowed, allowedHelp, defaultsTo, callback, type, aliases, hide, mandatory, negatable, splitCommas) {
       var existing, t2, t3, option, _i, _this = this, _null = null,
@@ -38949,7 +40953,7 @@ self.util = _cliPkgRequires.util;
         t3 = type$.String;
         t3 = A.ConstantMap_ConstantMap$from(allowedHelp, t3, t3);
       }
-      option = new A.Option($name, abbr, help, valueHelp, t2, t3, defaultsTo, negatable, callback, type, splitCommas == null ? type === B.OptionType_qyr : splitCommas, false, hide);
+      option = new A.Option($name, abbr, help, valueHelp, t2, t3, defaultsTo, negatable, callback, type, splitCommas == null ? type === B.OptionType_yPm : splitCommas, false, hide);
       if ($name.length === 0)
         A.throwExpression(A.ArgumentError$("Name cannot be empty.", _null));
       else if (B.JSString_methods.startsWith$1($name, "-"))
@@ -38999,7 +41003,7 @@ self.util = _cliPkgRequires.util;
     call$1($name) {
       return this.$this.findByNameOrAlias$1($name) != null;
     },
-    $signature: 10
+    $signature: 4
   };
   A.ArgParserException.prototype = {};
   A.ArgResults.prototype = {
@@ -39022,7 +41026,7 @@ self.util = _cliPkgRequires.util;
       var t1;
       if (value != null)
         return value;
-      if (this.type === B.OptionType_qyr) {
+      if (this.type === B.OptionType_yPm) {
         t1 = this.defaultsTo;
         return t1 == null ? A._setArrayType([], type$.JSArray_String) : t1;
       }
@@ -39036,7 +41040,7 @@ self.util = _cliPkgRequires.util;
         t2 = _this._args;
       t2.toList$0(0);
       commandResults = null;
-      for (t3 = _this._parser$_rest, t4 = _this._grammar, t5 = t4.commands, t6 = t2.$ti._precomputed1; !t2.get$isEmpty(t2);) {
+      for (t3 = _this._parser$_rest, t4 = _this._grammar, t5 = t4.commands, t6 = t2.$ti._precomputed1; !t2.get$isEmpty(0);) {
         t7 = t2._head;
         if (t7 === t2._tail)
           A.throwExpression(A.IterableElementError_noElement());
@@ -39088,19 +41092,19 @@ self.util = _cliPkgRequires.util;
     },
     _readNextArgAsValue$1(option) {
       var t1 = this._args;
-      if (t1.get$isEmpty(t1))
+      if (t1.get$isEmpty(0))
         A.throwExpression(A.ArgParserException$('Missing argument for "' + option.name + '".', null));
-      this._setOption$3(this._results, option, t1.get$first(t1));
+      this._setOption$3(this._results, option, t1.get$first(0));
       t1.removeFirst$0();
     },
     _parseSoloOption$0() {
       var opt,
         t1 = this._args;
-      if (t1.get$first(t1).length !== 2)
+      if (t1.get$first(0).length !== 2)
         return false;
-      if (!B.JSString_methods.startsWith$1(t1.get$first(t1), "-"))
+      if (!B.JSString_methods.startsWith$1(t1.get$first(0), "-"))
         return false;
-      opt = t1.get$first(t1)[1];
+      opt = t1.get$first(0)[1];
       if (!A._isLetterOrDigit(opt.charCodeAt(0)))
         return false;
       this._handleSoloOption$1(opt);
@@ -39117,7 +41121,7 @@ self.util = _cliPkgRequires.util;
         return true;
       }
       _this._args.removeFirst$0();
-      if (option.type === B.OptionType_nMZ)
+      if (option.type === B.OptionType_I6i)
         _this._results.$indexSet(0, option.name, true);
       else
         _this._readNextArgAsValue$1(option);
@@ -39126,9 +41130,9 @@ self.util = _cliPkgRequires.util;
     _parseAbbreviation$1(innermostCommand) {
       var t2, index, t3, t4, lettersAndDigits, rest,
         t1 = this._args;
-      if (t1.get$first(t1).length < 2)
+      if (t1.get$first(0).length < 2)
         return false;
-      if (!B.JSString_methods.startsWith$1(t1.get$first(t1), "-"))
+      if (!B.JSString_methods.startsWith$1(t1.get$first(0), "-"))
         return false;
       t2 = t1.$ti._precomputed1;
       index = 1;
@@ -39155,8 +41159,8 @@ self.util = _cliPkgRequires.util;
       }
       if (index === 1)
         return false;
-      lettersAndDigits = B.JSString_methods.substring$2(t1.get$first(t1), 1, index);
-      rest = B.JSString_methods.substring$1(t1.get$first(t1), index);
+      lettersAndDigits = B.JSString_methods.substring$2(t1.get$first(0), 1, index);
+      rest = B.JSString_methods.substring$1(t1.get$first(0), index);
       if (B.JSString_methods.contains$1(rest, "\n") || B.JSString_methods.contains$1(rest, "\r"))
         return false;
       this._handleAbbreviation$3(lettersAndDigits, rest, innermostCommand);
@@ -39172,7 +41176,7 @@ self.util = _cliPkgRequires.util;
           A.throwExpression(A.ArgParserException$(string$.Could_ + c + '".', null));
         t1._handleAbbreviation$3(lettersAndDigits, rest, innermostCommand);
         return true;
-      } else if (first.type !== B.OptionType_nMZ)
+      } else if (first.type !== B.OptionType_I6i)
         _this._setOption$3(_this._results, first, B.JSString_methods.substring$1(lettersAndDigits, 1) + rest);
       else {
         t1 = B.JSString_methods.substring$1(lettersAndDigits, 1);
@@ -39196,18 +41200,18 @@ self.util = _cliPkgRequires.util;
         t1._parseShortFlag$1(c);
         return;
       }
-      if (option.type !== B.OptionType_nMZ)
+      if (option.type !== B.OptionType_I6i)
         A.throwExpression(A.ArgParserException$('Option "-' + c + '" must be a flag to be in a collapsed "-".', null));
       this._results.$indexSet(0, option.name, true);
     },
     _parseLongOption$0() {
       var index, t2, $name, t3, i, t4, t5, value,
         t1 = this._args;
-      if (!B.JSString_methods.startsWith$1(t1.get$first(t1), "--"))
+      if (!B.JSString_methods.startsWith$1(t1.get$first(0), "--"))
         return false;
-      index = B.JSString_methods.indexOf$1(t1.get$first(t1), "=");
+      index = B.JSString_methods.indexOf$1(t1.get$first(0), "=");
       t2 = index === -1;
-      $name = t2 ? B.JSString_methods.substring$1(t1.get$first(t1), 2) : B.JSString_methods.substring$2(t1.get$first(t1), 2, index);
+      $name = t2 ? B.JSString_methods.substring$1(t1.get$first(0), 2) : B.JSString_methods.substring$2(t1.get$first(0), 2, index);
       for (t3 = $name.length, i = 0; i !== t3; ++i) {
         t4 = $name.charCodeAt(i);
         if (!(t4 >= 65 && t4 <= 90))
@@ -39220,7 +41224,7 @@ self.util = _cliPkgRequires.util;
         if (!(t5 || t4 === 45 || t4 === 95))
           return false;
       }
-      value = t2 ? null : B.JSString_methods.substring$1(t1.get$first(t1), index + 1);
+      value = t2 ? null : B.JSString_methods.substring$1(t1.get$first(0), index + 1);
       if (value != null)
         t1 = B.JSString_methods.contains$1(value, "\n") || B.JSString_methods.contains$1(value, "\r");
       else
@@ -39237,7 +41241,7 @@ self.util = _cliPkgRequires.util;
         option = t1.findByNameOrAlias$1($name);
       if (option != null) {
         _this._args.removeFirst$0();
-        if (option.type === B.OptionType_nMZ) {
+        if (option.type === B.OptionType_I6i) {
           if (value != null)
             A.throwExpression(A.ArgParserException$('Flag option "' + $name + '" should not be given a value.', _null));
           _this._results.$indexSet(0, option.name, true);
@@ -39255,7 +41259,7 @@ self.util = _cliPkgRequires.util;
           return true;
         }
         _this._args.removeFirst$0();
-        if (option.type !== B.OptionType_nMZ)
+        if (option.type !== B.OptionType_I6i)
           A.throwExpression(A.ArgParserException$('Cannot negate non-flag option "' + $name + '".', _null));
         if (!option.negatable)
           A.throwExpression(A.ArgParserException$('Cannot negate option "' + $name + '".', _null));
@@ -39271,7 +41275,7 @@ self.util = _cliPkgRequires.util;
     },
     _setOption$3(results, option, value) {
       var list, t1, t2, t3, _i, element;
-      if (option.type !== B.OptionType_qyr) {
+      if (option.type !== B.OptionType_yPm) {
         this._validateAllowed$2(option, value);
         results.$indexSet(0, option.name, value);
         return;
@@ -39304,13 +41308,13 @@ self.util = _cliPkgRequires.util;
         return;
       callback.call$1(option.valueOrDefault$1(parsedOption));
     },
-    $signature: 367
+    $signature: 423
   };
   A.Parser__setOption_closure.prototype = {
     call$0() {
       return A._setArrayType([], type$.JSArray_String);
     },
-    $signature: 26
+    $signature: 124
   };
   A._Usage.prototype = {
     get$_columnWidths() {
@@ -39369,10 +41373,10 @@ self.util = _cliPkgRequires.util;
         _this._write$2(2, _this._buildAllowedList$1(option));
       else {
         t1 = option.type;
-        if (t1 === B.OptionType_nMZ) {
+        if (t1 === B.OptionType_I6i) {
           if (option.defaultsTo === true)
             _this._write$2(2, "(defaults to on)");
-        } else if (t1 === B.OptionType_qyr) {
+        } else if (t1 === B.OptionType_yPm) {
           t1 = option.defaultsTo;
           if (t1 != null && type$.Iterable_dynamic._as(t1).length !== 0) {
             type$.List_dynamic._as(t1);
@@ -39441,16 +41445,18 @@ self.util = _cliPkgRequires.util;
         _this._newlinesNeeded = t2 - 1;
       }
       for (; t2 = _this._currentColumn, t2 !== column;) {
-        if (t2 < 2)
-          t1._contents += B.JSString_methods.$mul(" ", _this.get$_columnWidths()[_this._currentColumn]);
-        else
+        if (t2 < 2) {
+          t2 = B.JSString_methods.$mul(" ", _this.get$_columnWidths()[_this._currentColumn]);
+          t1._contents += t2;
+        } else
           t1._contents += "\n";
         _this._currentColumn = (_this._currentColumn + 1) % 3;
       }
       _this.get$_columnWidths();
-      if (column < 2)
-        t1._contents += B.JSString_methods.padRight$1(text, _this.get$_columnWidths()[column]);
-      else
+      if (column < 2) {
+        t2 = B.JSString_methods.padRight$1(text, _this.get$_columnWidths()[column]);
+        t1._contents += t2;
+      } else
         t1._contents += text;
       _this._currentColumn = (_this._currentColumn + 1) % 3;
       if (column === 2)
@@ -39477,13 +41483,66 @@ self.util = _cliPkgRequires.util;
     call$1(value) {
       return '"' + A.S(value) + '"';
     },
-    $signature: 101
+    $signature: 108
   };
   A._Usage__buildAllowedList_closure.prototype = {
     call$1(value) {
       return value === this.option.defaultsTo;
     },
-    $signature: 122
+    $signature: 128
+  };
+  A.FutureGroup.prototype = {
+    add$1(_, task) {
+      var t1, index, _this = this;
+      if (_this._future_group$_closed)
+        throw A.wrapException(A.StateError$("The FutureGroup is closed."));
+      t1 = _this._future_group$_values;
+      index = t1.length;
+      t1.push(null);
+      ++_this._future_group$_pending;
+      task.then$1$1(0, new A.FutureGroup_add_closure(_this, index), type$.Null).catchError$1(new A.FutureGroup_add_closure0(_this));
+    },
+    close$0(_) {
+      var t1, t2, _this = this;
+      _this._future_group$_closed = true;
+      if (_this._future_group$_pending !== 0)
+        return;
+      t1 = _this._future_group$_completer;
+      if ((t1.future._state & 30) !== 0)
+        return;
+      t2 = _this.$ti._eval$1("WhereTypeIterable<1>");
+      t1.complete$1(A.List_List$of(new A.WhereTypeIterable(_this._future_group$_values, t2), true, t2._eval$1("Iterable.E")));
+    }
+  };
+  A.FutureGroup_add_closure.prototype = {
+    call$1(value) {
+      var t3, t4,
+        t1 = this.$this,
+        t2 = t1._future_group$_completer;
+      if ((t2.future._state & 30) !== 0)
+        return null;
+      t3 = --t1._future_group$_pending;
+      t4 = t1._future_group$_values;
+      t4[this.index] = value;
+      if (t3 !== 0)
+        return null;
+      if (!t1._future_group$_closed)
+        return null;
+      t1 = t1.$ti._eval$1("WhereTypeIterable<1>");
+      t2.complete$1(A.List_List$of(new A.WhereTypeIterable(t4, t1), true, t1._eval$1("Iterable.E")));
+    },
+    $signature() {
+      return this.$this.$ti._eval$1("Null(1)");
+    }
+  };
+  A.FutureGroup_add_closure0.prototype = {
+    call$2(error, stackTrace) {
+      var t1 = this.$this._future_group$_completer;
+      if ((t1.future._state & 30) !== 0)
+        return null;
+      t1.completeError$2(error, stackTrace);
+    },
+    $signature: 52
   };
   A.ErrorResult.prototype = {
     complete$1(completer) {
@@ -39546,11 +41605,11 @@ self.util = _cliPkgRequires.util;
       t1.toString;
       return new A._ControllerStream(t1, A._instanceType(t1)._eval$1("_ControllerStream<1>")).listen$4$cancelOnError$onDone$onError(0, onData, cancelOnError, onDone, onError);
     },
-    listen$1($receiver, onData) {
-      return this.listen$4$cancelOnError$onDone$onError($receiver, onData, null, null, null);
+    listen$1(_, onData) {
+      return this.listen$4$cancelOnError$onDone$onError(0, onData, null, null, null);
     },
-    listen$3$onDone$onError($receiver, onData, onDone, onError) {
-      return this.listen$4$cancelOnError$onDone$onError($receiver, onData, null, onDone, onError);
+    listen$3$onDone$onError(_, onData, onDone, onError) {
+      return this.listen$4$cancelOnError$onDone$onError(0, onData, null, onDone, onError);
     },
     _linkStreamToController$0() {
       var t2,
@@ -39588,9 +41647,9 @@ self.util = _cliPkgRequires.util;
       return future;
     },
     _onListen$0() {
-      var stream, t1, t2, t3, _i, entry, exception, onError, _this = this;
+      var stream, t1, t2, t3, _i, entry, exception, _this = this;
       _this._stream_group$_state = B._StreamGroupState_listening;
-      for (t1 = _this._subscriptions, t2 = A.List_List$of(t1.get$entries(t1), true, _this.$ti._eval$1("MapEntry<Stream<1>,StreamSubscription<1>?>")), t3 = t2.length, _i = 0; _i < t3; ++_i) {
+      for (t1 = _this._subscriptions, t2 = A.List_List$of(t1.get$entries(0), true, _this.$ti._eval$1("MapEntry<Stream<1>,StreamSubscription<1>?>")), t3 = t2.length, _i = 0; _i < t3; ++_i) {
         entry = t2[_i];
         if (entry.value != null)
           continue;
@@ -39599,14 +41658,8 @@ self.util = _cliPkgRequires.util;
           t1.$indexSet(0, stream, _this._listenToStream$1(stream));
         } catch (exception) {
           t1 = _this._onCancel$0();
-          if (t1 != null) {
-            onError = new A.StreamGroup__onListen_closure();
-            t2 = t1.$ti;
-            t3 = $.Zone__current;
-            if (t3 !== B.C__RootZone)
-              onError = A._registerErrorHandler(onError, t3);
-            t1._addListener$1(new A._FutureListener(new A._Future(t3, t2), 2, null, onError, t2._eval$1("@<1>")._bind$1(t2._precomputed1)._eval$1("_FutureListener<1,2>")));
-          }
+          if (t1 != null)
+            t1.catchError$1(new A.StreamGroup__onListen_closure());
           throw exception;
         }
       }
@@ -39614,7 +41667,7 @@ self.util = _cliPkgRequires.util;
     _onPause$0() {
       var t1, t2, t3;
       this._stream_group$_state = B._StreamGroupState_paused;
-      for (t1 = this._subscriptions, t1 = t1.get$values(t1), t1 = new A.MappedIterator(J.get$iterator$ax(t1.__internal$_iterable), t1._f), t2 = A._instanceType(t1)._rest[1]; t1.moveNext$0();) {
+      for (t1 = this._subscriptions.get$values(0), t2 = A._instanceType(t1), t2 = t2._eval$1("@<1>")._bind$1(t2._rest[1]), t1 = new A.MappedIterator(J.get$iterator$ax(t1.__internal$_iterable), t1._f, t2._eval$1("MappedIterator<1,2>")), t2 = t2._rest[1]; t1.moveNext$0();) {
         t3 = t1.__internal$_current;
         (t3 == null ? t2._as(t3) : t3).pause$0(0);
       }
@@ -39622,7 +41675,7 @@ self.util = _cliPkgRequires.util;
     _onResume$0() {
       var t1, t2, t3;
       this._stream_group$_state = B._StreamGroupState_listening;
-      for (t1 = this._subscriptions, t1 = t1.get$values(t1), t1 = new A.MappedIterator(J.get$iterator$ax(t1.__internal$_iterable), t1._f), t2 = A._instanceType(t1)._rest[1]; t1.moveNext$0();) {
+      for (t1 = this._subscriptions.get$values(0), t2 = A._instanceType(t1), t2 = t2._eval$1("@<1>")._bind$1(t2._rest[1]), t1 = new A.MappedIterator(J.get$iterator$ax(t1.__internal$_iterable), t1._f, t2._eval$1("MappedIterator<1,2>")), t2 = t2._rest[1]; t1.moveNext$0();) {
         t3 = t1.__internal$_current;
         (t3 == null ? t2._as(t3) : t3).resume$0(0);
       }
@@ -39631,7 +41684,7 @@ self.util = _cliPkgRequires.util;
       var t1, t2, futures;
       this._stream_group$_state = B._StreamGroupState_canceled;
       t1 = this._subscriptions;
-      t2 = A.IterableNullableExtension_whereNotNull(t1.get$entries(t1).map$1$1(0, new A.StreamGroup__onCancel_closure(this), type$.nullable_Future_void), type$.Future_void);
+      t2 = A.IterableNullableExtension_whereNotNull(t1.get$entries(0).map$1$1(0, new A.StreamGroup__onCancel_closure(this), type$.nullable_Future_void), type$.Future_void);
       futures = A.List_List$of(t2, true, t2.$ti._eval$1("Iterable.E"));
       t1.clear$0(0);
       return futures.length === 0 ? null : A.Future_wait(futures, false, type$.void);
@@ -39650,7 +41703,7 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return null;
     },
-    $signature: 2
+    $signature: 1
   };
   A.StreamGroup_add_closure0.prototype = {
     call$0() {
@@ -39663,7 +41716,7 @@ self.util = _cliPkgRequires.util;
   A.StreamGroup__onListen_closure.prototype = {
     call$1(_) {
     },
-    $signature: 68
+    $signature: 61
   };
   A.StreamGroup__onCancel_closure.prototype = {
     call$1(entry) {
@@ -39698,7 +41751,7 @@ self.util = _cliPkgRequires.util;
   A.StreamQueue.prototype = {
     _updateRequests$0() {
       var t1, t2, t3, t4, _this = this;
-      for (t1 = _this._requestQueue, t2 = _this._eventQueue, t3 = t1.$ti._precomputed1; !t1.get$isEmpty(t1);) {
+      for (t1 = _this._requestQueue, t2 = _this._eventQueue, t3 = t1.$ti._precomputed1; !t1.get$isEmpty(0);) {
         t4 = t1._head;
         if (t4 === t1._tail)
           A.throwExpression(A.IterableElementError_noElement());
@@ -39752,7 +41805,7 @@ self.util = _cliPkgRequires.util;
     call$2(error, stackTrace) {
       this.$this._addResult$1(new A.ErrorResult(error, stackTrace));
     },
-    $signature: 62
+    $signature: 52
   };
   A.StreamQueue__ensureListening_closure0.prototype = {
     call$0() {
@@ -39787,14 +41840,14 @@ self.util = _cliPkgRequires.util;
         return true;
       }
     },
-    $signature: 1
+    $signature: 22
   };
   A.Repl.prototype = {};
   A.alwaysValid_closure.prototype = {
     call$1(text) {
       return true;
     },
-    $signature: 10
+    $signature: 4
   };
   A.ReplAdapter.prototype = {
     runAsync$0() {
@@ -39807,7 +41860,7 @@ self.util = _cliPkgRequires.util;
       t1.statement = "";
       t1.prompt = t2;
       runController = A._Cell$();
-      runController._value = A.StreamController_StreamController(_this.get$exit(_this), new A.ReplAdapter_runAsync_closure(t1, _this, rl, runController), null, null, false, type$.String);
+      runController.__late_helper$_value = A.StreamController_StreamController(_this.get$exit(_this), new A.ReplAdapter_runAsync_closure(t1, _this, rl, runController), null, null, false, type$.String);
       return runController._readLocal$0().get$stream();
     },
     exit$0(_) {
@@ -39821,7 +41874,7 @@ self.util = _cliPkgRequires.util;
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.void),
-        $async$handler = 1, $async$currentError, $async$self = this, lineController, lineQueue, line, error, stackTrace, t1, t2, t3, t4, $prompt, prompt0, t5, t6, t7, t8, t9, line0, toZone, statement, exception, $async$exception;
+        $async$handler = 1, $async$currentError, $async$self = this, lineController, lineQueue, line, error, stackTrace, t1, t2, t3, t4, $prompt, prompt0, t5, t6, t7, t8, line0, toZone, statement, exception, $async$exception;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1) {
           $async$currentError = $async$result;
@@ -39836,28 +41889,29 @@ self.util = _cliPkgRequires.util;
               t1 = lineController;
               t2 = A.QueueList$(null, type$.Result_String);
               t3 = A.ListQueue$(type$._EventRequest_dynamic);
-              lineQueue = new A.StreamQueue(new A._ControllerStream(t1, A.instanceType(t1)._eval$1("_ControllerStream<1>")), t2, t3, type$.StreamQueue_String);
+              lineQueue = new A.StreamQueue(new A._ControllerStream(t1, A._instanceType(t1)._eval$1("_ControllerStream<1>")), t2, t3, type$.StreamQueue_String);
               t1 = $async$self.rl;
               t2 = J.getInterceptor$x(t1);
               t2.on$2(t1, "line", A.allowInterop(new A.ReplAdapter_runAsync__closure(lineController)));
-              t3 = $async$self._box_0, t4 = $async$self.$this.repl, $prompt = t4.continuation, prompt0 = t4.prompt, t5 = $async$self.runController, t6 = t5.__late_helper$_name;
+              t3 = $async$self._box_0, t4 = $async$self.$this.repl, $prompt = t4.continuation, prompt0 = t4.prompt, t5 = $async$self.runController;
             case 6:
               // for condition
               // trivial condition
-              t7 = J.get$isTTY$x(self.process.stdin);
-              if (t7 == null ? false : t7)
+              t6 = J.get$isTTY$x(self.process.stdin);
+              if (t6 == null ? false : t6)
                 J.write$1$x(self.process.stdout, t3.prompt);
-              t7 = lineQueue;
-              t8 = A.instanceType(t7);
-              t9 = new A._Future($.Zone__current, t8._eval$1("_Future<1>"));
-              t7._addRequest$1(new A._NextRequest(new A._AsyncCompleter(t9, t8._eval$1("_AsyncCompleter<1>")), t8._eval$1("_NextRequest<1>")));
+              t6 = lineQueue;
+              t6.toString;
+              t7 = t6.$ti;
+              t8 = new A._Future($.Zone__current, t7._eval$1("_Future<1>"));
+              t6._addRequest$1(new A._NextRequest(new A._AsyncCompleter(t8, t7._eval$1("_AsyncCompleter<1>")), t7._eval$1("_NextRequest<1>")));
               $async$goto = 8;
-              return A._asyncAwait(t9, $async$call$0);
+              return A._asyncAwait(t8, $async$call$0);
             case 8:
               // returning from await.
               line = $async$result;
-              t7 = J.get$isTTY$x(self.process.stdin);
-              if (!(t7 == null ? false : t7)) {
+              t6 = J.get$isTTY$x(self.process.stdin);
+              if (!(t6 == null ? false : t6)) {
                 line0 = t3.prompt + A.S(line);
                 toZone = $.printToZone;
                 if (toZone == null)
@@ -39868,10 +41922,10 @@ self.util = _cliPkgRequires.util;
               statement = B.JSString_methods.$add(t3.statement, line);
               t3.statement = statement;
               if (t4.validator.call$1(statement)) {
-                t7 = t5._value;
-                if (t7 === t5)
-                  A.throwExpression(A.LateError$localNI(t6));
-                J.add$1$ax(t7, t3.statement);
+                t6 = t5.__late_helper$_value;
+                if (t6 === t5)
+                  A.throwExpression(A.LateError$localNI(""));
+                J.add$1$ax(t6, t3.statement);
                 t3.statement = "";
                 t3.prompt = prompt0;
                 t2.setPrompt$1(t1, prompt0);
@@ -39897,8 +41951,10 @@ self.util = _cliPkgRequires.util;
               stackTrace = A.getTraceFromException($async$exception);
               t1 = $async$self.runController;
               t1._readLocal$0().addError$2(error, stackTrace);
+              t2 = $async$self.$this.exit$0(0);
+              t2 = A._Future$value(t2, type$.void);
               $async$goto = 9;
-              return A._asyncAwait($async$self.$this.exit$0(0), $async$call$0);
+              return A._asyncAwait(t2, $async$call$0);
             case 9:
               // returning from await.
               J.close$0$x(t1._readLocal$0());
@@ -39921,13 +41977,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 30
+    $signature: 25
   };
   A.ReplAdapter_runAsync__closure.prototype = {
     call$1(value) {
       return this.lineController.add$1(0, A._asString(value));
     },
-    $signature: 127
+    $signature: 71
   };
   A.Stdin.prototype = {};
   A.Stdout.prototype = {};
@@ -40046,7 +42102,7 @@ self.util = _cliPkgRequires.util;
     },
     hash$1(map) {
       var t1, t2, hash, key, keyHash, t3;
-      for (t1 = J.get$iterator$ax(map.get$keys(map)), t2 = A._instanceType(this)._rest[1], hash = 0; t1.moveNext$0();) {
+      for (t1 = J.get$iterator$ax(map.get$keys(map)), t2 = this.$ti._rest[1], hash = 0; t1.moveNext$0();) {
         key = t1.get$current(t1);
         keyHash = J.get$hashCode$(key);
         t3 = map.$index(0, key);
@@ -40065,7 +42121,7 @@ self.util = _cliPkgRequires.util;
       var addCount, $length, t1, endSpace, t2, preSpace, _this = this;
       if (type$.List_dynamic._is(iterable)) {
         addCount = J.get$length$asx(iterable);
-        $length = _this.get$length(_this);
+        $length = _this.get$length(0);
         t1 = $length + addCount;
         if (t1 >= J.get$length$asx(_this._queue_list$_table)) {
           _this._preGrow$1(t1);
@@ -40131,9 +42187,9 @@ self.util = _cliPkgRequires.util;
       var delta, newTail, t1, t2, _this = this;
       if (value < 0)
         throw A.wrapException(A.RangeError$("Length " + value + " may not be negative."));
-      if (value > _this.get$length(_this) && !A._instanceType(_this)._eval$1("QueueList.E")._is(null))
+      if (value > _this.get$length(0) && !A._instanceType(_this)._eval$1("QueueList.E")._is(null))
         throw A.wrapException(A.UnsupportedError$("The length can only be increased when the element type is nullable, but the current element type is `" + A.createRuntimeType(A._instanceType(_this)._eval$1("QueueList.E")).toString$0(0) + "`."));
-      delta = value - _this.get$length(_this);
+      delta = value - _this.get$length(0);
       if (delta >= 0) {
         if (J.get$length$asx(_this._queue_list$_table) <= value)
           _this._preGrow$1(value);
@@ -40155,15 +42211,15 @@ self.util = _cliPkgRequires.util;
     },
     $index(_, index) {
       var t1, _this = this;
-      if (index < 0 || index >= _this.get$length(_this))
-        throw A.wrapException(A.RangeError$("Index " + index + " must be in the range [0.." + _this.get$length(_this) + ")."));
+      if (index < 0 || index >= _this.get$length(0))
+        throw A.wrapException(A.RangeError$("Index " + index + " must be in the range [0.." + _this.get$length(0) + ")."));
       t1 = J.$index$asx(_this._queue_list$_table, (_this.get$_queue_list$_head() + index & J.get$length$asx(_this._queue_list$_table) - 1) >>> 0);
       return t1 == null ? A._instanceType(_this)._eval$1("QueueList.E")._as(t1) : t1;
     },
     $indexSet(_, index, value) {
       var _this = this;
-      if (index < 0 || index >= _this.get$length(_this))
-        throw A.wrapException(A.RangeError$("Index " + index + " must be in the range [0.." + _this.get$length(_this) + ")."));
+      if (index < 0 || index >= _this.get$length(0))
+        throw A.wrapException(A.RangeError$("Index " + index + " must be in the range [0.." + _this.get$length(0) + ")."));
       J.$indexSet$ax(_this._queue_list$_table, (_this.get$_queue_list$_head() + index & J.get$length$asx(_this._queue_list$_table) - 1) >>> 0, value);
     },
     _queue_list$_add$1(element) {
@@ -40237,8 +42293,7 @@ self.util = _cliPkgRequires.util;
   A._QueueList_Object_ListMixin.prototype = {};
   A.UnionSet.prototype = {
     get$length(_) {
-      var t1 = this.get$_union_set$_iterable();
-      t1 = t1.get$length(t1);
+      var t1 = this.get$_union_set$_iterable().get$length(0);
       return t1;
     },
     get$iterator(_) {
@@ -40258,7 +42313,7 @@ self.util = _cliPkgRequires.util;
     toSet$0(_) {
       var t2, t3, t4,
         t1 = A.LinkedHashSet_LinkedHashSet$_empty(this.$ti._precomputed1);
-      for (t2 = this._sets, t2 = A._LinkedHashSetIterator$(t2, t2._collection$_modifications), t3 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
+      for (t2 = this._sets, t2 = A._LinkedHashSetIterator$(t2, t2._modifications, A._instanceType(t2)._precomputed1), t3 = t2.$ti._precomputed1; t2.moveNext$0();) {
         t4 = t2._collection$_current;
         t1.addAll$1(0, t4 == null ? t3._as(t4) : t4);
       }
@@ -40296,12 +42351,18 @@ self.util = _cliPkgRequires.util;
   };
   A._UnmodifiableSetView_DelegatingSet_UnmodifiableSetMixin.prototype = {};
   A._DelegatingIterableBase.prototype = {
+    any$1(_, test) {
+      return J.any$1$ax(this.get$_base(), test);
+    },
     contains$1(_, element) {
       return J.contains$1$asx(this.get$_base(), element);
     },
     elementAt$1(_, index) {
       return J.elementAt$1$ax(this.get$_base(), index);
     },
+    every$1(_, test) {
+      return J.every$1$ax(this.get$_base(), test);
+    },
     get$first(_) {
       return J.get$first$ax(this.get$_base());
     },
@@ -40335,8 +42396,8 @@ self.util = _cliPkgRequires.util;
     toList$1$growable(_, growable) {
       return J.toList$1$growable$ax(this.get$_base(), true);
     },
-    toList$0($receiver) {
-      return this.toList$1$growable($receiver, true);
+    toList$0(_) {
+      return this.toList$1$growable(0, true);
     },
     toSet$0(_) {
       return J.toSet$0$ax(this.get$_base());
@@ -40460,19 +42521,19 @@ self.util = _cliPkgRequires.util;
     call$1(value) {
       this.completer.complete$1(value);
     },
-    $signature: 68
+    $signature: 61
   };
   A.promiseToFuture_closure0.prototype = {
     call$1(error) {
       this.completer.completeError$1(error);
     },
-    $signature: 68
+    $signature: 61
   };
   A.futureToPromise_closure.prototype = {
     call$2(resolve, reject) {
       this.future.then$1$2$onError(0, new A.futureToPromise__closure(resolve, this.T), reject, type$.dynamic);
     },
-    $signature: 470
+    $signature: 629
   };
   A.futureToPromise__closure.prototype = {
     call$1(result) {
@@ -40497,7 +42558,8 @@ self.util = _cliPkgRequires.util;
       return this.join$16(0, t1 == null ? A.current() : t1, part1, part2, part3, part4, part5, part6, part7, part8, part9, part10, part11, part12, part13, part14, part15);
     },
     absolute$1(part1) {
-      return this.absolute$15(part1, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+      var _null = null;
+      return this.absolute$15(part1, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null);
     },
     dirname$1(path) {
       var t1, t2,
@@ -40523,13 +42585,14 @@ self.util = _cliPkgRequires.util;
       A._validateArgList("join", parts);
       return this.joinAll$1(new A.WhereTypeIterable(parts, type$.WhereTypeIterable_String));
     },
-    join$2($receiver, part1, part2) {
-      return this.join$16($receiver, part1, part2, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+    join$2(_, part1, part2) {
+      var _null = null;
+      return this.join$16(0, part1, part2, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null);
     },
     joinAll$1(parts) {
       var t1, t2, t3, needsSeparator, isAbsoluteAndNotRootRelative, t4, t5, parsed, path;
-      for (t1 = parts.get$iterator(parts), t2 = new A.WhereIterator(t1, new A.Context_joinAll_closure()), t3 = this.style, needsSeparator = false, isAbsoluteAndNotRootRelative = false, t4 = ""; t2.moveNext$0();) {
-        t5 = t1.get$current(t1);
+      for (t1 = J.where$1$ax(parts, new A.Context_joinAll_closure()), t2 = J.get$iterator$ax(t1.__internal$_iterable), t1 = new A.WhereIterator(t2, t1._f), t3 = this.style, needsSeparator = false, isAbsoluteAndNotRootRelative = false, t4 = ""; t1.moveNext$0();) {
+        t5 = t2.get$current(t2);
         if (t3.isRootRelative$1(t5) && isAbsoluteAndNotRootRelative) {
           parsed = A.ParsedPath_ParsedPath$parse(t5, t3);
           path = t4.charCodeAt(0) == 0 ? t4 : t4;
@@ -40811,9 +42874,9 @@ self.util = _cliPkgRequires.util;
                 return B._PathRelation_inconclusive;
             }
           }
-          if (_this._pathDirection$2(child, childIndex) !== B._PathDirection_988)
+          if (_this._pathDirection$2(child, childIndex) !== B._PathDirection_yLX)
             return B._PathRelation_inconclusive;
-          if (_this._pathDirection$2($parent, parentIndex) !== B._PathDirection_988)
+          if (_this._pathDirection$2($parent, parentIndex) !== B._PathDirection_yLX)
             return B._PathRelation_inconclusive;
           return B._PathRelation_different;
         }
@@ -40824,14 +42887,14 @@ self.util = _cliPkgRequires.util;
         else if (lastParentSeparator == null)
           lastParentSeparator = Math.max(0, parentRootLength - 1);
         direction = _this._pathDirection$2($parent, lastParentSeparator);
-        if (direction === B._PathDirection_8Gl)
+        if (direction === B._PathDirection_8OV)
           return B._PathRelation_equal;
-        return direction === B._PathDirection_ZGD ? B._PathRelation_inconclusive : B._PathRelation_different;
+        return direction === B._PathDirection_3KU ? B._PathRelation_inconclusive : B._PathRelation_different;
       }
       direction = _this._pathDirection$2(child, childIndex);
-      if (direction === B._PathDirection_8Gl)
+      if (direction === B._PathDirection_8OV)
         return B._PathRelation_equal;
-      if (direction === B._PathDirection_ZGD)
+      if (direction === B._PathDirection_3KU)
         return B._PathRelation_inconclusive;
       return t1.isSeparator$1(child.charCodeAt(childIndex)) || t1.isSeparator$1(lastCodeUnit) ? B._PathRelation_within : B._PathRelation_different;
     },
@@ -40866,12 +42929,12 @@ self.util = _cliPkgRequires.util;
         i = i0 + 1;
       }
       if (depth < 0)
-        return B._PathDirection_ZGD;
+        return B._PathDirection_3KU;
       if (depth === 0)
-        return B._PathDirection_8Gl;
+        return B._PathDirection_8OV;
       if (reachedRoot)
-        return B._PathDirection_FIw;
-      return B._PathDirection_988;
+        return B._PathDirection_e7w;
+      return B._PathDirection_yLX;
     },
     hash$1(path) {
       var result, parsed, t1, _this = this;
@@ -40953,19 +43016,19 @@ self.util = _cliPkgRequires.util;
     call$1(part) {
       return part !== "";
     },
-    $signature: 10
+    $signature: 4
   };
   A.Context_split_closure.prototype = {
     call$1(part) {
       return part.length !== 0;
     },
-    $signature: 10
+    $signature: 4
   };
   A._validateArgList_closure.prototype = {
     call$1(arg) {
       return arg == null ? "null" : '"' + arg + '"';
     },
-    $signature: 473
+    $signature: 609
   };
   A._PathDirection.prototype = {
     toString$0(_) {
@@ -41122,13 +43185,13 @@ self.util = _cliPkgRequires.util;
     call$1(p) {
       return p !== "";
     },
-    $signature: 171
+    $signature: 139
   };
   A.ParsedPath__splitExtension_closure0.prototype = {
     call$0() {
       return null;
     },
-    $signature: 2
+    $signature: 1
   };
   A.PathException.prototype = {
     toString$0(_) {
@@ -41148,19 +43211,19 @@ self.util = _cliPkgRequires.util;
         return false;
       return this._box_0.context._isWithinOrEquals$2(path1, path2) === B._PathRelation_equal;
     },
-    $signature: 495
+    $signature: 553
   };
   A.PathMap__create_closure0.prototype = {
     call$1(path) {
       return path == null ? 0 : this._box_0.context.hash$1(path);
     },
-    $signature: 534
+    $signature: 530
   };
   A.PathMap__create_closure1.prototype = {
     call$1(path) {
       return typeof path == "string" || path == null;
     },
-    $signature: 122
+    $signature: 128
   };
   A.Style.prototype = {
     toString$0(_) {
@@ -41229,7 +43292,7 @@ self.util = _cliPkgRequires.util;
       return B.JSString_methods.endsWith$1(path, "://") && this.rootLength$1(path) === t1;
     },
     rootLength$2$withDrive(path, withDrive) {
-      var i, codeUnit, index, t2,
+      var i, codeUnit, index,
         t1 = path.length;
       if (t1 === 0)
         return 0;
@@ -41249,10 +43312,8 @@ self.util = _cliPkgRequires.util;
             return index;
           if (!B.JSString_methods.startsWith$1(path, "file://"))
             return index;
-          if (!A.isDriveLetter(path, index + 1))
-            return index;
-          t2 = index + 3;
-          return t1 === t2 ? t2 : index + 4;
+          t1 = A.driveLetterEnd(path, index + 1);
+          return t1 == null ? index : t1;
         }
       }
       return 0;
@@ -41334,7 +43395,7 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException(A.ArgumentError$("Uri " + uri.toString$0(0) + " must have scheme 'file:'.", null));
       path = uri.get$path(uri);
       if (uri.get$host() === "") {
-        if (path.length >= 3 && B.JSString_methods.startsWith$1(path, "/") && A.isDriveLetter(path, 1))
+        if (path.length >= 3 && B.JSString_methods.startsWith$1(path, "/") && A.driveLetterEnd(path, 1) != null)
           path = B.JSString_methods.replaceFirst$2(path, "/", "");
       } else
         path = "\\\\" + uri.get$host() + path;
@@ -41348,10 +43409,10 @@ self.util = _cliPkgRequires.util;
       t1.toString;
       if (B.JSString_methods.startsWith$1(t1, "\\\\")) {
         rootParts = new A.WhereIterable(A._setArrayType(t1.split("\\"), type$.JSArray_String), new A.WindowsStyle_absolutePathToUri_closure(), type$.WhereIterable_String);
-        B.JSArray_methods.insert$2(parsed.parts, 0, rootParts.get$last(rootParts));
+        B.JSArray_methods.insert$2(parsed.parts, 0, rootParts.get$last(0));
         if (parsed.get$hasTrailingSeparator())
           B.JSArray_methods.add$1(parsed.parts, "");
-        return A._Uri__Uri(rootParts.get$first(rootParts), null, parsed.parts, "file");
+        return A._Uri__Uri(rootParts.get$first(0), null, parsed.parts, "file");
       } else {
         if (parsed.parts.length === 0 || parsed.get$hasTrailingSeparator())
           B.JSArray_methods.add$1(parsed.parts, "");
@@ -41411,7 +43472,7 @@ self.util = _cliPkgRequires.util;
     call$1(part) {
       return part !== "";
     },
-    $signature: 10
+    $signature: 4
   };
   A.Version.prototype = {
     get$min() {
@@ -41513,7 +43574,7 @@ self.util = _cliPkgRequires.util;
       var t1 = A.Primitives_parseInt(part, null);
       return t1 == null ? part : t1;
     },
-    $signature: 535
+    $signature: 529
   };
   A.VersionRange.prototype = {
     $eq(_, other) {
@@ -41523,13 +43584,11 @@ self.util = _cliPkgRequires.util;
       if (!type$.VersionRange._is(other))
         return false;
       if (this.min == other.get$min())
-        if (J.$eq$(this.max, other.get$max()))
-          if (!other.get$includeMin()) {
+        if (J.$eq$(this.max, other.get$max())) {
+          t1 = !other.get$includeMin();
+          if (t1)
             other.get$includeMax();
-            t1 = true;
-          } else
-            t1 = false;
-        else
+        } else
           t1 = false;
       else
         t1 = false;
@@ -41832,7 +43891,7 @@ self.util = _cliPkgRequires.util;
     call$1(sibling) {
       return !sibling.accept$1(B._IsInvisibleVisitor_true_false);
     },
-    $signature: 124
+    $signature: 525
   };
   A.ModifiableCssParentNode.prototype = {
     get$isChildless() {
@@ -41874,7 +43933,7 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     copyWithoutChildren$0() {
-      return A.ModifiableCssStyleRule$(this._style_rule$_selector, this.span, this.originalSelector);
+      return A.ModifiableCssStyleRule$(this._style_rule$_selector, this.span, false, this.originalSelector);
     },
     get$span(receiver) {
       return this.span;
@@ -42069,7 +44128,7 @@ self.util = _cliPkgRequires.util;
       if (_this.restArgument != null)
         return;
       if (positional > t2) {
-        t1 = names.get$isEmpty(names) ? "" : "positional ";
+        t1 = names.get$isEmpty(0) ? "" : "positional ";
         throw A.wrapException(A.MultiSpanSassScriptException$("Only " + t2 + " " + t1 + A.pluralize(_s8_, t2, null) + " allowed, but " + positional + " " + A.pluralize("was", positional, "were") + " passed.", _s10_, A.LinkedHashMap_LinkedHashMap$_literal([_this.get$spanWithName(), "declaration"], type$.FileSpan, type$.String)));
       }
       if (namedUsed < t3.get$length(t3)) {
@@ -42148,13 +44207,13 @@ self.util = _cliPkgRequires.util;
     call$1(argument) {
       return argument.name;
     },
-    $signature: 630
+    $signature: 518
   };
   A.ArgumentDeclaration_verify_closure0.prototype = {
     call$1($name) {
       return "$" + $name;
     },
-    $signature: 7
+    $signature: 5
   };
   A.ArgumentInvocation.prototype = {
     get$isEmpty(_) {
@@ -42167,42 +44226,26 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     toString$0(_) {
-      var t2, t3, _i, $name, value, _1_0, rest, _2_0, keywordRest, _this = this,
+      var t2, t3, _i, _1_0, _2_0, _this = this,
         t1 = A._setArrayType([], type$.JSArray_String);
       for (t2 = _this.positional, t3 = t2.length, _i = 0; _i < t3; ++_i)
         t1.push(_this._parenthesizeArgument$1(t2[_i]));
       for (t2 = A.MapExtensions_get_pairs(_this.named, type$.String, type$.Expression), t2 = t2.get$iterator(t2); t2.moveNext$0();) {
         t3 = t2.get$current(t2);
-        $name = t3._0;
-        value = t3._1;
-        t1.push("$" + $name + ": " + _this._parenthesizeArgument$1(value));
+        t1.push("$" + t3._0 + ": " + _this._parenthesizeArgument$1(t3._1));
       }
       _1_0 = _this.rest;
-      if (_1_0 != null) {
-        rest = _1_0;
-        t2 = true;
-      } else {
-        rest = null;
-        t2 = false;
-      }
-      if (t2)
-        t1.push(_this._parenthesizeArgument$1(rest) + "...");
+      if (_1_0 != null)
+        t1.push(_this._parenthesizeArgument$1(_1_0) + "...");
       _2_0 = _this.keywordRest;
-      if (_2_0 != null) {
-        keywordRest = _2_0;
-        t2 = true;
-      } else {
-        keywordRest = null;
-        t2 = false;
-      }
-      if (t2)
-        t1.push(_this._parenthesizeArgument$1(keywordRest) + "...");
+      if (_2_0 != null)
+        t1.push(_this._parenthesizeArgument$1(_2_0) + "...");
       return "(" + B.JSArray_methods.join$1(t1, ", ") + ")";
     },
     _parenthesizeArgument$1(argument) {
       var t1;
       $label0$0: {
-        if (argument instanceof A.ListExpression && B.ListSeparator_rXA === argument.separator && !argument.hasBrackets && argument.contents.length >= 2) {
+        if (argument instanceof A.ListExpression && B.ListSeparator_ECn === argument.separator && !argument.hasBrackets && argument.contents.length >= 2) {
           t1 = "(" + argument.toString$0(0) + ")";
           break $label0$0;
         }
@@ -42262,7 +44305,7 @@ self.util = _cliPkgRequires.util;
   A._IsCalculationSafeVisitor.prototype = {
     visitBinaryOperationExpression$1(node) {
       var t1;
-      if (B.Set_FIwG4.contains$1(0, node.operator))
+      if (B.Set_mqKz.contains$1(0, node.operator))
         t1 = node.left.accept$1(this) || node.right.accept$1(this);
       else
         t1 = false;
@@ -42285,7 +44328,7 @@ self.util = _cliPkgRequires.util;
     },
     visitListExpression$1(node) {
       var t1;
-      if (node.separator === B.ListSeparator_EVt)
+      if (node.separator === B.ListSeparator_nbm)
         if (!node.hasBrackets) {
           t1 = node.contents;
           t1 = t1.length > 1 && B.JSArray_methods.every$1(t1, new A._IsCalculationSafeVisitor_visitListExpression_closure(this));
@@ -42346,7 +44389,7 @@ self.util = _cliPkgRequires.util;
     call$1(expression) {
       return expression.accept$1(this.$this);
     },
-    $signature: 126
+    $signature: 113
   };
   A.BinaryOperationExpression.prototype = {
     get$span(_) {
@@ -42360,11 +44403,11 @@ self.util = _cliPkgRequires.util;
       return left.get$span(left).expand$1(0, right.get$span(right));
     },
     get$operatorSpan() {
-      var t3, t4, _this = this,
-        t1 = _this.left,
+      var t3, t4,
+        t1 = this.left,
         t2 = t1.get$span(t1);
       t2 = t2.get$file(t2);
-      t3 = _this.right;
+      t3 = this.right;
       t4 = t3.get$span(t3);
       if (t2 === t4.get$file(t4)) {
         t2 = t1.get$span(t1);
@@ -42383,7 +44426,7 @@ self.util = _cliPkgRequires.util;
         t3 = A.SpanExtensions_trimRight(A.SpanExtensions_trimLeft(t2.span$2(0, t1.offset, t3.get$start(t3).offset)));
         t1 = t3;
       } else
-        t1 = _this.get$span(_this);
+        t1 = this.get$span(0);
       return t1;
     },
     accept$1$1(visitor) {
@@ -42393,18 +44436,11 @@ self.util = _cliPkgRequires.util;
       return this.accept$1$1(visitor, type$.dynamic);
     },
     toString$0(_) {
-      var precedence, t1, t2, right, operator, t3, _this = this,
+      var t1, t2, right, operator, t3, _this = this,
         _0_0 = _this.left;
       $label0$0: {
         if (_0_0 instanceof A.BinaryOperationExpression) {
-          precedence = _0_0.operator.precedence;
-          t1 = true;
-        } else {
-          precedence = null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = precedence < _this.operator.precedence;
+          t1 = _0_0.operator.precedence < _this.operator.precedence;
           break $label0$0;
         }
         if (_0_0 instanceof A.ListExpression && !_0_0.hasBrackets && _0_0.contents.length >= 2) {
@@ -42423,12 +44459,6 @@ self.util = _cliPkgRequires.util;
       $label1$1: {
         if (right instanceof A.BinaryOperationExpression) {
           operator = right.operator;
-          t3 = true;
-        } else {
-          operator = null;
-          t3 = false;
-        }
-        if (t3) {
           if (operator.precedence <= t2.precedence) {
             t3 = !(operator === t2 && operator.isAssociative);
             t2 = t3;
@@ -42494,8 +44524,10 @@ self.util = _cliPkgRequires.util;
     }
   };
   A.FunctionExpression.prototype = {
-    get$name(_) {
-      return A.stringReplaceAllUnchecked(this.originalName, "_", "-");
+    get$nameSpan() {
+      if (this.namespace == null)
+        return A.SpanExtensions_initialIdentifier(this.span);
+      return A.SpanExtensions_initialIdentifier(A.FileSpanExtension_subspan(A.SpanExtensions_withoutInitialIdentifier(this.span), 1, null));
     },
     accept$1$1(visitor) {
       return visitor.visitFunctionExpression$1(this);
@@ -42562,13 +44594,13 @@ self.util = _cliPkgRequires.util;
       else {
         t2 = _this.contents.length;
         if (t2 !== 0)
-          t2 = t2 === 1 && _this.separator === B.ListSeparator_rXA;
+          t2 = t2 === 1 && _this.separator === B.ListSeparator_ECn;
         else
           t2 = true;
         t2 = t2 ? "" + A.Primitives_stringFromCharCode(40) : "";
       }
       t3 = _this.contents;
-      t4 = _this.separator === B.ListSeparator_rXA;
+      t4 = _this.separator === B.ListSeparator_ECn;
       t5 = t4 ? ", " : " ";
       t5 = t2 + new A.MappedListIterable(t3, new A.ListExpression_toString_closure(_this), A._arrayInstanceType(t3)._eval$1("MappedListIterable<1,String>")).join$1(0, t5);
       if (t1)
@@ -42583,36 +44615,23 @@ self.util = _cliPkgRequires.util;
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     },
     _list0$_elementNeedsParens$1(expression) {
-      var childSeparator, t1,
-        _0_13 = A._InitializedCell$(new A.ListExpression__elementNeedsParens_closure(expression));
+      var childSeparator, t1, _0_13;
       $label0$0: {
-        if (expression instanceof A.ListExpression)
-          if (expression.contents.length >= 2)
-            if (!expression.hasBrackets) {
-              childSeparator = expression.separator;
-              t1 = true;
-            } else {
-              childSeparator = null;
-              t1 = false;
-            }
-          else {
-            childSeparator = null;
-            t1 = false;
-          }
-        else {
-          childSeparator = null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = this.separator === B.ListSeparator_rXA ? childSeparator === B.ListSeparator_rXA : childSeparator !== B.ListSeparator_undecided_null_undecided;
+        if (expression instanceof A.ListExpression && expression.contents.length >= 2 && !expression.hasBrackets) {
+          childSeparator = expression.separator;
+          t1 = this.separator === B.ListSeparator_ECn ? childSeparator === B.ListSeparator_ECn : childSeparator !== B.ListSeparator_undecided_null_undecided;
           break $label0$0;
         }
-        if (expression instanceof A.UnaryOperationExpression)
-          t1 = B.UnaryOperator_gg4 === _0_13._readFinal$0() || B.UnaryOperator_TLI === _0_13._readFinal$0();
-        else
+        if (expression instanceof A.UnaryOperationExpression) {
+          _0_13 = expression.operator;
+          if (B.UnaryOperator_cLp !== _0_13)
+            t1 = B.UnaryOperator_AiQ === _0_13;
+          else
+            t1 = true;
+        } else
           t1 = false;
         if (t1) {
-          t1 = this.separator === B.ListSeparator_EVt;
+          t1 = this.separator === B.ListSeparator_nbm;
           break $label0$0;
         }
         t1 = false;
@@ -42630,13 +44649,7 @@ self.util = _cliPkgRequires.util;
     call$1(element) {
       return this.$this._list0$_elementNeedsParens$1(element) ? "(" + element.toString$0(0) + ")" : element.toString$0(0);
     },
-    $signature: 132
-  };
-  A.ListExpression__elementNeedsParens_closure.prototype = {
-    call$0() {
-      return type$.UnaryOperationExpression._as(this._0_0).operator;
-    },
-    $signature: 137
+    $signature: 111
   };
   A.MapExpression.prototype = {
     accept$1$1(visitor) {
@@ -42746,7 +44759,8 @@ self.util = _cliPkgRequires.util;
       t3 = new A.StringBuffer("");
       t4 = A._setArrayType([], type$.JSArray_Object);
       buffer = new A.InterpolationBuffer(t3, t4);
-      t3._contents += A.Primitives_stringFromCharCode(quote);
+      t5 = A.Primitives_stringFromCharCode(quote);
+      t3._contents += t5;
       for (t5 = t2.length, t6 = type$.Expression, _i = 0; _i < t5; ++_i) {
         value = t2[_i];
         if (t6._is(value)) {
@@ -42757,7 +44771,8 @@ self.util = _cliPkgRequires.util;
         if (typeof value == "string")
           A.StringExpression__quoteInnerText(value, quote, buffer, $static);
       }
-      t3._contents += A.Primitives_stringFromCharCode(quote);
+      t2 = A.Primitives_stringFromCharCode(quote);
+      t3._contents += t2;
       return buffer.interpolation$1(t1.span);
     },
     asInterpolation$0() {
@@ -42807,11 +44822,8 @@ self.util = _cliPkgRequires.util;
             t2 = true;
         else
           t2 = true;
-        if (t2) {
-          t2 = true;
+        if (t2)
           break $label0$0;
-        }
-        t2 = false;
         break $label0$0;
       }
       if (t2)
@@ -42859,9 +44871,8 @@ self.util = _cliPkgRequires.util;
       return this.accept$1$1(visitor, type$.dynamic);
     },
     toString$0(_) {
-      var t1 = this.namespace,
-        t2 = this.name;
-      return t1 == null ? "$" + t2 : t1 + ".$" + t2;
+      var t1 = this.span;
+      return A.String_String$fromCharCodes(B.NativeUint32List_methods.sublist$2(t1.file._decodedChars, t1._file$_start, t1._end), 0, null);
     },
     $isAstNode: 1,
     $isExpression: 1,
@@ -42893,54 +44904,48 @@ self.util = _cliPkgRequires.util;
   };
   A.Interpolation.prototype = {
     get$asPlain() {
-      var t1, first,
-        _0_0 = this.contents,
-        _0_1 = A._InitializedCell$(new A.Interpolation_asPlain_closure(_0_0)),
-        _0_6 = A._InitializedCell$(new A.Interpolation_asPlain_closure0(_0_0));
+      var _0_1, t1, _0_6_isSet, _0_6, first, _null = null,
+        _0_0 = this.contents;
       $label0$0: {
-        if (_0_1._readFinal$0() <= 0) {
+        _0_1 = _0_0.length;
+        if (_0_1 <= 0) {
           t1 = "";
           break $label0$0;
         }
-        if (J.$eq$(_0_1._readFinal$0(), 1))
-          if (typeof _0_6._readFinal$0() == "string") {
-            first = _0_6._readFinal$0();
-            t1 = true;
-          } else {
-            first = null;
-            t1 = false;
-          }
-        else {
-          first = null;
+        _0_6_isSet = _0_1 === 1;
+        if (_0_6_isSet) {
+          _0_6 = _0_0[0];
+          t1 = _0_6;
+          t1 = typeof t1 == "string";
+        } else {
+          _0_6 = _null;
           t1 = false;
         }
         if (t1) {
+          first = A._asString(_0_6_isSet ? _0_6 : _0_0[0]);
           t1 = first;
           break $label0$0;
         }
-        t1 = null;
+        t1 = _null;
         break $label0$0;
       }
       return t1;
     },
     get$initialPlain() {
-      var first, t1,
-        _0_0 = this.contents,
-        _0_4 = A._InitializedCell$(new A.Interpolation_initialPlain_closure(_0_0));
+      var _0_4_isSet, _0_4, t1, first,
+        _0_0 = this.contents;
       $label0$0: {
-        if (_0_0.length >= 1)
-          if (typeof _0_4._readFinal$0() == "string") {
-            first = _0_4._readFinal$0();
-            t1 = true;
-          } else {
-            first = null;
-            t1 = false;
-          }
-        else {
-          first = null;
+        _0_4_isSet = _0_0.length >= 1;
+        if (_0_4_isSet) {
+          _0_4 = _0_0[0];
+          t1 = _0_4;
+          t1 = typeof t1 == "string";
+        } else {
+          _0_4 = null;
           t1 = false;
         }
         if (t1) {
+          first = A._asString(_0_4_isSet ? _0_4 : _0_0[0]);
           t1 = first;
           break $label0$0;
         }
@@ -42970,29 +44975,11 @@ self.util = _cliPkgRequires.util;
       return this.span;
     }
   };
-  A.Interpolation_asPlain_closure.prototype = {
-    call$0() {
-      return this._0_0.length;
-    },
-    $signature: 3
-  };
-  A.Interpolation_asPlain_closure0.prototype = {
-    call$0() {
-      return this._0_0[0];
-    },
-    $signature: 14
-  };
-  A.Interpolation_initialPlain_closure.prototype = {
-    call$0() {
-      return this._0_0[0];
-    },
-    $signature: 14
-  };
   A.Interpolation_toString_closure.prototype = {
     call$1(value) {
       return typeof value == "string" ? value : "#{" + A.S(value) + "}";
     },
-    $signature: 139
+    $signature: 134
   };
   A.AtRootRule.prototype = {
     accept$1$1(visitor) {
@@ -43063,7 +45050,7 @@ self.util = _cliPkgRequires.util;
     },
     toString$0(_) {
       var t1 = this.$arguments;
-      return t1.get$isEmpty(t1) ? "@content;" : "@content(" + t1.toString$0(0) + ");";
+      return t1.get$isEmpty(0) ? "@content;" : "@content(" + t1.toString$0(0) + ");";
     },
     $isAstNode: 1,
     $isStatement: 1,
@@ -43095,7 +45082,7 @@ self.util = _cliPkgRequires.util;
       return this.accept$1$1(visitor, type$.dynamic);
     },
     toString$0(_) {
-      var t3, _0_0, children,
+      var t3, _0_0,
         buffer = new A.StringBuffer(""),
         t1 = this.name,
         t2 = "" + t1.toString$0(0);
@@ -43107,15 +45094,8 @@ self.util = _cliPkgRequires.util;
         buffer._contents = t1 + t3.toString$0(0);
       }
       _0_0 = this.children;
-      if (_0_0 != null) {
-        children = _0_0;
-        t1 = true;
-      } else {
-        children = null;
-        t1 = false;
-      }
-      if (t1)
-        return buffer.toString$0(0) + " {" + (children && B.JSArray_methods).join$1(children, " ") + "}";
+      if (_0_0 != null)
+        return buffer.toString$0(0) + " {" + B.JSArray_methods.join$1(_0_0, " ") + "}";
       else
         return buffer.toString$0(0) + ";";
     },
@@ -43143,7 +45123,7 @@ self.util = _cliPkgRequires.util;
     call$1(variable) {
       return "$" + variable;
     },
-    $signature: 7
+    $signature: 5
   };
   A.ErrorRule.prototype = {
     accept$1$1(visitor) {
@@ -43214,18 +45194,11 @@ self.util = _cliPkgRequires.util;
         t2.toString;
         t2 = t1 + " show " + _this._forward_rule$_memberList$2(shownMixinsAndFunctions, t2);
         t1 = t2;
-      } else {
-        if (hiddenMixinsAndFunctions != null) {
-          t2 = hiddenMixinsAndFunctions._base;
-          t2 = t2.get$isNotEmpty(t2);
-        } else
-          t2 = false;
-        if (t2) {
-          t2 = _this.hiddenVariables;
-          t2.toString;
-          t2 = t1 + " hide " + _this._forward_rule$_memberList$2(hiddenMixinsAndFunctions, t2);
-          t1 = t2;
-        }
+      } else if (hiddenMixinsAndFunctions != null && hiddenMixinsAndFunctions._base.get$isNotEmpty(0)) {
+        t2 = _this.hiddenVariables;
+        t2.toString;
+        t2 = t1 + " hide " + _this._forward_rule$_memberList$2(hiddenMixinsAndFunctions, t2);
+        t1 = t2;
       }
       prefix = _this.prefix;
       if (prefix != null)
@@ -43237,8 +45210,8 @@ self.util = _cliPkgRequires.util;
     _forward_rule$_memberList$2(mixinsAndFunctions, variables) {
       var t2,
         t1 = A.List_List$of(mixinsAndFunctions, true, type$.String);
-      for (t2 = variables._base, t2 = t2.get$iterator(t2); t2.moveNext$0();)
-        t1.push("$" + t2.get$current(t2));
+      for (t2 = variables._base.get$iterator(0); t2.moveNext$0();)
+        t1.push("$" + t2.get$current(0));
       return B.JSArray_methods.join$1(t1, ", ");
     },
     $isAstNode: 1,
@@ -43282,26 +45255,19 @@ self.util = _cliPkgRequires.util;
       var t1 = index === 0 ? "if" : "else if";
       return "@" + t1 + " " + clause.expression.toString$0(0) + " {" + B.JSArray_methods.join$1(clause.children, " ") + "}";
     },
-    $signature: 335
+    $signature: 499
   };
   A.IfRuleClause.prototype = {};
   A.IfRuleClause$__closure.prototype = {
     call$1(child) {
-      var t1, imports;
+      var t1;
       $label0$0: {
         if (child instanceof A.VariableDeclaration || child instanceof A.FunctionRule || child instanceof A.MixinRule) {
           t1 = true;
           break $label0$0;
         }
         if (child instanceof A.ImportRule) {
-          imports = child.imports;
-          t1 = true;
-        } else {
-          imports = null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = (imports && B.JSArray_methods).any$1(imports, new A.IfRuleClause$___closure());
+          t1 = B.JSArray_methods.any$1(child.imports, new A.IfRuleClause$___closure());
           break $label0$0;
         }
         t1 = false;
@@ -43309,13 +45275,13 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 150
+    $signature: 152
   };
   A.IfRuleClause$___closure.prototype = {
     call$1($import) {
       return $import instanceof A.DynamicImport;
     },
-    $signature: 152
+    $signature: 156
   };
   A.IfClause.prototype = {
     toString$0(_) {
@@ -43355,6 +45321,22 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
+    get$nameSpan() {
+      var startSpan, scanner, _null = null,
+        t1 = this.span,
+        t2 = t1._file$_start,
+        t3 = t1._end,
+        t4 = t1.file._decodedChars;
+      if (B.JSString_methods.startsWith$1(A.String_String$fromCharCodes(B.NativeUint32List_methods.sublist$2(t4, t2, t3), 0, _null), "+"))
+        startSpan = A.SpanExtensions_trimLeft(A.FileSpanExtension_subspan(t1, 1, _null));
+      else {
+        scanner = A.StringScanner$(A.String_String$fromCharCodes(B.NativeUint32List_methods.sublist$2(t4, t2, t3), 0, _null), _null, _null);
+        scanner.expectChar$1(64);
+        A._scanIdentifier(scanner);
+        startSpan = A.SpanExtensions_trimLeft(A.FileSpanExtension_subspan(t1, scanner._string_scanner$_position, _null));
+      }
+      return A.SpanExtensions_initialIdentifier(this.namespace != null ? A.FileSpanExtension_subspan(A.SpanExtensions_withoutInitialIdentifier(startSpan), 1, _null) : startSpan);
+    },
     accept$1$1(visitor) {
       return visitor.visitIncludeRule$1(this);
     },
@@ -43367,7 +45349,7 @@ self.util = _cliPkgRequires.util;
       t1 = t1 != null ? "@include " + (t1 + ".") : "@include ";
       t1 += _this.name;
       t2 = _this.$arguments;
-      if (!t2.get$isEmpty(t2))
+      if (!t2.get$isEmpty(0))
         t1 += "(" + t2.toString$0(0) + ")";
       t2 = _this.content;
       t1 += t2 == null ? ";" : " " + t2.toString$0(0);
@@ -43447,21 +45429,14 @@ self.util = _cliPkgRequires.util;
   A.ParentStatement.prototype = {$isAstNode: 1, $isStatement: 1};
   A.ParentStatement_closure.prototype = {
     call$1(child) {
-      var t1, imports;
+      var t1;
       $label0$0: {
         if (child instanceof A.VariableDeclaration || child instanceof A.FunctionRule || child instanceof A.MixinRule) {
           t1 = true;
           break $label0$0;
         }
         if (child instanceof A.ImportRule) {
-          imports = child.imports;
-          t1 = true;
-        } else {
-          imports = null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = (imports && B.JSArray_methods).any$1(imports, new A.ParentStatement__closure());
+          t1 = B.JSArray_methods.any$1(child.imports, new A.ParentStatement__closure());
           break $label0$0;
         }
         t1 = false;
@@ -43469,13 +45444,13 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 150
+    $signature: 152
   };
   A.ParentStatement__closure.prototype = {
     call$1($import) {
       return $import instanceof A.DynamicImport;
     },
-    $signature: 152
+    $signature: 156
   };
   A.ReturnRule.prototype = {
     accept$1$1(visitor) {
@@ -43667,23 +45642,11 @@ self.util = _cliPkgRequires.util;
   };
   A.SupportsDeclaration.prototype = {
     get$isCustomProperty() {
-      var text, t1,
+      var t1,
         _0_0 = this.name;
       $label0$0: {
-        if (_0_0 instanceof A.StringExpression)
-          if (!_0_0.hasQuotes) {
-            text = _0_0.text;
-            t1 = true;
-          } else {
-            text = null;
-            t1 = false;
-          }
-        else {
-          text = null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = B.JSString_methods.startsWith$1(text.get$initialPlain(), "--");
+        if (_0_0 instanceof A.StringExpression && !_0_0.hasQuotes) {
+          t1 = B.JSString_methods.startsWith$1(_0_0.text.get$initialPlain(), "--");
           break $label0$0;
         }
         t1 = false;
@@ -43750,11 +45713,9 @@ self.util = _cliPkgRequires.util;
   };
   A.Selector.prototype = {
     assertNotBogus$1$name($name) {
-      var t1;
       if (!this.accept$1(B._IsBogusVisitor_true))
         return;
-      t1 = this.toString$0(0);
-      A.EvaluationContext_current().warn$2(0, "$" + $name + ": " + (t1 + string$.x20is_nov), B.Deprecation_vrR);
+      A.warnForDeprecation("$" + $name + ": " + (this.toString$0(0) + string$.x20is_nov), B.Deprecation_ido);
     },
     toString$0(_) {
       var visitor = A._SerializeVisitor$(null, true, null, true, false, null, true);
@@ -43782,20 +45743,13 @@ self.util = _cliPkgRequires.util;
       return true;
     },
     visitPseudoSelector$1(pseudo) {
-      var selector, t1,
+      var t1,
         _0_0 = pseudo.selector;
       if (_0_0 != null) {
-        selector = _0_0;
-        t1 = true;
-      } else {
-        selector = null;
-        t1 = false;
-      }
-      if (t1) {
         if (pseudo.name === "not")
-          t1 = this.includeBogus && selector.accept$1(B._IsBogusVisitor_true);
+          t1 = this.includeBogus && _0_0.accept$1(B._IsBogusVisitor_true);
         else
-          t1 = this.visitSelectorList$1(selector);
+          t1 = this.visitSelectorList$1(_0_0);
         return t1;
       } else
         return false;
@@ -43823,7 +45777,7 @@ self.util = _cliPkgRequires.util;
     call$1(component) {
       return component.combinators.length > 1 || this.$this.visitCompoundSelector$1(component.selector);
     },
-    $signature: 53
+    $signature: 49
   };
   A._IsUselessVisitor.prototype = {
     visitComplexSelector$1(complex) {
@@ -43837,7 +45791,7 @@ self.util = _cliPkgRequires.util;
     call$1(component) {
       return component.combinators.length > 1 || this.$this.visitCompoundSelector$1(component.selector);
     },
-    $signature: 53
+    $signature: 49
   };
   A.__IsBogusVisitor_Object_AnySelectorVisitor.prototype = {};
   A.__IsInvisibleVisitor_Object_AnySelectorVisitor.prototype = {};
@@ -43909,24 +45863,25 @@ self.util = _cliPkgRequires.util;
       return value;
     },
     get$singleCompound() {
-      var _0_0, _0_4, selector, t1;
+      var _0_0, _0_4, t1, selector, _null = null;
       if (this.leadingCombinators.length !== 0)
-        return null;
+        return _null;
       _0_0 = this.components;
-      _0_4 = A._InitializedCell$(new A.ComplexSelector_singleCompound_closure(_0_0));
       $label0$0: {
         if (_0_0.length === 1) {
-          selector = _0_4._readFinal$0().selector;
-          t1 = _0_4._readFinal$0().combinators.length <= 0;
+          _0_4 = _0_0[0];
+          t1 = _0_4;
+          selector = t1.selector;
+          t1 = _0_4.combinators.length <= 0;
         } else {
-          selector = null;
+          selector = _null;
           t1 = false;
         }
         if (t1) {
           t1 = selector;
           break $label0$0;
         }
-        t1 = null;
+        t1 = _null;
         break $label0$0;
       }
       return t1;
@@ -43941,44 +45896,33 @@ self.util = _cliPkgRequires.util;
       return this.leadingCombinators.length === 0 && other.leadingCombinators.length === 0 && A.complexIsSuperselector(this.components, other.components);
     },
     withAdditionalCombinators$1(combinators) {
-      var _0_0, _0_1, initial, last, t1, t2, _this = this, _null = null;
+      var _0_0, _0_1, t1, initial, last, _this = this;
       if (combinators.length === 0)
         return _this;
       _0_0 = _this.components;
-      _0_1 = A._InitializedCell$(new A.ComplexSelector_withAdditionalCombinators_closure(_0_0));
       $label0$0: {
-        if (_0_1._readFinal$0() >= 1) {
-          initial = B.JSArray_methods.sublist$2(_0_0, 0, _0_1._readFinal$0() - 1);
-          last = _0_0[_0_1._readFinal$0() - 1];
-          last = last;
-          t1 = true;
-        } else {
-          last = _null;
-          initial = last;
-          t1 = false;
-        }
-        if (t1) {
+        _0_1 = _0_0.length;
+        if (_0_1 >= 1) {
+          t1 = _0_1 - 1;
+          initial = B.JSArray_methods.sublist$2(_0_0, 0, t1);
+          last = _0_0[t1];
           t1 = A.List_List$of(initial, true, type$.ComplexSelectorComponent);
           t1.push(last.withAdditionalCombinators$1(combinators));
-          t2 = _this.lineBreak || false;
-          t2 = A.ComplexSelector$(_this.leadingCombinators, t1, _this.span, t2);
-          t1 = t2;
+          t1 = A.ComplexSelector$(_this.leadingCombinators, t1, _this.span, _this.lineBreak);
           break $label0$0;
         }
-        if (_0_1._readFinal$0() <= 0) {
+        if (_0_1 <= 0) {
           t1 = A.List_List$of(_this.leadingCombinators, true, type$.CssValue_Combinator);
           B.JSArray_methods.addAll$1(t1, combinators);
-          t2 = _this.lineBreak || false;
-          t2 = A.ComplexSelector$(t1, B.List_empty0, _this.span, t2);
-          t1 = t2;
+          t1 = A.ComplexSelector$(t1, B.List_empty2, _this.span, _this.lineBreak);
           break $label0$0;
         }
-        t1 = _null;
+        throw A.wrapException(A.ReachabilityError$(string$.None_o));
       }
       return t1;
     },
     concatenate$3$forceLineBreak(child, span, forceLineBreak) {
-      var t2, _0_1, initial, last, t3, t4, _this = this,
+      var t2, _0_1, initial, last, _this = this,
         t1 = child.leadingCombinators,
         _0_0 = _this.components;
       if (t1.length === 0) {
@@ -43987,28 +45931,21 @@ self.util = _cliPkgRequires.util;
         t2 = _this.lineBreak || child.lineBreak || forceLineBreak;
         return A.ComplexSelector$(_this.leadingCombinators, t1, span, t2);
       } else {
-        _0_1 = A._InitializedCell$(new A.ComplexSelector_concatenate_closure(_0_0));
-        if (_0_1._readFinal$0() >= 1) {
-          initial = B.JSArray_methods.sublist$2(_0_0, 0, _0_1._readFinal$0() - 1);
-          last = _0_0[_0_1._readFinal$0() - 1];
-          last = last;
-          t2 = true;
-        } else {
-          initial = null;
-          last = null;
-          t2 = false;
-        }
-        t3 = _this.leadingCombinators;
-        t4 = child.components;
-        if (t2) {
+        _0_1 = _0_0.length;
+        if (_0_1 >= 1) {
+          t2 = _0_1 - 1;
+          initial = B.JSArray_methods.sublist$2(_0_0, 0, t2);
+          last = _0_0[t2];
           t2 = A.List_List$of(initial, true, type$.ComplexSelectorComponent);
           t2.push(last.withAdditionalCombinators$1(t1));
-          B.JSArray_methods.addAll$1(t2, t4);
-          return A.ComplexSelector$(t3, t2, span, _this.lineBreak || child.lineBreak || forceLineBreak);
+          B.JSArray_methods.addAll$1(t2, child.components);
+          t1 = _this.lineBreak || child.lineBreak || forceLineBreak;
+          return A.ComplexSelector$(_this.leadingCombinators, t2, span, t1);
         } else {
-          t2 = A.List_List$of(t3, true, type$.CssValue_Combinator);
+          t2 = A.List_List$of(_this.leadingCombinators, true, type$.CssValue_Combinator);
           B.JSArray_methods.addAll$1(t2, t1);
-          return A.ComplexSelector$(t2, t4, span, _this.lineBreak || child.lineBreak || forceLineBreak);
+          t1 = _this.lineBreak || child.lineBreak || forceLineBreak;
+          return A.ComplexSelector$(t2, child.components, span, t1);
         }
       }
     },
@@ -44028,25 +45965,7 @@ self.util = _cliPkgRequires.util;
     call$2(sum, component) {
       return sum + component.selector.get$specificity();
     },
-    $signature: 411
-  };
-  A.ComplexSelector_singleCompound_closure.prototype = {
-    call$0() {
-      return this._0_0[0];
-    },
-    $signature: 416
-  };
-  A.ComplexSelector_withAdditionalCombinators_closure.prototype = {
-    call$0() {
-      return this._0_0.length;
-    },
-    $signature: 3
-  };
-  A.ComplexSelector_concatenate_closure.prototype = {
-    call$0() {
-      return this._0_0.length;
-    },
-    $signature: 3
+    $signature: 359
   };
   A.ComplexSelectorComponent.prototype = {
     withAdditionalCombinators$1(combinators) {
@@ -44084,7 +46003,7 @@ self.util = _cliPkgRequires.util;
     call$1(combinator) {
       return " " + combinator.toString$0(0);
     },
-    $signature: 429
+    $signature: 353
   };
   A.CompoundSelector.prototype = {
     get$specificity() {
@@ -44098,6 +46017,17 @@ self.util = _cliPkgRequires.util;
       }
       return value;
     },
+    get$hasComplicatedSuperselectorSemantics() {
+      var result, _this = this,
+        value = _this.__CompoundSelector_hasComplicatedSuperselectorSemantics_FI;
+      if (value === $) {
+        result = B.JSArray_methods.any$1(_this.components, new A.CompoundSelector_hasComplicatedSuperselectorSemantics_closure());
+        _this.__CompoundSelector_hasComplicatedSuperselectorSemantics_FI !== $ && A.throwUnnamedLateFieldADI();
+        _this.__CompoundSelector_hasComplicatedSuperselectorSemantics_FI = result;
+        value = result;
+      }
+      return value;
+    },
     accept$1$1(visitor) {
       return visitor.visitCompoundSelector$1(this);
     },
@@ -44117,7 +46047,13 @@ self.util = _cliPkgRequires.util;
     call$2(sum, component) {
       return sum + component.get$specificity();
     },
-    $signature: 433
+    $signature: 346
+  };
+  A.CompoundSelector_hasComplicatedSuperselectorSemantics_closure.prototype = {
+    call$1(component) {
+      return component.get$hasComplicatedSuperselectorSemantics();
+    },
+    $signature: 13
   };
   A.IDSelector.prototype = {
     get$specificity() {
@@ -44155,12 +46091,12 @@ self.util = _cliPkgRequires.util;
         t1 = false;
       return t1;
     },
-    $signature: 16
+    $signature: 13
   };
   A.SelectorList.prototype = {
     get$asSassList() {
       var t1 = this.components;
-      return A.SassList$(new A.MappedListIterable(t1, new A.SelectorList_asSassList_closure(), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,Value>")), B.ListSeparator_rXA, false);
+      return A.SassList$(new A.MappedListIterable(t1, new A.SelectorList_asSassList_closure(), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,Value>")), B.ListSeparator_ECn, false);
     },
     accept$1$1(visitor) {
       return visitor.visitSelectorList$1(this);
@@ -44182,30 +46118,35 @@ self.util = _cliPkgRequires.util;
       }
       return t2.length === 0 ? null : A.SelectorList$(t2, this.span);
     },
-    resolveParentSelectors$2$implicitParent($parent, implicitParent) {
+    nestWithin$3$implicitParent$preserveParentSelectors($parent, implicitParent, preserveParentSelectors) {
       var parentSelector, t1, _this = this;
       if ($parent == null) {
+        if (preserveParentSelectors)
+          return _this;
         parentSelector = B.C__ParentSelectorVisitor.visitSelectorList$1(_this);
         if (parentSelector == null)
           return _this;
-        throw A.wrapException(A.SassException$(string$.Top_le, parentSelector.span, null));
+        throw A.wrapException(A.SassException$(string$.Top_les, parentSelector.span, null));
       }
       t1 = _this.components;
-      return A.SelectorList$(A.flattenVertically(new A.MappedListIterable(t1, new A.SelectorList_resolveParentSelectors_closure(_this, implicitParent, $parent), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,Iterable<ComplexSelector>>")), type$.ComplexSelector), _this.span);
+      return A.SelectorList$(A.flattenVertically(new A.MappedListIterable(t1, new A.SelectorList_nestWithin_closure(_this, preserveParentSelectors, implicitParent, $parent), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,Iterable<ComplexSelector>>")), type$.ComplexSelector), _this.span);
     },
-    resolveParentSelectors$1($parent) {
-      return this.resolveParentSelectors$2$implicitParent($parent, true);
+    nestWithin$1($parent) {
+      return this.nestWithin$3$implicitParent$preserveParentSelectors($parent, true, false);
     },
-    _resolveParentSelectorsCompound$2(component, $parent) {
+    nestWithin$2$implicitParent($parent, implicitParent) {
+      return this.nestWithin$3$implicitParent$preserveParentSelectors($parent, implicitParent, false);
+    },
+    _nestWithinCompound$2(component, $parent) {
       var resolvedSimples, parentSelector, error, stackTrace, t2, resolvedSimples0, exception,
         t1 = component.selector,
         simples = t1.components,
-        containsSelectorPseudo = J.any$1$ax(simples, new A.SelectorList__resolveParentSelectorsCompound_closure());
+        containsSelectorPseudo = J.any$1$ax(simples, new A.SelectorList__nestWithinCompound_closure());
       if (!containsSelectorPseudo && !(J.get$first$ax(simples) instanceof A.ParentSelector))
         return null;
       if (containsSelectorPseudo) {
         t2 = simples;
-        resolvedSimples0 = new A.MappedListIterable(t2, new A.SelectorList__resolveParentSelectorsCompound_closure0($parent), A.instanceType(t2)._eval$1("MappedListIterable<1,SimpleSelector>"));
+        resolvedSimples0 = new A.MappedListIterable(t2, new A.SelectorList__nestWithinCompound_closure0($parent), A._arrayInstanceType(t2)._eval$1("MappedListIterable<1,SimpleSelector>"));
       } else
         resolvedSimples0 = simples;
       resolvedSimples = resolvedSimples0;
@@ -44213,7 +46154,7 @@ self.util = _cliPkgRequires.util;
       try {
         if (!(parentSelector instanceof A.ParentSelector)) {
           t2 = component.span;
-          t2 = A._setArrayType([A.ComplexSelector$(B.List_empty1, A._setArrayType([new A.ComplexSelectorComponent(A.CompoundSelector$(resolvedSimples, t1.span), A.List_List$unmodifiable(component.combinators, type$.CssValue_Combinator), t2)], type$.JSArray_ComplexSelectorComponent), t2, false)], type$.JSArray_ComplexSelector);
+          t2 = A._setArrayType([A.ComplexSelector$(B.List_empty0, A._setArrayType([new A.ComplexSelectorComponent(A.CompoundSelector$(resolvedSimples, t1.span), A.List_List$unmodifiable(component.combinators, type$.CssValue_Combinator), t2)], type$.JSArray_ComplexSelectorComponent), t2, false)], type$.JSArray_ComplexSelector);
           return t2;
         } else if (J.get$length$asx(simples) === 1 && parentSelector.suffix == null) {
           t1 = $parent.withAdditionalCombinators$1(component.combinators);
@@ -44229,7 +46170,7 @@ self.util = _cliPkgRequires.util;
           throw exception;
       }
       t1 = $parent.components;
-      return new A.MappedListIterable(t1, new A.SelectorList__resolveParentSelectorsCompound_closure1(parentSelector, resolvedSimples, component), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,ComplexSelector>"));
+      return new A.MappedListIterable(t1, new A.SelectorList__nestWithinCompound_closure1(parentSelector, resolvedSimples, component), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,ComplexSelector>"));
     },
     isSuperselector$1(other) {
       return A.listIsSuperselector(this.components, other.components);
@@ -44270,24 +46211,24 @@ self.util = _cliPkgRequires.util;
           t5.push(new A.SassString(J.toString$0$(t6[_i0].value), false));
         B.JSArray_methods.addAll$1(t2, t5);
       }
-      return A.SassList$(t2, B.ListSeparator_EVt, false);
+      return A.SassList$(t2, B.ListSeparator_nbm, false);
     },
-    $signature: 437
+    $signature: 341
   };
-  A.SelectorList_resolveParentSelectors_closure.prototype = {
+  A.SelectorList_nestWithin_closure.prototype = {
     call$1(complex) {
       var t1, newComplexes, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, _i, component, resolved, i, t12, t13, t14, _i0, newComplex, t15, _this = this;
-      if (complex.accept$1(B.C__ParentSelectorVisitor) == null) {
+      if (_this.preserveParentSelectors || complex.accept$1(B.C__ParentSelectorVisitor) == null) {
         if (!_this.implicitParent)
           return A._setArrayType([complex], type$.JSArray_ComplexSelector);
         t1 = _this.parent.components;
-        return new A.MappedListIterable(t1, new A.SelectorList_resolveParentSelectors__closure(complex), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,ComplexSelector>"));
+        return new A.MappedListIterable(t1, new A.SelectorList_nestWithin__closure(complex), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,ComplexSelector>"));
       }
       t1 = type$.JSArray_ComplexSelector;
       newComplexes = A._setArrayType([], t1);
       for (t2 = complex.components, t3 = t2.length, t4 = _this.$this, t5 = _this.parent, t6 = type$.ComplexSelector, t7 = complex.leadingCombinators, t8 = t7.length === 0, t9 = complex.span, t10 = type$.ComplexSelectorComponent, t11 = type$.JSArray_ComplexSelectorComponent, _i = 0; _i < t3; ++_i) {
         component = t2[_i];
-        resolved = t4._resolveParentSelectorsCompound$2(component, t5);
+        resolved = t4._nestWithinCompound$2(component, t5);
         if (resolved == null)
           if (newComplexes.length === 0)
             newComplexes.push(A.ComplexSelector$(t7, A._setArrayType([component], t11), t9, false));
@@ -44297,10 +46238,11 @@ self.util = _cliPkgRequires.util;
               t13 = t12.leadingCombinators;
               t14 = A.List_List$of(t12.components, true, t10);
               t14.push(component);
-              newComplexes[i] = A.ComplexSelector$(t13, t14, t9, t12.lineBreak || false);
+              t12 = t12.lineBreak;
+              newComplexes[i] = A.ComplexSelector$(t13, t14, t9, t12);
             }
         else if (newComplexes.length === 0)
-          B.JSArray_methods.addAll$1(newComplexes, t8 ? resolved : J.map$1$1$ax(resolved, new A.SelectorList_resolveParentSelectors__closure0(complex), t6));
+          B.JSArray_methods.addAll$1(newComplexes, t8 ? resolved : J.map$1$1$ax(resolved, new A.SelectorList_nestWithin__closure0(complex), t6));
         else {
           t12 = A._setArrayType([], t1);
           for (t13 = newComplexes.length, t14 = J.getInterceptor$ax(resolved), _i0 = 0; _i0 < newComplexes.length; newComplexes.length === t13 || (0, A.throwConcurrentModificationError)(newComplexes), ++_i0) {
@@ -44313,16 +46255,16 @@ self.util = _cliPkgRequires.util;
       }
       return newComplexes;
     },
-    $signature: 454
+    $signature: 337
   };
-  A.SelectorList_resolveParentSelectors__closure.prototype = {
+  A.SelectorList_nestWithin__closure.prototype = {
     call$1(parentComplex) {
       var t1 = this.complex;
       return parentComplex.concatenate$2(t1, t1.span);
     },
     $signature: 59
   };
-  A.SelectorList_resolveParentSelectors__closure0.prototype = {
+  A.SelectorList_nestWithin__closure0.prototype = {
     call$1(resolvedComplex) {
       var t1 = resolvedComplex.leadingCombinators,
         t2 = this.complex,
@@ -44338,7 +46280,7 @@ self.util = _cliPkgRequires.util;
     },
     $signature: 59
   };
-  A.SelectorList__resolveParentSelectorsCompound_closure.prototype = {
+  A.SelectorList__nestWithinCompound_closure.prototype = {
     call$1(simple) {
       var selector;
       if (!(simple instanceof A.PseudoSelector))
@@ -44346,28 +46288,27 @@ self.util = _cliPkgRequires.util;
       selector = simple.selector;
       return selector != null && selector.accept$1(B.C__ParentSelectorVisitor) != null;
     },
-    $signature: 16
+    $signature: 13
   };
-  A.SelectorList__resolveParentSelectorsCompound_closure0.prototype = {
+  A.SelectorList__nestWithinCompound_closure0.prototype = {
     call$1(simple) {
-      var selector, t1,
-        _0_2 = A._InitializedCell$(new A.SelectorList__resolveParentSelectorsCompound__closure(simple));
+      var _0_2, selector, t1;
       $label0$0: {
         if (simple instanceof A.PseudoSelector) {
-          if (_0_2._readFinal$0() != null) {
-            selector = _0_2._readFinal$0();
-            t1 = true;
+          _0_2 = simple.selector;
+          if (_0_2 != null) {
+            selector = _0_2 == null ? type$.SelectorList._as(_0_2) : _0_2;
+            t1 = selector.accept$1(B.C__ParentSelectorVisitor) != null;
           } else {
             selector = null;
             t1 = false;
           }
-          t1 = t1 && selector.accept$1(B.C__ParentSelectorVisitor) != null;
         } else {
           selector = null;
           t1 = false;
         }
         if (t1) {
-          t1 = simple.withSelector$1(selector.resolveParentSelectors$2$implicitParent(this.parent, false));
+          t1 = simple.withSelector$1(selector.nestWithin$2$implicitParent(this.parent, false));
           break $label0$0;
         }
         t1 = simple;
@@ -44375,15 +46316,9 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 457
+    $signature: 333
   };
-  A.SelectorList__resolveParentSelectorsCompound__closure.prototype = {
-    call$0() {
-      return type$.PseudoSelector._as(this._0_0).selector;
-    },
-    $signature: 75
-  };
-  A.SelectorList__resolveParentSelectorsCompound_closure1.prototype = {
+  A.SelectorList__nestWithinCompound_closure1.prototype = {
     call$1(complex) {
       var lastComponent, suffix, lastSimples, t1, t2, last, t3, error, stackTrace, t4, t5, t6, t7, exception, _this = this;
       try {
@@ -44473,6 +46408,9 @@ self.util = _cliPkgRequires.util;
     get$isHostContext() {
       return this.isClass && this.name === "host-context" && this.selector != null;
     },
+    get$hasComplicatedSuperselectorSemantics() {
+      return !this.isClass || this.selector != null;
+    },
     get$specificity() {
       var result, _this = this,
         value = _this.__PseudoSelector_specificity_FI;
@@ -44595,19 +46533,19 @@ self.util = _cliPkgRequires.util;
           return A.SimpleSelector.prototype.get$specificity.call(t1);
       }
     },
-    $signature: 3
+    $signature: 10
   };
   A.PseudoSelector_specificity__closure.prototype = {
     call$1(component) {
       return component.get$specificity();
     },
-    $signature: 217
+    $signature: 177
   };
   A.PseudoSelector_specificity__closure0.prototype = {
     call$1(component) {
       return component.get$specificity();
     },
-    $signature: 217
+    $signature: 177
   };
   A.PseudoSelector_unify_closure.prototype = {
     call$1(simple) {
@@ -44618,7 +46556,7 @@ self.util = _cliPkgRequires.util;
         t1 = false;
       return t1;
     },
-    $signature: 16
+    $signature: 13
   };
   A.QualifiedName.prototype = {
     $eq(_, other) {
@@ -44639,6 +46577,9 @@ self.util = _cliPkgRequires.util;
     get$specificity() {
       return 1000;
     },
+    get$hasComplicatedSuperselectorSemantics() {
+      return false;
+    },
     addSuffix$1(suffix) {
       return A.throwExpression(A.MultiSpanSassException$('Selector "' + this.toString$0(0) + "\" can't have a suffix", this.span, "outer selector", A.LinkedHashMap_LinkedHashMap$_empty(type$.FileSpan, type$.String), null));
     },
@@ -44691,13 +46632,13 @@ self.util = _cliPkgRequires.util;
       var t1 = complex.components;
       return t1.length !== 0 && B.JSArray_methods.any$1(B.JSArray_methods.get$last(t1).selector.components, new A.SimpleSelector_isSuperselector__closure(this.$this));
     },
-    $signature: 19
+    $signature: 16
   };
   A.SimpleSelector_isSuperselector__closure.prototype = {
     call$1(simple) {
       return this.$this.isSuperselector$1(simple);
     },
-    $signature: 16
+    $signature: 13
   };
   A.TypeSelector.prototype = {
     get$specificity() {
@@ -44767,19 +46708,20 @@ self.util = _cliPkgRequires.util;
       return this.accept$1$1(visitor, type$.dynamic);
     },
     unify$1(compound) {
-      var rest, t1, unified, first, _this = this, _null = null,
-        _0_1 = A._InitializedCell$(new A.UniversalSelector_unify_closure(compound)),
-        _0_4 = A._InitializedCell$(new A.UniversalSelector_unify_closure0(compound));
-      if (_0_1._readFinal$0() >= 1)
-        if (_0_4._readFinal$0() instanceof A.UniversalSelector || _0_4._readFinal$0() instanceof A.TypeSelector) {
-          rest = B.JSArray_methods.sublist$1(compound, 1);
+      var _0_4, t1, rest, unified, _this = this, _null = null,
+        _0_1 = compound.length,
+        _0_4_isSet = _0_1 >= 1;
+      if (_0_4_isSet) {
+        _0_4 = compound[0];
+        t1 = _0_4;
+        if (!(t1 instanceof A.UniversalSelector))
+          t1 = _0_4 instanceof A.TypeSelector;
+        else
           t1 = true;
-        } else {
-          rest = _null;
-          t1 = false;
-        }
-      else {
+        rest = t1 ? B.JSArray_methods.sublist$1(compound, 1) : _null;
+      } else {
         rest = _null;
+        _0_4 = rest;
         t1 = false;
       }
       if (t1) {
@@ -44790,17 +46732,25 @@ self.util = _cliPkgRequires.util;
         B.JSArray_methods.addAll$1(t1, rest);
         return t1;
       }
-      if (J.$eq$(_0_1._readFinal$0(), 1))
-        if (_0_4._readFinal$0() instanceof A.PseudoSelector) {
-          first = _0_4._readFinal$0();
-          t1 = first.isClass && first.name === "host" || first.get$isHostContext();
+      if (_0_1 === 1) {
+        if (_0_4_isSet)
+          t1 = _0_4;
+        else {
+          _0_4 = compound[0];
+          t1 = _0_4;
+          _0_4_isSet = true;
+        }
+        if (t1 instanceof A.PseudoSelector) {
+          t1 = _0_4_isSet ? _0_4 : compound[0];
+          type$.PseudoSelector._as(t1);
+          t1 = t1.isClass && t1.name === "host" || t1.get$isHostContext();
         } else
           t1 = false;
-      else
+      } else
         t1 = false;
       if (t1)
         return _null;
-      if (_0_1._readFinal$0() <= 0)
+      if (_0_1 <= 0)
         return A._setArrayType([_this], type$.JSArray_SimpleSelector);
       t1 = _this.namespace;
       if (t1 == null || t1 === "*")
@@ -44830,18 +46780,6 @@ self.util = _cliPkgRequires.util;
       return J.get$hashCode$(this.namespace);
     }
   };
-  A.UniversalSelector_unify_closure.prototype = {
-    call$0() {
-      return this._0_0.length;
-    },
-    $signature: 3
-  };
-  A.UniversalSelector_unify_closure0.prototype = {
-    call$0() {
-      return this._0_0[0];
-    },
-    $signature: 218
-  };
   A._compileStylesheet_closure0.prototype = {
     call$1(url) {
       var t1;
@@ -44852,7 +46790,7 @@ self.util = _cliPkgRequires.util;
         t1 = this.importCache.sourceMapUrl$1(0, A.Uri_parse(url)).toString$0(0);
       return t1;
     },
-    $signature: 7
+    $signature: 5
   };
   A.AsyncEnvironment.prototype = {
     closure$0() {
@@ -44875,7 +46813,7 @@ self.util = _cliPkgRequires.util;
       if (forwardedModules == null)
         forwardedModules = _this._async_environment$_forwardedModules = A.LinkedHashMap_LinkedHashMap$_empty(type$.Module_AsyncCallable, type$.AstNode);
       view = A.ForwardedModuleView_ifNecessary(module, rule, type$.AsyncCallable);
-      for (t1 = A.LinkedHashMapKeyIterator$(forwardedModules, forwardedModules._modifications); t1.moveNext$0();) {
+      for (t1 = A.LinkedHashMapKeyIterator$(forwardedModules, forwardedModules.__js_helper$_modifications); t1.moveNext$0();) {
         t2 = t1.__js_helper$_current;
         _this._async_environment$_assertNoConflicts$5(view.get$variables(), t2.get$variables(), view, t2, "variable");
         _this._async_environment$_assertNoConflicts$5(view.get$functions(view), t2.get$functions(t2), view, t2, "function");
@@ -44897,7 +46835,6 @@ self.util = _cliPkgRequires.util;
         t4 = t2.get$current(t2);
         $name = t4._0;
         small = t4._1;
-        small = small;
         large = larger.$index(0, $name);
         if (large == null)
           continue;
@@ -44940,17 +46877,17 @@ self.util = _cliPkgRequires.util;
         forwardedModules = _this._async_environment$_forwardedModules = A.LinkedHashMap_LinkedHashMap$_empty(type$.Module_AsyncCallable, type$.AstNode);
       t1 = type$.String;
       t2 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
-      for (t3 = A.LinkedHashMapKeyIterator$(forwarded, forwarded._modifications); t3.moveNext$0();)
+      for (t3 = A.LinkedHashMapKeyIterator$(forwarded, forwarded.__js_helper$_modifications); t3.moveNext$0();)
         for (t4 = t3.__js_helper$_current.get$variables(), t4 = J.get$iterator$ax(t4.get$keys(t4)); t4.moveNext$0();)
           t2.add$1(0, t4.get$current(t4));
       t3 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
-      for (t4 = A.LinkedHashMapKeyIterator$(forwarded, forwarded._modifications); t4.moveNext$0();) {
+      for (t4 = A.LinkedHashMapKeyIterator$(forwarded, forwarded.__js_helper$_modifications); t4.moveNext$0();) {
         t5 = t4.__js_helper$_current;
         for (t5 = t5.get$functions(t5), t5 = J.get$iterator$ax(t5.get$keys(t5)); t5.moveNext$0();)
           t3.add$1(0, t5.get$current(t5));
       }
       t1 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
-      for (t4 = A.LinkedHashMapKeyIterator$(forwarded, forwarded._modifications); t4.moveNext$0();)
+      for (t4 = A.LinkedHashMapKeyIterator$(forwarded, forwarded.__js_helper$_modifications); t4.moveNext$0();)
         for (t5 = t4.__js_helper$_current.get$mixins(), t5 = J.get$iterator$ax(t5.get$keys(t5)); t5.moveNext$0();)
           t1.add$1(0, t5.get$current(t5));
       t4 = _this._async_environment$_variables;
@@ -45023,7 +46960,7 @@ self.util = _cliPkgRequires.util;
           t5 = t6;
         B.JSArray_methods.addAll$1(B.JSArray_methods.get$last(t5), new A.LinkedHashMapKeyIterable(forwarded, A._instanceType(forwarded)._eval$1("LinkedHashMapKeyIterable<1>")));
       }
-      for (t2 = A._LinkedHashSetIterator$(t2, t2._collection$_modifications), t5 = _this._async_environment$_variableIndices, t6 = _this._async_environment$_variableNodes, t7 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
+      for (t2 = A._LinkedHashSetIterator$(t2, t2._modifications, t2.$ti._precomputed1), t5 = _this._async_environment$_variableIndices, t6 = _this._async_environment$_variableNodes, t7 = t2.$ti._precomputed1; t2.moveNext$0();) {
         t8 = t2._collection$_current;
         if (t8 == null)
           t8 = t7._as(t8);
@@ -45031,14 +46968,14 @@ self.util = _cliPkgRequires.util;
         J.remove$1$z(B.JSArray_methods.get$last(t4), t8);
         J.remove$1$z(B.JSArray_methods.get$last(t6), t8);
       }
-      for (t2 = A._LinkedHashSetIterator$(t3, t3._collection$_modifications), t3 = _this._async_environment$_functionIndices, t4 = _this._async_environment$_functions, t5 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
+      for (t2 = A._LinkedHashSetIterator$(t3, t3._modifications, t3.$ti._precomputed1), t3 = _this._async_environment$_functionIndices, t4 = _this._async_environment$_functions, t5 = t2.$ti._precomputed1; t2.moveNext$0();) {
         t6 = t2._collection$_current;
         if (t6 == null)
           t6 = t5._as(t6);
         t3.remove$1(0, t6);
         J.remove$1$z(B.JSArray_methods.get$last(t4), t6);
       }
-      for (t1 = A._LinkedHashSetIterator$(t1, t1._collection$_modifications), t2 = _this._async_environment$_mixinIndices, t3 = _this._async_environment$_mixins, t4 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = A._LinkedHashSetIterator$(t1, t1._modifications, t1.$ti._precomputed1), t2 = _this._async_environment$_mixinIndices, t3 = _this._async_environment$_mixins, t4 = t1.$ti._precomputed1; t1.moveNext$0();) {
         t5 = t1._collection$_current;
         if (t5 == null)
           t5 = t4._as(t5);
@@ -45047,7 +46984,7 @@ self.util = _cliPkgRequires.util;
       }
     },
     getVariable$2$namespace($name, namespace) {
-      var t1, _0_0, index, t2, _1_0, _this = this;
+      var t1, _0_0, _1_0, _this = this;
       if (namespace != null)
         return _this._async_environment$_getModule$1(namespace).get$variables().$index(0, $name);
       if (_this._async_environment$_lastVariableName === $name) {
@@ -45059,31 +46996,17 @@ self.util = _cliPkgRequires.util;
       t1 = _this._async_environment$_variableIndices;
       _0_0 = t1.$index(0, $name);
       if (_0_0 != null) {
-        index = _0_0;
-        t2 = true;
-      } else {
-        index = null;
-        t2 = false;
-      }
-      if (t2) {
         _this._async_environment$_lastVariableName = $name;
-        _this._async_environment$_lastVariableIndex = index;
-        t1 = J.$index$asx(_this._async_environment$_variables[index], $name);
+        _this._async_environment$_lastVariableIndex = _0_0;
+        t1 = J.$index$asx(_this._async_environment$_variables[_0_0], $name);
         return t1 == null ? _this._async_environment$_getVariableFromGlobalModule$1($name) : t1;
       } else {
         _1_0 = _this._async_environment$_variableIndex$1($name);
         if (_1_0 != null) {
-          index = _1_0;
-          t2 = true;
-        } else {
-          index = null;
-          t2 = false;
-        }
-        if (t2) {
           _this._async_environment$_lastVariableName = $name;
-          _this._async_environment$_lastVariableIndex = index;
-          t1.$indexSet(0, $name, index);
-          t1 = J.$index$asx(_this._async_environment$_variables[index], $name);
+          _this._async_environment$_lastVariableIndex = _1_0;
+          t1.$indexSet(0, $name, _1_0);
+          t1 = J.$index$asx(_this._async_environment$_variables[_1_0], $name);
           return t1 == null ? _this._async_environment$_getVariableFromGlobalModule$1($name) : t1;
         } else
           return _this._async_environment$_getVariableFromGlobalModule$1($name);
@@ -45096,7 +47019,7 @@ self.util = _cliPkgRequires.util;
       return this._async_environment$_fromOneModule$3($name, "variable", new A.AsyncEnvironment__getVariableFromGlobalModule_closure($name));
     },
     getVariableNode$2$namespace($name, namespace) {
-      var t1, _0_0, index, t2, _1_0, _this = this;
+      var t1, _0_0, _1_0, _this = this;
       if (namespace != null)
         return _this._async_environment$_getModule$1(namespace).get$variableNodes().$index(0, $name);
       if (_this._async_environment$_lastVariableName === $name) {
@@ -45108,50 +47031,29 @@ self.util = _cliPkgRequires.util;
       t1 = _this._async_environment$_variableIndices;
       _0_0 = t1.$index(0, $name);
       if (_0_0 != null) {
-        index = _0_0;
-        t2 = true;
-      } else {
-        index = null;
-        t2 = false;
-      }
-      if (t2) {
         _this._async_environment$_lastVariableName = $name;
-        _this._async_environment$_lastVariableIndex = index;
-        t1 = J.$index$asx(_this._async_environment$_variableNodes[index], $name);
+        _this._async_environment$_lastVariableIndex = _0_0;
+        t1 = J.$index$asx(_this._async_environment$_variableNodes[_0_0], $name);
         return t1 == null ? _this._async_environment$_getVariableNodeFromGlobalModule$1($name) : t1;
       } else {
         _1_0 = _this._async_environment$_variableIndex$1($name);
         if (_1_0 != null) {
-          index = _1_0;
-          t2 = true;
-        } else {
-          index = null;
-          t2 = false;
-        }
-        if (t2) {
           _this._async_environment$_lastVariableName = $name;
-          _this._async_environment$_lastVariableIndex = index;
-          t1.$indexSet(0, $name, index);
-          t1 = J.$index$asx(_this._async_environment$_variableNodes[index], $name);
+          _this._async_environment$_lastVariableIndex = _1_0;
+          t1.$indexSet(0, $name, _1_0);
+          t1 = J.$index$asx(_this._async_environment$_variableNodes[_1_0], $name);
           return t1 == null ? _this._async_environment$_getVariableNodeFromGlobalModule$1($name) : t1;
         } else
           return _this._async_environment$_getVariableNodeFromGlobalModule$1($name);
       }
     },
     _async_environment$_getVariableNodeFromGlobalModule$1($name) {
-      var t1, t2, _0_0, value;
+      var t1, t2, _0_0;
       for (t1 = this._async_environment$_importedModules, t2 = this._async_environment$_globalModules, t2 = new A.LinkedHashMapKeyIterable(t1, A._instanceType(t1)._eval$1("LinkedHashMapKeyIterable<1>")).followedBy$1(0, new A.LinkedHashMapKeyIterable(t2, A._instanceType(t2)._eval$1("LinkedHashMapKeyIterable<1>"))), t2 = new A.FollowedByIterator(J.get$iterator$ax(t2.__internal$_first), t2._second); t2.moveNext$0();) {
         t1 = t2._currentIterator;
         _0_0 = t1.get$current(t1).get$variableNodes().$index(0, $name);
-        if (_0_0 != null) {
-          value = _0_0;
-          t1 = true;
-        } else {
-          value = null;
-          t1 = false;
-        }
-        if (t1)
-          return value;
+        if (_0_0 != null)
+          return _0_0;
       }
       return null;
     },
@@ -45194,9 +47096,9 @@ self.util = _cliPkgRequires.util;
       }
       nestedForwardedModules = _this._async_environment$_nestedForwardedModules;
       if (nestedForwardedModules != null && !_this._async_environment$_variableIndices.containsKey$1($name) && _this._async_environment$_variableIndex$1($name) == null)
-        for (t1 = new A.ReversedListIterable(nestedForwardedModules, A.instanceType(nestedForwardedModules)._eval$1("ReversedListIterable<1>")), t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
-          t3 = t1.__internal$_current;
-          for (t3 = J.get$reversed$ax(t3 == null ? t2._as(t3) : t3), t3 = new A.ListIterator(t3, t3.get$length(t3)), t4 = A._instanceType(t3)._precomputed1; t3.moveNext$0();) {
+        for (t1 = A._arrayInstanceType(nestedForwardedModules)._eval$1("ReversedListIterable<1>"), t2 = new A.ReversedListIterable(nestedForwardedModules, t1), t2 = new A.ListIterator(t2, t2.get$length(0), t1._eval$1("ListIterator<ListIterable.E>")), t1 = t1._eval$1("ListIterable.E"); t2.moveNext$0();) {
+          t3 = t2.__internal$_current;
+          for (t3 = J.get$reversed$ax(t3 == null ? t1._as(t3) : t3), t4 = t3.$ti, t3 = new A.ListIterator(t3, t3.get$length(0), t4._eval$1("ListIterator<ListIterable.E>")), t4 = t4._eval$1("ListIterable.E"); t3.moveNext$0();) {
             t5 = t3.__internal$_current;
             if (t5 == null)
               t5 = t4._as(t5);
@@ -45235,7 +47137,7 @@ self.util = _cliPkgRequires.util;
       J.$indexSet$ax(_this._async_environment$_variableNodes[index], $name, nodeWithSpan);
     },
     getFunction$2$namespace($name, namespace) {
-      var t1, _0_0, index, t2, _1_0, _this = this;
+      var t1, _0_0, _1_0, _this = this;
       if (namespace != null) {
         t1 = _this._async_environment$_getModule$1(namespace);
         return t1.get$functions(t1).$index(0, $name);
@@ -45243,27 +47145,13 @@ self.util = _cliPkgRequires.util;
       t1 = _this._async_environment$_functionIndices;
       _0_0 = t1.$index(0, $name);
       if (_0_0 != null) {
-        index = _0_0;
-        t2 = true;
-      } else {
-        index = null;
-        t2 = false;
-      }
-      if (t2) {
-        t1 = J.$index$asx(_this._async_environment$_functions[index], $name);
+        t1 = J.$index$asx(_this._async_environment$_functions[_0_0], $name);
         return t1 == null ? _this._async_environment$_getFunctionFromGlobalModule$1($name) : t1;
       } else {
         _1_0 = _this._async_environment$_functionIndex$1($name);
         if (_1_0 != null) {
-          index = _1_0;
-          t2 = true;
-        } else {
-          index = null;
-          t2 = false;
-        }
-        if (t2) {
-          t1.$indexSet(0, $name, index);
-          t1 = J.$index$asx(_this._async_environment$_functions[index], $name);
+          t1.$indexSet(0, $name, _1_0);
+          t1 = J.$index$asx(_this._async_environment$_functions[_1_0], $name);
           return t1 == null ? _this._async_environment$_getFunctionFromGlobalModule$1($name) : t1;
         } else
           return _this._async_environment$_getFunctionFromGlobalModule$1($name);
@@ -45283,33 +47171,19 @@ self.util = _cliPkgRequires.util;
       return null;
     },
     getMixin$2$namespace($name, namespace) {
-      var t1, _0_0, index, t2, _1_0, _this = this;
+      var t1, _0_0, _1_0, _this = this;
       if (namespace != null)
         return _this._async_environment$_getModule$1(namespace).get$mixins().$index(0, $name);
       t1 = _this._async_environment$_mixinIndices;
       _0_0 = t1.$index(0, $name);
       if (_0_0 != null) {
-        index = _0_0;
-        t2 = true;
-      } else {
-        index = null;
-        t2 = false;
-      }
-      if (t2) {
-        t1 = J.$index$asx(_this._async_environment$_mixins[index], $name);
+        t1 = J.$index$asx(_this._async_environment$_mixins[_0_0], $name);
         return t1 == null ? _this._async_environment$_getMixinFromGlobalModule$1($name) : t1;
       } else {
         _1_0 = _this._async_environment$_mixinIndex$1($name);
         if (_1_0 != null) {
-          index = _1_0;
-          t2 = true;
-        } else {
-          index = null;
-          t2 = false;
-        }
-        if (t2) {
-          t1.$indexSet(0, $name, index);
-          t1 = J.$index$asx(_this._async_environment$_mixins[index], $name);
+          t1.$indexSet(0, $name, _1_0);
+          t1 = J.$index$asx(_this._async_environment$_mixins[_1_0], $name);
           return t1 == null ? _this._async_environment$_getMixinFromGlobalModule$1($name) : t1;
         } else
           return _this._async_environment$_getMixinFromGlobalModule$1($name);
@@ -45529,59 +47403,30 @@ self.util = _cliPkgRequires.util;
       return A._EnvironmentModule__EnvironmentModule0(this, new A.CssStylesheet(new A.UnmodifiableListView(B.List_empty3, type$.UnmodifiableListView_CssNode), A.SourceFile$decoded(B.List_empty4, "<dummy module>").span$1(0, 0)), B.Map_empty7, B.C_EmptyExtensionStore, A.NullableExtension_andThen(this._async_environment$_forwardedModules, new A.AsyncEnvironment_toDummyModule_closure()));
     },
     _async_environment$_getModule$1(namespace) {
-      var module, t1,
-        _0_0 = this._async_environment$_modules.$index(0, namespace);
-      if (_0_0 != null) {
-        module = _0_0;
-        t1 = true;
-      } else {
-        module = null;
-        t1 = false;
-      }
-      if (t1)
-        return module;
+      var _0_0 = this._async_environment$_modules.$index(0, namespace);
+      if (_0_0 != null)
+        return _0_0;
       throw A.wrapException(A.SassScriptException$('There is no module with the namespace "' + namespace + '".', null));
     },
     _async_environment$_fromOneModule$1$3($name, type, callback) {
-      var nestedForwardedModules, t1, t2, t3, t4, t5, _1_0, value, _2_0, identity, valueInModule, identityFromModule, module, node, _null = null,
+      var t1, t2, t3, t4, t5, _1_0, _2_0, value, identity, valueInModule, identityFromModule, module, node,
         _0_0 = this._async_environment$_nestedForwardedModules;
-      if (_0_0 != null) {
-        nestedForwardedModules = _0_0;
-        t1 = true;
-      } else {
-        nestedForwardedModules = _null;
-        t1 = false;
-      }
-      if (t1)
-        for (t1 = new A.ReversedListIterable(nestedForwardedModules, A.instanceType(nestedForwardedModules)._eval$1("ReversedListIterable<1>")), t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
-          t3 = t1.__internal$_current;
-          for (t3 = J.get$reversed$ax(t3 == null ? t2._as(t3) : t3), t3 = new A.ListIterator(t3, t3.get$length(t3)), t4 = A._instanceType(t3)._precomputed1; t3.moveNext$0();) {
+      if (_0_0 != null)
+        for (t1 = A._arrayInstanceType(_0_0)._eval$1("ReversedListIterable<1>"), t2 = new A.ReversedListIterable(_0_0, t1), t2 = new A.ListIterator(t2, t2.get$length(0), t1._eval$1("ListIterator<ListIterable.E>")), t1 = t1._eval$1("ListIterable.E"); t2.moveNext$0();) {
+          t3 = t2.__internal$_current;
+          for (t3 = J.get$reversed$ax(t3 == null ? t1._as(t3) : t3), t4 = t3.$ti, t3 = new A.ListIterator(t3, t3.get$length(0), t4._eval$1("ListIterator<ListIterable.E>")), t4 = t4._eval$1("ListIterable.E"); t3.moveNext$0();) {
             t5 = t3.__internal$_current;
             _1_0 = callback.call$1(t5 == null ? t4._as(t5) : t5);
-            if (_1_0 != null) {
-              value = _1_0;
-              t5 = true;
-            } else {
-              value = _null;
-              t5 = false;
-            }
-            if (t5)
-              return value;
+            if (_1_0 != null)
+              return _1_0;
           }
         }
-      for (t1 = this._async_environment$_importedModules, t1 = A.LinkedHashMapKeyIterator$(t1, t1._modifications); t1.moveNext$0();) {
+      for (t1 = this._async_environment$_importedModules, t1 = A.LinkedHashMapKeyIterator$(t1, t1.__js_helper$_modifications); t1.moveNext$0();) {
         _2_0 = callback.call$1(t1.__js_helper$_current);
-        if (_2_0 != null) {
-          value = _2_0;
-          t2 = true;
-        } else {
-          value = _null;
-          t2 = false;
-        }
-        if (t2)
-          return value;
+        if (_2_0 != null)
+          return _2_0;
       }
-      for (t1 = this._async_environment$_globalModules, t2 = A.LinkedHashMapKeyIterator$(t1, t1._modifications), t3 = type$.AsyncCallable, identity = _null, value = identity; t2.moveNext$0();) {
+      for (t1 = this._async_environment$_globalModules, t2 = A.LinkedHashMapKeyIterator$(t1, t1.__js_helper$_modifications), t3 = type$.AsyncCallable, value = null, identity = null; t2.moveNext$0();) {
         t4 = t2.__js_helper$_current;
         valueInModule = callback.call$1(t4);
         if (valueInModule == null)
@@ -45613,7 +47458,7 @@ self.util = _cliPkgRequires.util;
     call$1(module) {
       return module.get$variables().$index(0, this.name);
     },
-    $signature: 474
+    $signature: 318
   };
   A.AsyncEnvironment_setVariable_closure.prototype = {
     call$0() {
@@ -45621,13 +47466,13 @@ self.util = _cliPkgRequires.util;
       t1._async_environment$_lastVariableName = this.name;
       return t1._async_environment$_lastVariableIndex = 0;
     },
-    $signature: 3
+    $signature: 10
   };
   A.AsyncEnvironment_setVariable_closure0.prototype = {
     call$1(module) {
       return module.get$variables().containsKey$1(this.name) ? module : null;
     },
-    $signature: 475
+    $signature: 317
   };
   A.AsyncEnvironment_setVariable_closure1.prototype = {
     call$0() {
@@ -45635,31 +47480,31 @@ self.util = _cliPkgRequires.util;
         t2 = t1._async_environment$_variableIndex$1(this.name);
       return t2 == null ? t1._async_environment$_variables.length - 1 : t2;
     },
-    $signature: 3
+    $signature: 10
   };
   A.AsyncEnvironment__getFunctionFromGlobalModule_closure.prototype = {
     call$1(module) {
       return module.get$functions(module).$index(0, this.name);
     },
-    $signature: 228
+    $signature: 178
   };
   A.AsyncEnvironment__getMixinFromGlobalModule_closure.prototype = {
     call$1(module) {
       return module.get$mixins().$index(0, this.name);
     },
-    $signature: 228
+    $signature: 178
   };
   A.AsyncEnvironment_toModule_closure.prototype = {
     call$1(modules) {
       return new A.MapKeySet(modules, type$.MapKeySet_Module_AsyncCallable);
     },
-    $signature: 240
+    $signature: 180
   };
   A.AsyncEnvironment_toDummyModule_closure.prototype = {
     call$1(modules) {
       return new A.MapKeySet(modules, type$.MapKeySet_Module_AsyncCallable);
     },
-    $signature: 240
+    $signature: 180
   };
   A._EnvironmentModule0.prototype = {
     get$url(_) {
@@ -45668,17 +47513,10 @@ self.util = _cliPkgRequires.util;
       return t1.get$sourceUrl(t1);
     },
     setVariable$3($name, value, nodeWithSpan) {
-      var module, t1, t2,
+      var t1, t2,
         _0_0 = this._async_environment$_modulesByVariable.$index(0, $name);
       if (_0_0 != null) {
-        module = _0_0;
-        t1 = true;
-      } else {
-        module = null;
-        t1 = false;
-      }
-      if (t1) {
-        module.setVariable$3($name, value, nodeWithSpan);
+        _0_0.setVariable$3($name, value, nodeWithSpan);
         return;
       }
       t1 = this._async_environment$_environment;
@@ -45708,7 +47546,9 @@ self.util = _cliPkgRequires.util;
       else {
         t1 = t1.get$span(t1);
         t1 = t1.get$sourceUrl(t1);
-        t1 = $.$get$context().prettyUri$1(t1);
+        t2 = $.$get$context();
+        t1.toString;
+        t1 = t2.prettyUri$1(t1);
       }
       return t1;
     },
@@ -45748,37 +47588,37 @@ self.util = _cliPkgRequires.util;
     call$1(module) {
       return module.get$variables();
     },
-    $signature: 504
+    $signature: 312
   };
   A._EnvironmentModule__EnvironmentModule_closure6.prototype = {
     call$1(module) {
       return module.get$variableNodes();
     },
-    $signature: 512
+    $signature: 306
   };
   A._EnvironmentModule__EnvironmentModule_closure7.prototype = {
     call$1(module) {
       return module.get$functions(module);
     },
-    $signature: 242
+    $signature: 185
   };
   A._EnvironmentModule__EnvironmentModule_closure8.prototype = {
     call$1(module) {
       return module.get$mixins();
     },
-    $signature: 242
+    $signature: 185
   };
   A._EnvironmentModule__EnvironmentModule_closure9.prototype = {
     call$1(module) {
       return module.get$transitivelyContainsCss();
     },
-    $signature: 146
+    $signature: 123
   };
   A._EnvironmentModule__EnvironmentModule_closure10.prototype = {
     call$1(module) {
       return module.get$transitivelyContainsExtensions();
     },
-    $signature: 146
+    $signature: 123
   };
   A.AsyncImportCache.prototype = {
     canonicalize$4$baseImporter$baseUrl$forImport(_, url, baseImporter, baseUrl, forImport) {
@@ -45787,7 +47627,7 @@ self.util = _cliPkgRequires.util;
     canonicalize$body$AsyncImportCache(_, url, baseImporter, baseUrl, forImport) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl),
-        $async$returnValue, $async$self = this, t1, relativeResult;
+        $async$returnValue, $async$self = this, t1, resolvedUrl, key, relativeResult, t2, t3, t4, t5, t6, cacheable, i, importer, perImporterKey, t7, _1_0, _1_2_isSet, _1_2, result, _2_0, _2_1, _2_5_isSet, _2_3, _2_5, _2_3_isSet, j;
       var $async$canonicalize$4$baseImporter$baseUrl$forImport = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -45805,8 +47645,12 @@ self.util = _cliPkgRequires.util;
               break;
             case 3:
               // then
+              resolvedUrl = baseUrl == null ? null : baseUrl.resolveUri$1(url);
+              if (resolvedUrl == null)
+                resolvedUrl = url;
+              key = new A._Record_3_forImport(baseImporter, resolvedUrl, forImport);
               $async$goto = 5;
-              return A._asyncAwait(A.putIfAbsentAsync($async$self._async_import_cache$_relativeCanonicalizeCache, new A._Record_4_baseImporter_baseUrl_forImport([url, baseImporter, baseUrl, forImport]), new A.AsyncImportCache_canonicalize_closure($async$self, baseImporter, baseUrl, url, forImport), type$.Record_4_Uri_and_AsyncImporter_baseImporter_and_nullable_Uri_baseUrl_and_bool_forImport, type$.nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl), $async$canonicalize$4$baseImporter$baseUrl$forImport);
+              return A._asyncAwait(A.putIfAbsentAsync($async$self._async_import_cache$_perImporterCanonicalizeCache, key, new A.AsyncImportCache_canonicalize_closure($async$self, baseImporter, resolvedUrl, baseUrl, forImport, key, url), type$.Record_3_AsyncImporter_and_Uri_and_bool_forImport, type$.nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl), $async$canonicalize$4$baseImporter$baseUrl$forImport);
             case 5:
               // returning from await.
               relativeResult = $async$result;
@@ -45818,11 +47662,132 @@ self.util = _cliPkgRequires.util;
               }
             case 4:
               // join
-              $async$goto = 6;
-              return A._asyncAwait(A.putIfAbsentAsync($async$self._async_import_cache$_canonicalizeCache, new A._Record_2_forImport(url, forImport), new A.AsyncImportCache_canonicalize_closure0($async$self, url, baseUrl, forImport), type$.Record_2_Uri_and_bool_forImport, type$.nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl), $async$canonicalize$4$baseImporter$baseUrl$forImport);
+              key = new A._Record_2_forImport(url, forImport);
+              t1 = $async$self._async_import_cache$_canonicalizeCache;
+              if (t1.containsKey$1(key)) {
+                $async$returnValue = t1.$index(0, key);
+                // goto return
+                $async$goto = 1;
+                break;
+              }
+              t2 = $async$self._async_import_cache$_importers, t3 = type$.Record_1_nullable_Object, t4 = $async$self._async_import_cache$_perImporterCanonicalizeCache, t5 = type$.nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl, t6 = type$.Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl, cacheable = true, i = 0;
             case 6:
+              // for condition
+              if (!(i < t2.length)) {
+                // goto after for
+                $async$goto = 8;
+                break;
+              }
+              importer = t2[i];
+              perImporterKey = new A._Record_3_forImport(importer, url, forImport);
+              if (t4.containsKey$1(perImporterKey)) {
+                t7 = t4.$index(0, perImporterKey);
+                _1_0 = new A._Record_1(t7 == null ? t5._as(t7) : t7);
+              } else
+                _1_0 = null;
+              _1_2_isSet = t3._is(_1_0);
+              if (_1_2_isSet) {
+                _1_2 = _1_0._0;
+                t7 = _1_2 != null;
+                if (t7) {
+                  t6._as(_1_2);
+                  result = _1_2;
+                } else
+                  result = null;
+              } else {
+                _1_2 = null;
+                result = null;
+                t7 = false;
+              }
+              if (t7) {
+                $async$returnValue = result;
+                // goto return
+                $async$goto = 1;
+                break;
+              }
+              if (_1_2_isSet)
+                t7 = _1_2 == null;
+              else
+                t7 = false;
+              if (t7) {
+                // goto for update
+                $async$goto = 7;
+                break;
+              }
+              $async$goto = 10;
+              return A._asyncAwait($async$self._async_import_cache$_canonicalize$4(importer, url, baseUrl, forImport), $async$canonicalize$4$baseImporter$baseUrl$forImport);
+            case 10:
               // returning from await.
-              $async$returnValue = $async$result;
+              _2_0 = $async$result;
+              _2_1 = _2_0._0;
+              _2_5_isSet = _2_1 != null;
+              if (_2_5_isSet) {
+                result = _2_1 == null ? t6._as(_2_1) : _2_1;
+                _2_3 = _2_0._1;
+                t7 = _2_3;
+                _2_5 = t7;
+                t7 = t7 && cacheable;
+              } else {
+                _2_5 = null;
+                _2_3 = null;
+                result = null;
+                t7 = false;
+              }
+              if (t7) {
+                t1.$indexSet(0, key, result);
+                $async$returnValue = result;
+                // goto return
+                $async$goto = 1;
+                break;
+              }
+              if (_2_5_isSet) {
+                t7 = _2_5;
+                _2_3_isSet = _2_5_isSet;
+              } else {
+                _2_3 = _2_0._1;
+                t7 = _2_3;
+                _2_3_isSet = true;
+              }
+              t7 = t7 && !cacheable;
+              if (t7) {
+                t4.$indexSet(0, perImporterKey, _2_1);
+                if (_2_1 != null) {
+                  $async$returnValue = _2_1;
+                  // goto return
+                  $async$goto = 1;
+                  break;
+                }
+                // goto break $label0$1
+                $async$goto = 9;
+                break;
+              }
+              t7 = false === (_2_3_isSet ? _2_3 : _2_0._1);
+              if (t7) {
+                if (cacheable) {
+                  for (j = 0; j < i; ++j)
+                    t4.$indexSet(0, new A._Record_3_forImport(t2[j], url, forImport), null);
+                  cacheable = false;
+                }
+                if (_2_1 != null) {
+                  $async$returnValue = _2_1;
+                  // goto return
+                  $async$goto = 1;
+                  break;
+                }
+              }
+            case 9:
+              // break $label0$1
+            case 7:
+              // for update
+              ++i;
+              // goto for condition
+              $async$goto = 6;
+              break;
+            case 8:
+              // after for
+              if (cacheable)
+                t1.$indexSet(0, key, null);
+              $async$returnValue = null;
               // goto return
               $async$goto = 1;
               break;
@@ -45838,8 +47803,8 @@ self.util = _cliPkgRequires.util;
     },
     _canonicalize$body$AsyncImportCache(importer, url, baseUrl, forImport) {
       var $async$goto = 0,
-        $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl),
-        $async$returnValue, $async$self = this, t1, passContainingUrl, result, canonicalize;
+        $async$completer = A._makeAsyncAwaitCompleter(type$.Record_2_nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl_and_bool),
+        $async$returnValue, $async$self = this, t1, passContainingUrl, canonicalizeContext, result, cacheable;
       var $async$_async_import_cache$_canonicalize$4 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -45847,7 +47812,6 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              canonicalize = forImport ? new A.AsyncImportCache__canonicalize_closure(importer, url) : new A.AsyncImportCache__canonicalize_closure0(importer, url);
               $async$goto = baseUrl != null ? 3 : 5;
               break;
             case 3:
@@ -45856,9 +47820,9 @@ self.util = _cliPkgRequires.util;
               break;
             case 6:
               // then
-              url.get$scheme();
+              t1 = A._Future$value(importer.isNonCanonicalScheme$1(url.get$scheme()), type$.bool);
               $async$goto = 9;
-              return A._asyncAwait(false, $async$_async_import_cache$_canonicalize$4);
+              return A._asyncAwait(t1, $async$_async_import_cache$_canonicalize$4);
             case 9:
               // returning from await.
               t1 = $async$result;
@@ -45879,14 +47843,17 @@ self.util = _cliPkgRequires.util;
               passContainingUrl = false;
             case 4:
               // join
-              t1 = passContainingUrl ? baseUrl : null;
+              canonicalizeContext = new A.CanonicalizeContext(forImport, passContainingUrl ? baseUrl : null);
+              t1 = type$.nullable_Object;
+              t1 = A.runZoned(new A.AsyncImportCache__canonicalize_closure(importer, url), A.LinkedHashMap_LinkedHashMap$_literal([B.Symbol__canonicalizeContext, canonicalizeContext], t1, t1), type$.FutureOr_nullable_Uri);
               $async$goto = 10;
-              return A._asyncAwait(A.withContainingUrl(t1, canonicalize, type$.FutureOr_nullable_Uri), $async$_async_import_cache$_canonicalize$4);
+              return A._asyncAwait(type$.Future_nullable_Uri._is(t1) ? t1 : A._Future$value(t1, type$.nullable_Uri), $async$_async_import_cache$_canonicalize$4);
             case 10:
               // returning from await.
               result = $async$result;
+              cacheable = !passContainingUrl || !canonicalizeContext._wasContainingUrlAccessed;
               if (result == null) {
-                $async$returnValue = null;
+                $async$returnValue = new A._Record_2(null, cacheable);
                 // goto return
                 $async$goto = 1;
                 break;
@@ -45895,22 +47862,22 @@ self.util = _cliPkgRequires.util;
               break;
             case 11:
               // then
-              A.WarnForDeprecation_warnForDeprecation($async$self._async_import_cache$_logger, B.Deprecation_mFp, "Importer " + importer.toString$0(0) + " canonicalized " + url.toString$0(0) + " to " + result.toString$0(0) + string$.x2e_Rela, null, null);
+              A.WarnForDeprecation_warnForDeprecation($async$self._async_import_cache$_logger, B.Deprecation_IMm, "Importer " + importer.toString$0(0) + " canonicalized " + url.toString$0(0) + " to " + result.toString$0(0) + string$.x2e_Rela, null, null);
               // goto join
               $async$goto = 12;
               break;
             case 13:
               // else
-              result.get$scheme();
+              t1 = A._Future$value(importer.isNonCanonicalScheme$1(result.get$scheme()), type$.bool);
               $async$goto = 14;
-              return A._asyncAwait(false, $async$_async_import_cache$_canonicalize$4);
+              return A._asyncAwait(t1, $async$_async_import_cache$_canonicalize$4);
             case 14:
               // returning from await.
               if ($async$result)
                 throw A.wrapException("Importer " + importer.toString$0(0) + " canonicalized " + url.toString$0(0) + " to " + result.toString$0(0) + string$.x2c_whicu);
             case 12:
               // join
-              $async$returnValue = new A._Record_3_originalUrl(importer, result, url);
+              $async$returnValue = new A._Record_2(new A._Record_3_originalUrl(importer, result, url), cacheable);
               // goto return
               $async$goto = 1;
               break;
@@ -45954,35 +47921,22 @@ self.util = _cliPkgRequires.util;
       return A._asyncStartSync($async$importCanonical$4$originalUrl$quiet, $async$completer);
     },
     humanize$1(canonicalUrl) {
-      var t2,
-        t1 = this._async_import_cache$_canonicalizeCache;
-      t1 = A.IterableNullableExtension_whereNotNull(t1.get$values(t1), type$.Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl);
-      t2 = t1.$ti;
+      var t1 = A.IterableNullableExtension_whereNotNull(this._async_import_cache$_canonicalizeCache.get$values(0), type$.Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl),
+        t2 = t1.$ti;
       t2 = A.NullableExtension_andThen(A.minBy(new A.MappedIterable(new A.WhereIterable(t1, new A.AsyncImportCache_humanize_closure(canonicalUrl), t2._eval$1("WhereIterable<Iterable.E>")), new A.AsyncImportCache_humanize_closure0(), t2._eval$1("MappedIterable<Iterable.E,Uri>")), new A.AsyncImportCache_humanize_closure1()), new A.AsyncImportCache_humanize_closure2(canonicalUrl));
       return t2 == null ? canonicalUrl : t2;
     },
     sourceMapUrl$1(_, canonicalUrl) {
       var t1 = this._async_import_cache$_resultsCache.$index(0, canonicalUrl);
-      t1 = t1 == null ? null : t1.get$sourceMapUrl(t1);
+      t1 = t1 == null ? null : t1.get$sourceMapUrl(0);
       return t1 == null ? canonicalUrl : t1;
     }
   };
   A.AsyncImportCache_canonicalize_closure.prototype = {
-    call$0() {
-      var _this = this,
-        t1 = _this.baseUrl,
-        t2 = t1 == null ? null : t1.resolveUri$1(_this.url);
-      if (t2 == null)
-        t2 = _this.url;
-      return _this.$this._async_import_cache$_canonicalize$4(_this.baseImporter, t2, t1, _this.forImport);
-    },
-    $signature: 294
-  };
-  A.AsyncImportCache_canonicalize_closure0.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl),
-        $async$returnValue, $async$self = this, t1, t2, t3, t4, t5, t6, _i, _0_0, result, t7;
+        $async$returnValue, $async$self = this, t1, t2, _0_0, result;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -45990,41 +47944,18 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              t1 = $async$self.$this, t2 = t1._async_import_cache$_importers, t3 = t2.length, t4 = $async$self.url, t5 = $async$self.baseUrl, t6 = $async$self.forImport, _i = 0;
+              t1 = $async$self.$this;
+              t2 = $async$self.baseUrl;
+              $async$goto = 3;
+              return A._asyncAwait(t1._async_import_cache$_canonicalize$4($async$self.baseImporter, $async$self.resolvedUrl, t2, $async$self.forImport), $async$call$0);
             case 3:
-              // for condition
-              if (!(_i < t2.length)) {
-                // goto after for
-                $async$goto = 5;
-                break;
-              }
-              $async$goto = 6;
-              return A._asyncAwait(t1._async_import_cache$_canonicalize$4(t2[_i], t4, t5, t6), $async$call$0);
-            case 6:
               // returning from await.
               _0_0 = $async$result;
-              if (_0_0 != null) {
-                result = _0_0;
-                t7 = true;
-              } else {
-                result = null;
-                t7 = false;
-              }
-              if (t7) {
-                $async$returnValue = result;
-                // goto return
-                $async$goto = 1;
-                break;
-              }
-            case 4:
-              // for update
-              t2.length === t3 || (0, A.throwConcurrentModificationError)(t2), ++_i;
-              // goto for condition
-              $async$goto = 3;
-              break;
-            case 5:
-              // after for
-              $async$returnValue = null;
+              result = _0_0._0;
+              _0_0._1;
+              if (t2 != null)
+                t1._async_import_cache$_nonCanonicalRelativeUrls.$indexSet(0, $async$self.key, $async$self.url);
+              $async$returnValue = result;
               // goto return
               $async$goto = 1;
               break;
@@ -46035,32 +47966,19 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 294
+    $signature: 266
   };
   A.AsyncImportCache__canonicalize_closure.prototype = {
     call$0() {
-      var t1 = type$.nullable_Object;
-      return A.runZoned(new A.AsyncImportCache__canonicalize__closure(this.importer, this.resolved), A.LinkedHashMap_LinkedHashMap$_literal([B.Symbol__inImportRule, true], t1, t1), type$.FutureOr_nullable_Uri);
+      return this.importer.canonicalize$1(0, this.url);
     },
-    $signature: 55
-  };
-  A.AsyncImportCache__canonicalize__closure.prototype = {
-    call$0() {
-      return this.importer.canonicalize$1(0, this.resolved);
-    },
-    $signature: 55
-  };
-  A.AsyncImportCache__canonicalize_closure0.prototype = {
-    call$0() {
-      return this.importer.canonicalize$1(0, this.resolved);
-    },
-    $signature: 55
+    $signature: 263
   };
   A.AsyncImportCache_importCanonical_closure.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Stylesheet),
-        $async$returnValue, $async$self = this, t2, t3, t4, t1, result;
+        $async$returnValue, $async$self = this, t3, t4, t1, t2, result;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -46069,8 +47987,9 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               t1 = $async$self.canonicalUrl;
+              t2 = A._Future$value($async$self.importer.load$1(0, t1), type$.nullable_ImporterResult);
               $async$goto = 3;
-              return A._asyncAwait($async$self.importer.load$1(0, t1), $async$call$0);
+              return A._asyncAwait(t2, $async$call$0);
             case 3:
               // returning from await.
               result = $async$result;
@@ -46096,33 +48015,33 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 548
+    $signature: 278
   };
   A.AsyncImportCache_humanize_closure.prototype = {
     call$1(result) {
       return J.$eq$(result._1, this.canonicalUrl);
     },
-    $signature: 581
+    $signature: 289
   };
   A.AsyncImportCache_humanize_closure0.prototype = {
     call$1(result) {
       return result._2;
     },
-    $signature: 629
+    $signature: 294
   };
   A.AsyncImportCache_humanize_closure1.prototype = {
     call$1(url) {
       return url.get$path(url).length;
     },
-    $signature: 111
+    $signature: 87
   };
   A.AsyncImportCache_humanize_closure2.prototype = {
     call$1(url) {
       var t1 = $.$get$url(),
         t2 = this.canonicalUrl;
-      return url.resolve$1(A.ParsedPath_ParsedPath$parse(t2.get$path(t2), t1.style).get$basename());
+      return url.resolve$1(0, A.ParsedPath_ParsedPath$parse(t2.get$path(t2), t1.style).get$basename());
     },
-    $signature: 48
+    $signature: 43
   };
   A.AsyncBuiltInCallable.prototype = {
     callbackFor$2(positional, names) {
@@ -46143,7 +48062,7 @@ self.util = _cliPkgRequires.util;
     $call$body$AsyncBuiltInCallable$mixin_closure($arguments) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Value),
-        $async$returnValue, $async$self = this;
+        $async$returnValue, $async$self = this, t1;
       var $async$call$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -46151,8 +48070,9 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
+              t1 = $async$self.callback.call$1($arguments);
               $async$goto = 3;
-              return A._asyncAwait($async$self.callback.call$1($arguments), $async$call$1);
+              return A._asyncAwait(t1 instanceof A._Future ? t1 : A._Future$value(t1, type$.void), $async$call$1);
             case 3:
               // returning from await.
               $async$returnValue = B.C__SassNull;
@@ -46166,7 +48086,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$1, $async$completer);
     },
-    $signature: 159
+    $signature: 257
   };
   A.BuiltInCallable.prototype = {
     callbackFor$2(positional, names) {
@@ -46244,49 +48164,30 @@ self.util = _cliPkgRequires.util;
         t1 = this.importCache.sourceMapUrl$1(0, A.Uri_parse(url)).toString$0(0);
       return t1;
     },
-    $signature: 7
+    $signature: 5
   };
   A.CompileResult.prototype = {};
   A.Configuration.prototype = {
     throughForward$1($forward) {
-      var _0_0, prefix, t1, _1_0, shownVariables, _2_0, hiddenVariables,
+      var _0_0, _1_0, _2_0, t1, hiddenVariables,
         newValues = this._configuration$_values;
       if (newValues.get$isEmpty(newValues))
         return B.Configuration_Map_empty_null;
       _0_0 = $forward.prefix;
-      if (_0_0 != null) {
-        prefix = _0_0;
-        t1 = true;
-      } else {
-        prefix = null;
-        t1 = false;
-      }
-      if (t1)
-        newValues = new A.UnprefixedMapView(newValues, prefix, type$.UnprefixedMapView_ConfiguredValue);
+      if (_0_0 != null)
+        newValues = new A.UnprefixedMapView(newValues, _0_0, type$.UnprefixedMapView_ConfiguredValue);
       _1_0 = $forward.shownVariables;
-      if (_1_0 != null) {
-        shownVariables = _1_0;
-        t1 = true;
-      } else {
-        shownVariables = null;
-        t1 = false;
-      }
-      if (t1)
-        newValues = new A.LimitedMapView(newValues, shownVariables._base.intersection$1(new A.MapKeySet(newValues, type$.MapKeySet_nullable_Object)), type$.LimitedMapView_String_ConfiguredValue);
+      if (_1_0 != null)
+        newValues = new A.LimitedMapView(newValues, _1_0._base.intersection$1(new A.MapKeySet(newValues, type$.MapKeySet_nullable_Object)), type$.LimitedMapView_String_ConfiguredValue);
       else {
         _2_0 = $forward.hiddenVariables;
         if (_2_0 != null) {
+          t1 = _2_0._base.get$isNotEmpty(0);
           hiddenVariables = _2_0;
-          t1 = true;
         } else {
           hiddenVariables = null;
           t1 = false;
         }
-        if (t1) {
-          t1 = hiddenVariables._base;
-          t1 = t1.get$isNotEmpty(t1);
-        } else
-          t1 = false;
         if (t1)
           newValues = A.LimitedMapView$blocklist(newValues, hiddenVariables, type$.String, type$.ConfiguredValue);
       }
@@ -46297,13 +48198,11 @@ self.util = _cliPkgRequires.util;
       return new A.Configuration(values, t1 == null ? this : t1);
     },
     toString$0(_) {
-      var t2, t3, $name, value,
+      var t2, t3,
         t1 = A._setArrayType([], type$.JSArray_String);
       for (t2 = A.MapExtensions_get_pairs(new A.UnmodifiableMapView(this._configuration$_values, type$.UnmodifiableMapView_String_ConfiguredValue), type$.String, type$.ConfiguredValue), t2 = t2.get$iterator(t2); t2.moveNext$0();) {
         t3 = t2.get$current(t2);
-        $name = t3._0;
-        value = t3._1;
-        t1.push("$" + $name + ": " + value.toString$0(0));
+        t1.push("$" + t3._0 + ": " + t3._1.toString$0(0));
       }
       return "(" + B.JSArray_methods.join$1(t1, ",") + ")";
     }
@@ -46333,7 +48232,7 @@ self.util = _cliPkgRequires.util;
     call$1(deprecation) {
       return deprecation.id === this.id;
     },
-    $signature: 320
+    $signature: 302
   };
   A.Environment.prototype = {
     closure$0() {
@@ -46356,7 +48255,7 @@ self.util = _cliPkgRequires.util;
       if (forwardedModules == null)
         forwardedModules = _this._forwardedModules = A.LinkedHashMap_LinkedHashMap$_empty(type$.Module_Callable, type$.AstNode);
       view = A.ForwardedModuleView_ifNecessary(module, rule, type$.Callable);
-      for (t1 = A.LinkedHashMapKeyIterator$(forwardedModules, forwardedModules._modifications); t1.moveNext$0();) {
+      for (t1 = A.LinkedHashMapKeyIterator$(forwardedModules, forwardedModules.__js_helper$_modifications); t1.moveNext$0();) {
         t2 = t1.__js_helper$_current;
         _this._assertNoConflicts$5(view.get$variables(), t2.get$variables(), view, t2, "variable");
         _this._assertNoConflicts$5(view.get$functions(view), t2.get$functions(t2), view, t2, "function");
@@ -46378,7 +48277,6 @@ self.util = _cliPkgRequires.util;
         t4 = t2.get$current(t2);
         $name = t4._0;
         small = t4._1;
-        small = small;
         large = larger.$index(0, $name);
         if (large == null)
           continue;
@@ -46421,17 +48319,17 @@ self.util = _cliPkgRequires.util;
         forwardedModules = _this._forwardedModules = A.LinkedHashMap_LinkedHashMap$_empty(type$.Module_Callable, type$.AstNode);
       t1 = type$.String;
       t2 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
-      for (t3 = A.LinkedHashMapKeyIterator$(forwarded, forwarded._modifications); t3.moveNext$0();)
+      for (t3 = A.LinkedHashMapKeyIterator$(forwarded, forwarded.__js_helper$_modifications); t3.moveNext$0();)
         for (t4 = t3.__js_helper$_current.get$variables(), t4 = J.get$iterator$ax(t4.get$keys(t4)); t4.moveNext$0();)
           t2.add$1(0, t4.get$current(t4));
       t3 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
-      for (t4 = A.LinkedHashMapKeyIterator$(forwarded, forwarded._modifications); t4.moveNext$0();) {
+      for (t4 = A.LinkedHashMapKeyIterator$(forwarded, forwarded.__js_helper$_modifications); t4.moveNext$0();) {
         t5 = t4.__js_helper$_current;
         for (t5 = t5.get$functions(t5), t5 = J.get$iterator$ax(t5.get$keys(t5)); t5.moveNext$0();)
           t3.add$1(0, t5.get$current(t5));
       }
       t1 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
-      for (t4 = A.LinkedHashMapKeyIterator$(forwarded, forwarded._modifications); t4.moveNext$0();)
+      for (t4 = A.LinkedHashMapKeyIterator$(forwarded, forwarded.__js_helper$_modifications); t4.moveNext$0();)
         for (t5 = t4.__js_helper$_current.get$mixins(), t5 = J.get$iterator$ax(t5.get$keys(t5)); t5.moveNext$0();)
           t1.add$1(0, t5.get$current(t5));
       t4 = _this._variables;
@@ -46504,7 +48402,7 @@ self.util = _cliPkgRequires.util;
           t5 = t6;
         B.JSArray_methods.addAll$1(B.JSArray_methods.get$last(t5), new A.LinkedHashMapKeyIterable(forwarded, A._instanceType(forwarded)._eval$1("LinkedHashMapKeyIterable<1>")));
       }
-      for (t2 = A._LinkedHashSetIterator$(t2, t2._collection$_modifications), t5 = _this._variableIndices, t6 = _this._variableNodes, t7 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
+      for (t2 = A._LinkedHashSetIterator$(t2, t2._modifications, t2.$ti._precomputed1), t5 = _this._variableIndices, t6 = _this._variableNodes, t7 = t2.$ti._precomputed1; t2.moveNext$0();) {
         t8 = t2._collection$_current;
         if (t8 == null)
           t8 = t7._as(t8);
@@ -46512,14 +48410,14 @@ self.util = _cliPkgRequires.util;
         J.remove$1$z(B.JSArray_methods.get$last(t4), t8);
         J.remove$1$z(B.JSArray_methods.get$last(t6), t8);
       }
-      for (t2 = A._LinkedHashSetIterator$(t3, t3._collection$_modifications), t3 = _this._functionIndices, t4 = _this._functions, t5 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
+      for (t2 = A._LinkedHashSetIterator$(t3, t3._modifications, t3.$ti._precomputed1), t3 = _this._functionIndices, t4 = _this._functions, t5 = t2.$ti._precomputed1; t2.moveNext$0();) {
         t6 = t2._collection$_current;
         if (t6 == null)
           t6 = t5._as(t6);
         t3.remove$1(0, t6);
         J.remove$1$z(B.JSArray_methods.get$last(t4), t6);
       }
-      for (t1 = A._LinkedHashSetIterator$(t1, t1._collection$_modifications), t2 = _this._mixinIndices, t3 = _this._mixins, t4 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = A._LinkedHashSetIterator$(t1, t1._modifications, t1.$ti._precomputed1), t2 = _this._mixinIndices, t3 = _this._mixins, t4 = t1.$ti._precomputed1; t1.moveNext$0();) {
         t5 = t1._collection$_current;
         if (t5 == null)
           t5 = t4._as(t5);
@@ -46528,7 +48426,7 @@ self.util = _cliPkgRequires.util;
       }
     },
     getVariable$2$namespace($name, namespace) {
-      var t1, _0_0, index, t2, _1_0, _this = this;
+      var t1, _0_0, _1_0, _this = this;
       if (namespace != null)
         return _this._getModule$1(namespace).get$variables().$index(0, $name);
       if (_this._lastVariableName === $name) {
@@ -46540,31 +48438,17 @@ self.util = _cliPkgRequires.util;
       t1 = _this._variableIndices;
       _0_0 = t1.$index(0, $name);
       if (_0_0 != null) {
-        index = _0_0;
-        t2 = true;
-      } else {
-        index = null;
-        t2 = false;
-      }
-      if (t2) {
         _this._lastVariableName = $name;
-        _this._lastVariableIndex = index;
-        t1 = J.$index$asx(_this._variables[index], $name);
+        _this._lastVariableIndex = _0_0;
+        t1 = J.$index$asx(_this._variables[_0_0], $name);
         return t1 == null ? _this._getVariableFromGlobalModule$1($name) : t1;
       } else {
         _1_0 = _this._variableIndex$1($name);
         if (_1_0 != null) {
-          index = _1_0;
-          t2 = true;
-        } else {
-          index = null;
-          t2 = false;
-        }
-        if (t2) {
           _this._lastVariableName = $name;
-          _this._lastVariableIndex = index;
-          t1.$indexSet(0, $name, index);
-          t1 = J.$index$asx(_this._variables[index], $name);
+          _this._lastVariableIndex = _1_0;
+          t1.$indexSet(0, $name, _1_0);
+          t1 = J.$index$asx(_this._variables[_1_0], $name);
           return t1 == null ? _this._getVariableFromGlobalModule$1($name) : t1;
         } else
           return _this._getVariableFromGlobalModule$1($name);
@@ -46577,7 +48461,7 @@ self.util = _cliPkgRequires.util;
       return this._fromOneModule$3($name, "variable", new A.Environment__getVariableFromGlobalModule_closure($name));
     },
     getVariableNode$2$namespace($name, namespace) {
-      var t1, _0_0, index, t2, _1_0, _this = this;
+      var t1, _0_0, _1_0, _this = this;
       if (namespace != null)
         return _this._getModule$1(namespace).get$variableNodes().$index(0, $name);
       if (_this._lastVariableName === $name) {
@@ -46589,50 +48473,29 @@ self.util = _cliPkgRequires.util;
       t1 = _this._variableIndices;
       _0_0 = t1.$index(0, $name);
       if (_0_0 != null) {
-        index = _0_0;
-        t2 = true;
-      } else {
-        index = null;
-        t2 = false;
-      }
-      if (t2) {
         _this._lastVariableName = $name;
-        _this._lastVariableIndex = index;
-        t1 = J.$index$asx(_this._variableNodes[index], $name);
+        _this._lastVariableIndex = _0_0;
+        t1 = J.$index$asx(_this._variableNodes[_0_0], $name);
         return t1 == null ? _this._getVariableNodeFromGlobalModule$1($name) : t1;
       } else {
         _1_0 = _this._variableIndex$1($name);
         if (_1_0 != null) {
-          index = _1_0;
-          t2 = true;
-        } else {
-          index = null;
-          t2 = false;
-        }
-        if (t2) {
           _this._lastVariableName = $name;
-          _this._lastVariableIndex = index;
-          t1.$indexSet(0, $name, index);
-          t1 = J.$index$asx(_this._variableNodes[index], $name);
+          _this._lastVariableIndex = _1_0;
+          t1.$indexSet(0, $name, _1_0);
+          t1 = J.$index$asx(_this._variableNodes[_1_0], $name);
           return t1 == null ? _this._getVariableNodeFromGlobalModule$1($name) : t1;
         } else
           return _this._getVariableNodeFromGlobalModule$1($name);
       }
     },
     _getVariableNodeFromGlobalModule$1($name) {
-      var t1, t2, _0_0, value;
+      var t1, t2, _0_0;
       for (t1 = this._importedModules, t2 = this._globalModules, t2 = new A.LinkedHashMapKeyIterable(t1, A._instanceType(t1)._eval$1("LinkedHashMapKeyIterable<1>")).followedBy$1(0, new A.LinkedHashMapKeyIterable(t2, A._instanceType(t2)._eval$1("LinkedHashMapKeyIterable<1>"))), t2 = new A.FollowedByIterator(J.get$iterator$ax(t2.__internal$_first), t2._second); t2.moveNext$0();) {
         t1 = t2._currentIterator;
         _0_0 = t1.get$current(t1).get$variableNodes().$index(0, $name);
-        if (_0_0 != null) {
-          value = _0_0;
-          t1 = true;
-        } else {
-          value = null;
-          t1 = false;
-        }
-        if (t1)
-          return value;
+        if (_0_0 != null)
+          return _0_0;
       }
       return null;
     },
@@ -46675,9 +48538,9 @@ self.util = _cliPkgRequires.util;
       }
       nestedForwardedModules = _this._nestedForwardedModules;
       if (nestedForwardedModules != null && !_this._variableIndices.containsKey$1($name) && _this._variableIndex$1($name) == null)
-        for (t1 = new A.ReversedListIterable(nestedForwardedModules, A.instanceType(nestedForwardedModules)._eval$1("ReversedListIterable<1>")), t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
-          t3 = t1.__internal$_current;
-          for (t3 = J.get$reversed$ax(t3 == null ? t2._as(t3) : t3), t3 = new A.ListIterator(t3, t3.get$length(t3)), t4 = A._instanceType(t3)._precomputed1; t3.moveNext$0();) {
+        for (t1 = A._arrayInstanceType(nestedForwardedModules)._eval$1("ReversedListIterable<1>"), t2 = new A.ReversedListIterable(nestedForwardedModules, t1), t2 = new A.ListIterator(t2, t2.get$length(0), t1._eval$1("ListIterator<ListIterable.E>")), t1 = t1._eval$1("ListIterable.E"); t2.moveNext$0();) {
+          t3 = t2.__internal$_current;
+          for (t3 = J.get$reversed$ax(t3 == null ? t1._as(t3) : t3), t4 = t3.$ti, t3 = new A.ListIterator(t3, t3.get$length(0), t4._eval$1("ListIterator<ListIterable.E>")), t4 = t4._eval$1("ListIterable.E"); t3.moveNext$0();) {
             t5 = t3.__internal$_current;
             if (t5 == null)
               t5 = t4._as(t5);
@@ -46716,7 +48579,7 @@ self.util = _cliPkgRequires.util;
       J.$indexSet$ax(_this._variableNodes[index], $name, nodeWithSpan);
     },
     getFunction$2$namespace($name, namespace) {
-      var t1, _0_0, index, t2, _1_0, _this = this;
+      var t1, _0_0, _1_0, _this = this;
       if (namespace != null) {
         t1 = _this._getModule$1(namespace);
         return t1.get$functions(t1).$index(0, $name);
@@ -46724,27 +48587,13 @@ self.util = _cliPkgRequires.util;
       t1 = _this._functionIndices;
       _0_0 = t1.$index(0, $name);
       if (_0_0 != null) {
-        index = _0_0;
-        t2 = true;
-      } else {
-        index = null;
-        t2 = false;
-      }
-      if (t2) {
-        t1 = J.$index$asx(_this._functions[index], $name);
+        t1 = J.$index$asx(_this._functions[_0_0], $name);
         return t1 == null ? _this._getFunctionFromGlobalModule$1($name) : t1;
       } else {
         _1_0 = _this._functionIndex$1($name);
         if (_1_0 != null) {
-          index = _1_0;
-          t2 = true;
-        } else {
-          index = null;
-          t2 = false;
-        }
-        if (t2) {
-          t1.$indexSet(0, $name, index);
-          t1 = J.$index$asx(_this._functions[index], $name);
+          t1.$indexSet(0, $name, _1_0);
+          t1 = J.$index$asx(_this._functions[_1_0], $name);
           return t1 == null ? _this._getFunctionFromGlobalModule$1($name) : t1;
         } else
           return _this._getFunctionFromGlobalModule$1($name);
@@ -46764,33 +48613,19 @@ self.util = _cliPkgRequires.util;
       return null;
     },
     getMixin$2$namespace($name, namespace) {
-      var t1, _0_0, index, t2, _1_0, _this = this;
+      var t1, _0_0, _1_0, _this = this;
       if (namespace != null)
         return _this._getModule$1(namespace).get$mixins().$index(0, $name);
       t1 = _this._mixinIndices;
       _0_0 = t1.$index(0, $name);
       if (_0_0 != null) {
-        index = _0_0;
-        t2 = true;
-      } else {
-        index = null;
-        t2 = false;
-      }
-      if (t2) {
-        t1 = J.$index$asx(_this._mixins[index], $name);
+        t1 = J.$index$asx(_this._mixins[_0_0], $name);
         return t1 == null ? _this._getMixinFromGlobalModule$1($name) : t1;
       } else {
         _1_0 = _this._mixinIndex$1($name);
         if (_1_0 != null) {
-          index = _1_0;
-          t2 = true;
-        } else {
-          index = null;
-          t2 = false;
-        }
-        if (t2) {
-          t1.$indexSet(0, $name, index);
-          t1 = J.$index$asx(_this._mixins[index], $name);
+          t1.$indexSet(0, $name, _1_0);
+          t1 = J.$index$asx(_this._mixins[_1_0], $name);
           return t1 == null ? _this._getMixinFromGlobalModule$1($name) : t1;
         } else
           return _this._getMixinFromGlobalModule$1($name);
@@ -46867,14 +48702,14 @@ self.util = _cliPkgRequires.util;
           t1.pop();
       }
     },
-    scope$1$1(callback, $T) {
-      return this.scope$1$3$semiGlobal$when(callback, false, true, $T);
+    scope$1$1(callback) {
+      return this.scope$1$3$semiGlobal$when(callback, false, true);
     },
-    scope$1$2$when(callback, when, $T) {
-      return this.scope$1$3$semiGlobal$when(callback, false, when, $T);
+    scope$1$2$when(callback, when) {
+      return this.scope$1$3$semiGlobal$when(callback, false, when);
     },
-    scope$1$2$semiGlobal(callback, semiGlobal, $T) {
-      return this.scope$1$3$semiGlobal$when(callback, semiGlobal, true, $T);
+    scope$1$2$semiGlobal(callback, semiGlobal) {
+      return this.scope$1$3$semiGlobal$when(callback, semiGlobal, true);
     },
     toImplicitConfiguration$0() {
       var t2, t3, t4, i, values, nodes, t5, t6, $name, value,
@@ -46901,59 +48736,30 @@ self.util = _cliPkgRequires.util;
       return A._EnvironmentModule__EnvironmentModule(this, new A.CssStylesheet(new A.UnmodifiableListView(B.List_empty3, type$.UnmodifiableListView_CssNode), A.SourceFile$decoded(B.List_empty4, "<dummy module>").span$1(0, 0)), B.Map_empty0, B.C_EmptyExtensionStore, A.NullableExtension_andThen(this._forwardedModules, new A.Environment_toDummyModule_closure()));
     },
     _getModule$1(namespace) {
-      var module, t1,
-        _0_0 = this._environment$_modules.$index(0, namespace);
-      if (_0_0 != null) {
-        module = _0_0;
-        t1 = true;
-      } else {
-        module = null;
-        t1 = false;
-      }
-      if (t1)
-        return module;
+      var _0_0 = this._environment$_modules.$index(0, namespace);
+      if (_0_0 != null)
+        return _0_0;
       throw A.wrapException(A.SassScriptException$('There is no module with the namespace "' + namespace + '".', null));
     },
     _fromOneModule$1$3($name, type, callback) {
-      var nestedForwardedModules, t1, t2, t3, t4, t5, _1_0, value, _2_0, identity, valueInModule, identityFromModule, module, node, _null = null,
+      var t1, t2, t3, t4, t5, _1_0, _2_0, value, identity, valueInModule, identityFromModule, module, node,
         _0_0 = this._nestedForwardedModules;
-      if (_0_0 != null) {
-        nestedForwardedModules = _0_0;
-        t1 = true;
-      } else {
-        nestedForwardedModules = _null;
-        t1 = false;
-      }
-      if (t1)
-        for (t1 = new A.ReversedListIterable(nestedForwardedModules, A.instanceType(nestedForwardedModules)._eval$1("ReversedListIterable<1>")), t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
-          t3 = t1.__internal$_current;
-          for (t3 = J.get$reversed$ax(t3 == null ? t2._as(t3) : t3), t3 = new A.ListIterator(t3, t3.get$length(t3)), t4 = A._instanceType(t3)._precomputed1; t3.moveNext$0();) {
+      if (_0_0 != null)
+        for (t1 = A._arrayInstanceType(_0_0)._eval$1("ReversedListIterable<1>"), t2 = new A.ReversedListIterable(_0_0, t1), t2 = new A.ListIterator(t2, t2.get$length(0), t1._eval$1("ListIterator<ListIterable.E>")), t1 = t1._eval$1("ListIterable.E"); t2.moveNext$0();) {
+          t3 = t2.__internal$_current;
+          for (t3 = J.get$reversed$ax(t3 == null ? t1._as(t3) : t3), t4 = t3.$ti, t3 = new A.ListIterator(t3, t3.get$length(0), t4._eval$1("ListIterator<ListIterable.E>")), t4 = t4._eval$1("ListIterable.E"); t3.moveNext$0();) {
             t5 = t3.__internal$_current;
             _1_0 = callback.call$1(t5 == null ? t4._as(t5) : t5);
-            if (_1_0 != null) {
-              value = _1_0;
-              t5 = true;
-            } else {
-              value = _null;
-              t5 = false;
-            }
-            if (t5)
-              return value;
+            if (_1_0 != null)
+              return _1_0;
           }
         }
-      for (t1 = this._importedModules, t1 = A.LinkedHashMapKeyIterator$(t1, t1._modifications); t1.moveNext$0();) {
+      for (t1 = this._importedModules, t1 = A.LinkedHashMapKeyIterator$(t1, t1.__js_helper$_modifications); t1.moveNext$0();) {
         _2_0 = callback.call$1(t1.__js_helper$_current);
-        if (_2_0 != null) {
-          value = _2_0;
-          t2 = true;
-        } else {
-          value = _null;
-          t2 = false;
-        }
-        if (t2)
-          return value;
+        if (_2_0 != null)
+          return _2_0;
       }
-      for (t1 = this._globalModules, t2 = A.LinkedHashMapKeyIterator$(t1, t1._modifications), t3 = type$.Callable, identity = _null, value = identity; t2.moveNext$0();) {
+      for (t1 = this._globalModules, t2 = A.LinkedHashMapKeyIterator$(t1, t1.__js_helper$_modifications), t3 = type$.Callable, value = null, identity = null; t2.moveNext$0();) {
         t4 = t2.__js_helper$_current;
         valueInModule = callback.call$1(t4);
         if (valueInModule == null)
@@ -46985,7 +48791,7 @@ self.util = _cliPkgRequires.util;
     call$1(module) {
       return module.get$variables().$index(0, this.name);
     },
-    $signature: 323
+    $signature: 310
   };
   A.Environment_setVariable_closure.prototype = {
     call$0() {
@@ -46993,13 +48799,13 @@ self.util = _cliPkgRequires.util;
       t1._lastVariableName = this.name;
       return t1._lastVariableIndex = 0;
     },
-    $signature: 3
+    $signature: 10
   };
   A.Environment_setVariable_closure0.prototype = {
     call$1(module) {
       return module.get$variables().containsKey$1(this.name) ? module : null;
     },
-    $signature: 326
+    $signature: 313
   };
   A.Environment_setVariable_closure1.prototype = {
     call$0() {
@@ -47007,31 +48813,31 @@ self.util = _cliPkgRequires.util;
         t2 = t1._variableIndex$1(this.name);
       return t2 == null ? t1._variables.length - 1 : t2;
     },
-    $signature: 3
+    $signature: 10
   };
   A.Environment__getFunctionFromGlobalModule_closure.prototype = {
     call$1(module) {
       return module.get$functions(module).$index(0, this.name);
     },
-    $signature: 163
+    $signature: 246
   };
   A.Environment__getMixinFromGlobalModule_closure.prototype = {
     call$1(module) {
       return module.get$mixins().$index(0, this.name);
     },
-    $signature: 163
+    $signature: 246
   };
   A.Environment_toModule_closure.prototype = {
     call$1(modules) {
       return new A.MapKeySet(modules, type$.MapKeySet_Module_Callable);
     },
-    $signature: 167
+    $signature: 243
   };
   A.Environment_toDummyModule_closure.prototype = {
     call$1(modules) {
       return new A.MapKeySet(modules, type$.MapKeySet_Module_Callable);
     },
-    $signature: 167
+    $signature: 243
   };
   A._EnvironmentModule.prototype = {
     get$url(_) {
@@ -47040,17 +48846,10 @@ self.util = _cliPkgRequires.util;
       return t1.get$sourceUrl(t1);
     },
     setVariable$3($name, value, nodeWithSpan) {
-      var module, t1, t2,
+      var t1, t2,
         _0_0 = this._modulesByVariable.$index(0, $name);
       if (_0_0 != null) {
-        module = _0_0;
-        t1 = true;
-      } else {
-        module = null;
-        t1 = false;
-      }
-      if (t1) {
-        module.setVariable$3($name, value, nodeWithSpan);
+        _0_0.setVariable$3($name, value, nodeWithSpan);
         return;
       }
       t1 = this._environment$_environment;
@@ -47080,7 +48879,9 @@ self.util = _cliPkgRequires.util;
       else {
         t1 = t1.get$span(t1);
         t1 = t1.get$sourceUrl(t1);
-        t1 = $.$get$context().prettyUri$1(t1);
+        t2 = $.$get$context();
+        t1.toString;
+        t1 = t2.prettyUri$1(t1);
       }
       return t1;
     },
@@ -47120,57 +48921,55 @@ self.util = _cliPkgRequires.util;
     call$1(module) {
       return module.get$variables();
     },
-    $signature: 331
+    $signature: 319
   };
   A._EnvironmentModule__EnvironmentModule_closure0.prototype = {
     call$1(module) {
       return module.get$variableNodes();
     },
-    $signature: 333
+    $signature: 323
   };
   A._EnvironmentModule__EnvironmentModule_closure1.prototype = {
     call$1(module) {
       return module.get$functions(module);
     },
-    $signature: 170
+    $signature: 234
   };
   A._EnvironmentModule__EnvironmentModule_closure2.prototype = {
     call$1(module) {
       return module.get$mixins();
     },
-    $signature: 170
+    $signature: 234
   };
   A._EnvironmentModule__EnvironmentModule_closure3.prototype = {
     call$1(module) {
       return module.get$transitivelyContainsCss();
     },
-    $signature: 134
+    $signature: 117
   };
   A._EnvironmentModule__EnvironmentModule_closure4.prototype = {
     call$1(module) {
       return module.get$transitivelyContainsExtensions();
     },
-    $signature: 134
+    $signature: 117
   };
   A.SassException.prototype = {
     get$trace(_) {
-      return A.Trace$(A._setArrayType([A.frameForSpan(A.SourceSpanException.prototype.get$span.call(this, this), "root stylesheet", null)], type$.JSArray_Frame), null);
+      return A.Trace$(A._setArrayType([A.frameForSpan(A.SourceSpanException.prototype.get$span.call(this, 0), "root stylesheet", null)], type$.JSArray_Frame), null);
     },
     get$span(_) {
-      return A.SourceSpanException.prototype.get$span.call(this, this);
+      return A.SourceSpanException.prototype.get$span.call(this, 0);
     },
     withAdditionalSpan$2(span, label) {
-      var _this = this;
-      return A.MultiSpanSassException$(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, _this), "", A.LinkedHashMap_LinkedHashMap$_literal([span, label], type$.FileSpan, type$.String), _this.loadedUrls);
+      return A.MultiSpanSassException$(this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(this, 0), "", A.LinkedHashMap_LinkedHashMap$_literal([span, label], type$.FileSpan, type$.String), this.loadedUrls);
     },
     withTrace$1(trace) {
-      var _this = this,
-        t1 = A.SourceSpanException.prototype.get$span.call(_this, _this),
-        t2 = A.Set_Set$unmodifiable(_this.loadedUrls, type$.Uri);
-      return new A.SassRuntimeException(trace, t2, _this._span_exception$_message, t1);
+      var t1 = A.SourceSpanException.prototype.get$span.call(this, 0),
+        t2 = A.Set_Set$unmodifiable(this.loadedUrls, type$.Uri);
+      return new A.SassRuntimeException(trace, t2, this._span_exception$_message, t1);
     },
     withLoadedUrls$1(loadedUrls) {
-      var t1 = A.SourceSpanException.prototype.get$span.call(this, this),
+      var t1 = A.SourceSpanException.prototype.get$span.call(this, 0),
         t2 = A.Set_Set$unmodifiable(loadedUrls, type$.Uri);
       return new A.SassException(t2, this._span_exception$_message, t1);
     },
@@ -47179,7 +48978,7 @@ self.util = _cliPkgRequires.util;
         buffer = new A.StringBuffer(""),
         t1 = "" + ("Error: " + _this._span_exception$_message + "\n");
       buffer._contents = t1;
-      buffer._contents = t1 + A.SourceSpanException.prototype.get$span.call(_this, _this).highlight$1$color(color);
+      buffer._contents = t1 + A.SourceSpanException.prototype.get$span.call(_this, 0).highlight$1$color(color);
       for (t1 = _this.get$trace(_this).toString$0(0).split("\n"), t2 = t1.length, _i = 0; _i < t2; ++_i) {
         frame = t1[_i];
         if (J.get$length$asx(frame) === 0)
@@ -47190,8 +48989,8 @@ self.util = _cliPkgRequires.util;
       t1 = buffer._contents;
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     },
-    toString$0($receiver) {
-      return this.toString$1$color($receiver, null);
+    toString$0(_) {
+      return this.toString$1$color(0, null);
     },
     toCssString$0() {
       var commentMessage, stringMessage, rune,
@@ -47204,12 +49003,17 @@ self.util = _cliPkgRequires.util;
       stringMessage = new A.StringBuffer("");
       for (t1 = new A.RuneIterator(A.serializeValue(new A.SassString(this.toString$1$color(0, false), true), true, true)); t1.moveNext$0();) {
         rune = t1._currentCodePoint;
-        if (rune > 255) {
-          stringMessage._contents += A.Primitives_stringFromCharCode(92);
-          stringMessage._contents += B.JSInt_methods.toRadixString$1(rune, 16);
-          stringMessage._contents += A.Primitives_stringFromCharCode(32);
-        } else
-          stringMessage._contents += A.Primitives_stringFromCharCode(rune);
+        if (rune > 127) {
+          t2 = A.Primitives_stringFromCharCode(92);
+          stringMessage._contents += t2;
+          t2 = B.JSInt_methods.toRadixString$1(rune, 16);
+          stringMessage._contents += t2;
+          t2 = A.Primitives_stringFromCharCode(32);
+          stringMessage._contents += t2;
+        } else {
+          t2 = A.Primitives_stringFromCharCode(rune);
+          stringMessage._contents += t2;
+        }
       }
       return "/* " + B.JSArray_methods.join$1(A._setArrayType(commentMessage.split("\n"), type$.JSArray_String), "\n * ") + ' */\n\nbody::before {\n  font-family: "Source Code Pro", "SF Mono", Monaco, Inconsolata, "Fira Mono",\n      "Droid Sans Mono", monospace, monospace;\n  white-space: pre;\n  display: block;\n  padding: 1em;\n  margin-bottom: 1em;\n  border-bottom: 2px solid black;\n  content: ' + stringMessage.toString$0(0) + ";\n}";
     }
@@ -47217,36 +49021,37 @@ self.util = _cliPkgRequires.util;
   A.MultiSpanSassException.prototype = {
     withAdditionalSpan$2(span, label) {
       var _this = this,
-        t1 = A.SourceSpanException.prototype.get$span.call(_this, _this),
+        t1 = A.SourceSpanException.prototype.get$span.call(_this, 0),
         t2 = A.LinkedHashMap_LinkedHashMap$of(_this.secondarySpans, type$.FileSpan, type$.String);
       t2.$indexSet(0, span, label);
       return A.MultiSpanSassException$(_this._span_exception$_message, t1, _this.primaryLabel, t2, _this.loadedUrls);
     },
     withTrace$1(trace) {
       var _this = this;
-      return A.MultiSpanSassRuntimeException$(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, _this), _this.primaryLabel, _this.secondarySpans, trace, _this.loadedUrls);
+      return A.MultiSpanSassRuntimeException$(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, 0), _this.primaryLabel, _this.secondarySpans, trace, _this.loadedUrls);
     },
     withLoadedUrls$1(loadedUrls) {
       var _this = this;
-      return A.MultiSpanSassException$(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, _this), _this.primaryLabel, _this.secondarySpans, loadedUrls);
+      return A.MultiSpanSassException$(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, 0), _this.primaryLabel, _this.secondarySpans, loadedUrls);
     },
     toString$1$color(_, color) {
-      var t1, t2, _i, frame, _this = this,
-        useColor = color === true && true,
+      var t1, t2, _i, frame, t3, _this = this,
+        useColor = color === true,
         buffer = new A.StringBuffer("Error: " + _this._span_exception$_message + "\n");
-      A.NullableExtension_andThen(A.Highlighter$multiple(A.SourceSpanException.prototype.get$span.call(_this, _this), _this.primaryLabel, _this.secondarySpans, useColor, null, null).highlight$0(), buffer.get$write(buffer));
+      A.NullableExtension_andThen(A.Highlighter$multiple(A.SourceSpanException.prototype.get$span.call(_this, 0), _this.primaryLabel, _this.secondarySpans, useColor, null, null).highlight$0(), buffer.get$write(buffer));
       for (t1 = _this.get$trace(_this).toString$0(0).split("\n"), t2 = t1.length, _i = 0; _i < t2; ++_i) {
         frame = t1[_i];
         if (J.get$length$asx(frame) === 0)
           continue;
         buffer._contents += "\n";
-        buffer._contents += "  " + A.S(frame);
+        t3 = "  " + A.S(frame);
+        buffer._contents += t3;
       }
       t1 = buffer._contents;
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     },
-    toString$0($receiver) {
-      return this.toString$1$color($receiver, null);
+    toString$0(_) {
+      return this.toString$1$color(0, null);
     },
     get$primaryLabel() {
       return this.primaryLabel;
@@ -47258,13 +49063,12 @@ self.util = _cliPkgRequires.util;
   A.SassRuntimeException.prototype = {
     withAdditionalSpan$2(span, label) {
       var _this = this;
-      return A.MultiSpanSassRuntimeException$(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, _this), "", A.LinkedHashMap_LinkedHashMap$_literal([span, label], type$.FileSpan, type$.String), _this.trace, _this.loadedUrls);
+      return A.MultiSpanSassRuntimeException$(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, 0), "", A.LinkedHashMap_LinkedHashMap$_literal([span, label], type$.FileSpan, type$.String), _this.trace, _this.loadedUrls);
     },
     withLoadedUrls$1(loadedUrls) {
-      var _this = this,
-        t1 = A.SourceSpanException.prototype.get$span.call(_this, _this),
+      var t1 = A.SourceSpanException.prototype.get$span.call(this, 0),
         t2 = A.Set_Set$unmodifiable(loadedUrls, type$.Uri);
-      return new A.SassRuntimeException(_this.trace, t2, _this._span_exception$_message, t1);
+      return new A.SassRuntimeException(this.trace, t2, this._span_exception$_message, t1);
     },
     get$trace(receiver) {
       return this.trace;
@@ -47273,14 +49077,14 @@ self.util = _cliPkgRequires.util;
   A.MultiSpanSassRuntimeException.prototype = {
     withAdditionalSpan$2(span, label) {
       var _this = this,
-        t1 = A.SourceSpanException.prototype.get$span.call(_this, _this),
+        t1 = A.SourceSpanException.prototype.get$span.call(_this, 0),
         t2 = A.LinkedHashMap_LinkedHashMap$of(_this.secondarySpans, type$.FileSpan, type$.String);
       t2.$indexSet(0, span, label);
       return A.MultiSpanSassRuntimeException$(_this._span_exception$_message, t1, _this.primaryLabel, t2, _this.trace, _this.loadedUrls);
     },
     withLoadedUrls$1(loadedUrls) {
       var _this = this;
-      return A.MultiSpanSassRuntimeException$(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, _this), _this.primaryLabel, _this.secondarySpans, _this.trace, loadedUrls);
+      return A.MultiSpanSassRuntimeException$(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, 0), _this.primaryLabel, _this.secondarySpans, _this.trace, loadedUrls);
     },
     $isSassRuntimeException: 1,
     get$trace(receiver) {
@@ -47289,15 +49093,14 @@ self.util = _cliPkgRequires.util;
   };
   A.SassFormatException.prototype = {
     get$source() {
-      var t1 = A.SourceSpanException.prototype.get$span.call(this, this);
+      var t1 = A.SourceSpanException.prototype.get$span.call(this, 0);
       return A.String_String$fromCharCodes(B.NativeUint32List_methods.sublist$2(t1.get$file(t1)._decodedChars, 0, null), 0, null);
     },
     withAdditionalSpan$2(span, label) {
-      var _this = this;
-      return A.MultiSpanSassFormatException$(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, _this), "", A.LinkedHashMap_LinkedHashMap$_literal([span, label], type$.FileSpan, type$.String), _this.loadedUrls);
+      return A.MultiSpanSassFormatException$(this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(this, 0), "", A.LinkedHashMap_LinkedHashMap$_literal([span, label], type$.FileSpan, type$.String), this.loadedUrls);
     },
     withLoadedUrls$1(loadedUrls) {
-      var t1 = A.SourceSpanException.prototype.get$span.call(this, this),
+      var t1 = A.SourceSpanException.prototype.get$span.call(this, 0),
         t2 = A.Set_Set$unmodifiable(loadedUrls, type$.Uri);
       return new A.SassFormatException(t2, this._span_exception$_message, t1);
     },
@@ -47306,19 +49109,19 @@ self.util = _cliPkgRequires.util;
   };
   A.MultiSpanSassFormatException.prototype = {
     get$source() {
-      var t1 = A.SourceSpanException.prototype.get$span.call(this, this);
+      var t1 = A.SourceSpanException.prototype.get$span.call(this, 0);
       return A.String_String$fromCharCodes(B.NativeUint32List_methods.sublist$2(t1.get$file(t1)._decodedChars, 0, null), 0, null);
     },
     withAdditionalSpan$2(span, label) {
       var _this = this,
-        t1 = A.SourceSpanException.prototype.get$span.call(_this, _this),
+        t1 = A.SourceSpanException.prototype.get$span.call(_this, 0),
         t2 = A.LinkedHashMap_LinkedHashMap$of(_this.secondarySpans, type$.FileSpan, type$.String);
       t2.$indexSet(0, span, label);
       return A.MultiSpanSassFormatException$(_this._span_exception$_message, t1, _this.primaryLabel, t2, _this.loadedUrls);
     },
     withLoadedUrls$1(loadedUrls) {
       var _this = this;
-      return A.MultiSpanSassFormatException$(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, _this), _this.primaryLabel, _this.secondarySpans, loadedUrls);
+      return A.MultiSpanSassFormatException$(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, 0), _this.primaryLabel, _this.secondarySpans, loadedUrls);
     },
     $isFormatException: 1,
     $isSassFormatException: 1,
@@ -47345,13 +49148,7 @@ self.util = _cliPkgRequires.util;
     call$1(url) {
       return this.options.sourceMapUrl$2(0, A.Uri_parse(url), this.destination).toString$0(0);
     },
-    $signature: 7
-  };
-  A.compileStylesheets_closure.prototype = {
-    call$0() {
-      return this._1_0[0];
-    },
-    $signature: 336
+    $signature: 5
   };
   A.ExecutableOptions.prototype = {
     get$interactive() {
@@ -47369,6 +49166,26 @@ self.util = _cliPkgRequires.util;
       var t1 = this._options;
       return t1.wasParsed$1("color") ? A._asBool(t1.$index(0, "color")) : A.hasTerminal();
     },
+    get$pkgImporters() {
+      var t2, t3, t4, _null = null,
+        t1 = A._setArrayType([], type$.JSArray_Importer);
+      for (t2 = J.get$iterator$ax(type$.List_String._as(this._options.$index(0, "pkg-importer"))); t2.moveNext$0();) {
+        t2.get$current(t2);
+        t3 = new A.NodePackageImporter();
+        t4 = self.process;
+        if (t4 == null)
+          t4 = _null;
+        else {
+          t4 = J.get$release$x(t4);
+          t4 = t4 == null ? _null : J.get$name$x(t4);
+        }
+        if (!J.$eq$(t4, "node") && self.document != null && typeof self.document.querySelector == "function")
+          A.throwExpression(string$.The_No);
+        t3.__NodePackageImporter__entryPointDirectory_F = $.$get$context().absolute$15(".", _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null);
+        t1.push(t3);
+      }
+      return t1;
+    },
     get$emitErrorCss() {
       var t1 = A._asBoolQ(this._options.$index(0, "error-css"));
       if (t1 == null) {
@@ -47379,50 +49196,50 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     _ensureSources$0() {
-      var t1, stdin, t2, t3, $directories, t4, t5, colonArgs, positionalArgs, t6, t7, t8, message, target, source, destination, seen, _0_0, _this = this, _null = null,
+      var t1, stdin, t2, t3, $directories, t4, t5, t6, colonArgs, positionalArgs, t7, t8, t9, message, target, source, destination, seen, _0_0, _this = this, _null = null,
         _s18_ = 'Duplicate source "';
       if (_this._sourcesToDestinations != null)
         return;
       t1 = _this._options;
       stdin = A._asBool(t1.$index(0, "stdin"));
       t2 = t1.rest;
-      if (t2.get$length(t2) === 0 && !stdin)
+      if (t2.get$length(0) === 0 && !stdin)
         A.ExecutableOptions__fail("Compile Sass to CSS.");
       t3 = type$.String;
       $directories = A.LinkedHashSet_LinkedHashSet$_empty(t3);
-      for (t4 = new A.ListIterator(t2, t2.get$length(t2)), t5 = A._instanceType(t4)._precomputed1, colonArgs = false, positionalArgs = false; t4.moveNext$0();) {
-        t6 = t4.__internal$_current;
-        if (t6 == null)
-          t6 = t5._as(t6);
-        t7 = t6.length;
-        if (t7 === 0)
+      for (t4 = t2.$ti, t5 = t4._eval$1("ListIterator<ListBase.E>"), t6 = new A.ListIterator(t2, t2.get$length(0), t5), t4 = t4._eval$1("ListBase.E"), colonArgs = false, positionalArgs = false; t6.moveNext$0();) {
+        t7 = t6.__internal$_current;
+        if (t7 == null)
+          t7 = t4._as(t7);
+        t8 = t7.length;
+        if (t8 === 0)
           A.ExecutableOptions__fail('Invalid argument "".');
-        if (A.stringContainsUnchecked(t6, ":", 0)) {
-          if (t7 > 2) {
-            t8 = t6.charCodeAt(0);
-            if (!(t8 >= 97 && t8 <= 122))
-              t8 = t8 >= 65 && t8 <= 90;
+        if (A.stringContainsUnchecked(t7, ":", 0)) {
+          if (t8 > 2) {
+            t9 = t7.charCodeAt(0);
+            if (!(t9 >= 97 && t9 <= 122))
+              t9 = t9 >= 65 && t9 <= 90;
             else
-              t8 = true;
-            t8 = t8 && t6.charCodeAt(1) === 58;
+              t9 = true;
+            t9 = t9 && t7.charCodeAt(1) === 58;
           } else
-            t8 = false;
-          if (t8) {
-            if (2 > t7)
-              A.throwExpression(A.RangeError$range(2, 0, t7, _null, _null));
-            t7 = A.stringContainsUnchecked(t6, ":", 2);
+            t9 = false;
+          if (t9) {
+            if (2 > t8)
+              A.throwExpression(A.RangeError$range(2, 0, t8, _null, _null));
+            t8 = A.stringContainsUnchecked(t7, ":", 2);
           } else
-            t7 = true;
+            t8 = true;
         } else
-          t7 = false;
-        if (t7)
+          t8 = false;
+        if (t8)
           colonArgs = true;
-        else if (A.dirExists(t6))
-          $directories.add$1(0, t6);
+        else if (A.dirExists(t7))
+          $directories.add$1(0, t7);
         else
           positionalArgs = true;
       }
-      if (positionalArgs || t2.get$length(t2) === 0) {
+      if (positionalArgs || t2.get$length(0) === 0) {
         if (colonArgs)
           A.ExecutableOptions__fail('Positional and ":" arguments may not both be used.');
         else if (stdin) {
@@ -47432,7 +49249,7 @@ self.util = _cliPkgRequires.util;
             A.ExecutableOptions__fail("--update is not allowed with --stdin.");
           else if (A._asBool(t1.$index(0, "watch")))
             A.ExecutableOptions__fail("--watch is not allowed with --stdin.");
-          t1 = t2.get$length(t2) === 0 ? _null : t2.get$first(t2);
+          t1 = t2.get$length(0) === 0 ? _null : t2.get$first(t2);
           t2 = type$.dynamic;
           t3 = type$.nullable_String;
           _this._sourcesToDestinations = A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([null, t1], t2, t2), t3, t3);
@@ -47442,9 +49259,9 @@ self.util = _cliPkgRequires.util;
           if (t4.get$length(t3) > 2)
             A.ExecutableOptions__fail("Only two positional args may be passed.");
           else if ($directories._collection$_length !== 0) {
-            message = 'Directory "' + A.S($directories.get$first($directories)) + '" may not be a positional arg.';
+            message = 'Directory "' + A.S($directories.get$first(0)) + '" may not be a positional arg.';
             target = t2.get$last(t2);
-            A.ExecutableOptions__fail(J.$eq$($directories.get$first($directories), t2.get$first(t2)) && !A.fileExists(target) ? message + ('\nTo compile all CSS in "' + A.S($directories.get$first($directories)) + '" to "' + target + '", use `sass ' + A.S($directories.get$first($directories)) + ":" + target + "`.") : message);
+            A.ExecutableOptions__fail(J.$eq$($directories.get$first(0), t2.get$first(t2)) && !A.fileExists(target) ? message + ('\nTo compile all CSS in "' + A.S($directories.get$first(0)) + '" to "' + target + '", use `sass ' + A.S($directories.get$first(0)) + ":" + target + "`.") : message);
           } else {
             source = J.$eq$(t2.get$first(t2), "-") ? _null : t2.get$first(t2);
             destination = t4.get$length(t3) === 1 ? _null : t2.get$last(t2);
@@ -47466,20 +49283,20 @@ self.util = _cliPkgRequires.util;
         A.ExecutableOptions__fail('--stdin may not be used with ":" arguments.');
       seen = A.LinkedHashSet_LinkedHashSet$_empty(t3);
       t1 = A.PathMap__create(_null, t3);
-      t4 = type$.PathMap_String;
+      t6 = type$.PathMap_String;
       t3 = A.PathMap__create(_null, t3);
-      for (t2 = new A.ListIterator(t2, t2.get$length(t2)), t5 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
-        t6 = t2.__internal$_current;
-        if (t6 == null)
-          t6 = t5._as(t6);
-        if ($directories.contains$1(0, t6)) {
-          if (!seen.add$1(0, t6))
-            A.ExecutableOptions__fail(_s18_ + t6 + '".');
-          t3.$indexSet(0, t6, t6);
-          t1.addAll$1(0, _this._listSourceDirectory$2(t6, t6));
+      for (t2 = new A.ListIterator(t2, t2.get$length(0), t5); t2.moveNext$0();) {
+        t5 = t2.__internal$_current;
+        if (t5 == null)
+          t5 = t4._as(t5);
+        if ($directories.contains$1(0, t5)) {
+          if (!seen.add$1(0, t5))
+            A.ExecutableOptions__fail(_s18_ + t5 + '".');
+          t3.$indexSet(0, t5, t5);
+          t1.addAll$1(0, _this._listSourceDirectory$2(t5, t5));
           continue;
         }
-        _0_0 = _this._splitSourceAndDestination$1(t6);
+        _0_0 = _this._splitSourceAndDestination$1(t5);
         source = _0_0._0;
         destination = _0_0._1;
         if (!seen.add$1(0, source))
@@ -47492,9 +49309,9 @@ self.util = _cliPkgRequires.util;
         } else
           t1.$indexSet(0, source, destination);
       }
-      _this._sourcesToDestinations = new A.UnmodifiableMapView(new A.PathMap(t1, t4), type$.UnmodifiableMapView_of_nullable_String_and_nullable_String);
+      _this._sourcesToDestinations = new A.UnmodifiableMapView(new A.PathMap(t1, t6), type$.UnmodifiableMapView_of_nullable_String_and_nullable_String);
       _this.__ExecutableOptions__sourceDirectoriesToDestinations_F !== $ && A.throwUnnamedLateFieldAI();
-      _this.__ExecutableOptions__sourceDirectoriesToDestinations_F = new A.UnmodifiableMapView(new A.PathMap(t3, t4), type$.UnmodifiableMapView_of_nullable_String_and_String);
+      _this.__ExecutableOptions__sourceDirectoriesToDestinations_F = new A.UnmodifiableMapView(new A.PathMap(t3, t6), type$.UnmodifiableMapView_of_nullable_String_and_String);
     },
     _splitSourceAndDestination$1(argument) {
       var t1, i, t2, t3, nextColon;
@@ -47616,11 +49433,21 @@ self.util = _cliPkgRequires.util;
         t2 = A.absolute(path, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null);
       return t1.toUri$1(t2);
     },
-    get$fatalDeprecations() {
+    get$silenceDeprecations(_) {
+      var t2, t3, t4,
+        t1 = A.LinkedHashSet_LinkedHashSet$_empty(type$.Deprecation);
+      for (t2 = J.get$iterator$ax(type$.List_String._as(this._options.$index(0, "silence-deprecation"))); t2.moveNext$0();) {
+        t3 = t2.get$current(t2);
+        t4 = A.Deprecation_fromId(t3);
+        t1.add$1(0, t4 == null ? A.ExecutableOptions__fail('Invalid deprecation "' + t3 + '".') : t4);
+      }
+      return t1;
+    },
+    get$fatalDeprecations(_) {
       var t1 = this._fatalDeprecations;
       return t1 == null ? this._fatalDeprecations = new A.ExecutableOptions_fatalDeprecations_closure(this).call$0() : t1;
     },
-    get$futureDeprecations() {
+    get$futureDeprecations(_) {
       var t2, t3, t4,
         t1 = A.LinkedHashSet_LinkedHashSet$_empty(type$.Deprecation);
       for (t2 = J.get$iterator$ax(type$.List_String._as(this._options.$index(0, "future-deprecation"))); t2.moveNext$0();) {
@@ -47637,11 +49464,10 @@ self.util = _cliPkgRequires.util;
   };
   A.ExecutableOptions__parser_closure.prototype = {
     call$0() {
-      var _i, deprecation, _0_4, $self, id, description, t4, _1_5, _null = null,
-        t1 = type$.String,
+      var t1 = type$.String,
         t2 = A.LinkedHashMap_LinkedHashMap$_empty(t1, type$.Option),
         t3 = [],
-        parser = new A.ArgParser(t2, A.LinkedHashMap_LinkedHashMap$_empty(t1, t1), new A.UnmodifiableMapView(t2, type$.UnmodifiableMapView_String_Option), new A.UnmodifiableMapView(A.LinkedHashMap_LinkedHashMap$_empty(t1, type$.ArgParser), type$.UnmodifiableMapView_String_ArgParser), t3, true, _null);
+        parser = new A.ArgParser(t2, A.LinkedHashMap_LinkedHashMap$_empty(t1, t1), new A.UnmodifiableMapView(t2, type$.UnmodifiableMapView_String_Option), new A.UnmodifiableMapView(A.LinkedHashMap_LinkedHashMap$_empty(t1, type$.ArgParser), type$.UnmodifiableMapView_String_ArgParser), t3, true, null);
       parser.addOption$2$hide("precision", true);
       parser.addFlag$2$hide("async", true);
       t3.push(A.ExecutableOptions__separator("Input and Output"));
@@ -47649,9 +49475,10 @@ self.util = _cliPkgRequires.util;
       parser.addFlag$2$help("indented", "Use the indented syntax for input from stdin.");
       parser.addMultiOption$5$abbr$help$splitCommas$valueHelp("load-path", "I", "A path to use when resolving imports.\nMay be passed multiple times.", false, "PATH");
       t2 = type$.JSArray_String;
+      parser.addMultiOption$6$abbr$allowed$allowedHelp$help$valueHelp("pkg-importer", "p", A._setArrayType(["node"], t2), A.LinkedHashMap_LinkedHashMap$_literal(["node", "Load files like Node.js package resolution."], t1, t1), "Built-in importer(s) to use for pkg: URLs.", "TYPE");
       parser.addOption$6$abbr$allowed$defaultsTo$help$valueHelp("style", "s", A._setArrayType(["expanded", "compressed"], t2), "expanded", "Output style.", "NAME");
       parser.addFlag$3$defaultsTo$help("charset", true, "Emit a @charset or BOM for CSS with non-ASCII characters.");
-      parser.addFlag$3$defaultsTo$help("error-css", _null, "When an error occurs, emit a stylesheet describing it.\nDefaults to true when compiling to a file.");
+      parser.addFlag$3$defaultsTo$help("error-css", null, "When an error occurs, emit a stylesheet describing it.\nDefaults to true when compiling to a file.");
       parser.addFlag$3$help$negatable("update", "Only compile out-of-date stylesheets.", false);
       t3.push(A.ExecutableOptions__separator("Source Maps"));
       parser.addFlag$3$defaultsTo$help("source-map", true, "Whether to generate source maps.");
@@ -47662,52 +49489,9 @@ self.util = _cliPkgRequires.util;
       parser.addFlag$3$abbr$help("quiet", "q", "Don't print warnings.");
       parser.addFlag$2$help("quiet-deps", "Don't print compiler warnings from dependencies.\nStylesheets imported through load paths count as dependencies.");
       parser.addFlag$2$help("verbose", "Print all deprecation warnings even when they're repetitive.");
-      t2 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1);
-      for (_i = 0; _i < 16; ++_i) {
-        deprecation = B.List_GN8[_i];
-        _0_4 = A._InitializedCell$(new A.ExecutableOptions__parser__closure(deprecation));
-        $self = deprecation._deprecatedIn;
-        if (($self == null ? _null : A.Version___parse_tearOff($self)) != null && true) {
-          id = deprecation.id;
-          if (_0_4._readFinal$0() != null) {
-            description = _0_4._readFinal$0();
-            t4 = true;
-          } else {
-            description = _null;
-            t4 = false;
-          }
-        } else {
-          description = _null;
-          id = description;
-          t4 = false;
-        }
-        if (t4)
-          t2.$indexSet(0, id, description);
-      }
-      parser.addMultiOption$3$allowedHelp$help("fatal-deprecation", t2, "Deprecations to treat as errors. You may also pass a Sass\nversion to include any behavior deprecated in or before it.\nSee https://sass-lang.com/documentation/breaking-changes for \na complete list.");
-      t1 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1);
-      for (_i = 0; _i < 16; ++_i) {
-        deprecation = B.List_GN8[_i];
-        _1_5 = A._InitializedCell$(new A.ExecutableOptions__parser__closure0(deprecation));
-        $self = deprecation._deprecatedIn;
-        if (($self == null ? _null : A.Version___parse_tearOff($self)) == null) {
-          id = deprecation.id;
-          if (_1_5._readFinal$0() != null) {
-            description = _1_5._readFinal$0();
-            t2 = true;
-          } else {
-            description = _null;
-            t2 = false;
-          }
-        } else {
-          description = _null;
-          id = description;
-          t2 = false;
-        }
-        if (t2)
-          t1.$indexSet(0, id, description);
-      }
-      parser.addMultiOption$3$allowedHelp$help("future-deprecation", t1, "Opt in to a deprecation early.");
+      parser.addMultiOption$2$help("fatal-deprecation", "Deprecations to treat as errors. You may also pass a Sass\nversion to include any behavior deprecated in or before it.\nSee https://sass-lang.com/documentation/breaking-changes for \na complete list.");
+      parser.addMultiOption$2$help("silence-deprecation", "Deprecations to ignore.");
+      parser.addMultiOption$2$help("future-deprecation", "Opt in to a deprecation early.");
       t3.push(A.ExecutableOptions__separator("Other"));
       parser.addFlag$4$abbr$help$negatable("watch", "w", "Watch stylesheets and recompile when they change.", false);
       parser.addFlag$2$help("poll", "Manually check for changes rather than using a native watcher.\nOnly valid with --watch.");
@@ -47720,67 +49504,41 @@ self.util = _cliPkgRequires.util;
       parser.addFlag$3$help$negatable("version", "Print the version of Dart Sass.", false);
       return parser;
     },
-    $signature: 337
-  };
-  A.ExecutableOptions__parser__closure.prototype = {
-    call$0() {
-      return this._0_0.description;
-    },
-    $signature: 32
-  };
-  A.ExecutableOptions__parser__closure0.prototype = {
-    call$0() {
-      return this._1_0.description;
-    },
-    $signature: 32
+    $signature: 330
   };
   A.ExecutableOptions_interactive_closure.prototype = {
     call$0() {
-      var _0_0, option,
+      var _0_0,
         t1 = this.$this._options;
       if (!A._asBool(t1.$index(0, "interactive")))
         return false;
       _0_0 = A.IterableExtension_firstWhereOrNull(A._setArrayType(["stdin", "indented", "style", "source-map", "source-map-urls", "embed-sources", "embed-source-map", "update", "watch"], type$.JSArray_String), t1.get$wasParsed());
-      if (_0_0 != null) {
-        option = _0_0;
-        t1 = true;
-      } else {
-        option = null;
-        t1 = false;
-      }
-      if (t1)
-        throw A.wrapException(A.UsageException$("--" + A.S(option) + " isn't allowed with --interactive."));
+      if (_0_0 != null)
+        throw A.wrapException(A.UsageException$("--" + _0_0 + " isn't allowed with --interactive."));
       return true;
     },
-    $signature: 1
+    $signature: 22
   };
   A.ExecutableOptions_emitErrorCss_closure.prototype = {
     call$1(destination) {
       return destination != null;
     },
-    $signature: 171
+    $signature: 139
   };
   A.ExecutableOptions_fatalDeprecations_closure.prototype = {
     call$0() {
-      var id, argVersion, sassVersion, t1, t2, _0_0, deprecation, t3, exception,
+      var id, argVersion, sassVersion, t1, t2, _0_0, exception,
         deprecations = A.LinkedHashSet_LinkedHashSet$_empty(type$.Deprecation);
       for (t1 = J.get$iterator$ax(type$.List_String._as(this.$this._options.$index(0, "fatal-deprecation"))), t2 = type$.FormatException; t1.moveNext$0();) {
         id = t1.get$current(t1);
         _0_0 = A.Deprecation_fromId(id);
         if (_0_0 != null) {
-          deprecation = _0_0;
-          t3 = true;
-        } else {
-          deprecation = null;
-          t3 = false;
-        }
-        if (t3) {
-          J.add$1$ax(deprecations, deprecation);
+          J.add$1$ax(deprecations, _0_0);
           continue;
         }
         try {
           argVersion = A.Version_Version$parse(id);
-          sassVersion = A.Version_Version$parse("1.69.5");
+          sassVersion = A.Version_Version$parse("1.77.8");
           if (J.compareTo$1$ns(argVersion, sassVersion) > 0)
             A.ExecutableOptions__fail("Invalid version " + A.S(argVersion) + ". --fatal-deprecation requires a version less than or equal to the current Dart Sass version.");
           J.addAll$1$ax(deprecations, A.Deprecation_forVersion(argVersion));
@@ -47793,7 +49551,7 @@ self.util = _cliPkgRequires.util;
       }
       return deprecations;
     },
-    $signature: 339
+    $signature: 332
   };
   A.UsageException.prototype = {$isException: 1,
     get$message(receiver) {
@@ -47806,7 +49564,7 @@ self.util = _cliPkgRequires.util;
         dir = $.$get$context().dirname$1(dir);
       return this.dirWatcher.watch$1(0, dir);
     },
-    $signature: 340
+    $signature: 334
   };
   A._Watcher.prototype = {
     _delete$1(path) {
@@ -47858,7 +49616,7 @@ self.util = _cliPkgRequires.util;
                 $async$goto = 7;
                 break;
               }
-              $event = t1.get$current(t1);
+              $event = t1.get$current(0);
               extension = A.ParsedPath_ParsedPath$parse($event.path, $.$get$context().style)._splitExtension$1(1)[1];
               if (!J.$eq$(extension, ".sass") && !J.$eq$(extension, ".scss") && !J.$eq$(extension, ".css")) {
                 // goto for condition
@@ -47976,7 +49734,7 @@ self.util = _cliPkgRequires.util;
     _handleModify$body$_Watcher(path) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.bool),
-        $async$returnValue, $async$self = this, t2, t0, url, _0_0, node, t1;
+        $async$returnValue, $async$self = this, t2, t0, url, _0_0, t1;
       var $async$_handleModify$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -48006,20 +49764,13 @@ self.util = _cliPkgRequires.util;
               url = t2.toUri$1(t1);
               t1 = $async$self._graph;
               _0_0 = t1._nodes.$index(0, url);
-              if (_0_0 != null) {
-                node = _0_0;
-                t2 = true;
-              } else {
-                node = null;
-                t2 = false;
-              }
-              $async$goto = t2 ? 3 : 5;
+              $async$goto = _0_0 != null ? 3 : 5;
               break;
             case 3:
               // then
               t1.reload$1(url);
               $async$goto = 6;
-              return A._asyncAwait($async$self._recompileDownstream$1(A._setArrayType([node], type$.JSArray_StylesheetNode)), $async$_handleModify$1);
+              return A._asyncAwait($async$self._recompileDownstream$1(A._setArrayType([_0_0], type$.JSArray_StylesheetNode)), $async$_handleModify$1);
             case 6:
               // returning from await.
               $async$returnValue = $async$result;
@@ -48077,7 +49828,7 @@ self.util = _cliPkgRequires.util;
               success = true;
             case 4:
               // join
-              t1 = A.absolute(".", null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+              t1 = $.$get$FilesystemImporter_cwd();
               t2 = A.isNodeJs() ? self.process : null;
               if (!J.$eq$(t2 == null ? null : J.get$platform$x(t2), "win32")) {
                 t2 = A.isNodeJs() ? self.process : null;
@@ -48098,7 +49849,7 @@ self.util = _cliPkgRequires.util;
                 t2 = t0;
               }
               $async$goto = 7;
-              return A._asyncAwait($async$self._recompileDownstream$1($async$self._graph.addCanonical$3(new A.FilesystemImporter(t1), t3.toUri$1(t2), t3.toUri$1(path))), $async$_handleAdd$1);
+              return A._asyncAwait($async$self._recompileDownstream$1($async$self._graph.addCanonical$3(t1, t3.toUri$1(t2), t3.toUri$1(path))), $async$_handleAdd$1);
             case 7:
               // returning from await.
               $async$returnValue = $async$result && success;
@@ -48118,7 +49869,7 @@ self.util = _cliPkgRequires.util;
     _handleRemove$body$_Watcher(path) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.bool),
-        $async$returnValue, $async$self = this, t2, t0, url, _0_0, destination, t3, node, toRecompile, t1;
+        $async$returnValue, $async$self = this, t2, t0, url, _0_0, t3, node, toRecompile, t1;
       var $async$_handleRemove$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -48150,17 +49901,10 @@ self.util = _cliPkgRequires.util;
               t2 = t1._nodes;
               if (t2.containsKey$1(url)) {
                 _0_0 = $async$self._destinationFor$1(path);
-                if (_0_0 != null) {
-                  destination = _0_0;
-                  t3 = true;
-                } else {
-                  destination = null;
-                  t3 = false;
-                }
-                if (t3)
-                  $async$self._delete$1(destination);
+                if (_0_0 != null)
+                  $async$self._delete$1(_0_0);
               }
-              t3 = A.absolute(".", null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+              t3 = $.$get$FilesystemImporter_cwd();
               node = t2.remove$1(0, url);
               t2 = node != null;
               if (t2) {
@@ -48168,7 +49912,7 @@ self.util = _cliPkgRequires.util;
                 t1.importCache.clearImport$1(url);
                 node._stylesheet_graph$_remove$0();
               }
-              toRecompile = t1._recanonicalizeImports$2(new A.FilesystemImporter(t3), url);
+              toRecompile = t1._recanonicalizeImports$2(t3, url);
               if (t2)
                 toRecompile.addAll$1(0, node._downstream);
               $async$goto = 3;
@@ -48262,7 +50006,7 @@ self.util = _cliPkgRequires.util;
       return A._asyncStartSync($async$_recompileDownstream$1, $async$completer);
     },
     _sourceEntrypointsToDestinations$1(nodes) {
-      var _i, url, source, _0_0, destination, t2,
+      var _i, url, source, _0_0,
         t1 = type$.String,
         entrypoints = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1);
       for (t1 = nodes.length, _i = 0; _i < nodes.length; nodes.length === t1 || (0, A.throwConcurrentModificationError)(nodes), ++_i) {
@@ -48271,36 +50015,22 @@ self.util = _cliPkgRequires.util;
           continue;
         source = $.$get$context().style.pathFromUri$1(A._parseUri(url));
         _0_0 = this._destinationFor$1(source);
-        if (_0_0 != null) {
-          destination = _0_0;
-          t2 = true;
-        } else {
-          destination = null;
-          t2 = false;
-        }
-        if (t2)
-          entrypoints.$indexSet(0, source, destination);
+        if (_0_0 != null)
+          entrypoints.$indexSet(0, source, _0_0);
       }
       return entrypoints;
     },
     _destinationFor$1(source) {
-      var t2, _0_0, destination, t3, sourceDir, destinationDir, _null = null,
+      var t2, _0_0, t3, sourceDir, destinationDir, destination,
         t1 = this._watch$_options;
       t1._ensureSources$0();
       t2 = type$.String;
       _0_0 = t1._sourcesToDestinations.cast$2$0(0, t2, t2).$index(0, source);
-      if (_0_0 != null) {
-        destination = _0_0;
-        t3 = true;
-      } else {
-        destination = _null;
-        t3 = false;
-      }
-      if (t3)
-        return destination;
+      if (_0_0 != null)
+        return _0_0;
       t3 = $.$get$context();
       if (B.JSString_methods.startsWith$1(A.ParsedPath_ParsedPath$parse(source, t3.style).get$basename(), "_"))
-        return _null;
+        return null;
       t1._ensureSources$0();
       t1 = t1.__ExecutableOptions__sourceDirectoriesToDestinations_F;
       t1 === $ && A.throwUnnamedLateFieldNI();
@@ -48312,41 +50042,33 @@ self.util = _cliPkgRequires.util;
         destinationDir = t1._1;
         if (t3._isWithinOrEquals$2(sourceDir, source) !== B._PathRelation_within)
           continue;
-        destination = A.join(destinationDir, t3.withoutExtension$1(t3.relative$2$from(source, sourceDir)) + ".css", _null);
+        destination = A.join(destinationDir, t3.withoutExtension$1(t3.relative$2$from(source, sourceDir)) + ".css", null);
         if (t3._isWithinOrEquals$2(destination, source) !== B._PathRelation_equal)
           return destination;
       }
-      return _null;
+      return null;
     }
   };
   A._Watcher__debounceEvents_closure.prototype = {
     call$1(buffer) {
-      var t3, t4, t5, _0_0, _0_1, _0_4, newType, _1_1, type,
+      var t3, t4, t5, oldType, newType, _1_1,
         t1 = type$.ChangeType,
         t2 = A.PathMap__create(null, t1);
       for (t3 = J.get$iterator$ax(buffer); t3.moveNext$0();) {
         t4 = t3.get$current(t3);
         t5 = t4.path;
-        _0_0 = new A._Record_2(t2.$index(0, t5), t4.type);
-        _0_1 = A._InitializedCell$(new A._Watcher__debounceEvents__closure(_0_0));
-        _0_4 = A._InitializedCell$(new A._Watcher__debounceEvents__closure0(_0_0));
+        oldType = t2.$index(0, t5);
+        newType = t4.type;
         $label0$0: {
-          if (_0_1._readFinal$0() == null) {
-            newType = _0_4._readFinal$0();
-            t4 = true;
-          } else {
-            newType = null;
-            t4 = false;
-          }
-          if (t4) {
+          if (oldType == null) {
             t4 = newType;
             break $label0$0;
           }
-          if (B.ChangeType_remove === _0_4._readFinal$0()) {
+          if (B.ChangeType_remove === newType) {
             t4 = B.ChangeType_remove;
             break $label0$0;
           }
-          if (B.ChangeType_add === _0_1._readFinal$0()) {
+          if (B.ChangeType_add === oldType) {
             t4 = B.ChangeType_add;
             break $label0$0;
           }
@@ -48358,35 +50080,15 @@ self.util = _cliPkgRequires.util;
       t3 = A._setArrayType([], type$.JSArray_WatchEvent);
       for (t1 = A.MapExtensions_get_pairs(new A.PathMap(t2, type$.PathMap_ChangeType), type$.nullable_String, t1), t1 = t1.get$iterator(t1); t1.moveNext$0();) {
         t2 = t1.get$current(t1);
-        _1_1 = A._InitializedCell$(new A._Watcher__debounceEvents__closure1(t2));
-        _1_1._readFinal$0().toString;
-        t4 = _1_1._readFinal$0();
+        _1_1 = t2._0;
+        t4 = _1_1;
         t4.toString;
-        type = t2._1;
-        type = type;
-        t3.push(new A.WatchEvent(type, t4));
+        _1_1.toString;
+        t3.push(new A.WatchEvent(t2._1, _1_1));
       }
       return t3;
     },
-    $signature: 344
-  };
-  A._Watcher__debounceEvents__closure.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature: 349
-  };
-  A._Watcher__debounceEvents__closure0.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 351
-  };
-  A._Watcher__debounceEvents__closure1.prototype = {
-    call$0() {
-      return this._1_0._0;
-    },
-    $signature: 32
+    $signature: 340
   };
   A.EmptyExtensionStore.prototype = {
     get$_extensions() {
@@ -48564,31 +50266,28 @@ self.util = _cliPkgRequires.util;
       return new A.Box(modifiableSelector, type$.Box_SelectorList);
     },
     _registerSelector$2(list, selector) {
-      var t1, t2, t3, _i, t4, t5, _i0, t6, t7, _i1, simple, _0_2, selectorInPseudo, t8;
-      for (t1 = list.components, t2 = t1.length, t3 = this._selectors, _i = 0; _i < t2; ++_i)
-        for (t4 = t1[_i].components, t5 = t4.length, _i0 = 0; _i0 < t5; ++_i0)
-          for (t6 = t4[_i0].selector.components, t7 = t6.length, _i1 = 0; _i1 < t7; ++_i1) {
-            simple = t6[_i1];
+      var t1, t2, t3, t4, _i, t5, t6, _i0, t7, t8, _i1, simple, _0_2_isSet, _0_2, t9, selectorInPseudo;
+      for (t1 = list.components, t2 = t1.length, t3 = this._selectors, t4 = type$.SelectorList, _i = 0; _i < t2; ++_i)
+        for (t5 = t1[_i].components, t6 = t5.length, _i0 = 0; _i0 < t6; ++_i0)
+          for (t7 = t5[_i0].selector.components, t8 = t7.length, _i1 = 0; _i1 < t8; ++_i1) {
+            simple = t7[_i1];
             J.add$1$ax(t3.putIfAbsent$2(simple, new A.ExtensionStore__registerSelector_closure()), selector);
-            _0_2 = A._InitializedCell$(new A.ExtensionStore__registerSelector_closure0(simple));
-            if (simple instanceof A.PseudoSelector)
-              if (_0_2._readFinal$0() != null) {
-                selectorInPseudo = _0_2._readFinal$0();
-                t8 = true;
-              } else {
-                selectorInPseudo = null;
-                t8 = false;
-              }
-            else {
-              selectorInPseudo = null;
-              t8 = false;
+            _0_2_isSet = simple instanceof A.PseudoSelector;
+            if (_0_2_isSet) {
+              _0_2 = simple.selector;
+              t9 = _0_2 != null;
+            } else {
+              _0_2 = null;
+              t9 = false;
+            }
+            if (t9) {
+              selectorInPseudo = _0_2_isSet ? _0_2 : simple.selector;
+              this._registerSelector$2(selectorInPseudo == null ? t4._as(selectorInPseudo) : selectorInPseudo, selector);
             }
-            if (t8)
-              this._registerSelector$2(selectorInPseudo, selector);
           }
     },
     addExtension$4(extender, target, extend, mediaContext) {
-      var t2, t3, t4, t5, t6, t7, t8, t9, t10, newExtensions, _i, complex, t11, extension, _0_0, existingExtension, t12, newExtensionsByTarget, additionalExtensions, _this = this,
+      var t2, t3, t4, t5, t6, t7, t8, t9, t10, newExtensions, _i, complex, t11, extension, _0_0, t12, newExtensionsByTarget, additionalExtensions, _this = this,
         selectors = _this._selectors.$index(0, target),
         t1 = _this._extensionsByExtender,
         existingExtensions = t1.$index(0, target),
@@ -48602,14 +50301,7 @@ self.util = _cliPkgRequires.util;
         extension = t11._extension = new A.Extension(t11, target, mediaContext, t7, t6);
         _0_0 = sources.$index(0, complex);
         if (_0_0 != null) {
-          existingExtension = _0_0;
-          t11 = true;
-        } else {
-          existingExtension = null;
-          t11 = false;
-        }
-        if (t11) {
-          sources.$indexSet(0, complex, A.MergedExtension_merge(existingExtension, extension));
+          sources.$indexSet(0, complex, A.MergedExtension_merge(_0_0, extension));
           continue;
         }
         sources.$indexSet(0, complex, extension);
@@ -48643,7 +50335,7 @@ self.util = _cliPkgRequires.util;
       var $async$self = this;
       return function() {
         var complex = $async$complex;
-        var $async$goto = 0, $async$handler = 1, $async$currentError, t1, t2, _i, t3, t4, _i0, simple, _0_2, selector, t5, t6, _i1;
+        var $async$goto = 0, $async$handler = 1, $async$currentError, t1, t2, t3, _i, t4, t5, _i0, simple, _0_2_isSet, _0_2, t6, selector, t7, _i1;
         return function $async$_simpleSelectors$1($async$iterator, $async$errorCode, $async$result) {
           if ($async$errorCode === 1) {
             $async$currentError = $async$result;
@@ -48653,7 +50345,7 @@ self.util = _cliPkgRequires.util;
             switch ($async$goto) {
               case 0:
                 // Function start
-                t1 = complex.components, t2 = t1.length, _i = 0;
+                t1 = complex.components, t2 = t1.length, t3 = type$.SelectorList, _i = 0;
               case 2:
                 // for condition
                 if (!(_i < t2)) {
@@ -48661,46 +50353,42 @@ self.util = _cliPkgRequires.util;
                   $async$goto = 4;
                   break;
                 }
-                t3 = t1[_i].selector.components, t4 = t3.length, _i0 = 0;
+                t4 = t1[_i].selector.components, t5 = t4.length, _i0 = 0;
               case 5:
                 // for condition
-                if (!(_i0 < t4)) {
+                if (!(_i0 < t5)) {
                   // goto after for
                   $async$goto = 7;
                   break;
                 }
-                simple = t3[_i0];
+                simple = t4[_i0];
                 $async$goto = 8;
                 return $async$iterator._async$_current = simple, 1;
               case 8:
                 // after yield
-                _0_2 = A._InitializedCell$(new A.ExtensionStore__simpleSelectors_closure(simple));
-                if (simple instanceof A.PseudoSelector)
-                  if (_0_2._readFinal$0() != null) {
-                    selector = _0_2._readFinal$0();
-                    t5 = true;
-                  } else {
-                    selector = null;
-                    t5 = false;
-                  }
-                else {
-                  selector = null;
-                  t5 = false;
+                _0_2_isSet = simple instanceof A.PseudoSelector;
+                if (_0_2_isSet) {
+                  _0_2 = simple.selector;
+                  t6 = _0_2 != null;
+                } else {
+                  _0_2 = null;
+                  t6 = false;
                 }
-                $async$goto = t5 ? 9 : 10;
+                $async$goto = t6 ? 9 : 10;
                 break;
               case 9:
                 // then
-                t5 = selector.components, t6 = t5.length, _i1 = 0;
+                selector = _0_2_isSet ? _0_2 : simple.selector;
+                t6 = (selector == null ? t3._as(selector) : selector).components, t7 = t6.length, _i1 = 0;
               case 11:
                 // for condition
-                if (!(_i1 < t6)) {
+                if (!(_i1 < t7)) {
                   // goto after for
                   $async$goto = 13;
                   break;
                 }
                 $async$goto = 14;
-                return $async$iterator._yieldStar$1($async$self._simpleSelectors$1(t5[_i1]));
+                return $async$iterator._yieldStar$1($async$self._simpleSelectors$1(t6[_i1]));
               case 14:
                 // after yield
               case 12:
@@ -48739,8 +50427,8 @@ self.util = _cliPkgRequires.util;
       };
     },
     _extendExistingExtensions$2(extensions, newExtensions) {
-      var extension, selectors, error, stackTrace, t1, t2, t3, t4, t5, t6, additionalExtensions, _i, t7, exception, t8, t9, containsExtension, selectors0, t10, t11, t12, t13, t14, withExtender, _0_0, existingExtension, _i0, _i1, _null = null;
-      for (t1 = J.toList$0$ax(extensions), t2 = t1.length, t3 = this._extensionsByExtender, t4 = type$.SimpleSelector, t5 = type$.Map_ComplexSelector_Extension, t6 = this._extensions, additionalExtensions = _null, _i = 0; _i < t1.length; t1.length === t2 || (0, A.throwConcurrentModificationError)(t1), ++_i) {
+      var extension, selectors, error, stackTrace, t1, t2, t3, t4, t5, t6, additionalExtensions, _i, t7, exception, t8, t9, selectors0, t10, t11, t12, t13, t14, withExtender, _0_0, _i0, _i1;
+      for (t1 = J.toList$0$ax(extensions), t2 = t1.length, t3 = this._extensionsByExtender, t4 = type$.SimpleSelector, t5 = type$.Map_ComplexSelector_Extension, t6 = this._extensions, additionalExtensions = null, _i = 0; _i < t1.length; t1.length === t2 || (0, A.throwConcurrentModificationError)(t1), ++_i) {
         extension = t1[_i];
         t7 = t6.$index(0, extension.target);
         t7.toString;
@@ -48760,12 +50448,11 @@ self.util = _cliPkgRequires.util;
         }
         t8 = J.get$first$ax(selectors);
         t9 = extension.extender.selector;
-        containsExtension = B.C_ListEquality.equals$2(0, t8.leadingCombinators, t9.leadingCombinators) && B.C_ListEquality.equals$2(0, t8.components, t9.components);
-        if (containsExtension) {
+        if (B.C_ListEquality.equals$2(0, t8.leadingCombinators, t9.leadingCombinators) && B.C_ListEquality.equals$2(0, t8.components, t9.components)) {
           t8 = selectors;
-          t9 = A.instanceType(t8);
-          selectors0 = new A.SubListIterable(t8, 1, _null, t9._eval$1("SubListIterable<1>"));
-          selectors0.SubListIterable$3(t8, 1, _null, t9._precomputed1);
+          t9 = A._arrayInstanceType(t8);
+          selectors0 = new A.SubListIterable(t8, 1, null, t9._eval$1("SubListIterable<1>"));
+          selectors0.SubListIterable$3(t8, 1, null, t9._precomputed1);
           selectors = selectors0;
         }
         for (t8 = J.get$iterator$ax(selectors); t8.moveNext$0();) {
@@ -48779,15 +50466,8 @@ self.util = _cliPkgRequires.util;
           t14 = new A.Extender(t9, false);
           withExtender = t14._extension = new A.Extension(t14, t11, t13, t10, t12);
           _0_0 = t7.$index(0, t9);
-          if (_0_0 != null) {
-            existingExtension = _0_0;
-            t10 = true;
-          } else {
-            existingExtension = _null;
-            t10 = false;
-          }
-          if (t10)
-            t7.$indexSet(0, t9, A.MergedExtension_merge(existingExtension, withExtender));
+          if (_0_0 != null)
+            t7.$indexSet(0, t9, A.MergedExtension_merge(_0_0, withExtender));
           else {
             t7.$indexSet(0, t9, withExtender);
             for (t10 = t9.components, t11 = t10.length, _i0 = 0; _i0 < t11; ++_i0)
@@ -48800,8 +50480,6 @@ self.util = _cliPkgRequires.util;
             }
           }
         }
-        if (!containsExtension)
-          t7.remove$1(0, extension.extender);
       }
       return additionalExtensions;
     },
@@ -48832,7 +50510,7 @@ self.util = _cliPkgRequires.util;
       }
     },
     addExtensions$1(extensionStores) {
-      var t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, newExtensions, selectorsToExtend, extensionsToExtend, t12, t13, target, newSources, first, extensionsForTarget, t14, selectorsForTarget, t15, _2_0, existingSources, t16, extender, extension, _this = this, _null = null;
+      var t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, newExtensions, selectorsToExtend, extensionsToExtend, t12, t13, target, newSources, first, extensionsForTarget, t14, selectorsForTarget, t15, _2_0, t16, extender, extension, _this = this, _null = null;
       for (t1 = J.get$iterator$ax(extensionStores), t2 = type$.SimpleSelector, t3 = type$.Map_ComplexSelector_Extension, t4 = _this._extensions, t5 = type$.ComplexSelector, t6 = type$.Extension, t7 = _this._selectors, t8 = _this._extensionsByExtender, t9 = type$.JSArray_Extension, t10 = type$.ModifiableBox_SelectorList, t11 = _this._sourceSpecificity, newExtensions = _null, selectorsToExtend = newExtensions, extensionsToExtend = selectorsToExtend; t1.moveNext$0();) {
         t12 = t1.get$current(t1);
         if (t12.get$isEmpty(t12))
@@ -48870,24 +50548,17 @@ self.util = _cliPkgRequires.util;
             t15.addAll$1(0, selectorsForTarget);
           }
           _2_0 = t4.$index(0, target);
-          if (_2_0 != null) {
-            existingSources = _2_0;
-            t15 = true;
-          } else {
-            existingSources = _null;
-            t15 = false;
-          }
-          if (t15)
+          if (_2_0 != null)
             for (t15 = A.MapExtensions_get_pairs(newSources, t5, t6), t15 = t15.get$iterator(t15); t15.moveNext$0();) {
               t16 = t15.get$current(t15);
               extender = t16._0;
               extension = t16._1;
-              if (existingSources.containsKey$1(extender)) {
-                t16 = existingSources.$index(0, extender);
-                extension = A.MergedExtension_merge(t16, extension);
-                existingSources.$indexSet(0, extender, extension);
+              if (_2_0.containsKey$1(extender)) {
+                t16 = _2_0.$index(0, extender);
+                extension = A.MergedExtension_merge(t16 == null ? t6._as(t16) : t16, extension);
+                _2_0.$indexSet(0, extender, extension);
               } else
-                existingSources.$indexSet(0, extender, extension);
+                _2_0.$indexSet(0, extender, extension);
               if (!t13 || t14) {
                 if (newExtensions == null) {
                   newExtensions = A.LinkedHashMap_LinkedHashMap$_empty(t2, t3);
@@ -48960,7 +50631,7 @@ self.util = _cliPkgRequires.util;
         extended = this._extendCompound$4$inOriginal(component, extensions, mediaQueryContext, isOriginal);
         if (extended == null) {
           if (extendedNotExpanded != null)
-            extendedNotExpanded.push(A._setArrayType([A.ComplexSelector$(B.List_empty1, A._setArrayType([component], t10), t8, t6)], t9));
+            extendedNotExpanded.push(A._setArrayType([A.ComplexSelector$(B.List_empty0, A._setArrayType([component], t10), t8, t6)], t9));
         } else if (extendedNotExpanded != null)
           extendedNotExpanded.push(extended);
         else if (i !== 0) {
@@ -48991,7 +50662,7 @@ self.util = _cliPkgRequires.util;
       return A.List_List$of(t1, true, t1.$ti._eval$1("Iterable.E"));
     },
     _extendCompound$4$inOriginal(component, extensions, mediaQueryContext, inOriginal) {
-      var t3, t4, t5, t6, t7, t8, t9, t10, t11, options, i, simple, extended, t12, result, compound, extenders, complex, extenderPaths, withCombinators, isOriginal, _this = this, _null = null,
+      var t3, t4, t5, t6, t7, t8, t9, t10, t11, options, i, simple, extended, t12, result, compound, complex, extenderPaths, withCombinators, isOriginal, _this = this, _null = null,
         t1 = _this._mode,
         targetsUsed = t1 === B.ExtendMode_normal_normal || extensions.__js_helper$_length < 2 ? _null : A.LinkedHashSet_LinkedHashSet$_empty(type$.SimpleSelector),
         t2 = component.selector,
@@ -49015,10 +50686,10 @@ self.util = _cliPkgRequires.util;
               compound = new A.CompoundSelector(t12, t10);
               if (t12.length === 0)
                 A.throwExpression(A.ArgumentError$("components may not be empty.", _null));
-              result = A.List_List$from(B.List_empty1, false, t6);
+              result = A.List_List$from(B.List_empty0, false, t6);
               result.fixed$length = Array;
               result.immutable$list = Array;
-              t12 = A.ComplexSelector$(B.List_empty1, A._setArrayType([new A.ComplexSelectorComponent(compound, result, t10)], t7), t10, false);
+              t12 = A.ComplexSelector$(B.List_empty0, A._setArrayType([new A.ComplexSelectorComponent(compound, result, t10)], t7), t10, false);
               _this._sourceSpecificityFor$1(compound);
               options.push(A._setArrayType([new A.Extender(t12, true)], t5));
             }
@@ -49031,14 +50702,7 @@ self.util = _cliPkgRequires.util;
       if (targetsUsed != null && targetsUsed._collection$_length !== extensions.__js_helper$_length)
         return _null;
       if (options.length === 1) {
-        extenders = options[0];
-        t3 = true;
-      } else {
-        extenders = _null;
-        t3 = false;
-      }
-      if (t3) {
-        for (t1 = J.get$iterator$ax(extenders), t2 = component.combinators, t3 = type$.JSArray_ComplexSelector, result = _null; t1.moveNext$0();) {
+        for (t1 = J.get$iterator$ax(options[0]), t2 = component.combinators, t3 = type$.JSArray_ComplexSelector, result = _null; t1.moveNext$0();) {
           t4 = t1.get$current(t1);
           t4.assertCompatibleMediaContext$1(mediaQueryContext);
           complex = t4.selector.withAdditionalCombinators$1(t2);
@@ -49055,18 +50719,19 @@ self.util = _cliPkgRequires.util;
       t1 = t1 === B.ExtendMode_replace_replace;
       t4 = !t1;
       if (t4)
-        t3.push(A.ComplexSelector$(B.List_empty1, A._setArrayType([new A.ComplexSelectorComponent(A.CompoundSelector$(J.expand$1$1$ax(J.get$first$ax(extenderPaths), new A.ExtensionStore__extendCompound_closure(), t11), t2.span), A.List_List$unmodifiable(component.combinators, t6), t10)], t7), t10, false));
+        t3.push(A.ComplexSelector$(B.List_empty0, A._setArrayType([new A.ComplexSelectorComponent(A.CompoundSelector$(J.expand$1$1$ax(J.get$first$ax(extenderPaths), new A.ExtensionStore__extendCompound_closure(), t11), t2.span), A.List_List$unmodifiable(component.combinators, t6), t10)], t7), t10, false));
       t2 = J.skip$1$ax(extenderPaths, t1 ? 0 : 1);
-      t2 = new A.ListIterator(t2, t2.get$length(t2));
-      t5 = component.combinators;
-      t6 = A._instanceType(t2)._precomputed1;
+      t5 = t2.$ti;
+      t2 = new A.ListIterator(t2, t2.get$length(0), t5._eval$1("ListIterator<ListIterable.E>"));
+      t6 = component.combinators;
+      t5 = t5._eval$1("ListIterable.E");
       for (; t2.moveNext$0();) {
         t1 = t2.__internal$_current;
-        extended = _this._unifyExtenders$3(t1 == null ? t6._as(t1) : t1, mediaQueryContext, t10);
+        extended = _this._unifyExtenders$3(t1 == null ? t5._as(t1) : t1, mediaQueryContext, t10);
         if (extended == null)
           continue;
         for (t1 = J.get$iterator$ax(extended); t1.moveNext$0();) {
-          withCombinators = t1.get$current(t1).withAdditionalCombinators$1(t5);
+          withCombinators = t1.get$current(t1).withAdditionalCombinators$1(t6);
           if (!withCombinators.accept$1(B.C__IsUselessVisitor))
             t3.push(withCombinators);
         }
@@ -49094,7 +50759,7 @@ self.util = _cliPkgRequires.util;
         }
       }
       if (originals != null)
-        toUnify.addFirst$1(A.ComplexSelector$(B.List_empty1, A._setArrayType([new A.ComplexSelectorComponent(A.CompoundSelector$(originals, span), A.List_List$unmodifiable(B.List_empty1, type$.CssValue_Combinator), span)], type$.JSArray_ComplexSelectorComponent), span, originalsLineBreak));
+        toUnify.addFirst$1(A.ComplexSelector$(B.List_empty0, A._setArrayType([new A.ComplexSelectorComponent(A.CompoundSelector$(originals, span), A.List_List$unmodifiable(B.List_empty0, type$.CssValue_Combinator), span)], type$.JSArray_ComplexSelectorComponent), span, originalsLineBreak));
       complexes = A.unifyComplex(toUnify, span);
       if (complexes == null)
         return _null;
@@ -49103,25 +50768,22 @@ self.util = _cliPkgRequires.util;
       return complexes;
     },
     _extendSimple$4(simple, extensions, mediaQueryContext, targetsUsed) {
-      var _1_0, extended, t2,
+      var t2, _1_0,
         t1 = new A.ExtensionStore__extendSimple_withoutPseudo(this, extensions, targetsUsed);
-      if (simple instanceof A.PseudoSelector && simple.selector != null && true) {
+      if (simple instanceof A.PseudoSelector)
+        t2 = simple.selector != null;
+      else
+        t2 = false;
+      if (t2) {
         _1_0 = this._extendPseudo$3(simple, extensions, mediaQueryContext);
-        if (_1_0 != null) {
-          extended = _1_0;
-          t2 = true;
-        } else {
-          extended = null;
-          t2 = false;
-        }
-        if (t2)
-          return new A.MappedListIterable(extended, new A.ExtensionStore__extendSimple_closure(this, t1), A.instanceType(extended)._eval$1("MappedListIterable<1,List<Extender>>"));
+        if (_1_0 != null)
+          return new A.MappedListIterable(_1_0, new A.ExtensionStore__extendSimple_closure(this, t1), A._arrayInstanceType(_1_0)._eval$1("MappedListIterable<1,List<Extender>>"));
       }
       return A.NullableExtension_andThen(t1.call$1(simple), new A.ExtensionStore__extendSimple_closure0());
     },
     _extenderForSimple$1(simple) {
       var t1 = simple.span;
-      t1 = A.ComplexSelector$(B.List_empty1, A._setArrayType([new A.ComplexSelectorComponent(A.CompoundSelector$(A._setArrayType([simple], type$.JSArray_SimpleSelector), t1), A.List_List$unmodifiable(B.List_empty1, type$.CssValue_Combinator), t1)], type$.JSArray_ComplexSelectorComponent), t1, false);
+      t1 = A.ComplexSelector$(B.List_empty0, A._setArrayType([new A.ComplexSelectorComponent(A.CompoundSelector$(A._setArrayType([simple], type$.JSArray_SimpleSelector), t1), A.List_List$unmodifiable(B.List_empty0, type$.CssValue_Combinator), t1)], type$.JSArray_ComplexSelectorComponent), t1, false);
       this._sourceSpecificity.$index(0, simple);
       return new A.Extender(t1, true);
     },
@@ -49146,10 +50808,8 @@ self.util = _cliPkgRequires.util;
         return A._setArrayType([pseudo.withSelector$1(A.SelectorList$(complexes, selector.span))], type$.JSArray_PseudoSelector);
     },
     _trim$2(selectors, isOriginal) {
-      var result, i, t1, t2, numOriginals, _box_0, complex1, j, t3, t4, _i, t5, maxSpecificity;
-      if (selectors.length > 100)
-        return selectors;
-      result = A.QueueList$(null, type$.ComplexSelector);
+      var i, t1, t2, numOriginals, _box_0, complex1, j, t3, t4, _i, t5, maxSpecificity,
+        result = A.QueueList$(null, type$.ComplexSelector);
       $label0$0:
         for (i = selectors.length - 1, t1 = A._arrayInstanceType(selectors), t2 = t1._precomputed1, t1 = t1._eval$1("SubListIterable<1>"), numOriginals = 0; i >= 0; --i) {
           _box_0 = {};
@@ -49214,68 +50874,56 @@ self.util = _cliPkgRequires.util;
     call$1(extension) {
       return !extension.isOptional;
     },
-    $signature: 358
+    $signature: 342
   };
   A.ExtensionStore__registerSelector_closure.prototype = {
     call$0() {
       return A.LinkedHashSet_LinkedHashSet$_empty(type$.ModifiableBox_SelectorList);
     },
-    $signature: 365
-  };
-  A.ExtensionStore__registerSelector_closure0.prototype = {
-    call$0() {
-      return type$.PseudoSelector._as(this._0_0).selector;
-    },
-    $signature: 75
+    $signature: 343
   };
   A.ExtensionStore_addExtension_closure.prototype = {
     call$0() {
       return A.LinkedHashMap_LinkedHashMap$_empty(type$.ComplexSelector, type$.Extension);
     },
-    $signature: 117
+    $signature: 115
   };
   A.ExtensionStore_addExtension_closure0.prototype = {
     call$0() {
       return A._setArrayType([], type$.JSArray_Extension);
     },
-    $signature: 190
+    $signature: 220
   };
   A.ExtensionStore_addExtension_closure1.prototype = {
     call$0() {
       return this.complex.get$specificity();
     },
-    $signature: 3
-  };
-  A.ExtensionStore__simpleSelectors_closure.prototype = {
-    call$0() {
-      return type$.PseudoSelector._as(this._0_0).selector;
-    },
-    $signature: 75
+    $signature: 10
   };
   A.ExtensionStore__extendExistingExtensions_closure.prototype = {
     call$0() {
       return A._setArrayType([], type$.JSArray_Extension);
     },
-    $signature: 190
+    $signature: 220
   };
   A.ExtensionStore__extendExistingExtensions_closure0.prototype = {
     call$0() {
       return A.LinkedHashMap_LinkedHashMap$_empty(type$.ComplexSelector, type$.Extension);
     },
-    $signature: 117
+    $signature: 115
   };
   A.ExtensionStore_addExtensions_closure.prototype = {
     call$0() {
       return A.LinkedHashMap_LinkedHashMap$_empty(type$.ComplexSelector, type$.Extension);
     },
-    $signature: 117
+    $signature: 115
   };
   A.ExtensionStore__extendComplex_closure.prototype = {
     call$1(path) {
       var t1 = this.complex;
       return J.map$1$1$ax(A.weave(path, t1.span, t1.lineBreak), new A.ExtensionStore__extendComplex__closure(this._box_0, this.$this, t1), type$.ComplexSelector);
     },
-    $signature: 378
+    $signature: 348
   };
   A.ExtensionStore__extendComplex__closure.prototype = {
     call$1(outputComplex) {
@@ -49292,19 +50940,19 @@ self.util = _cliPkgRequires.util;
     call$1(extender) {
       return B.JSArray_methods.get$last(extender.selector.components).selector.components;
     },
-    $signature: 384
+    $signature: 349
   };
   A.ExtensionStore__extendCompound_closure0.prototype = {
     call$1(_) {
       return false;
     },
-    $signature: 19
+    $signature: 16
   };
   A.ExtensionStore__extendCompound_closure1.prototype = {
     call$1(complex) {
       return complex.$eq(0, this.original);
     },
-    $signature: 19
+    $signature: 16
   };
   A.ExtensionStore__extendSimple_withoutPseudo.prototype = {
     call$1(simple) {
@@ -49323,38 +50971,38 @@ self.util = _cliPkgRequires.util;
         t1.push(t2.get$current(t2).extender);
       return t1;
     },
-    $signature: 401
+    $signature: 350
   };
   A.ExtensionStore__extendSimple_closure.prototype = {
     call$1(pseudo) {
       var t1 = this.withoutPseudo.call$1(pseudo);
       return t1 == null ? A._setArrayType([this.$this._extenderForSimple$1(pseudo)], type$.JSArray_Extender) : t1;
     },
-    $signature: 402
+    $signature: 361
   };
   A.ExtensionStore__extendSimple_closure0.prototype = {
     call$1(result) {
       return A._setArrayType([result], type$.JSArray_List_Extender);
     },
-    $signature: 403
+    $signature: 362
   };
   A.ExtensionStore__extendPseudo_closure.prototype = {
     call$1(complex) {
       return complex.components.length > 1;
     },
-    $signature: 19
+    $signature: 16
   };
   A.ExtensionStore__extendPseudo_closure0.prototype = {
     call$1(complex) {
       return complex.components.length === 1;
     },
-    $signature: 19
+    $signature: 16
   };
   A.ExtensionStore__extendPseudo_closure1.prototype = {
     call$1(complex) {
       return complex.components.length <= 1;
     },
-    $signature: 19
+    $signature: 16
   };
   A.ExtensionStore__extendPseudo_closure2.prototype = {
     call$1(complex) {
@@ -49374,7 +51022,7 @@ self.util = _cliPkgRequires.util;
       t1 = this.pseudo;
       switch (t1.normalizedName) {
         case "not":
-          if (!B.Set_aAXJu.contains$1(0, innerPseudo.normalizedName))
+          if (!B.Set_mlzm2.contains$1(0, innerPseudo.normalizedName))
             return A._setArrayType([], type$.JSArray_ComplexSelector);
           return innerSelector.components;
         case "is":
@@ -49398,29 +51046,29 @@ self.util = _cliPkgRequires.util;
           return A._setArrayType([], type$.JSArray_ComplexSelector);
       }
     },
-    $signature: 404
+    $signature: 378
   };
   A.ExtensionStore__extendPseudo_closure3.prototype = {
     call$1(complex) {
       return this.pseudo.withSelector$1(A.SelectorList$(A._setArrayType([complex], type$.JSArray_ComplexSelector), this.selector.span));
     },
-    $signature: 405
+    $signature: 379
   };
   A.ExtensionStore__trim_closure.prototype = {
     call$1(complex2) {
       return complex2.get$specificity() >= this._box_0.maxSpecificity && complex2.isSuperselector$1(this.complex1);
     },
-    $signature: 19
+    $signature: 16
   };
   A.ExtensionStore__trim_closure0.prototype = {
     call$1(complex2) {
       return complex2.get$specificity() >= this._box_0.maxSpecificity && complex2.isSuperselector$1(this.complex1);
     },
-    $signature: 19
+    $signature: 16
   };
   A.ExtensionStore_clone_closure.prototype = {
     call$2(simple, selectors) {
-      var t2, t3, t4, t5, t6, t7, newSelector, _0_0, mediaContext, _this = this,
+      var t2, t3, t4, t5, t6, t7, newSelector, _0_0, _this = this,
         t1 = type$.ModifiableBox_SelectorList,
         newSelectorSet = A.LinkedHashSet_LinkedHashSet$_empty(t1);
       _this.newSelectors.$indexSet(0, simple, newSelectorSet);
@@ -49430,56 +51078,19 @@ self.util = _cliPkgRequires.util;
         newSelectorSet.add$1(0, newSelector);
         t3.$indexSet(0, t7.value, new A.Box(newSelector, t4));
         _0_0 = t5.$index(0, t7);
-        if (_0_0 != null) {
-          mediaContext = _0_0;
-          t7 = true;
-        } else {
-          mediaContext = null;
-          t7 = false;
-        }
-        if (t7)
-          t6.$indexSet(0, newSelector, mediaContext);
+        if (_0_0 != null)
+          t6.$indexSet(0, newSelector, _0_0);
       }
     },
-    $signature: 410
+    $signature: 380
   };
   A.unifyComplex_closure.prototype = {
-    call$0() {
-      return this._0_0.leadingCombinators;
-    },
-    $signature: 193
-  };
-  A.unifyComplex_closure0.prototype = {
-    call$0() {
-      return this._1_0.combinators;
-    },
-    $signature: 193
-  };
-  A.unifyComplex_closure1.prototype = {
     call$1(complex) {
       return complex.lineBreak;
     },
-    $signature: 19
-  };
-  A._namespaceAndName_closure.prototype = {
-    call$0() {
-      return type$.TypeSelector._as(this._0_0).name;
-    },
-    $signature: 413
+    $signature: 16
   };
   A._weaveParents_closure.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature: 195
-  };
-  A._weaveParents_closure0.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 195
-  };
-  A._weaveParents_closure1.prototype = {
     call$2(group1, group2) {
       var t1, unified;
       if (B.C_ListEquality.equals$2(0, group1, group2))
@@ -49491,7 +51102,7 @@ self.util = _cliPkgRequires.util;
       if (!A._mustUnify(group1, group2))
         return null;
       t1 = this.span;
-      unified = A.unifyComplex(A._setArrayType([A.ComplexSelector$(B.List_empty1, group1, t1, false), A.ComplexSelector$(B.List_empty1, group2, t1, false)], type$.JSArray_ComplexSelector), t1);
+      unified = A.unifyComplex(A._setArrayType([A.ComplexSelector$(B.List_empty0, group1, t1, false), A.ComplexSelector$(B.List_empty0, group2, t1, false)], type$.JSArray_ComplexSelector), t1);
       if (unified == null)
         t1 = null;
       else {
@@ -49500,119 +51111,31 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 417
+    $signature: 381
   };
-  A._weaveParents_closure2.prototype = {
+  A._weaveParents_closure0.prototype = {
     call$1(sequence) {
       return A._complexIsParentSuperselector(sequence.get$first(sequence), this.group);
     },
-    $signature: 196
+    $signature: 206
   };
-  A._weaveParents_closure3.prototype = {
+  A._weaveParents_closure1.prototype = {
     call$1(sequence) {
-      return sequence.get$length(sequence) === 0;
+      return sequence.get$length(0) === 0;
     },
-    $signature: 196
+    $signature: 206
   };
-  A._weaveParents_closure4.prototype = {
+  A._weaveParents_closure2.prototype = {
     call$1(choice) {
       return J.get$isNotEmpty$asx(choice);
     },
-    $signature: 430
-  };
-  A._mergeLeadingCombinators_closure.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature: 200
-  };
-  A._mergeLeadingCombinators_closure0.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 200
-  };
-  A._mergeLeadingCombinators_closure1.prototype = {
-    call$0() {
-      var t1 = this._0_1._readFinal$0();
-      return J.get$length$asx(t1 == null ? type$.List_CssValue_Combinator._as(t1) : t1);
-    },
-    $signature: 3
-  };
-  A._mergeLeadingCombinators_closure2.prototype = {
-    call$0() {
-      var t1 = this._0_4._readFinal$0();
-      return J.get$length$asx(t1 == null ? type$.List_CssValue_Combinator._as(t1) : t1);
-    },
-    $signature: 3
-  };
-  A._mergeTrailingCombinators_closure.prototype = {
-    call$0() {
-      var t1 = this._0_0;
-      return t1.get$length(t1);
-    },
-    $signature: 3
-  };
-  A._mergeTrailingCombinators_closure0.prototype = {
-    call$0() {
-      var t1 = this._1_0;
-      return t1.get$length(t1);
-    },
-    $signature: 3
-  };
-  A._mergeTrailingCombinators_closure1.prototype = {
-    call$0() {
-      return this._4_0._values[0];
-    },
-    $signature: 203
-  };
-  A._mergeTrailingCombinators_closure2.prototype = {
-    call$0() {
-      return B.Combinator_Htt === this._4_1._readFinal$0();
-    },
-    $signature: 1
-  };
-  A._mergeTrailingCombinators_closure3.prototype = {
-    call$0() {
-      return this._4_0._values[1];
-    },
-    $signature: 203
-  };
-  A._mergeTrailingCombinators_closure4.prototype = {
-    call$0() {
-      return B.Combinator_Htt === this._4_4._readFinal$0();
-    },
-    $signature: 1
-  };
-  A._mergeTrailingCombinators_closure6.prototype = {
-    call$0() {
-      return this._4_0._values[2];
-    },
-    $signature: 204
-  };
-  A._mergeTrailingCombinators_closure7.prototype = {
-    call$0() {
-      return this._4_0._values[3];
-    },
-    $signature: 204
-  };
-  A._mergeTrailingCombinators_closure5.prototype = {
-    call$0() {
-      return B.Combinator_4QF === this._4_4._readFinal$0();
-    },
-    $signature: 1
-  };
-  A._mergeTrailingCombinators_closure8.prototype = {
-    call$0() {
-      return B.Combinator_4QF === this._4_1._readFinal$0();
-    },
-    $signature: 1
+    $signature: 387
   };
   A._mustUnify_closure.prototype = {
     call$1(component) {
       return B.JSArray_methods.any$1(component.selector.components, new A._mustUnify__closure(this.uniqueSelectors));
     },
-    $signature: 53
+    $signature: 49
   };
   A._mustUnify__closure.prototype = {
     call$1(simple) {
@@ -49623,35 +51146,7 @@ self.util = _cliPkgRequires.util;
         t1 = true;
       return t1 && this.uniqueSelectors.contains$1(0, simple);
     },
-    $signature: 16
-  };
-  A._chunks_closure.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature() {
-      return this.T._eval$1("List<0>()");
-    }
-  };
-  A._chunks_closure0.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_1._readFinal$0()) <= 0;
-    },
-    $signature: 1
-  };
-  A._chunks_closure1.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature() {
-      return this.T._eval$1("List<0>()");
-    }
-  };
-  A._chunks_closure2.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_5._readFinal$0()) <= 0;
-    },
-    $signature: 1
+    $signature: 13
   };
   A.paths_closure.prototype = {
     call$2(paths, choice) {
@@ -49686,56 +51181,50 @@ self.util = _cliPkgRequires.util;
     call$1(complex1) {
       return B.JSArray_methods.any$1(this.list1, new A.listIsSuperselector__closure(complex1));
     },
-    $signature: 19
+    $signature: 16
   };
   A.listIsSuperselector__closure.prototype = {
     call$1(complex2) {
       return complex2.isSuperselector$1(this.complex1);
     },
-    $signature: 19
+    $signature: 16
   };
   A.complexIsSuperselector_closure.prototype = {
     call$1($parent) {
       return $parent.combinators.length > 1;
     },
-    $signature: 53
+    $signature: 49
   };
   A.complexIsSuperselector_closure0.prototype = {
     call$1(component) {
       return A._isSupercombinator(this.combinator1, A.IterableExtension_get_firstOrNull(component.combinators));
     },
-    $signature: 53
+    $signature: 49
   };
   A._compatibleWithPreviousCombinator_closure.prototype = {
     call$1(component) {
       var t1 = component.combinators,
         t2 = A.IterableExtension_get_firstOrNull(t1);
-      if (!J.$eq$(t2 == null ? null : t2.value, B.Combinator_Htt)) {
+      if (!J.$eq$(t2 == null ? null : t2.value, B.Combinator_y18)) {
         t1 = A.IterableExtension_get_firstOrNull(t1);
-        t1 = J.$eq$(t1 == null ? null : t1.value, B.Combinator_4QF);
+        t1 = J.$eq$(t1 == null ? null : t1.value, B.Combinator_gRV);
       } else
         t1 = true;
       return t1;
     },
-    $signature: 53
+    $signature: 49
   };
   A.compoundIsSuperselector_closure.prototype = {
-    call$0() {
-      return this._0_0._0;
+    call$1(simple1) {
+      return B.JSArray_methods.any$1(this.compound2.components, simple1.get$isSuperselector());
     },
-    $signature: 207
-  };
-  A.compoundIsSuperselector_closure0.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 207
+    $signature: 13
   };
   A._selectorPseudoIsSuperselector_closure.prototype = {
     call$1(selector2) {
       return A.listIsSuperselector(this.selector1.components, selector2.components);
     },
-    $signature: 73
+    $signature: 70
   };
   A._selectorPseudoIsSuperselector_closure0.prototype = {
     call$1(complex1) {
@@ -49746,25 +51235,25 @@ self.util = _cliPkgRequires.util;
         if (t2 != null)
           B.JSArray_methods.addAll$1(t1, t2);
         t2 = this.compound2;
-        t1.push(new A.ComplexSelectorComponent(t2, A.List_List$unmodifiable(B.List_empty1, type$.CssValue_Combinator), t2.span));
+        t1.push(new A.ComplexSelectorComponent(t2, A.List_List$unmodifiable(B.List_empty0, type$.CssValue_Combinator), t2.span));
         t1 = A.complexIsSuperselector(complex1.components, t1);
       } else
         t1 = false;
       return t1;
     },
-    $signature: 19
+    $signature: 16
   };
   A._selectorPseudoIsSuperselector_closure1.prototype = {
     call$1(selector2) {
       return A.listIsSuperselector(this.selector1.components, selector2.components);
     },
-    $signature: 73
+    $signature: 70
   };
   A._selectorPseudoIsSuperselector_closure2.prototype = {
     call$1(selector2) {
       return A.listIsSuperselector(this.selector1.components, selector2.components);
     },
-    $signature: 73
+    $signature: 70
   };
   A._selectorPseudoIsSuperselector_closure3.prototype = {
     call$1(complex) {
@@ -49772,30 +51261,29 @@ self.util = _cliPkgRequires.util;
         return false;
       return B.JSArray_methods.any$1(this.compound2.components, new A._selectorPseudoIsSuperselector__closure(complex, this.pseudo1));
     },
-    $signature: 19
+    $signature: 16
   };
   A._selectorPseudoIsSuperselector__closure.prototype = {
     call$1(simple2) {
-      var t1, selector2, _this = this,
-        _0_4 = A._InitializedCell$(new A._selectorPseudoIsSuperselector___closure(simple2));
+      var t1, _0_4, selector2, _this = this;
       $label0$1: {
         if (simple2 instanceof A.TypeSelector) {
-          t1 = B.JSArray_methods.any$1(B.JSArray_methods.get$last(_this.complex.components).selector.components, new A._selectorPseudoIsSuperselector___closure0(simple2));
+          t1 = B.JSArray_methods.any$1(B.JSArray_methods.get$last(_this.complex.components).selector.components, new A._selectorPseudoIsSuperselector___closure(simple2));
           break $label0$1;
         }
         if (simple2 instanceof A.IDSelector) {
-          t1 = B.JSArray_methods.any$1(B.JSArray_methods.get$last(_this.complex.components).selector.components, new A._selectorPseudoIsSuperselector___closure1(simple2));
+          t1 = B.JSArray_methods.any$1(B.JSArray_methods.get$last(_this.complex.components).selector.components, new A._selectorPseudoIsSuperselector___closure0(simple2));
           break $label0$1;
         }
         if (simple2 instanceof A.PseudoSelector) {
-          if (_0_4._readFinal$0() != null) {
-            selector2 = _0_4._readFinal$0();
-            t1 = true;
+          _0_4 = simple2.selector;
+          if (_0_4 != null) {
+            selector2 = _0_4 == null ? type$.SelectorList._as(_0_4) : _0_4;
+            t1 = simple2.name === _this.pseudo1.name;
           } else {
             selector2 = null;
             t1 = false;
           }
-          t1 = t1 && simple2.name === _this.pseudo1.name;
         } else {
           selector2 = null;
           t1 = false;
@@ -49809,9 +51297,9 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 16
+    $signature: 13
   };
-  A._selectorPseudoIsSuperselector___closure0.prototype = {
+  A._selectorPseudoIsSuperselector___closure.prototype = {
     call$1(simple1) {
       var t1;
       if (simple1 instanceof A.TypeSelector) {
@@ -49821,9 +51309,9 @@ self.util = _cliPkgRequires.util;
         t1 = false;
       return t1;
     },
-    $signature: 16
+    $signature: 13
   };
-  A._selectorPseudoIsSuperselector___closure1.prototype = {
+  A._selectorPseudoIsSuperselector___closure0.prototype = {
     call$1(simple1) {
       var t1;
       if (simple1 instanceof A.IDSelector) {
@@ -49833,20 +51321,14 @@ self.util = _cliPkgRequires.util;
         t1 = false;
       return t1;
     },
-    $signature: 16
-  };
-  A._selectorPseudoIsSuperselector___closure.prototype = {
-    call$0() {
-      return type$.PseudoSelector._as(this._0_0).selector;
-    },
-    $signature: 75
+    $signature: 13
   };
   A._selectorPseudoIsSuperselector_closure4.prototype = {
     call$1(selector2) {
       var t1 = B.C_ListEquality.equals$2(0, this.selector1.components, selector2.components);
       return t1;
     },
-    $signature: 73
+    $signature: 70
   };
   A._selectorPseudoIsSuperselector_closure5.prototype = {
     call$1(pseudo2) {
@@ -49863,19 +51345,19 @@ self.util = _cliPkgRequires.util;
         return false;
       return A.listIsSuperselector(this.selector1.components, selector2.components);
     },
-    $signature: 16
+    $signature: 13
   };
   A._selectorPseudoArgs_closure.prototype = {
     call$1(pseudo) {
       return pseudo.isClass === this.isClass && pseudo.name === this.name;
     },
-    $signature: 445
+    $signature: 388
   };
   A._selectorPseudoArgs_closure0.prototype = {
     call$1(pseudo) {
       return pseudo.selector;
     },
-    $signature: 453
+    $signature: 390
   };
   A.MergedExtension.prototype = {
     unmerge$0() {
@@ -50020,9 +51502,9 @@ self.util = _cliPkgRequires.util;
         return A._functionString("invert", t1.take$1($arguments, 1));
       }
       color = t1.$index($arguments, 0).assertColor$1("color");
-      t1 = color.get$red(color);
-      t2 = color.get$green(color);
-      return A._mixColors(color.changeRgb$3$blue$green$red(255 - color.get$blue(color), 255 - t2, 255 - t1), color, weight);
+      t1 = color.get$red(0);
+      t2 = color.get$green(0);
+      return A._mixColors(color.changeRgb$3$blue$green$red(255 - color.get$blue(0), 255 - t2, 255 - t1), color, weight);
     },
     $signature: 6
   };
@@ -50046,7 +51528,7 @@ self.util = _cliPkgRequires.util;
       else
         throw A.wrapException(A.SassScriptException$("Missing argument $lightness.", null));
     },
-    $signature: 20
+    $signature: 17
   };
   A.global_closure12.prototype = {
     call$1($arguments) {
@@ -50075,7 +51557,7 @@ self.util = _cliPkgRequires.util;
       else
         throw A.wrapException(A.SassScriptException$("Missing argument $lightness.", null));
     },
-    $signature: 20
+    $signature: 17
   };
   A.global_closure16.prototype = {
     call$1($arguments) {
@@ -50098,27 +51580,27 @@ self.util = _cliPkgRequires.util;
       var t1 = J.getInterceptor$asx($arguments),
         color = t1.$index($arguments, 0).assertColor$1("color"),
         degrees = A._angleValue(t1.$index($arguments, 1), "degrees");
-      return color.changeHsl$1$hue(color.get$hue(color) + degrees);
+      return color.changeHsl$1$hue(color.get$hue(0) + degrees);
     },
-    $signature: 35
+    $signature: 29
   };
   A.global_closure19.prototype = {
     call$1($arguments) {
       var t1 = J.getInterceptor$asx($arguments),
         color = t1.$index($arguments, 0).assertColor$1("color"),
         amount = t1.$index($arguments, 1).assertNumber$1("amount");
-      return color.changeHsl$1$lightness(B.JSNumber_methods.clamp$2(color.get$lightness(color) + amount.valueInRange$3(0, 100, "amount"), 0, 100));
+      return color.changeHsl$1$lightness(B.JSNumber_methods.clamp$2(color.get$lightness(0) + amount.valueInRange$3(0, 100, "amount"), 0, 100));
     },
-    $signature: 35
+    $signature: 29
   };
   A.global_closure20.prototype = {
     call$1($arguments) {
       var t1 = J.getInterceptor$asx($arguments),
         color = t1.$index($arguments, 0).assertColor$1("color"),
         amount = t1.$index($arguments, 1).assertNumber$1("amount");
-      return color.changeHsl$1$lightness(B.JSNumber_methods.clamp$2(color.get$lightness(color) - amount.valueInRange$3(0, 100, "amount"), 0, 100));
+      return color.changeHsl$1$lightness(B.JSNumber_methods.clamp$2(color.get$lightness(0) - amount.valueInRange$3(0, 100, "amount"), 0, 100));
     },
-    $signature: 35
+    $signature: 29
   };
   A.global_closure21.prototype = {
     call$1($arguments) {
@@ -50127,25 +51609,25 @@ self.util = _cliPkgRequires.util;
         return A._functionString("saturate", $arguments);
       return new A.SassString("saturate(" + A.serializeValue(t1.$index($arguments, 0).assertNumber$1("amount"), false, true) + ")", false);
     },
-    $signature: 20
+    $signature: 17
   };
   A.global_closure22.prototype = {
     call$1($arguments) {
       var t1 = J.getInterceptor$asx($arguments),
         color = t1.$index($arguments, 0).assertColor$1("color"),
         amount = t1.$index($arguments, 1).assertNumber$1("amount");
-      return color.changeHsl$1$saturation(B.JSNumber_methods.clamp$2(color.get$saturation(color) + amount.valueInRange$3(0, 100, "amount"), 0, 100));
+      return color.changeHsl$1$saturation(B.JSNumber_methods.clamp$2(color.get$saturation(0) + amount.valueInRange$3(0, 100, "amount"), 0, 100));
     },
-    $signature: 35
+    $signature: 29
   };
   A.global_closure23.prototype = {
     call$1($arguments) {
       var t1 = J.getInterceptor$asx($arguments),
         color = t1.$index($arguments, 0).assertColor$1("color"),
         amount = t1.$index($arguments, 1).assertNumber$1("amount");
-      return color.changeHsl$1$saturation(B.JSNumber_methods.clamp$2(color.get$saturation(color) - amount.valueInRange$3(0, 100, "amount"), 0, 100));
+      return color.changeHsl$1$saturation(B.JSNumber_methods.clamp$2(color.get$saturation(0) - amount.valueInRange$3(0, 100, "amount"), 0, 100));
     },
-    $signature: 35
+    $signature: 29
   };
   A.global_closure24.prototype = {
     call$1($arguments) {
@@ -50168,13 +51650,13 @@ self.util = _cliPkgRequires.util;
       else
         throw A.wrapException(A.SassScriptException$("Only 1 argument allowed, but " + t1 + " were passed.", null));
     },
-    $signature: 20
+    $signature: 17
   };
   A.global__closure.prototype = {
     call$1(argument) {
       return argument instanceof A.SassString && !argument._hasQuotes && B.JSString_methods.contains$1(argument._string$_text, $.$get$_microsoftFilterStart());
     },
-    $signature: 79
+    $signature: 72
   };
   A.global_closure26.prototype = {
     call$1($arguments) {
@@ -50187,34 +51669,30 @@ self.util = _cliPkgRequires.util;
   };
   A.module_closure1.prototype = {
     call$1($arguments) {
-      var result, t2, color,
+      var result, color, t2,
         t1 = J.getInterceptor$asx($arguments),
         weight = t1.$index($arguments, 1).assertNumber$1("weight");
       if (t1.$index($arguments, 0) instanceof A.SassNumber) {
         if (weight._number$_value !== 100 || !weight.hasUnit$1("%"))
           throw A.wrapException(string$.Only_oa);
         result = A._functionString("invert", t1.take$1($arguments, 1));
-        t1 = A.S(t1.$index($arguments, 0));
-        t2 = result.toString$0(0);
-        A.EvaluationContext_current().warn$2(0, "Passing a number (" + t1 + string$.x29x20to_ci + t2, B.Deprecation_s4m);
+        A.warnForDeprecation("Passing a number (" + A.S(t1.$index($arguments, 0)) + string$.x29x20to_ci + result.toString$0(0), B.Deprecation_iDZ);
         return result;
       }
       color = t1.$index($arguments, 0).assertColor$1("color");
-      t1 = color.get$red(color);
-      t2 = color.get$green(color);
-      return A._mixColors(color.changeRgb$3$blue$green$red(255 - color.get$blue(color), 255 - t2, 255 - t1), color, weight);
+      t1 = color.get$red(0);
+      t2 = color.get$green(0);
+      return A._mixColors(color.changeRgb$3$blue$green$red(255 - color.get$blue(0), 255 - t2, 255 - t1), color, weight);
     },
     $signature: 6
   };
   A.module_closure2.prototype = {
     call$1($arguments) {
-      var result, t2,
+      var result,
         t1 = J.getInterceptor$asx($arguments);
       if (t1.$index($arguments, 0) instanceof A.SassNumber) {
         result = A._functionString("grayscale", t1.take$1($arguments, 1));
-        t1 = A.S(t1.$index($arguments, 0));
-        t2 = result.toString$0(0);
-        A.EvaluationContext_current().warn$2(0, "Passing a number (" + t1 + string$.x29x20to_cg + t2, B.Deprecation_s4m);
+        A.warnForDeprecation("Passing a number (" + A.S(t1.$index($arguments, 0)) + string$.x29x20to_cg + result.toString$0(0), B.Deprecation_iDZ);
         return result;
       }
       return t1.$index($arguments, 0).assertColor$1("color").changeHsl$1$saturation(0);
@@ -50239,26 +51717,23 @@ self.util = _cliPkgRequires.util;
   };
   A.module_closure5.prototype = {
     call$1($arguments) {
-      var t1 = J.get$first$ax($arguments).assertColor$1("color");
-      return A.SassNumber_SassNumber(t1.get$whiteness(t1), "%");
+      return A.SassNumber_SassNumber(J.get$first$ax($arguments).assertColor$1("color").get$whiteness(0), "%");
     },
-    $signature: 13
+    $signature: 11
   };
   A.module_closure6.prototype = {
     call$1($arguments) {
-      var t1 = J.get$first$ax($arguments).assertColor$1("color");
-      return A.SassNumber_SassNumber(t1.get$blackness(t1), "%");
+      return A.SassNumber_SassNumber(J.get$first$ax($arguments).assertColor$1("color").get$blackness(0), "%");
     },
-    $signature: 13
+    $signature: 11
   };
   A.module_closure7.prototype = {
     call$1($arguments) {
-      var result, t1,
+      var result,
         argument = J.$index$asx($arguments, 0);
       if (argument instanceof A.SassString && !argument._hasQuotes && B.JSString_methods.contains$1(argument._string$_text, $.$get$_microsoftFilterStart())) {
         result = A._functionString("alpha", $arguments);
-        t1 = result.toString$0(0);
-        A.EvaluationContext_current().warn$2(0, string$.Using_c + t1, B.Deprecation_s4m);
+        A.warnForDeprecation(string$.Using_c + result.toString$0(0), B.Deprecation_iDZ);
         return result;
       }
       return A.SassNumber_SassNumber(argument.assertColor$1("color")._alpha, null);
@@ -50271,29 +51746,26 @@ self.util = _cliPkgRequires.util;
         t1 = J.getInterceptor$asx($arguments);
       if (B.JSArray_methods.every$1(t1.$index($arguments, 0).get$asList(), new A.module__closure1())) {
         result = A._functionString("alpha", $arguments);
-        t1 = result.toString$0(0);
-        A.EvaluationContext_current().warn$2(0, string$.Using_c + t1, B.Deprecation_s4m);
+        A.warnForDeprecation(string$.Using_c + result.toString$0(0), B.Deprecation_iDZ);
         return result;
       }
       throw A.wrapException(A.SassScriptException$("Only 1 argument allowed, but " + t1.get$length($arguments) + " were passed.", null));
     },
-    $signature: 20
+    $signature: 17
   };
   A.module__closure1.prototype = {
     call$1(argument) {
       return argument instanceof A.SassString && !argument._hasQuotes && B.JSString_methods.contains$1(argument._string$_text, $.$get$_microsoftFilterStart());
     },
-    $signature: 79
+    $signature: 72
   };
   A.module_closure9.prototype = {
     call$1($arguments) {
-      var result, t2,
+      var result,
         t1 = J.getInterceptor$asx($arguments);
       if (t1.$index($arguments, 0) instanceof A.SassNumber) {
         result = A._functionString("opacity", $arguments);
-        t1 = A.S(t1.$index($arguments, 0));
-        t2 = result.toString$0(0);
-        A.EvaluationContext_current().warn$2(0, "Passing a number (" + t1 + string$.x20to_co + t2, B.Deprecation_s4m);
+        A.warnForDeprecation("Passing a number (" + A.S(t1.$index($arguments, 0)) + string$.x20to_co + result.toString$0(0), B.Deprecation_iDZ);
         return result;
       }
       return A.SassNumber_SassNumber(t1.$index($arguments, 0).assertColor$1("color")._alpha, null);
@@ -50302,95 +51774,89 @@ self.util = _cliPkgRequires.util;
   };
   A._red_closure.prototype = {
     call$1($arguments) {
-      var t1 = J.get$first$ax($arguments).assertColor$1("color");
-      return A.SassNumber_SassNumber(t1.get$red(t1), null);
+      return A.SassNumber_SassNumber(J.get$first$ax($arguments).assertColor$1("color").get$red(0), null);
     },
-    $signature: 13
+    $signature: 11
   };
   A._green_closure.prototype = {
     call$1($arguments) {
-      var t1 = J.get$first$ax($arguments).assertColor$1("color");
-      return A.SassNumber_SassNumber(t1.get$green(t1), null);
+      return A.SassNumber_SassNumber(J.get$first$ax($arguments).assertColor$1("color").get$green(0), null);
     },
-    $signature: 13
+    $signature: 11
   };
   A._blue_closure.prototype = {
     call$1($arguments) {
-      var t1 = J.get$first$ax($arguments).assertColor$1("color");
-      return A.SassNumber_SassNumber(t1.get$blue(t1), null);
+      return A.SassNumber_SassNumber(J.get$first$ax($arguments).assertColor$1("color").get$blue(0), null);
     },
-    $signature: 13
+    $signature: 11
   };
   A._mix_closure.prototype = {
     call$1($arguments) {
       var t1 = J.getInterceptor$asx($arguments);
       return A._mixColors(t1.$index($arguments, 0).assertColor$1("color1"), t1.$index($arguments, 1).assertColor$1("color2"), t1.$index($arguments, 2).assertNumber$1("weight"));
     },
-    $signature: 35
+    $signature: 29
   };
   A._hue_closure.prototype = {
     call$1($arguments) {
-      var t1 = J.get$first$ax($arguments).assertColor$1("color");
-      return A.SassNumber_SassNumber(t1.get$hue(t1), "deg");
+      return A.SassNumber_SassNumber(J.get$first$ax($arguments).assertColor$1("color").get$hue(0), "deg");
     },
-    $signature: 13
+    $signature: 11
   };
   A._saturation_closure.prototype = {
     call$1($arguments) {
-      var t1 = J.get$first$ax($arguments).assertColor$1("color");
-      return A.SassNumber_SassNumber(t1.get$saturation(t1), "%");
+      return A.SassNumber_SassNumber(J.get$first$ax($arguments).assertColor$1("color").get$saturation(0), "%");
     },
-    $signature: 13
+    $signature: 11
   };
   A._lightness_closure.prototype = {
     call$1($arguments) {
-      var t1 = J.get$first$ax($arguments).assertColor$1("color");
-      return A.SassNumber_SassNumber(t1.get$lightness(t1), "%");
+      return A.SassNumber_SassNumber(J.get$first$ax($arguments).assertColor$1("color").get$lightness(0), "%");
     },
-    $signature: 13
+    $signature: 11
   };
   A._complement_closure.prototype = {
     call$1($arguments) {
       var color = J.$index$asx($arguments, 0).assertColor$1("color");
-      return color.changeHsl$1$hue(color.get$hue(color) + 180);
+      return color.changeHsl$1$hue(color.get$hue(0) + 180);
     },
-    $signature: 35
+    $signature: 29
   };
   A._adjust_closure.prototype = {
     call$1($arguments) {
       return A._updateComponents($arguments, true, false, false);
     },
-    $signature: 35
+    $signature: 29
   };
   A._scale_closure.prototype = {
     call$1($arguments) {
       return A._updateComponents($arguments, false, false, true);
     },
-    $signature: 35
+    $signature: 29
   };
   A._change_closure.prototype = {
     call$1($arguments) {
       return A._updateComponents($arguments, false, true, false);
     },
-    $signature: 35
+    $signature: 29
   };
   A._ieHexStr_closure.prototype = {
     call$1($arguments) {
       var color = J.$index$asx($arguments, 0).assertColor$1("color"),
         t1 = new A._ieHexStr_closure_hexString();
-      return new A.SassString("#" + A.S(t1.call$1(A.fuzzyRound(color._alpha * 255))) + A.S(t1.call$1(color.get$red(color))) + A.S(t1.call$1(color.get$green(color))) + A.S(t1.call$1(color.get$blue(color))), false);
+      return new A.SassString("#" + A.S(t1.call$1(A.fuzzyRound(color._alpha * 255))) + A.S(t1.call$1(color.get$red(0))) + A.S(t1.call$1(color.get$green(0))) + A.S(t1.call$1(color.get$blue(0))), false);
     },
-    $signature: 20
+    $signature: 17
   };
   A._ieHexStr_closure_hexString.prototype = {
     call$1(component) {
       return B.JSString_methods.padLeft$2(B.JSInt_methods.toRadixString$1(component, 16), 2, "0").toUpperCase();
     },
-    $signature: 223
+    $signature: 191
   };
   A._updateComponents_getParam.prototype = {
     call$5$assertPercent$checkPercent$checkUnitless($name, max, assertPercent, checkPercent, checkUnitless) {
-      var t2, t3, t4, _this = this,
+      var t2, _this = this,
         t1 = _this.keywords.remove$1(0, $name),
         number = t1 == null ? null : t1.assertNumber$1($name);
       if (number == null)
@@ -50398,11 +51864,8 @@ self.util = _cliPkgRequires.util;
       t1 = _this.scale;
       t2 = !t1;
       if (t2 && checkUnitless)
-        if (number.get$hasUnits()) {
-          t3 = number.get$unitString();
-          t4 = number.unitSuggestion$1($name);
-          A.EvaluationContext_current().warn$2(0, "$" + $name + ": Passing a number with unit " + t3 + string$.x20is_de + t4 + string$.x0a_Morex3a, B.Deprecation_8WR);
-        }
+        if (number.get$hasUnits())
+          A.warnForDeprecation("$" + $name + ": Passing a number with unit " + number.get$unitString() + string$.x20is_de + number.unitSuggestion$1($name) + string$.x0a_Morex3a, B.Deprecation_2jN);
       if (t2 && checkPercent)
         A._checkPercent(number, $name);
       if (!t2 || assertPercent)
@@ -50429,19 +51892,19 @@ self.util = _cliPkgRequires.util;
     call$3$assertPercent($name, max, assertPercent) {
       return this.call$5$assertPercent$checkPercent$checkUnitless($name, max, assertPercent, false, false);
     },
-    $signature: 227
+    $signature: 189
   };
   A._updateComponents_closure.prototype = {
     call$1(hue) {
       return A._angleValue(hue, "hue");
     },
-    $signature: 115
+    $signature: 83
   };
   A._updateComponents_closure0.prototype = {
     call$1($name) {
       return "$" + $name;
     },
-    $signature: 7
+    $signature: 5
   };
   A._updateComponents_updateValue.prototype = {
     call$3(current, param, max) {
@@ -50455,19 +51918,19 @@ self.util = _cliPkgRequires.util;
       t1 = param > 0 ? max - current : current;
       return current + t1 * (param / 100);
     },
-    $signature: 232
+    $signature: 251
   };
   A._updateComponents_updateRgb.prototype = {
     call$2(current, param) {
       return A.fuzzyRound(this.updateValue.call$3(current, param, 255));
     },
-    $signature: 238
+    $signature: 249
   };
   A._functionString_closure.prototype = {
     call$1(argument) {
       return A.serializeValue(argument, false, true);
     },
-    $signature: 481
+    $signature: 475
   };
   A._removedColorFunction_closure.prototype = {
     call$1($arguments) {
@@ -50477,49 +51940,37 @@ self.util = _cliPkgRequires.util;
         t4 = this.negative ? "-" : "";
       throw A.wrapException(A.SassScriptException$("The function " + t1 + string$.x28__isn + t3 + ", $" + this.argument + ": " + t4 + A.S(t2.$index($arguments, 1)) + string$.x29x0a_Mor + t1, null));
     },
-    $signature: 484
+    $signature: 527
   };
   A._rgb_closure.prototype = {
     call$1(alpha) {
       return A._percentageOrUnitless(alpha.assertNumber$1("alpha"), 1, "alpha");
     },
-    $signature: 115
+    $signature: 83
   };
   A._hsl_closure.prototype = {
     call$1(alpha) {
       return A._percentageOrUnitless(alpha.assertNumber$1("alpha"), 1, "alpha");
     },
-    $signature: 115
+    $signature: 83
   };
   A._hwb_closure.prototype = {
     call$1(alpha) {
       return A._percentageOrUnitless(alpha.assertNumber$1("alpha"), 1, "alpha");
     },
-    $signature: 115
+    $signature: 83
   };
   A._parseChannels_closure.prototype = {
-    call$0() {
-      return this._0_0[0];
-    },
-    $signature: 25
-  };
-  A._parseChannels_closure0.prototype = {
     call$1(value) {
       return value.get$isVar();
     },
-    $signature: 79
-  };
-  A._parseChannels_closure1.prototype = {
-    call$0() {
-      return type$.SassNumber._as(this._1_0).asSlash;
-    },
-    $signature: 502
+    $signature: 72
   };
   A._length_closure0.prototype = {
     call$1($arguments) {
       return A.SassNumber_SassNumber(J.$index$asx($arguments, 0).get$asList().length, null);
     },
-    $signature: 13
+    $signature: 11
   };
   A._nth_closure.prototype = {
     call$1($arguments) {
@@ -50542,11 +51993,11 @@ self.util = _cliPkgRequires.util;
       newList[list.sassIndexToListIndex$2(index, "n")] = value;
       return list.withListContents$1(newList);
     },
-    $signature: 29
+    $signature: 24
   };
   A._join_closure.prototype = {
     call$1($arguments) {
-      var _0_0, _0_1, _0_3, _0_4, separator, bracketed, t2,
+      var _0_1, _0_4, _0_3, t2, _0_40, separator, bracketed, _null = null,
         t1 = J.getInterceptor$asx($arguments),
         list1 = t1.$index($arguments, 0),
         list2 = t1.$index($arguments, 1),
@@ -50555,67 +52006,53 @@ self.util = _cliPkgRequires.util;
         _1_0 = separatorParam._string$_text;
       $label1$1: {
         if ("auto" === _1_0) {
-          _0_0 = new A._Record_2(list1.get$separator(list1), list2.get$separator(list2));
-          _0_1 = A._InitializedCell$(new A._join__closure(_0_0));
-          _0_3 = A._InitializedCell$(new A._join__closure0(_0_1));
-          _0_4 = A._InitializedCell$(new A._join__closure1(_0_0));
+          _0_1 = list1.get$separator(list1);
+          _0_4 = list2.get$separator(list2);
           $label0$0: {
-            if (_0_3._readFinal$0() && B.ListSeparator_undecided_null_undecided === _0_4._readFinal$0()) {
-              t1 = B.ListSeparator_EVt;
+            _0_3 = B.ListSeparator_undecided_null_undecided === _0_1;
+            t1 = _0_3;
+            if (t1) {
+              t2 = B.ListSeparator_undecided_null_undecided === _0_4;
+              _0_40 = _0_4;
+            } else {
+              _0_40 = _null;
+              t2 = false;
+            }
+            if (t2) {
+              t1 = B.ListSeparator_nbm;
               break $label0$0;
             }
-            if (_0_3._readFinal$0()) {
-              separator = _0_4._readFinal$0();
-              t1 = true;
-            } else {
-              separator = null;
-              t1 = false;
-            }
-            if (!t1)
-              separator = _0_1._readFinal$0();
+            if (_0_3)
+              separator = t1 ? _0_40 : _0_4;
+            else
+              separator = _null;
+            if (!_0_3)
+              separator = _0_1;
             t1 = separator;
             break $label0$0;
           }
           break $label1$1;
         }
         if ("space" === _1_0) {
-          t1 = B.ListSeparator_EVt;
+          t1 = B.ListSeparator_nbm;
           break $label1$1;
         }
         if ("comma" === _1_0) {
-          t1 = B.ListSeparator_rXA;
+          t1 = B.ListSeparator_ECn;
           break $label1$1;
         }
         if ("slash" === _1_0) {
-          t1 = B.ListSeparator_zg9;
+          t1 = B.ListSeparator_cQA;
           break $label1$1;
         }
-        t1 = A.throwExpression(A.SassScriptException$(string$.x24separ, null));
+        t1 = A.throwExpression(A.SassScriptException$(string$.x24separ, _null));
       }
       bracketed = bracketedParam instanceof A.SassString && bracketedParam._string$_text === "auto" ? list1.get$hasBrackets() : bracketedParam.get$isTruthy();
       t2 = A.List_List$of(list1.get$asList(), true, type$.Value);
       B.JSArray_methods.addAll$1(t2, list2.get$asList());
       return A.SassList$(t2, t1, bracketed);
     },
-    $signature: 29
-  };
-  A._join__closure.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature: 246
-  };
-  A._join__closure0.prototype = {
-    call$0() {
-      return B.ListSeparator_undecided_null_undecided === this._0_1._readFinal$0();
-    },
-    $signature: 1
-  };
-  A._join__closure1.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 246
+    $signature: 24
   };
   A._append_closure0.prototype = {
     call$1($arguments) {
@@ -50626,19 +52063,19 @@ self.util = _cliPkgRequires.util;
         _0_0 = t1.$index($arguments, 2).assertString$1("separator")._string$_text;
       $label0$0: {
         if ("auto" === _0_0) {
-          t1 = list.get$separator(list) === B.ListSeparator_undecided_null_undecided ? B.ListSeparator_EVt : list.get$separator(list);
+          t1 = list.get$separator(list) === B.ListSeparator_undecided_null_undecided ? B.ListSeparator_nbm : list.get$separator(list);
           break $label0$0;
         }
         if ("space" === _0_0) {
-          t1 = B.ListSeparator_EVt;
+          t1 = B.ListSeparator_nbm;
           break $label0$0;
         }
         if ("comma" === _0_0) {
-          t1 = B.ListSeparator_rXA;
+          t1 = B.ListSeparator_ECn;
           break $label0$0;
         }
         if ("slash" === _0_0) {
-          t1 = B.ListSeparator_zg9;
+          t1 = B.ListSeparator_cQA;
           break $label0$0;
         }
         t1 = A.throwExpression(A.SassScriptException$(string$.x24separ, null));
@@ -50647,7 +52084,7 @@ self.util = _cliPkgRequires.util;
       t2.push(value);
       return list.withListContents$2$separator(t2, t1);
     },
-    $signature: 29
+    $signature: 24
   };
   A._zip_closure.prototype = {
     call$1($arguments) {
@@ -50656,31 +52093,31 @@ self.util = _cliPkgRequires.util;
         t2 = A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,List<Value>>"),
         lists = A.List_List$of(new A.MappedListIterable(t1, new A._zip__closure(), t2), true, t2._eval$1("ListIterable.E"));
       if (lists.length === 0)
-        return B.SassList_Sof;
+        return B.SassList_bdS;
       _box_0.i = 0;
       results = A._setArrayType([], type$.JSArray_SassList);
       for (t1 = A._arrayInstanceType(lists)._eval$1("MappedListIterable<1,Value>"), t2 = type$.Value; B.JSArray_methods.every$1(lists, new A._zip__closure0(_box_0));) {
         result = A.List_List$from(new A.MappedListIterable(lists, new A._zip__closure1(_box_0), t1), false, t2);
         result.fixed$length = Array;
         result.immutable$list = Array;
-        results.push(new A.SassList(result, B.ListSeparator_EVt, false));
+        results.push(new A.SassList(result, B.ListSeparator_nbm, false));
         ++_box_0.i;
       }
-      return A.SassList$(results, B.ListSeparator_rXA, false);
+      return A.SassList$(results, B.ListSeparator_ECn, false);
     },
-    $signature: 29
+    $signature: 24
   };
   A._zip__closure.prototype = {
     call$1(list) {
       return list.get$asList();
     },
-    $signature: 520
+    $signature: 591
   };
   A._zip__closure0.prototype = {
     call$1(list) {
       return this._box_0.i !== J.get$length$asx(list);
     },
-    $signature: 527
+    $signature: 608
   };
   A._zip__closure1.prototype = {
     call$1(list) {
@@ -50701,11 +52138,11 @@ self.util = _cliPkgRequires.util;
       var t1,
         _0_0 = J.get$separator$x(J.$index$asx($arguments, 0));
       $label0$0: {
-        if (B.ListSeparator_rXA === _0_0) {
+        if (B.ListSeparator_ECn === _0_0) {
           t1 = new A.SassString("comma", false);
           break $label0$0;
         }
-        if (B.ListSeparator_zg9 === _0_0) {
+        if (B.ListSeparator_cQA === _0_0) {
           t1 = new A.SassString("slash", false);
           break $label0$0;
         }
@@ -50714,22 +52151,22 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 20
+    $signature: 17
   };
   A._isBracketed_closure.prototype = {
     call$1($arguments) {
       return J.$index$asx($arguments, 0).get$hasBrackets() ? B.SassBoolean_true : B.SassBoolean_false;
     },
-    $signature: 23
+    $signature: 20
   };
   A._slash_closure.prototype = {
     call$1($arguments) {
       var list = J.$index$asx($arguments, 0).get$asList();
       if (list.length < 2)
         throw A.wrapException(A.SassScriptException$("At least two elements are required.", null));
-      return A.SassList$(list, B.ListSeparator_zg9, false);
+      return A.SassList$(list, B.ListSeparator_cQA, false);
     },
-    $signature: 29
+    $signature: 24
   };
   A._get_closure.prototype = {
     call$1($arguments) {
@@ -50751,52 +52188,45 @@ self.util = _cliPkgRequires.util;
   A._set_closure.prototype = {
     call$1($arguments) {
       var t1 = J.getInterceptor$asx($arguments);
-      return A._modify(t1.$index($arguments, 0).assertMap$1("map"), A._setArrayType([t1.$index($arguments, 1)], type$.JSArray_Value), new A._set__closure1($arguments), true);
+      return A._modify(t1.$index($arguments, 0).assertMap$1("map"), A._setArrayType([t1.$index($arguments, 1)], type$.JSArray_Value), new A._set__closure0($arguments), true);
     },
     $signature: 6
   };
-  A._set__closure1.prototype = {
+  A._set__closure0.prototype = {
     call$1(_) {
       return J.$index$asx(this.$arguments, 2);
     },
-    $signature: 43
+    $signature: 39
   };
   A._set_closure0.prototype = {
     call$1($arguments) {
-      var keys, value, t1 = {},
+      var keys, t3, t1 = {},
         t2 = J.getInterceptor$asx($arguments),
         map = t2.$index($arguments, 0).assertMap$1("map"),
         _0_0 = t2.$index($arguments, 1).get$asList(),
-        _0_1 = A._InitializedCell$(new A._set__closure(_0_0));
-      if (_0_1._readFinal$0() <= 0)
+        _0_1 = _0_0.length;
+      if (_0_1 <= 0)
         throw A.wrapException(A.SassScriptException$("Expected $args to contain a key.", null));
-      if (J.$eq$(_0_1._readFinal$0(), 1))
+      if (_0_1 === 1)
         throw A.wrapException(A.SassScriptException$("Expected $args to contain a value.", null));
       keys = t1.value = null;
-      if (_0_1._readFinal$0() >= 1) {
-        keys = B.JSArray_methods.sublist$2(_0_0, 0, _0_1._readFinal$0() - 1);
-        value = _0_0[_0_1._readFinal$0() - 1];
-        t1.value = value;
-        t2 = true;
-      } else
-        t2 = false;
+      t2 = _0_1 >= 1;
+      if (t2) {
+        t3 = _0_1 - 1;
+        keys = B.JSArray_methods.sublist$2(_0_0, 0, t3);
+        t1.value = _0_0[t3];
+      }
       if (t2)
-        return A._modify(map, keys, new A._set__closure0(t1), true);
+        return A._modify(map, keys, new A._set__closure(t1), true);
       throw A.wrapException("[BUG] Unreachable code");
     },
     $signature: 6
   };
   A._set__closure.prototype = {
-    call$0() {
-      return this._0_0.length;
-    },
-    $signature: 3
-  };
-  A._set__closure0.prototype = {
     call$1(_) {
       return this._box_0.value;
     },
-    $signature: 43
+    $signature: 39
   };
   A._merge_closure.prototype = {
     call$1($arguments) {
@@ -50809,42 +52239,35 @@ self.util = _cliPkgRequires.util;
       t2.addAll$1(0, map2._map$_contents);
       return new A.SassMap(A.ConstantMap_ConstantMap$from(t2, t1, t1));
     },
-    $signature: 40
+    $signature: 33
   };
   A._merge_closure0.prototype = {
     call$1($arguments) {
-      var keys, last, _null = null,
+      var t2, keys, last, _null = null,
         t1 = J.getInterceptor$asx($arguments),
         map1 = t1.$index($arguments, 0).assertMap$1("map1"),
         _0_0 = t1.$index($arguments, 1).get$asList(),
-        _0_1 = A._InitializedCell$(new A._merge__closure(_0_0));
-      if (_0_1._readFinal$0() <= 0)
+        _0_1 = _0_0.length;
+      if (_0_1 <= 0)
         throw A.wrapException(A.SassScriptException$("Expected $args to contain a key.", _null));
-      if (J.$eq$(_0_1._readFinal$0(), 1))
+      if (_0_1 === 1)
         throw A.wrapException(A.SassScriptException$("Expected $args to contain a map.", _null));
-      if (_0_1._readFinal$0() >= 1) {
-        keys = B.JSArray_methods.sublist$2(_0_0, 0, _0_1._readFinal$0() - 1);
-        last = _0_0[_0_1._readFinal$0() - 1];
-        last = last;
-        t1 = true;
+      t1 = _0_1 >= 1;
+      if (t1) {
+        t2 = _0_1 - 1;
+        keys = B.JSArray_methods.sublist$2(_0_0, 0, t2);
+        last = _0_0[t2];
       } else {
         last = _null;
         keys = last;
-        t1 = false;
       }
       if (t1)
-        return A._modify(map1, keys, new A._merge__closure0(last.assertMap$1("map2")), true);
+        return A._modify(map1, keys, new A._merge__closure(last.assertMap$1("map2")), true);
       throw A.wrapException("[BUG] Unreachable code");
     },
     $signature: 6
   };
   A._merge__closure.prototype = {
-    call$0() {
-      return this._0_0.length;
-    },
-    $signature: 3
-  };
-  A._merge__closure0.prototype = {
     call$1(oldValue) {
       var t1, t2,
         nestedMap = oldValue.tryMap$0();
@@ -50855,14 +52278,14 @@ self.util = _cliPkgRequires.util;
       t2.addAll$1(0, this.map2._map$_contents);
       return new A.SassMap(A.ConstantMap_ConstantMap$from(t2, t1, t1));
     },
-    $signature: 537
+    $signature: 301
   };
   A._deepMerge_closure.prototype = {
     call$1($arguments) {
       var t1 = J.getInterceptor$asx($arguments);
       return A._deepMergeImpl(t1.$index($arguments, 0).assertMap$1("map1"), t1.$index($arguments, 1).assertMap$1("map2"));
     },
-    $signature: 40
+    $signature: 33
   };
   A._deepRemove_closure.prototype = {
     call$1($arguments) {
@@ -50876,16 +52299,16 @@ self.util = _cliPkgRequires.util;
   };
   A._deepRemove__closure.prototype = {
     call$1(value) {
-      var nestedMap, t1, t2,
+      var t1, nestedMap, t2,
         _0_0 = value.tryMap$0();
       if (_0_0 != null) {
+        t1 = _0_0._map$_contents.containsKey$1(B.JSArray_methods.get$last(this.keys));
         nestedMap = _0_0;
-        t1 = true;
       } else {
         nestedMap = null;
         t1 = false;
       }
-      if (t1 && nestedMap._map$_contents.containsKey$1(B.JSArray_methods.get$last(this.keys))) {
+      if (t1) {
         t1 = type$.Value;
         t2 = A.LinkedHashMap_LinkedHashMap$of(nestedMap._map$_contents, t1, t1);
         t2.remove$1(0, B.JSArray_methods.get$last(this.keys));
@@ -50893,13 +52316,13 @@ self.util = _cliPkgRequires.util;
       }
       return value;
     },
-    $signature: 43
+    $signature: 39
   };
   A._remove_closure.prototype = {
     call$1($arguments) {
       return J.$index$asx($arguments, 0).assertMap$1("map");
     },
-    $signature: 40
+    $signature: 33
   };
   A._remove_closure0.prototype = {
     call$1($arguments) {
@@ -50914,21 +52337,21 @@ self.util = _cliPkgRequires.util;
         mutableMap.remove$1(0, t2[_i]);
       return new A.SassMap(A.ConstantMap_ConstantMap$from(mutableMap, t1, t1));
     },
-    $signature: 40
+    $signature: 33
   };
   A._keys_closure.prototype = {
     call$1($arguments) {
       var t1 = J.$index$asx($arguments, 0).assertMap$1("map")._map$_contents;
-      return A.SassList$(t1.get$keys(t1), B.ListSeparator_rXA, false);
+      return A.SassList$(t1.get$keys(t1), B.ListSeparator_ECn, false);
     },
-    $signature: 29
+    $signature: 24
   };
   A._values_closure.prototype = {
     call$1($arguments) {
       var t1 = J.$index$asx($arguments, 0).assertMap$1("map")._map$_contents;
-      return A.SassList$(t1.get$values(t1), B.ListSeparator_rXA, false);
+      return A.SassList$(t1.get$values(t1), B.ListSeparator_ECn, false);
     },
-    $signature: 29
+    $signature: 24
   };
   A._hasKey_closure.prototype = {
     call$1($arguments) {
@@ -50944,7 +52367,7 @@ self.util = _cliPkgRequires.util;
       }
       return map._map$_contents.containsKey$1(B.JSArray_methods.get$last(t2)) ? B.SassBoolean_true : B.SassBoolean_false;
     },
-    $signature: 23
+    $signature: 20
   };
   A._modify_modifyNestedMap.prototype = {
     call$1(map) {
@@ -50968,45 +52391,30 @@ self.util = _cliPkgRequires.util;
       mutableMap.$indexSet(0, key, _this.call$1(t2 ? B.SassMap_Map_empty : nestedMap));
       return new A.SassMap(A.ConstantMap_ConstantMap$from(mutableMap, t1, t1));
     },
-    $signature: 538
-  };
-  A._deepMergeImpl_closure.prototype = {
-    call$0() {
-      return this._1_0._0;
-    },
-    $signature: 293
-  };
-  A._deepMergeImpl_closure0.prototype = {
-    call$0() {
-      return this._1_0._1;
-    },
-    $signature: 293
+    $signature: 627
   };
   A.global_closure.prototype = {
     call$1($arguments) {
-      var t1, t2,
+      var t1,
         number = J.$index$asx($arguments, 0).assertNumber$1("number");
-      if (number.hasUnit$1("%")) {
-        t1 = number.toString$0(0);
-        t2 = number.toString$0(0);
-        A.EvaluationContext_current().warn$2(0, string$.Passinp + t1 + ")\nTo emit a CSS abs() now: abs(#{" + t2 + string$.x7d__Mor, B.Deprecation_043);
-      }
+      if (number.hasUnit$1("%"))
+        A.warnForDeprecation(string$.Passinp + number.toString$0(0) + ")\nTo emit a CSS abs() now: abs(#{" + number.toString$0(0) + string$.x7d__Mor, B.Deprecation_GFc);
       t1 = number.get$numeratorUnits(number);
       return A.SassNumber_SassNumber$withUnits(Math.abs(number._number$_value), number.get$denominatorUnits(number), t1);
     },
-    $signature: 13
+    $signature: 11
   };
   A.module_closure0.prototype = {
     call$1(value) {
       return Math.abs(value);
     },
-    $signature: 42
+    $signature: 37
   };
   A._ceil_closure.prototype = {
     call$1(value) {
       return B.JSNumber_methods.ceil$0(value);
     },
-    $signature: 42
+    $signature: 37
   };
   A._clamp_closure.prototype = {
     call$1($arguments) {
@@ -51024,13 +52432,13 @@ self.util = _cliPkgRequires.util;
         return max;
       return number;
     },
-    $signature: 13
+    $signature: 11
   };
   A._floor_closure.prototype = {
     call$1(value) {
       return B.JSNumber_methods.floor$0(value);
     },
-    $signature: 42
+    $signature: 37
   };
   A._max_closure.prototype = {
     call$1($arguments) {
@@ -51044,7 +52452,7 @@ self.util = _cliPkgRequires.util;
         return max;
       throw A.wrapException(A.SassScriptException$("At least one argument must be passed.", null));
     },
-    $signature: 13
+    $signature: 11
   };
   A._min_closure.prototype = {
     call$1($arguments) {
@@ -51058,13 +52466,13 @@ self.util = _cliPkgRequires.util;
         return min;
       throw A.wrapException(A.SassScriptException$("At least one argument must be passed.", null));
     },
-    $signature: 13
+    $signature: 11
   };
   A._round_closure.prototype = {
     call$1(number) {
       return B.JSNumber_methods.round$0(number);
     },
-    $signature: 42
+    $signature: 37
   };
   A._hypot_closure.prototype = {
     call$1($arguments) {
@@ -51085,13 +52493,13 @@ self.util = _cliPkgRequires.util;
       t4 = t3.get$numeratorUnits(t2);
       return A.SassNumber_SassNumber$withUnits(t1, t3.get$denominatorUnits(t2), t4);
     },
-    $signature: 13
+    $signature: 11
   };
   A._hypot__closure.prototype = {
     call$1(argument) {
       return argument.assertNumber$0();
     },
-    $signature: 549
+    $signature: 606
   };
   A._log_closure.prototype = {
     call$1($arguments) {
@@ -51110,14 +52518,14 @@ self.util = _cliPkgRequires.util;
       else
         return A.SassNumber_SassNumber(Math.log(number._number$_value) / Math.log(base._number$_value), _null);
     },
-    $signature: 13
+    $signature: 11
   };
   A._pow_closure.prototype = {
     call$1($arguments) {
       var t1 = J.getInterceptor$asx($arguments);
       return A.pow0(t1.$index($arguments, 0).assertNumber$1("base"), t1.$index($arguments, 1).assertNumber$1("exponent"));
     },
-    $signature: 13
+    $signature: 11
   };
   A._atan2_closure.prototype = {
     call$1($arguments) {
@@ -51125,26 +52533,26 @@ self.util = _cliPkgRequires.util;
         y = t1.$index($arguments, 0).assertNumber$1("y");
       return A.SassNumber_SassNumber$withUnits(Math.atan2(y._number$_value, t1.$index($arguments, 1).assertNumber$1("x").convertValueToMatch$3(y, "x", "y")) * 57.29577951308232, null, A._setArrayType(["deg"], type$.JSArray_String));
     },
-    $signature: 13
+    $signature: 11
   };
   A._compatible_closure.prototype = {
     call$1($arguments) {
       var t1 = J.getInterceptor$asx($arguments);
       return t1.$index($arguments, 0).assertNumber$1("number1").isComparableTo$1(t1.$index($arguments, 1).assertNumber$1("number2")) ? B.SassBoolean_true : B.SassBoolean_false;
     },
-    $signature: 23
+    $signature: 20
   };
   A._isUnitless_closure.prototype = {
     call$1($arguments) {
       return !J.$index$asx($arguments, 0).assertNumber$1("number").get$hasUnits() ? B.SassBoolean_true : B.SassBoolean_false;
     },
-    $signature: 23
+    $signature: 20
   };
   A._unit_closure.prototype = {
     call$1($arguments) {
       return new A.SassString(J.$index$asx($arguments, 0).assertNumber$1("number").get$unitString(), true);
     },
-    $signature: 20
+    $signature: 17
   };
   A._percentage_closure.prototype = {
     call$1($arguments) {
@@ -51152,38 +52560,31 @@ self.util = _cliPkgRequires.util;
       number.assertNoUnits$1("number");
       return A.SassNumber_SassNumber(number._number$_value * 100, "%");
     },
-    $signature: 13
+    $signature: 11
   };
   A._randomFunction_closure.prototype = {
     call$1($arguments) {
-      var limit, t2, t3, t4, limitScalar,
+      var limit, limitScalar,
         t1 = J.getInterceptor$asx($arguments);
       if (J.$eq$(t1.$index($arguments, 0), B.C__SassNull))
         return A.SassNumber_SassNumber($.$get$_random0().nextDouble$0(), null);
       limit = t1.$index($arguments, 0).assertNumber$1("limit");
-      if (limit.get$hasUnits()) {
-        t1 = limit.toString$0(0);
-        t2 = limit.get$unitString();
-        t3 = limit.get$unitString();
-        t4 = limit.get$unitString();
-        A.EvaluationContext_current().warn$2(0, string$.math_r + t1 + string$.x29x20in_a + t2 + ")) * 1" + t3 + string$.x0a_To_p + t4 + string$.x29x29__Mo, B.Deprecation_8WR);
-      }
+      if (limit.get$hasUnits())
+        A.warnForDeprecation(string$.math_r + limit.toString$0(0) + string$.x29x20in_a + limit.get$unitString() + ")) * 1" + limit.get$unitString() + string$.x0a_To_p + limit.get$unitString() + string$.x29x29__Mo, B.Deprecation_2jN);
       limitScalar = limit.assertInt$1("limit");
       if (limitScalar < 1)
         throw A.wrapException(A.SassScriptException$("$limit: Must be greater than 0, was " + limit.toString$0(0) + ".", null));
       return A.SassNumber_SassNumber($.$get$_random0().nextInt$1(limitScalar) + 1, null);
     },
-    $signature: 13
+    $signature: 11
   };
   A._div_closure.prototype = {
     call$1($arguments) {
       var t1 = J.getInterceptor$asx($arguments),
         number1 = t1.$index($arguments, 0),
         number2 = t1.$index($arguments, 1);
-      if (!(number1 instanceof A.SassNumber) || !(number2 instanceof A.SassNumber)) {
-        t1 = A.EvaluationContext_current();
-        t1.warn$2(0, string$.math_d, null);
-      }
+      if (!(number1 instanceof A.SassNumber) || !(number2 instanceof A.SassNumber))
+        A.warn(string$.math_d);
       return number1.dividedBy$1(number2);
     },
     $signature: 6
@@ -51192,7 +52593,7 @@ self.util = _cliPkgRequires.util;
     call$1($arguments) {
       return this.mathFunc.call$1(J.$index$asx($arguments, 0).assertNumber$1("number"));
     },
-    $signature: 13
+    $signature: 11
   };
   A._numberFunction_closure.prototype = {
     call$1($arguments) {
@@ -51201,19 +52602,19 @@ self.util = _cliPkgRequires.util;
         t2 = number.get$numeratorUnits(number);
       return A.SassNumber_SassNumber$withUnits(t1, number.get$denominatorUnits(number), t2);
     },
-    $signature: 13
+    $signature: 11
   };
   A.global_closure27.prototype = {
     call$1($arguments) {
       return $._features.contains$1(0, J.$index$asx($arguments, 0).assertString$1("feature")._string$_text) ? B.SassBoolean_true : B.SassBoolean_false;
     },
-    $signature: 23
+    $signature: 20
   };
   A.global_closure28.prototype = {
     call$1($arguments) {
       return new A.SassString(A.serializeValue(J.get$first$ax($arguments), true, true), false);
     },
-    $signature: 20
+    $signature: 17
   };
   A.global_closure29.prototype = {
     call$1($arguments) {
@@ -51268,98 +52669,82 @@ self.util = _cliPkgRequires.util;
       }
       return new A.SassString(t1, false);
     },
-    $signature: 20
+    $signature: 17
   };
   A.global_closure30.prototype = {
     call$1($arguments) {
-      var t2, keywords, t3, t4, key, value,
+      var t2, t3, t4,
         t1 = J.getInterceptor$asx($arguments),
         _1_0 = t1.$index($arguments, 0);
       if (_1_0 instanceof A.SassArgumentList) {
-        t2 = _1_0._wereKeywordsAccessed = true;
-        keywords = _1_0._keywords;
-      } else {
-        keywords = null;
-        t2 = false;
-      }
-      if (t2) {
+        _1_0._wereKeywordsAccessed = true;
         t1 = type$.Value;
         t2 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1);
-        for (t3 = A.MapExtensions_get_pairs(keywords, type$.String, t1), t3 = t3.get$iterator(t3); t3.moveNext$0();) {
+        for (t3 = A.MapExtensions_get_pairs(_1_0._keywords, type$.String, t1), t3 = t3.get$iterator(t3); t3.moveNext$0();) {
           t4 = t3.get$current(t3);
-          key = t4._0;
-          value = t4._1;
-          value = value;
-          t2.$indexSet(0, new A.SassString(key, false), value);
+          t2.$indexSet(0, new A.SassString(t4._0, false), t4._1);
         }
         return new A.SassMap(A.ConstantMap_ConstantMap$from(t2, t1, t1));
       } else
         throw A.wrapException("$args: " + A.S(t1.$index($arguments, 0)) + " is not an argument list.");
     },
-    $signature: 40
+    $signature: 33
   };
   A.local_closure.prototype = {
     call$1($arguments) {
       return new A.SassString(J.$index$asx($arguments, 0).assertCalculation$1("calc").name, true);
     },
-    $signature: 20
+    $signature: 17
   };
   A.local_closure0.prototype = {
     call$1($arguments) {
       var t1 = J.$index$asx($arguments, 0).assertCalculation$1("calc").$arguments;
-      return A.SassList$(new A.MappedListIterable(t1, new A.local__closure0(), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,Value>")), B.ListSeparator_rXA, false);
+      return A.SassList$(new A.MappedListIterable(t1, new A.local__closure(), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,Value>")), B.ListSeparator_ECn, false);
     },
-    $signature: 29
+    $signature: 24
   };
-  A.local__closure0.prototype = {
+  A.local__closure.prototype = {
     call$1(argument) {
       return argument instanceof A.Value ? argument : new A.SassString(J.toString$0$(argument), false);
     },
-    $signature: 562
+    $signature: 605
   };
   A.local_closure1.prototype = {
     call$1($arguments) {
-      var _0_2, acceptsContent, _0_2_isSet, t1, hasContent, _null = null,
+      var _0_2_isSet, _0_2, acceptsContent, t1, _0_5_isSet, _0_5, hasContent,
         mixin = J.$index$asx($arguments, 0).assertMixin$1("mixin"),
-        _0_0 = mixin.callable,
-        _0_5 = A._InitializedCell$(new A.local__closure(_0_0));
+        _0_0 = mixin.callable;
       $label0$0: {
-        if (type$.AsyncBuiltInCallable._is(_0_0)) {
+        _0_2_isSet = type$.AsyncBuiltInCallable._is(_0_0);
+        if (_0_2_isSet) {
           _0_2 = _0_0.get$acceptsContent();
           acceptsContent = _0_2;
-          _0_2_isSet = true;
-          t1 = true;
-        } else {
-          acceptsContent = _null;
-          _0_2 = acceptsContent;
-          _0_2_isSet = false;
-          t1 = false;
-        }
-        if (!t1)
-          if (_0_0 instanceof A.BuiltInCallable) {
-            acceptsContent = _0_2_isSet ? _0_2 : _0_0.acceptsContent;
-            t1 = true;
-          } else
-            t1 = false;
-        else
+        } else
+          acceptsContent = null;
+        if (!_0_2_isSet) {
+          _0_2_isSet = _0_0 instanceof A.BuiltInCallable;
+          if (_0_2_isSet) {
+            _0_2 = _0_0.acceptsContent;
+            acceptsContent = _0_2;
+          }
+          t1 = _0_2_isSet;
+        } else
           t1 = true;
         if (t1) {
           t1 = acceptsContent;
           break $label0$0;
         }
-        if (_0_0 instanceof A.UserDefinedCallable)
-          if (_0_5._readFinal$0() instanceof A.MixinRule) {
-            hasContent = _0_5._readFinal$0().get$hasContent();
-            t1 = true;
-          } else {
-            hasContent = _null;
-            t1 = false;
-          }
-        else {
-          hasContent = _null;
+        _0_5_isSet = _0_0 instanceof A.UserDefinedCallable;
+        if (_0_5_isSet) {
+          _0_5 = _0_0.declaration;
+          t1 = _0_5 instanceof A.MixinRule;
+        } else {
+          _0_5 = null;
           t1 = false;
         }
         if (t1) {
+          t1 = _0_5_isSet ? _0_5 : _0_0.declaration;
+          hasContent = type$.MixinRule._as(t1).get$hasContent();
           t1 = hasContent;
           break $label0$0;
         }
@@ -51367,13 +52752,7 @@ self.util = _cliPkgRequires.util;
       }
       return t1 ? B.SassBoolean_true : B.SassBoolean_false;
     },
-    $signature: 23
-  };
-  A.local__closure.prototype = {
-    call$0() {
-      return type$.UserDefinedCallable_dynamic._as(this._0_0).declaration;
-    },
-    $signature: 143
+    $signature: 20
   };
   A._nest_closure.prototype = {
     call$1($arguments) {
@@ -51384,7 +52763,7 @@ self.util = _cliPkgRequires.util;
       t1.first = true;
       return new A.MappedListIterable(selectors, new A._nest__closure(t1), A._arrayInstanceType(selectors)._eval$1("MappedListIterable<1,SelectorList>")).reduce$1(0, new A._nest__closure0()).get$asSassList();
     },
-    $signature: 29
+    $signature: 24
   };
   A._nest__closure.prototype = {
     call$1(selector) {
@@ -51393,51 +52772,52 @@ self.util = _cliPkgRequires.util;
       t1.first = false;
       return result;
     },
-    $signature: 153
+    $signature: 137
   };
   A._nest__closure0.prototype = {
     call$2($parent, child) {
-      return child.resolveParentSelectors$1($parent);
+      return child.nestWithin$1($parent);
     },
-    $signature: 157
+    $signature: 138
   };
   A._append_closure.prototype = {
     call$1($arguments) {
-      var selectors = J.$index$asx($arguments, 0).get$asList();
+      var t1,
+        selectors = J.$index$asx($arguments, 0).get$asList();
       if (selectors.length === 0)
         throw A.wrapException(A.SassScriptException$(string$.x24selec, null));
-      return new A.MappedListIterable(selectors, new A._append__closure(), A._arrayInstanceType(selectors)._eval$1("MappedListIterable<1,SelectorList>")).reduce$1(0, new A._append__closure0(A.EvaluationContext_current().get$currentCallableSpan())).get$asSassList();
+      t1 = A.EvaluationContext_currentOrNull();
+      return new A.MappedListIterable(selectors, new A._append__closure(), A._arrayInstanceType(selectors)._eval$1("MappedListIterable<1,SelectorList>")).reduce$1(0, new A._append__closure0((t1 == null ? A.throwExpression(A.StateError$(string$.No_Sass)) : t1).get$currentCallableSpan())).get$asSassList();
     },
-    $signature: 29
+    $signature: 24
   };
   A._append__closure.prototype = {
     call$1(selector) {
       return A.SassApiValue_assertSelector(selector, false, null);
     },
-    $signature: 153
+    $signature: 137
   };
   A._append__closure0.prototype = {
     call$2($parent, child) {
       var t1 = child.components,
         t2 = this.span;
-      return A.SelectorList$(new A.MappedListIterable(t1, new A._append___closure($parent, t2), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,ComplexSelector>")), t2).resolveParentSelectors$1($parent);
+      return A.SelectorList$(new A.MappedListIterable(t1, new A._append___closure($parent, t2), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,ComplexSelector>")), t2).nestWithin$1($parent);
     },
-    $signature: 157
+    $signature: 138
   };
   A._append___closure.prototype = {
     call$1(complex) {
-      var _0_0, component, rest, t1, newCompound, t2, _null = null;
+      var _0_0, t1, component, rest, newCompound, t2, _null = null;
       if (complex.leadingCombinators.length !== 0)
         throw A.wrapException(A.SassScriptException$("Can't append " + complex.toString$0(0) + " to " + this.parent.toString$0(0) + ".", _null));
       _0_0 = complex.components;
-      if (_0_0.length >= 1) {
+      t1 = _0_0.length >= 1;
+      if (t1) {
         component = _0_0[0];
         rest = B.JSArray_methods.sublist$1(_0_0, 1);
-        t1 = true;
       } else {
         rest = _null;
         component = rest;
-        t1 = false;
       }
       if (!t1)
         throw A.wrapException(A.StateError$("Pattern matching error"));
@@ -51447,7 +52827,7 @@ self.util = _cliPkgRequires.util;
       t1 = this.span;
       t2 = A._setArrayType([new A.ComplexSelectorComponent(newCompound, A.List_List$unmodifiable(component.combinators, type$.CssValue_Combinator), t1)], type$.JSArray_ComplexSelectorComponent);
       B.JSArray_methods.addAll$1(t2, rest);
-      return A.ComplexSelector$(B.List_empty1, t2, t1, false);
+      return A.ComplexSelector$(B.List_empty0, t2, t1, false);
     },
     $signature: 59
   };
@@ -51464,9 +52844,10 @@ self.util = _cliPkgRequires.util;
       target.assertNotBogus$1$name(_s8_0);
       source = A.SassApiValue_assertSelector(t1.$index($arguments, 2), false, _s8_1);
       source.assertNotBogus$1$name(_s8_1);
-      return A.ExtensionStore__extendOrReplace(selector, source, target, B.ExtendMode_allTargets_allTargets, A.EvaluationContext_current().get$currentCallableSpan()).get$asSassList();
+      t1 = A.EvaluationContext_currentOrNull();
+      return A.ExtensionStore__extendOrReplace(selector, source, target, B.ExtendMode_allTargets_allTargets, (t1 == null ? A.throwExpression(A.StateError$(string$.No_Sass)) : t1).get$currentCallableSpan()).get$asSassList();
     },
-    $signature: 29
+    $signature: 24
   };
   A._replace_closure.prototype = {
     call$1($arguments) {
@@ -51481,9 +52862,10 @@ self.util = _cliPkgRequires.util;
       target.assertNotBogus$1$name(_s8_0);
       source = A.SassApiValue_assertSelector(t1.$index($arguments, 2), false, _s11_);
       source.assertNotBogus$1$name(_s11_);
-      return A.ExtensionStore__extendOrReplace(selector, source, target, B.ExtendMode_replace_replace, A.EvaluationContext_current().get$currentCallableSpan()).get$asSassList();
+      t1 = A.EvaluationContext_currentOrNull();
+      return A.ExtensionStore__extendOrReplace(selector, source, target, B.ExtendMode_replace_replace, (t1 == null ? A.throwExpression(A.StateError$(string$.No_Sass)) : t1).get$currentCallableSpan()).get$asSassList();
     },
-    $signature: 29
+    $signature: 24
   };
   A._unify_closure.prototype = {
     call$1($arguments) {
@@ -51511,38 +52893,26 @@ self.util = _cliPkgRequires.util;
       selector2.assertNotBogus$1$name("sub");
       return A.listIsSuperselector(selector1.components, selector2.components) ? B.SassBoolean_true : B.SassBoolean_false;
     },
-    $signature: 23
+    $signature: 20
   };
   A._simpleSelectors_closure.prototype = {
     call$1($arguments) {
       var t1 = A.SassApiValue_assertCompoundSelector(J.$index$asx($arguments, 0), "selector").components;
-      return A.SassList$(new A.MappedListIterable(t1, new A._simpleSelectors__closure(), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,Value>")), B.ListSeparator_rXA, false);
+      return A.SassList$(new A.MappedListIterable(t1, new A._simpleSelectors__closure(), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,Value>")), B.ListSeparator_ECn, false);
     },
-    $signature: 29
+    $signature: 24
   };
   A._simpleSelectors__closure.prototype = {
     call$1(simple) {
       return new A.SassString(A.serializeSelector(simple, true), false);
     },
-    $signature: 300
+    $signature: 590
   };
   A._parse_closure.prototype = {
     call$1($arguments) {
       return A.SassApiValue_assertSelector(J.$index$asx($arguments, 0), false, "selector").get$asSassList();
     },
-    $signature: 29
-  };
-  A._prependParent_closure.prototype = {
-    call$0() {
-      return this._0_0.length >= 1;
-    },
-    $signature: 1
-  };
-  A._prependParent_closure0.prototype = {
-    call$0() {
-      return this._0_0[0];
-    },
-    $signature: 218
+    $signature: 24
   };
   A.module_closure.prototype = {
     call$1($arguments) {
@@ -51556,11 +52926,11 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException(A.SassScriptException$("$limit: Must be 1 or greater, was " + A.S(limit) + ".", null));
       t1 = string._string$_text;
       if (t1.length === 0)
-        return B.SassList_Sof0;
+        return B.SassList_bdS0;
       else {
         t2 = separator._string$_text;
         if (t2.length === 0)
-          return A.SassList$(A.MappedIterable_MappedIterable(new A.Runes(t1), new A.module__closure(string), type$.Runes._eval$1("Iterable.E"), type$.Value), B.ListSeparator_rXA, true);
+          return A.SassList$(A.MappedIterable_MappedIterable(new A.Runes(t1), new A.module__closure(string), type$.Runes._eval$1("Iterable.E"), type$.Value), B.ListSeparator_ECn, true);
       }
       chunks = A._setArrayType([], type$.JSArray_String);
       for (t2 = B.JSString_methods.allMatches$1(t2, t1), t2 = new A._StringAllMatchesIterator(t2._input, t2._pattern, t2.__js_helper$_index), i = 0, lastEnd = 0; t2.moveNext$0();) {
@@ -51573,21 +52943,21 @@ self.util = _cliPkgRequires.util;
           break;
       }
       chunks.push(B.JSString_methods.substring$1(t1, lastEnd));
-      return A.SassList$(new A.MappedListIterable(chunks, new A.module__closure0(string), type$.MappedListIterable_String_Value), B.ListSeparator_rXA, true);
+      return A.SassList$(new A.MappedListIterable(chunks, new A.module__closure0(string), type$.MappedListIterable_String_Value), B.ListSeparator_ECn, true);
     },
-    $signature: 29
+    $signature: 24
   };
   A.module__closure.prototype = {
     call$1(rune) {
       return new A.SassString(A.Primitives_stringFromCharCode(rune), this.string._hasQuotes);
     },
-    $signature: 308
+    $signature: 569
   };
   A.module__closure0.prototype = {
     call$1(chunk) {
       return new A.SassString(chunk, this.string._hasQuotes);
     },
-    $signature: 310
+    $signature: 562
   };
   A._unquote_closure.prototype = {
     call$1($arguments) {
@@ -51596,7 +52966,7 @@ self.util = _cliPkgRequires.util;
         return string;
       return new A.SassString(string._string$_text, false);
     },
-    $signature: 20
+    $signature: 17
   };
   A._quote_closure.prototype = {
     call$1($arguments) {
@@ -51605,13 +52975,13 @@ self.util = _cliPkgRequires.util;
         return string;
       return new A.SassString(string._string$_text, true);
     },
-    $signature: 20
+    $signature: 17
   };
   A._length_closure.prototype = {
     call$1($arguments) {
       return A.SassNumber_SassNumber(J.$index$asx($arguments, 0).assertString$1("string").get$_sassLength(), null);
     },
-    $signature: 13
+    $signature: 11
   };
   A._insert_closure.prototype = {
     call$1($arguments) {
@@ -51628,7 +52998,7 @@ self.util = _cliPkgRequires.util;
       codeUnitIndex = A.codepointIndexToCodeUnitIndex(t1, A._codepointForIndex(indexInt, string.get$_sassLength(), false));
       return new A.SassString(B.JSString_methods.replaceRange$3(t1, codeUnitIndex, codeUnitIndex, insert._string$_text), string._hasQuotes);
     },
-    $signature: 20
+    $signature: 17
   };
   A._index_closure.prototype = {
     call$1($arguments) {
@@ -51664,7 +53034,7 @@ self.util = _cliPkgRequires.util;
       t1 = string._string$_text;
       return new A.SassString(B.JSString_methods.substring$2(t1, A.codepointIndexToCodeUnitIndex(t1, startCodepoint), A.codepointIndexToCodeUnitIndex(t1, endCodepoint + 1)), string._hasQuotes);
     },
-    $signature: 20
+    $signature: 17
   };
   A._toUpperCase_closure.prototype = {
     call$1($arguments) {
@@ -51676,7 +53046,7 @@ self.util = _cliPkgRequires.util;
       }
       return new A.SassString(t3.charCodeAt(0) == 0 ? t3 : t3, string._hasQuotes);
     },
-    $signature: 20
+    $signature: 17
   };
   A._toLowerCase_closure.prototype = {
     call$1($arguments) {
@@ -51688,7 +53058,7 @@ self.util = _cliPkgRequires.util;
       }
       return new A.SassString(t3.charCodeAt(0) == 0 ? t3 : t3, string._hasQuotes);
     },
-    $signature: 20
+    $signature: 17
   };
   A._uniqueId_closure.prototype = {
     call$1($arguments) {
@@ -51698,11 +53068,11 @@ self.util = _cliPkgRequires.util;
         $._previousUniqueId = B.JSInt_methods.$mod($.$get$_previousUniqueId(), A._asInt(Math.pow(36, 6)));
       return new A.SassString("u" + B.JSString_methods.padLeft$2(B.JSInt_methods.toRadixString$1($.$get$_previousUniqueId(), 36), 6, "0"), false);
     },
-    $signature: 20
+    $signature: 17
   };
   A.ImportCache.prototype = {
     canonicalize$4$baseImporter$baseUrl$forImport(_, url, baseImporter, baseUrl, forImport) {
-      var t1, relativeResult, _this = this;
+      var t1, resolvedUrl, key, relativeResult, t2, t3, t4, t5, t6, cacheable, i, importer, perImporterKey, t7, _1_0, _1_2_isSet, _1_2, result, _2_0, _2_1, _2_5_isSet, _2_3, _2_5, _2_3_isSet, j, _this = this, _null = null;
       if (A.isBrowser())
         t1 = (baseImporter == null || baseImporter instanceof A.NoOpImporter) && _this._importers.length === 0;
       else
@@ -51710,35 +53080,119 @@ self.util = _cliPkgRequires.util;
       if (t1)
         throw A.wrapException(string$.Custom);
       if (baseImporter != null && url.get$scheme() === "") {
-        relativeResult = _this._relativeCanonicalizeCache.putIfAbsent$2(new A._Record_4_baseImporter_baseUrl_forImport([url, baseImporter, baseUrl, forImport]), new A.ImportCache_canonicalize_closure(_this, baseImporter, baseUrl, url, forImport));
+        resolvedUrl = baseUrl == null ? _null : baseUrl.resolveUri$1(url);
+        if (resolvedUrl == null)
+          resolvedUrl = url;
+        key = new A._Record_3_forImport(baseImporter, resolvedUrl, forImport);
+        relativeResult = _this._perImporterCanonicalizeCache.putIfAbsent$2(key, new A.ImportCache_canonicalize_closure(_this, baseImporter, resolvedUrl, baseUrl, forImport, key, url));
         if (relativeResult != null)
           return relativeResult;
       }
-      return _this._canonicalizeCache.putIfAbsent$2(new A._Record_2_forImport(url, forImport), new A.ImportCache_canonicalize_closure0(_this, url, baseUrl, forImport));
+      key = new A._Record_2_forImport(url, forImport);
+      t1 = _this._canonicalizeCache;
+      if (t1.containsKey$1(key))
+        return t1.$index(0, key);
+      for (t2 = _this._importers, t3 = type$.Record_1_nullable_Object, t4 = _this._perImporterCanonicalizeCache, t5 = type$.nullable_Record_3_Importer_and_Uri_and_Uri_originalUrl, t6 = type$.Record_3_Importer_and_Uri_and_Uri_originalUrl, cacheable = true, i = 0; i < t2.length; ++i) {
+        importer = t2[i];
+        perImporterKey = new A._Record_3_forImport(importer, url, forImport);
+        if (t4.containsKey$1(perImporterKey)) {
+          t7 = t4.$index(0, perImporterKey);
+          _1_0 = new A._Record_1(t7 == null ? t5._as(t7) : t7);
+        } else
+          _1_0 = _null;
+        _1_2_isSet = t3._is(_1_0);
+        if (_1_2_isSet) {
+          _1_2 = _1_0._0;
+          t7 = _1_2 != null;
+          if (t7) {
+            t6._as(_1_2);
+            result = _1_2;
+          } else
+            result = _null;
+        } else {
+          result = _null;
+          _1_2 = result;
+          t7 = false;
+        }
+        if (t7)
+          return result;
+        if (_1_2_isSet)
+          t7 = _1_2 == null;
+        else
+          t7 = false;
+        if (t7)
+          continue;
+        $label0$1: {
+          _2_0 = _this._canonicalize$4(importer, url, baseUrl, forImport);
+          _2_1 = _2_0._0;
+          _2_5_isSet = _2_1 != null;
+          if (_2_5_isSet) {
+            result = _2_1 == null ? t6._as(_2_1) : _2_1;
+            _2_3 = _2_0._1;
+            t7 = _2_3;
+            _2_5 = t7;
+            t7 = t7 && cacheable;
+          } else {
+            result = _null;
+            _2_3 = result;
+            _2_5 = _2_3;
+            t7 = false;
+          }
+          if (t7) {
+            t1.$indexSet(0, key, result);
+            return result;
+          }
+          if (_2_5_isSet) {
+            t7 = _2_5;
+            _2_3_isSet = _2_5_isSet;
+          } else {
+            _2_3 = _2_0._1;
+            t7 = _2_3;
+            _2_3_isSet = true;
+          }
+          t7 = t7 && !cacheable;
+          if (t7) {
+            t4.$indexSet(0, perImporterKey, _2_1);
+            if (_2_1 != null)
+              return _2_1;
+            break $label0$1;
+          }
+          t7 = false === (_2_3_isSet ? _2_3 : _2_0._1);
+          if (t7) {
+            if (cacheable) {
+              for (j = 0; j < i; ++j)
+                t4.$indexSet(0, new A._Record_3_forImport(t2[j], url, forImport), _null);
+              cacheable = false;
+            }
+            if (_2_1 != null)
+              return _2_1;
+          }
+        }
+      }
+      if (cacheable)
+        t1.$indexSet(0, key, _null);
+      return _null;
     },
-    canonicalize$3$baseImporter$baseUrl($receiver, url, baseImporter, baseUrl) {
-      return this.canonicalize$4$baseImporter$baseUrl$forImport($receiver, url, baseImporter, baseUrl, false);
+    canonicalize$3$baseImporter$baseUrl(_, url, baseImporter, baseUrl) {
+      return this.canonicalize$4$baseImporter$baseUrl$forImport(0, url, baseImporter, baseUrl, false);
     },
     _canonicalize$4(importer, url, baseUrl, forImport) {
-      var passContainingUrl, t1, result, _null = null,
-        canonicalize = forImport ? new A.ImportCache__canonicalize_closure(importer, url) : new A.ImportCache__canonicalize_closure0(importer, url);
+      var passContainingUrl, canonicalizeContext, t1, result, cacheable, _null = null;
       if (baseUrl != null)
-        if (url.get$scheme() !== "") {
-          url.get$scheme();
-          passContainingUrl = false;
-        } else
-          passContainingUrl = true;
+        passContainingUrl = url.get$scheme() === "" || importer.isNonCanonicalScheme$1(url.get$scheme());
       else
         passContainingUrl = false;
-      t1 = passContainingUrl ? baseUrl : _null;
-      result = A.withContainingUrl(t1, canonicalize, type$.nullable_Uri);
+      canonicalizeContext = new A.CanonicalizeContext(forImport, passContainingUrl ? baseUrl : _null);
+      t1 = type$.nullable_Object;
+      result = A.runZoned(new A.ImportCache__canonicalize_closure(importer, url), A.LinkedHashMap_LinkedHashMap$_literal([B.Symbol__canonicalizeContext, canonicalizeContext], t1, t1), type$.nullable_Uri);
+      cacheable = !passContainingUrl || !canonicalizeContext._wasContainingUrlAccessed;
       if (result == null)
-        return _null;
+        return new A._Record_2(_null, cacheable);
       if (result.get$scheme() === "")
-        A.WarnForDeprecation_warnForDeprecation(this._logger, B.Deprecation_mFp, "Importer " + importer.toString$0(0) + " canonicalized " + url.toString$0(0) + " to " + result.toString$0(0) + string$.x2e_Rela, _null, _null);
-      else
-        result.get$scheme();
-      return new A._Record_3_originalUrl(importer, result, url);
+        A.WarnForDeprecation_warnForDeprecation(this._logger, B.Deprecation_IMm, "Importer " + importer.toString$0(0) + " canonicalized " + url.toString$0(0) + " to " + result.toString$0(0) + string$.x2e_Rela, _null, _null);
+      else if (importer.isNonCanonicalScheme$1(result.get$scheme()))
+        throw A.wrapException("Importer " + importer.toString$0(0) + " canonicalized " + url.toString$0(0) + " to " + result.toString$0(0) + string$.x2c_whicu);
+      return new A._Record_2(new A._Record_3_originalUrl(importer, result, url), cacheable);
     },
     importCanonical$4$originalUrl$quiet(importer, canonicalUrl, originalUrl, quiet) {
       return this._importCache.putIfAbsent$2(canonicalUrl, new A.ImportCache_importCanonical_closure(this, importer, canonicalUrl, originalUrl, quiet));
@@ -51750,23 +53204,21 @@ self.util = _cliPkgRequires.util;
       return this.importCanonical$4$originalUrl$quiet(importer, canonicalUrl, null, false);
     },
     humanize$1(canonicalUrl) {
-      var t2,
-        t1 = this._canonicalizeCache;
-      t1 = A.IterableNullableExtension_whereNotNull(t1.get$values(t1), type$.Record_3_Importer_and_Uri_and_Uri_originalUrl);
-      t2 = t1.$ti;
+      var t1 = A.IterableNullableExtension_whereNotNull(this._canonicalizeCache.get$values(0), type$.Record_3_Importer_and_Uri_and_Uri_originalUrl),
+        t2 = t1.$ti;
       t2 = A.NullableExtension_andThen(A.minBy(new A.MappedIterable(new A.WhereIterable(t1, new A.ImportCache_humanize_closure(canonicalUrl), t2._eval$1("WhereIterable<Iterable.E>")), new A.ImportCache_humanize_closure0(), t2._eval$1("MappedIterable<Iterable.E,Uri>")), new A.ImportCache_humanize_closure1()), new A.ImportCache_humanize_closure2(canonicalUrl));
       return t2 == null ? canonicalUrl : t2;
     },
     sourceMapUrl$1(_, canonicalUrl) {
       var t1 = this._resultsCache.$index(0, canonicalUrl);
-      t1 = t1 == null ? null : t1.get$sourceMapUrl(t1);
+      t1 = t1 == null ? null : t1.get$sourceMapUrl(0);
       return t1 == null ? canonicalUrl : t1;
     },
     clearCanonicalize$1(url) {
       var t1 = this._canonicalizeCache;
       t1.remove$1(0, new A._Record_2_forImport(url, false));
       t1.remove$1(0, new A._Record_2_forImport(url, true));
-      this._relativeCanonicalizeCache.removeWhere$1(0, new A.ImportCache_clearCanonicalize_closure(url));
+      this._perImporterCanonicalizeCache.removeWhere$1(0, new A.ImportCache_clearCanonicalize_closure(this, url));
     },
     clearImport$1(canonicalUrl) {
       this._resultsCache.remove$1(0, canonicalUrl);
@@ -51776,51 +53228,20 @@ self.util = _cliPkgRequires.util;
   A.ImportCache_canonicalize_closure.prototype = {
     call$0() {
       var _this = this,
-        t1 = _this.baseUrl,
-        t2 = t1 == null ? null : t1.resolveUri$1(_this.url);
-      if (t2 == null)
-        t2 = _this.url;
-      return _this.$this._canonicalize$4(_this.baseImporter, t2, t1, _this.forImport);
+        t1 = _this.$this,
+        t2 = _this.baseUrl,
+        _0_0 = t1._canonicalize$4(_this.baseImporter, _this.resolvedUrl, t2, _this.forImport);
+      if (t2 != null)
+        t1._nonCanonicalRelativeUrls.$indexSet(0, _this.key, _this.url);
+      return _0_0._0;
     },
-    $signature: 100
-  };
-  A.ImportCache_canonicalize_closure0.prototype = {
-    call$0() {
-      var t1, t2, t3, t4, t5, t6, _i, _0_0, result, t7, _this = this;
-      for (t1 = _this.$this, t2 = t1._importers, t3 = t2.length, t4 = _this.url, t5 = _this.baseUrl, t6 = _this.forImport, _i = 0; _i < t2.length; t2.length === t3 || (0, A.throwConcurrentModificationError)(t2), ++_i) {
-        _0_0 = t1._canonicalize$4(t2[_i], t4, t5, t6);
-        if (_0_0 != null) {
-          result = _0_0;
-          t7 = true;
-        } else {
-          result = null;
-          t7 = false;
-        }
-        if (t7)
-          return result;
-      }
-      return null;
-    },
-    $signature: 100
+    $signature: 122
   };
   A.ImportCache__canonicalize_closure.prototype = {
     call$0() {
-      var t1 = type$.nullable_Object;
-      return A.runZoned(new A.ImportCache__canonicalize__closure(this.importer, this.resolved), A.LinkedHashMap_LinkedHashMap$_literal([B.Symbol__inImportRule, true], t1, t1), type$.nullable_Uri);
+      return this.importer.canonicalize$1(0, this.url);
     },
-    $signature: 56
-  };
-  A.ImportCache__canonicalize__closure.prototype = {
-    call$0() {
-      return this.importer.canonicalize$1(0, this.resolved);
-    },
-    $signature: 56
-  };
-  A.ImportCache__canonicalize_closure0.prototype = {
-    call$0() {
-      return this.importer.canonicalize$1(0, this.resolved);
-    },
-    $signature: 56
+    $signature: 140
   };
   A.ImportCache_importCanonical_closure.prototype = {
     call$0() {
@@ -51837,39 +53258,40 @@ self.util = _cliPkgRequires.util;
       t1 = t5 == null ? t1 : t5.resolveUri$1(t1);
       return A.Stylesheet_Stylesheet$parse(t3, t4, _this.quiet ? $.$get$Logger_quiet() : t2._logger, t1);
     },
-    $signature: 112
+    $signature: 81
   };
   A.ImportCache_humanize_closure.prototype = {
     call$1(result) {
       return J.$eq$(result._1, this.canonicalUrl);
     },
-    $signature: 316
+    $signature: 541
   };
   A.ImportCache_humanize_closure0.prototype = {
     call$1(result) {
       return result._2;
     },
-    $signature: 317
+    $signature: 540
   };
   A.ImportCache_humanize_closure1.prototype = {
     call$1(url) {
       return url.get$path(url).length;
     },
-    $signature: 111
+    $signature: 87
   };
   A.ImportCache_humanize_closure2.prototype = {
     call$1(url) {
       var t1 = $.$get$url(),
         t2 = this.canonicalUrl;
-      return url.resolve$1(A.ParsedPath_ParsedPath$parse(t2.get$path(t2), t1.style).get$basename());
+      return url.resolve$1(0, A.ParsedPath_ParsedPath$parse(t2.get$path(t2), t1.style).get$basename());
     },
-    $signature: 48
+    $signature: 43
   };
   A.ImportCache_clearCanonicalize_closure.prototype = {
     call$2(key, _) {
-      return J.$eq$(key._values[0], this.url);
+      var t1 = this.url;
+      return J.$eq$(key._1, t1) || J.$eq$(this.$this._nonCanonicalRelativeUrls.$index(0, key), t1);
     },
-    $signature: 318
+    $signature: 538
   };
   A.Importer.prototype = {
     modificationTime$1(url) {
@@ -51877,14 +53299,30 @@ self.util = _cliPkgRequires.util;
     },
     couldCanonicalize$2(url, canonicalUrl) {
       return true;
+    },
+    isNonCanonicalScheme$1(scheme) {
+      return false;
     }
   };
   A.AsyncImporter.prototype = {};
+  A.CanonicalizeContext.prototype = {};
   A.FilesystemImporter.prototype = {
     canonicalize$1(_, url) {
-      if (url.get$scheme() !== "file" && url.get$scheme() !== "")
+      var resolved, _0_0;
+      if (url.get$scheme() === "file")
+        resolved = A.resolveImportPath($.$get$context().style.pathFromUri$1(A._parseUri(url)));
+      else if (url.get$scheme() !== "")
         return null;
-      return A.NullableExtension_andThen(A.resolveImportPath(A.join(this._loadPath, $.$get$context().style.pathFromUri$1(A._parseUri(url)), null)), new A.FilesystemImporter_canonicalize_closure());
+      else {
+        _0_0 = this._loadPath;
+        if (_0_0 != null) {
+          resolved = A.resolveImportPath(A.join(_0_0, $.$get$context().style.pathFromUri$1(A._parseUri(url)), null));
+          if (resolved != null && this._loadPathDeprecated)
+            A.warnForDeprecation(string$.Using_t, B.Deprecation_B4v);
+        } else
+          return null;
+      }
+      return A.NullableExtension_andThen(resolved, new A.FilesystemImporter_canonicalize_closure());
     },
     load$1(_, url) {
       var path = $.$get$context().style.pathFromUri$1(A._parseUri(url)),
@@ -51913,7 +53351,8 @@ self.util = _cliPkgRequires.util;
       return basename === canonicalBasename || basename === t1.withoutExtension$1(canonicalBasename);
     },
     toString$0(_) {
-      return this._loadPath;
+      var t1 = this._loadPath;
+      return t1 == null ? "<absolute file importer>" : t1;
     }
   };
   A.FilesystemImporter_canonicalize_closure.prototype = {
@@ -51940,9 +53379,444 @@ self.util = _cliPkgRequires.util;
       }
       return t2.toUri$1(t1);
     },
-    $signature: 164
+    $signature: 141
   };
   A.NoOpImporter.prototype = {};
+  A.NodePackageImporter.prototype = {
+    isNonCanonicalScheme$1(scheme) {
+      return scheme === "pkg";
+    },
+    canonicalize$1(_, url) {
+      var packageName, jsonPath, jsonString, packageManifest, e, t1, t2, t3, t4, baseDirectory, parts, t5, $name, subpath, packageRoot, exception, _1_0, rootPath, subpathInRoot, _this = this, _null = null;
+      if (url.get$scheme() === "file")
+        return $.$get$FilesystemImporter_cwd().canonicalize$1(0, url);
+      if (url.get$scheme() !== "pkg")
+        return _null;
+      if (url.get$hasAuthority())
+        throw A.wrapException(string$.A_pkg_h);
+      else {
+        t1 = $.$get$url();
+        t2 = t1.style;
+        if (t2.rootLength$1(url.get$path(url)) > 0)
+          throw A.wrapException("A pkg: URL's path must not begin with /.");
+        else if (url.get$path(url).length === 0)
+          throw A.wrapException("A pkg: URL must not have an empty path.");
+        else if (url.get$hasQuery() || url.get$hasFragment())
+          throw A.wrapException(string$.A_pkg_q);
+      }
+      t3 = A.canonicalizeContext();
+      t3._wasContainingUrlAccessed = true;
+      t3 = t3._containingUrl;
+      if ((t3 == null ? _null : t3.get$scheme()) === "file") {
+        t3 = A.canonicalizeContext();
+        t3._wasContainingUrlAccessed = true;
+        t3 = t3._containingUrl;
+        t3.toString;
+        t4 = $.$get$context();
+        baseDirectory = t4.dirname$1(t4.style.pathFromUri$1(A._parseUri(t3)));
+      } else {
+        t3 = _this.__NodePackageImporter__entryPointDirectory_F;
+        t3 === $ && A.throwUnnamedLateFieldNI();
+        baseDirectory = t3;
+      }
+      packageName = null;
+      parts = t1.split$1(0, url.get$path(url));
+      t3 = B.JSArray_methods.removeAt$1(parts, 0);
+      t4 = $.$get$context();
+      t3.toString;
+      t5 = t4.style;
+      $name = t5.pathFromUri$1(A._parseUri(t3));
+      if (B.JSString_methods.startsWith$1($name, "@"))
+        $name = parts.length !== 0 ? t1.join$2(0, $name, B.JSArray_methods.removeAt$1(parts, 0)) : $name;
+      subpath = parts.length !== 0 ? t5.pathFromUri$1(A._parseUri(t1.joinAll$1(parts))) : _null;
+      packageName = $name;
+      if (!J.startsWith$1$s(packageName, "."))
+        if (!J.contains$1$asx(packageName, "\\"))
+          if (!J.contains$1$asx(packageName, "%"))
+            t1 = J.startsWith$1$s(packageName, "@") && !J.contains$1$asx(packageName, t2.get$separator(t2));
+          else
+            t1 = true;
+        else
+          t1 = true;
+      else
+        t1 = true;
+      if (t1)
+        return _null;
+      packageRoot = _this._resolvePackageRoot$2(packageName, baseDirectory);
+      if (packageRoot == null)
+        return _null;
+      jsonPath = A.join(packageRoot, "package.json", _null);
+      jsonString = A.readFile(jsonPath);
+      packageManifest = null;
+      try {
+        packageManifest = type$.Map_String_dynamic._as(B.C_JsonCodec.decode$1(jsonString));
+      } catch (exception) {
+        e = A.unwrapException(exception);
+        t1 = A.S(jsonPath);
+        t2 = A.S(packageName);
+        t3 = A.S(e);
+        throw A.wrapException("Failed to parse " + t1 + ' for "pkg:' + t2 + '": ' + t3);
+      }
+      _1_0 = _this._resolvePackageExports$4(packageRoot, subpath, packageManifest, packageName);
+      if (_1_0 != null)
+        if (B.Set_0.contains$1(0, A.ParsedPath_ParsedPath$parse(_1_0, t5)._splitExtension$1(1)[1]))
+          return t4.toUri$1(t4.canonicalize$1(0, _1_0));
+        else {
+          t1 = subpath == null ? "root" : subpath;
+          throw A.wrapException("The export for '" + t1 + "' in '" + A.S(packageName) + "' resolved to '" + _1_0 + string$.x27x2c_whi);
+        }
+      if (subpath == null) {
+        rootPath = _this._resolvePackageRootValues$2(packageRoot, packageManifest);
+        return rootPath != null ? t4.toUri$1(t4.canonicalize$1(0, rootPath)) : _null;
+      }
+      subpathInRoot = A.join(packageRoot, subpath, _null);
+      return $.$get$FilesystemImporter_cwd().canonicalize$1(0, t4.toUri$1(subpathInRoot));
+    },
+    load$1(_, url) {
+      return $.$get$FilesystemImporter_cwd().load$1(0, url);
+    },
+    _resolvePackageRoot$2(packageName, baseDirectory) {
+      var potentialPackage, t1;
+      for (; true;) {
+        potentialPackage = A.join(baseDirectory, "node_modules", packageName);
+        if (A.dirExists(potentialPackage))
+          return potentialPackage;
+        t1 = $.$get$context();
+        if (t1.split$1(0, baseDirectory).length === 1)
+          return null;
+        baseDirectory = t1.dirname$1(baseDirectory);
+      }
+    },
+    _resolvePackageRootValues$2(packageRoot, packageManifest) {
+      var t1, sassValue, _1_0, styleValue, _null = null,
+        _0_0 = packageManifest.$index(0, "sass");
+      if (typeof _0_0 == "string") {
+        t1 = B.Set_0.contains$1(0, A.ParsedPath_ParsedPath$parse(_0_0, $.$get$url().style)._splitExtension$1(1)[1]);
+        sassValue = _0_0;
+      } else {
+        sassValue = _null;
+        t1 = false;
+      }
+      if (t1)
+        return A.join(packageRoot, sassValue, _null);
+      else {
+        _1_0 = packageManifest.$index(0, "style");
+        if (typeof _1_0 == "string") {
+          t1 = B.Set_0.contains$1(0, A.ParsedPath_ParsedPath$parse(_1_0, $.$get$url().style)._splitExtension$1(1)[1]);
+          styleValue = _1_0;
+        } else {
+          styleValue = _null;
+          t1 = false;
+        }
+        if (t1)
+          return A.join(packageRoot, styleValue, _null);
+      }
+      return A.resolveImportPath(A.join(packageRoot, "index", _null));
+    },
+    _resolvePackageExports$4(packageRoot, subpath, packageManifest, packageName) {
+      var _0_0, _1_0, _this = this,
+        exports = packageManifest.$index(0, "exports");
+      if (exports == null)
+        return null;
+      _0_0 = _this._nodePackageExportsResolve$5(packageRoot, _this._exportsToCheck$1(subpath), exports, subpath, packageName);
+      if (_0_0 != null)
+        return _0_0;
+      if (subpath != null && A.ParsedPath_ParsedPath$parse(subpath, $.$get$url().style)._splitExtension$1(1)[1].length !== 0)
+        return null;
+      _1_0 = _this._nodePackageExportsResolve$5(packageRoot, _this._exportsToCheck$2$addIndex(subpath, true), exports, subpath, packageName);
+      if (_1_0 != null)
+        return _1_0;
+      return null;
+    },
+    _nodePackageExportsResolve$5(packageRoot, subpathVariants, exports, subpath, packageName) {
+      var t1, matches, _1_1, path;
+      if (type$.Map_String_dynamic._is(exports) && J.any$1$ax(exports.get$keys(exports), new A.NodePackageImporter__nodePackageExportsResolve_closure()) && J.any$1$ax(exports.get$keys(exports), new A.NodePackageImporter__nodePackageExportsResolve_closure0()))
+        throw A.wrapException("`exports` in " + packageName + string$.x20can_n + J.map$1$1$ax(J.get$keys$z(exports), new A.NodePackageImporter__nodePackageExportsResolve_closure1(), type$.String).join$1(0, ",") + " in " + A.join(packageRoot, "package.json", null) + ".");
+      t1 = A.IterableNullableExtension_whereNotNull(new A.MappedListIterable(subpathVariants, new A.NodePackageImporter__nodePackageExportsResolve_closure2(this, exports, packageRoot), A._arrayInstanceType(subpathVariants)._eval$1("MappedListIterable<1,String?>")), type$.String);
+      matches = A.List_List$of(t1, true, t1.$ti._eval$1("Iterable.E"));
+      $label0$1: {
+        _1_1 = matches.length;
+        if (_1_1 === 1) {
+          path = matches[0];
+          t1 = path;
+          break $label0$1;
+        }
+        if (_1_1 <= 0) {
+          t1 = null;
+          break $label0$1;
+        }
+        t1 = subpath == null ? "root" : subpath;
+        t1 = A.throwExpression(string$.Unable + t1 + " in " + packageName + " should be used. \n\nFound:\n" + B.JSArray_methods.join$1(matches, "\n"));
+      }
+      return t1;
+    },
+    _compareExpansionKeys$2(keyA, keyB) {
+      var t1 = B.JSString_methods.contains$1(keyA, "*"),
+        baseLengthA = t1 ? B.JSString_methods.indexOf$1(keyA, "*") + 1 : keyA.length,
+        t2 = B.JSString_methods.contains$1(keyB, "*"),
+        baseLengthB = t2 ? B.JSString_methods.indexOf$1(keyB, "*") + 1 : keyB.length;
+      if (baseLengthA > baseLengthB)
+        return -1;
+      if (baseLengthB > baseLengthA)
+        return 1;
+      if (!t1)
+        return 1;
+      if (!t2)
+        return -1;
+      t1 = keyA.length;
+      t2 = keyB.length;
+      if (t1 > t2)
+        return -1;
+      if (t2 > t1)
+        return 1;
+      return 0;
+    },
+    _packageTargetResolve$4(subpath, exports, packageRoot, patternMatch) {
+      var t2, string, path, map, key, value, _1_0, array, _2_0, _null = null,
+        t1 = typeof exports == "string";
+      if (t1) {
+        t2 = !B.JSString_methods.startsWith$1(exports, "./");
+        string = exports;
+      } else {
+        string = _null;
+        t2 = false;
+      }
+      if (t2)
+        throw A.wrapException("Export '" + A.S(string) + string$.x27x20must + packageRoot + "'.");
+      if (t1) {
+        t2 = patternMatch != null;
+        string = exports;
+      } else {
+        string = _null;
+        t2 = false;
+      }
+      if (t2) {
+        t1 = J.replaceFirst$2$s(string, "*", patternMatch);
+        t2 = $.$get$context();
+        path = t2.normalize$1(A.join(packageRoot, t2.style.pathFromUri$1(A._parseUri(t1)), _null));
+        return A.fileExists(path) ? path : _null;
+      }
+      string = t1 ? exports : _null;
+      if (t1) {
+        t1 = $.$get$context();
+        string.toString;
+        return A.join(packageRoot, t1.style.pathFromUri$1(A._parseUri(string)), _null);
+      }
+      t1 = type$.Map_String_dynamic._is(exports);
+      map = t1 ? exports : _null;
+      if (t1) {
+        for (t1 = A.MapExtensions_get_pairs(map, type$.String, type$.dynamic), t1 = t1.get$iterator(t1); t1.moveNext$0();) {
+          t2 = t1.get$current(t1);
+          key = t2._0;
+          value = t2._1;
+          if (!B.Set_TnQrk.contains$1(0, key))
+            continue;
+          if (value == null)
+            continue;
+          _1_0 = this._packageTargetResolve$4(subpath, value, packageRoot, patternMatch);
+          if (_1_0 != null)
+            return _1_0;
+        }
+        return _null;
+      }
+      if (type$.List_nullable_Object._is(exports) && J.get$length$asx(exports) <= 0)
+        return _null;
+      t1 = type$.List_dynamic._is(exports);
+      array = t1 ? exports : _null;
+      if (t1) {
+        for (t1 = J.get$iterator$ax(array); t1.moveNext$0();) {
+          value = t1.get$current(t1);
+          if (value == null)
+            continue;
+          _2_0 = this._packageTargetResolve$4(subpath, value, packageRoot, patternMatch);
+          if (_2_0 != null)
+            return _2_0;
+        }
+        return _null;
+      }
+      throw A.wrapException("Invalid 'exports' value " + A.S(exports) + " in " + A.join(packageRoot, "package.json", _null) + ".");
+    },
+    _packageTargetResolve$3(subpath, exports, packageRoot) {
+      return this._packageTargetResolve$4(subpath, exports, packageRoot, null);
+    },
+    _getMainExport$1(exports) {
+      var t1, t2, map, _0_4, $export;
+      $label0$0: {
+        if (typeof exports == "string") {
+          t1 = exports;
+          break $label0$0;
+        }
+        if (type$.List_String._is(exports)) {
+          t1 = exports;
+          break $label0$0;
+        }
+        t1 = type$.Map_String_dynamic._is(exports);
+        if (t1) {
+          t2 = !J.any$1$ax(exports.get$keys(exports), new A.NodePackageImporter__getMainExport_closure());
+          map = exports;
+        } else {
+          map = null;
+          t2 = false;
+        }
+        if (t2) {
+          t1 = map;
+          break $label0$0;
+        }
+        if (t1) {
+          _0_4 = exports.$index(0, ".");
+          if (_0_4 == null)
+            t2 = exports.containsKey$1(".");
+          else
+            t2 = true;
+          if (t2)
+            t2 = _0_4 != null;
+          else
+            t2 = false;
+        } else {
+          _0_4 = null;
+          t2 = false;
+        }
+        if (t2) {
+          $export = t1 ? _0_4 : J.$index$asx(exports, ".");
+          t1 = $export;
+          break $label0$0;
+        }
+        t1 = null;
+        break $label0$0;
+      }
+      return t1;
+    },
+    _exportsToCheck$2$addIndex(subpath, addIndex) {
+      var basename, dirname, t3, t4, _i, path,
+        t1 = type$.JSArray_String,
+        paths = A._setArrayType([], t1),
+        t2 = subpath == null;
+      if (t2 && addIndex)
+        subpath = "index";
+      else if (!t2 && addIndex)
+        subpath = A.join(subpath, "index", null);
+      if (subpath == null)
+        return A._setArrayType([null], type$.JSArray_nullable_String);
+      if (B.Set_0.contains$1(0, A.ParsedPath_ParsedPath$parse(subpath, $.$get$url().style)._splitExtension$1(1)[1]))
+        paths.push(subpath);
+      else
+        B.JSArray_methods.addAll$1(paths, A._setArrayType([subpath, subpath + ".scss", subpath + ".sass", subpath + ".css"], t1));
+      t1 = $.$get$context();
+      t2 = t1.style;
+      basename = A.ParsedPath_ParsedPath$parse(subpath, t2).get$basename();
+      dirname = t1.dirname$1(subpath);
+      if (B.JSString_methods.startsWith$1(basename, "_"))
+        return paths;
+      t1 = A.List_List$of(paths, true, type$.nullable_String);
+      for (t3 = paths.length, t4 = dirname === ".", _i = 0; _i < paths.length; paths.length === t3 || (0, A.throwConcurrentModificationError)(paths), ++_i) {
+        path = paths[_i];
+        if (t4)
+          t1.push("_" + A.ParsedPath_ParsedPath$parse(path, t2).get$basename());
+        else
+          t1.push(A.join(dirname, "_" + A.ParsedPath_ParsedPath$parse(path, t2).get$basename(), null));
+      }
+      return t1;
+    },
+    _exportsToCheck$1(subpath) {
+      return this._exportsToCheck$2$addIndex(subpath, false);
+    }
+  };
+  A.NodePackageImporter__nodePackageExportsResolve_closure.prototype = {
+    call$1(key) {
+      return B.JSString_methods.startsWith$1(key, ".");
+    },
+    $signature: 4
+  };
+  A.NodePackageImporter__nodePackageExportsResolve_closure0.prototype = {
+    call$1(key) {
+      return !B.JSString_methods.startsWith$1(key, ".");
+    },
+    $signature: 4
+  };
+  A.NodePackageImporter__nodePackageExportsResolve_closure1.prototype = {
+    call$1(key) {
+      return '"' + key + '"';
+    },
+    $signature: 5
+  };
+  A.NodePackageImporter__nodePackageExportsResolve_closure2.prototype = {
+    call$1(variant) {
+      var t1, matchKey, t2, t3, t4, t5, t6, _i, expansionKey, _0_0, t7, patternBase, patternTrailer, t8, target, _this = this, _null = null;
+      if (variant == null) {
+        t1 = _this.$this;
+        return A.NullableExtension_andThen(t1._getMainExport$1(_this.exports), new A.NodePackageImporter__nodePackageExportsResolve__closure(t1, variant, _this.packageRoot));
+      } else {
+        t1 = _this.exports;
+        if (!type$.Map_String_dynamic._is(t1) || J.every$1$ax(t1.get$keys(t1), new A.NodePackageImporter__nodePackageExportsResolve__closure0()))
+          return _null;
+      }
+      matchKey = "./" + $.$get$context().toUri$1(variant).toString$0(0);
+      if (t1.containsKey$1(matchKey) && J.$index$asx(t1, matchKey) != null && !B.JSString_methods.contains$1(matchKey, "*")) {
+        t1 = J.$index$asx(t1, matchKey);
+        if (t1 == null)
+          t1 = type$.Object._as(t1);
+        return _this.$this._packageTargetResolve$3(matchKey, t1, _this.packageRoot);
+      }
+      t2 = A._setArrayType([], type$.JSArray_String);
+      for (t3 = J.getInterceptor$z(t1), t4 = J.get$iterator$ax(t3.get$keys(t1)); t4.moveNext$0();) {
+        t5 = t4.get$current(t4);
+        if (B.JSString_methods.allMatches$1("*", t5).get$length(0) === 1)
+          t2.push(t5);
+      }
+      t4 = _this.$this;
+      B.JSArray_methods.sort$1(t2, t4.get$_compareExpansionKeys());
+      for (t5 = t2.length, t6 = matchKey.length, _i = 0; _i < t2.length; t2.length === t5 || (0, A.throwConcurrentModificationError)(t2), ++_i) {
+        expansionKey = t2[_i];
+        _0_0 = expansionKey.split("*");
+        t7 = _0_0.length === 2;
+        if (t7) {
+          patternBase = _0_0[0];
+          patternTrailer = _0_0[1];
+          patternTrailer = patternTrailer;
+        } else {
+          patternTrailer = _null;
+          patternBase = patternTrailer;
+        }
+        if (!t7)
+          throw A.wrapException(A.StateError$("Pattern matching error"));
+        if (!B.JSString_methods.startsWith$1(matchKey, patternBase))
+          continue;
+        if (matchKey === patternBase)
+          continue;
+        t7 = patternTrailer.length;
+        if (t7 !== 0)
+          t8 = B.JSString_methods.endsWith$1(matchKey, patternTrailer) && t6 >= expansionKey.length;
+        else
+          t8 = true;
+        if (t8) {
+          target = t3.$index(t1, expansionKey);
+          if (target == null)
+            continue;
+          return t4._packageTargetResolve$4(variant, target, _this.packageRoot, B.JSString_methods.substring$2(matchKey, patternBase.length, t6 - t7));
+        }
+      }
+      return _null;
+    },
+    $signature: 143
+  };
+  A.NodePackageImporter__nodePackageExportsResolve__closure.prototype = {
+    call$1(mainExport) {
+      return this.$this._packageTargetResolve$3(this.variant, mainExport, this.packageRoot);
+    },
+    $signature: 144
+  };
+  A.NodePackageImporter__nodePackageExportsResolve__closure0.prototype = {
+    call$1(key) {
+      return !B.JSString_methods.startsWith$1(key, ".");
+    },
+    $signature: 4
+  };
+  A.NodePackageImporter__getMainExport_closure.prototype = {
+    call$1(key) {
+      return B.JSString_methods.startsWith$1(key, ".");
+    },
+    $signature: 4
+  };
   A.ImporterResult.prototype = {
     get$sourceMapUrl(_) {
       return this._sourceMapUrl;
@@ -51952,69 +53826,64 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return A._exactlyOne(A._tryPath($.$get$context().withoutExtension$1(this.path) + ".import" + this.extension));
     },
-    $signature: 32
+    $signature: 44
   };
   A.resolveImportPath_closure0.prototype = {
     call$0() {
       return A._exactlyOne(A._tryPathWithExtensions(this.path + ".import"));
     },
-    $signature: 32
+    $signature: 44
   };
   A._tryPathAsDirectory_closure.prototype = {
     call$0() {
       return A._exactlyOne(A._tryPathWithExtensions(A.join(this.path, "index.import", null)));
     },
-    $signature: 32
+    $signature: 44
   };
   A._exactlyOne_closure.prototype = {
-    call$0() {
-      return this._0_0.length;
-    },
-    $signature: 3
-  };
-  A._exactlyOne_closure0.prototype = {
     call$1(path) {
       var t1 = $.$get$context();
       return "  " + t1.prettyUri$1(t1.toUri$1(path));
     },
-    $signature: 7
+    $signature: 5
   };
   A.InterpolationBuffer.prototype = {
     writeCharCode$1(character) {
-      this._interpolation_buffer$_text._contents += A.Primitives_stringFromCharCode(character);
+      var t1 = this._interpolation_buffer$_text,
+        t2 = A.Primitives_stringFromCharCode(character);
+      t1._contents += t2;
       return null;
     },
     addInterpolation$1(interpolation) {
-      var _0_4, first, rest, _this = this, _null = null,
+      var _0_4_isSet, _0_4, first, rest, t2, _this = this,
         toAdd = interpolation.contents,
         t1 = toAdd.length;
       if (t1 === 0)
         return;
-      _0_4 = A._InitializedCell$(new A.InterpolationBuffer_addInterpolation_closure(toAdd));
-      if (t1 >= 1)
-        if (typeof _0_4._readFinal$0() == "string") {
-          first = _0_4._readFinal$0();
-          rest = B.JSArray_methods.sublist$1(toAdd, 1);
-          t1 = true;
-        } else {
-          rest = _null;
-          first = rest;
-          t1 = false;
-        }
-      else {
-        rest = _null;
-        first = rest;
+      _0_4_isSet = t1 >= 1;
+      if (_0_4_isSet) {
+        _0_4 = toAdd[0];
+        t1 = _0_4;
+        t1 = typeof t1 == "string";
+      } else {
+        _0_4 = null;
         t1 = false;
       }
       if (t1) {
-        _this._interpolation_buffer$_text._contents += A.S(first);
+        first = A._asString(_0_4_isSet ? _0_4 : toAdd[0]);
+        rest = B.JSArray_methods.sublist$1(toAdd, 1);
+        t1 = _this._interpolation_buffer$_text;
+        t1._contents += first;
         toAdd = rest;
       }
       _this._flushText$0();
       t1 = _this._interpolation_buffer$_contents;
       B.JSArray_methods.addAll$1(t1, toAdd);
-      if (typeof B.JSArray_methods.get$last(t1) == "string")
-        _this._interpolation_buffer$_text._contents += A.S(t1.pop());
+      if (typeof B.JSArray_methods.get$last(t1) == "string") {
+        t2 = _this._interpolation_buffer$_text;
+        t1 = A.S(t1.pop());
+        t2._contents += t1;
+      }
     },
     _flushText$0() {
       var t1 = this._interpolation_buffer$_text,
@@ -52041,12 +53910,6 @@ self.util = _cliPkgRequires.util;
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     }
   };
-  A.InterpolationBuffer_addInterpolation_closure.prototype = {
-    call$0() {
-      return this._0_0[0];
-    },
-    $signature: 14
-  };
   A.InterpolationMap.prototype = {
     mapException$1(error) {
       var t3, t4, _this = this,
@@ -52062,90 +53925,93 @@ self.util = _cliPkgRequires.util;
         t1 = type$.SourceSpan;
         t3 = type$.String;
         t4 = A.LinkedHashMap_LinkedHashMap$_literal([target, "error in interpolated output"], t1, t3);
-        error.get$source();
-        return new A.MultiSourceSpanFormatException("", A.ConstantMap_ConstantMap$from(t4, t1, t3), t2, source);
+        return new A.MultiSourceSpanFormatException(error.get$source(), "", A.ConstantMap_ConstantMap$from(t4, t1, t3), t2, source);
       }
     },
     mapSpan$1(target) {
-      var t1, start, end, t2, _this = this, _null = null,
-        _0_0 = new A._Record_2(_this._mapLocation$1(target.get$start(target)), _this._mapLocation$1(target.get$end(target))),
-        _0_1 = A._InitializedCell$(new A.InterpolationMap_mapSpan_closure(_0_0)),
-        _0_2 = A._InitializedCell$(new A.InterpolationMap_mapSpan_closure0(_0_0));
+      var _0_10, t1, _0_2_isSet, _0_20, t2, start, end, _this = this, _null = null,
+        _0_1 = _this._mapLocation$1(target.get$start(target)),
+        _0_2 = _this._mapLocation$1(target.get$end(target));
       $label0$0: {
+        _0_10 = _0_1;
         t1 = type$.FileSpan;
-        if (t1._is(_0_1._readFinal$0())) {
-          start = _0_1._readFinal$0();
-          if (t1._is(_0_2._readFinal$0())) {
-            end = _0_2._readFinal$0();
-            t2 = true;
-          } else {
-            end = _null;
-            t2 = false;
-          }
+        _0_2_isSet = t1._is(_0_1);
+        if (_0_2_isSet) {
+          t1._as(_0_10);
+          _0_20 = _0_2;
+          t2 = t1._is(_0_2);
+          start = _0_10;
+          _0_1 = start;
         } else {
-          end = _null;
-          start = end;
+          start = _null;
+          _0_20 = start;
+          _0_1 = _0_10;
           t2 = false;
         }
         if (t2) {
-          t1 = start.expand$1(0, end);
+          t1 = start.expand$1(0, t1._as(_0_2_isSet ? _0_20 : _0_2));
           break $label0$0;
         }
-        if (t1._is(_0_1._readFinal$0())) {
-          start = _0_1._readFinal$0();
-          if (_0_2._readFinal$0() instanceof A.FileLocation) {
-            end = _0_2._readFinal$0();
-            t2 = true;
-          } else {
-            end = _null;
-            t2 = false;
+        if (t1._is(_0_1)) {
+          if (_0_2_isSet)
+            t2 = _0_20;
+          else {
+            t2 = _0_2;
+            _0_20 = t2;
+            _0_2_isSet = true;
           }
+          t2 = t2 instanceof A.FileLocation;
+          start = _0_1;
         } else {
-          end = _null;
-          start = end;
+          start = _null;
           t2 = false;
         }
         if (t2) {
-          t1 = _this._interpolation.span;
-          t1 = t1.get$file(t1).span$2(0, _this._expandInterpolationSpanLeft$1(start.get$start(start)), end.offset);
+          t1 = _0_2_isSet ? _0_20 : _0_2;
+          type$.FileLocation._as(t1);
+          t2 = _this._interpolation.span;
+          t1 = t2.get$file(t2).span$2(0, _this._expandInterpolationSpanLeft$1(start.get$start(start)), t1.offset);
           break $label0$0;
         }
-        if (_0_1._readFinal$0() instanceof A.FileLocation) {
-          start = _0_1._readFinal$0();
-          if (t1._is(_0_2._readFinal$0())) {
-            end = _0_2._readFinal$0();
-            t1 = true;
-          } else {
-            end = _null;
-            t1 = false;
+        if (_0_1 instanceof A.FileLocation) {
+          if (_0_2_isSet)
+            t2 = _0_20;
+          else {
+            t2 = _0_2;
+            _0_20 = t2;
+            _0_2_isSet = true;
           }
+          t2 = t1._is(t2);
+          start = _0_1;
         } else {
-          end = _null;
-          start = end;
-          t1 = false;
+          start = _null;
+          t2 = false;
         }
-        if (t1) {
+        if (t2) {
+          end = t1._as(_0_2_isSet ? _0_20 : _0_2);
           t1 = _this._interpolation.span;
           t1 = t1.get$file(t1).span$2(0, start.offset, _this._expandInterpolationSpanRight$1(end.get$end(end)));
           break $label0$0;
         }
-        if (_0_1._readFinal$0() instanceof A.FileLocation) {
-          start = _0_1._readFinal$0();
-          if (_0_2._readFinal$0() instanceof A.FileLocation) {
-            end = _0_2._readFinal$0();
-            t1 = true;
-          } else {
-            end = _null;
-            t1 = false;
+        if (_0_1 instanceof A.FileLocation) {
+          if (_0_2_isSet)
+            t1 = _0_20;
+          else {
+            t1 = _0_2;
+            _0_20 = t1;
+            _0_2_isSet = true;
           }
+          t1 = t1 instanceof A.FileLocation;
+          start = _0_1;
         } else {
-          end = _null;
-          start = end;
+          start = _null;
           t1 = false;
         }
         if (t1) {
-          t1 = _this._interpolation.span;
-          t1 = t1.get$file(t1).span$2(0, start.offset, end.offset);
+          t1 = _0_2_isSet ? _0_20 : _0_2;
+          type$.FileLocation._as(t1);
+          t2 = _this._interpolation.span;
+          t1 = t2.get$file(t2).span$2(0, start.offset, t1.offset);
           break $label0$0;
         }
         t1 = A.throwExpression("[BUG] Unreachable");
@@ -52153,21 +54019,14 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     _mapLocation$1(target) {
-      var chunk, t4, previousLocation, _this = this,
+      var t4, previousLocation, _this = this,
         index = _this._indexInContents$1(target),
         t1 = _this._interpolation,
         t2 = t1.contents,
         _0_0 = t2[index],
         t3 = type$.Expression;
-      if (t3._is(_0_0)) {
-        chunk = _0_0;
-        t4 = true;
-      } else {
-        chunk = null;
-        t4 = false;
-      }
-      if (t4)
-        return chunk.get$span(chunk);
+      if (t3._is(_0_0))
+        return _0_0.get$span(_0_0);
       t4 = index === 0;
       t1 = t1.span;
       if (t4)
@@ -52287,19 +54146,7 @@ self.util = _cliPkgRequires.util;
     call$1($content) {
       return type$.Expression._is($content);
     },
-    $signature: 77
-  };
-  A.InterpolationMap_mapSpan_closure.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature: 14
-  };
-  A.InterpolationMap_mapSpan_closure0.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 14
+    $signature: 75
   };
   A._realCasePath_helper.prototype = {
     call$1(path) {
@@ -52308,11 +54155,11 @@ self.util = _cliPkgRequires.util;
         return path;
       return $._realCaseCache.putIfAbsent$2(path, new A._realCasePath_helper_closure(this, dirname, path));
     },
-    $signature: 7
+    $signature: 5
   };
   A._realCasePath_helper_closure.prototype = {
     call$0() {
-      var matches, t1, _0_0, match, t3, exception,
+      var matches, t1, _0_0, match, exception,
         realDirname = this.helper.call$1(this.dirname),
         t2 = this.path,
         basename = A.ParsedPath_ParsedPath$parse(t2, $.$get$context().style).get$basename();
@@ -52324,10 +54171,6 @@ self.util = _cliPkgRequires.util;
           match = null;
           if (J.get$length$asx(_0_0) === 1) {
             match = J.$index$asx(_0_0, 0);
-            t3 = true;
-          } else
-            t3 = false;
-          if (t3) {
             t1 = match;
             break $label0$0;
           }
@@ -52343,13 +54186,13 @@ self.util = _cliPkgRequires.util;
           throw exception;
       }
     },
-    $signature: 22
+    $signature: 26
   };
   A._realCasePath_helper__closure.prototype = {
     call$1(realPath) {
       return A.equalsIgnoreCase(A.ParsedPath_ParsedPath$parse(realPath, $.$get$context().style).get$basename(), this.basename);
     },
-    $signature: 10
+    $signature: 4
   };
   A.FileSystemException.prototype = {
     toString$0(_) {
@@ -52364,7 +54207,7 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return J.readFileSync$2$x(A.fs(), this.path, this.encoding);
     },
-    $signature: 58
+    $signature: 60
   };
   A.writeFile_closure.prototype = {
     call$0() {
@@ -52383,7 +54226,7 @@ self.util = _cliPkgRequires.util;
       this._box_0.contents = result;
       this.completer.complete$1(result);
     },
-    $signature: 85
+    $signature: 104
   };
   A.readStdin_closure0.prototype = {
     call$1(chunk) {
@@ -52397,7 +54240,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 94
+    $signature: 93
   };
   A.readStdin_closure1.prototype = {
     call$1(_) {
@@ -52411,7 +54254,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 94
+    $signature: 93
   };
   A.readStdin_closure2.prototype = {
     call$1(e) {
@@ -52428,7 +54271,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 94
+    $signature: 93
   };
   A.fileExists_closure.prototype = {
     call$0() {
@@ -52447,7 +54290,7 @@ self.util = _cliPkgRequires.util;
         throw exception;
       }
     },
-    $signature: 1
+    $signature: 22
   };
   A.dirExists_closure.prototype = {
     call$0() {
@@ -52466,7 +54309,7 @@ self.util = _cliPkgRequires.util;
         throw exception;
       }
     },
-    $signature: 1
+    $signature: 22
   };
   A.ensureDir_closure.prototype = {
     call$0() {
@@ -52495,47 +54338,42 @@ self.util = _cliPkgRequires.util;
       else
         return new A.listDir_closure_list().call$1(t1);
     },
-    $signature: 149
+    $signature: 145
   };
   A.listDir__closure.prototype = {
     call$1(child) {
       return A.join(this.path, A._asString(child), null);
     },
-    $signature: 101
+    $signature: 108
   };
   A.listDir__closure0.prototype = {
     call$1(child) {
       return !A.dirExists(child);
     },
-    $signature: 10
+    $signature: 4
   };
   A.listDir_closure_list.prototype = {
     call$1($parent) {
       return J.expand$1$1$ax(J.readdirSync$1$x(A.fs(), $parent), new A.listDir__list_closure($parent, this), type$.String);
     },
-    $signature: 174
+    $signature: 146
   };
   A.listDir__list_closure.prototype = {
     call$1(child) {
       var path = A.join(this.parent, A._asString(child), null);
       return A.dirExists(path) ? this.list.call$1(path) : A._setArrayType([path], type$.JSArray_String);
     },
-    $signature: 178
+    $signature: 147
   };
   A.modificationTime_closure.prototype = {
     call$0() {
-      var t2,
-        t1 = J.getTime$0$x(J.get$mtime$x(J.statSync$1$x(A.fs(), this.path)));
-      if (Math.abs(t1) <= 864e13)
-        t2 = false;
-      else
-        t2 = true;
-      if (t2)
+      var t1 = J.getTime$0$x(J.get$mtime$x(J.statSync$1$x(A.fs(), this.path)));
+      if (Math.abs(t1) > 864e13)
         A.throwExpression(A.ArgumentError$("DateTime is outside valid range: " + A.S(t1), null));
       A.checkNotNullable(false, "isUtc", type$.bool);
       return new A.DateTime(t1, false);
     },
-    $signature: 180
+    $signature: 148
   };
   A.watchDir_closure.prototype = {
     call$2(path, _) {
@@ -52550,7 +54388,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 181
+    $signature: 149
   };
   A.watchDir_closure0.prototype = {
     call$2(path, _) {
@@ -52565,21 +54403,21 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 181
+    $signature: 149
   };
   A.watchDir_closure1.prototype = {
     call$1(path) {
       var t1 = this._box_0.controller;
       return t1 == null ? null : t1.add$1(0, new A.WatchEvent(B.ChangeType_remove, path));
     },
-    $signature: 85
+    $signature: 104
   };
   A.watchDir_closure2.prototype = {
     call$1(error) {
       var t1 = this._box_0.controller;
       return t1 == null ? null : t1.addError$1(error);
     },
-    $signature: 110
+    $signature: 99
   };
   A.watchDir_closure3.prototype = {
     call$0() {
@@ -52587,13 +54425,13 @@ self.util = _cliPkgRequires.util;
       this._box_0.controller = controller;
       this.completer.complete$1(new A._ControllerStream(controller, A._instanceType(controller)._eval$1("_ControllerStream<1>")));
     },
-    $signature: 2
+    $signature: 1
   };
   A.watchDir__closure.prototype = {
     call$0() {
       J.close$0$x(this.watcher);
     },
-    $signature: 2
+    $signature: 1
   };
   A.JSArray0.prototype = {};
   A.Chokidar.prototype = {};
@@ -52607,73 +54445,124 @@ self.util = _cliPkgRequires.util;
   A.RenderContextOptions.prototype = {};
   A.RenderContextResult.prototype = {};
   A.RenderContextResultStats.prototype = {};
+  A.JSModule.prototype = {};
+  A.JSModuleRequire.prototype = {};
   A.JSClass.prototype = {};
   A.JSUrl.prototype = {};
   A._PropertyDescriptor.prototype = {};
+  A._RequireMain.prototype = {};
+  A.LoggerWithDeprecationType0.prototype = {
+    warn$4$deprecation$span$trace(_, message, deprecation, span, trace) {
+      this.internalWarn$4$deprecation$span$trace(message, deprecation ? B.Deprecation_JeE : null, span, trace);
+    },
+    warn$3$span$trace(_, message, span, trace) {
+      return this.warn$4$deprecation$span$trace(0, message, false, span, trace);
+    },
+    warn$2$span(_, message, span) {
+      return this.warn$4$deprecation$span$trace(0, message, false, span, null);
+    },
+    warn$2$trace(_, message, trace) {
+      return this.warn$4$deprecation$span$trace(0, message, false, null, trace);
+    }
+  };
   A._QuietLogger.prototype = {
     warn$4$deprecation$span$trace(_, message, deprecation, span, trace) {
     },
-    warn$1($receiver, message) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, null, null);
+    warn$1(_, message) {
+      return this.warn$4$deprecation$span$trace(0, message, false, null, null);
     },
-    warn$2$span($receiver, message, span) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, span, null);
+    warn$3$span$trace(_, message, span, trace) {
+      return this.warn$4$deprecation$span$trace(0, message, false, span, trace);
+    },
+    warn$2$span(_, message, span) {
+      return this.warn$4$deprecation$span$trace(0, message, false, span, null);
     },
     debug$2(_, message, span) {
     }
   };
-  A.DeprecationHandlingLogger.prototype = {
-    warn$4$deprecation$span$trace(_, message, deprecation, span, trace) {
-      this._inner.warn$4$deprecation$span$trace(0, message, deprecation, span, trace);
+  A.DeprecationProcessingLogger.prototype = {
+    DeprecationProcessingLogger$5$fatalDeprecations$futureDeprecations$limitRepetition$silenceDeprecations(_inner, fatalDeprecations, futureDeprecations, limitRepetition, silenceDeprecations) {
+      var t1, t2, t3, t4, t5, t6, _1_7, _this = this, _null = null;
+      for (t1 = _this.fatalDeprecations, t1 = t1.get$iterator(t1), t2 = _this.silenceDeprecations, t3 = _this.futureDeprecations, t4 = _this._inner; t1.moveNext$0();) {
+        t5 = t1.get$current(t1);
+        if (t5.isFuture && !t3.contains$1(0, t5)) {
+          t5 = t5.toString$0(0);
+          t4.warn$3$span$trace(0, "Future " + t5 + string$.x20deprex20m, _null, _null);
+          continue;
+        }
+        t6 = t2.contains$1(0, t5);
+        if (t6) {
+          t5 = t5.toString$0(0);
+          t4.warn$3$span$trace(0, "Ignoring setting to silence " + t5 + string$.x20deprex2c, _null, _null);
+          continue;
+        }
+      }
+      for (t1 = A._LinkedHashSetIterator$(t2, t2._modifications, A._instanceType(t2)._precomputed1), t2 = t1.$ti._precomputed1; t1.moveNext$0();) {
+        t5 = t1._collection$_current;
+        if (t5 == null)
+          t5 = t2._as(t5);
+        if (B.Deprecation_JeE === t5) {
+          t4.warn$3$span$trace(0, string$.User_a, _null, _null);
+          continue;
+        }
+        _1_7 = t5.isFuture;
+        if (_1_7 && t3.contains$1(0, t5)) {
+          t5 = t5.toString$0(0);
+          t4.warn$3$span$trace(0, "Conflicting options for future " + t5 + " deprecation cancel each other out.", _null, _null);
+          continue;
+        }
+        if (_1_7) {
+          t5 = t5.toString$0(0);
+          t4.warn$3$span$trace(0, "Future " + t5 + string$.x20deprex20i, _null, _null);
+          continue;
+        }
+      }
+      for (t1 = A._LinkedHashSetIterator$(t3, t3._modifications, A._instanceType(t3)._precomputed1), t2 = t1.$ti._precomputed1; t1.moveNext$0();) {
+        t3 = t1._collection$_current;
+        if (t3 == null)
+          t3 = t2._as(t3);
+        if (!t3.isFuture) {
+          t3 = t3.toString$0(0);
+          t4.warn$3$span$trace(0, t3 + string$.x20is_noaf, _null, _null);
+        }
+      }
     },
-    warn$3$span$trace($receiver, message, span, trace) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, span, trace);
+    internalWarn$4$deprecation$span$trace(message, deprecation, span, trace) {
+      if (deprecation != null)
+        this._handleDeprecation$4$span$trace(deprecation, message, span, trace);
+      else
+        this._inner.warn$3$span$trace(0, message, span, trace);
     },
-    warn$2$span($receiver, message, span) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, span, null);
-    },
-    warn$2$trace($receiver, message, trace) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, null, trace);
-    },
-    warnForDeprecation$4$span$trace(deprecation, message, span, trace) {
-      var _0_0, _0_1, _0_3, t1, t2, count, _this = this, _null = null;
+    _handleDeprecation$4$span$trace(deprecation, message, span, trace) {
+      var _0_3_isSet, span0, t1, _0_3, t2, count, _this = this, _null = null;
+      if (deprecation.isFuture && !_this.futureDeprecations.contains$1(0, deprecation))
+        return;
       if (_this.fatalDeprecations.contains$1(0, deprecation)) {
-        message += string$.x0a_This + deprecation.toString$0(0) + string$.x20depre;
-        _0_0 = new A._Record_2(span, trace);
-        _0_1 = A._InitializedCell$(new A.DeprecationHandlingLogger_warnForDeprecation_closure(_0_0));
-        _0_3 = A._InitializedCell$(new A.DeprecationHandlingLogger_warnForDeprecation_closure0(_0_0));
+        message += string$.x0a_This + deprecation.toString$0(0) + string$.x20deprex20t;
         $label0$0: {
-          if (_0_1.readFinal$0() != null) {
-            span = _0_1.readFinal$0();
-            t1 = true;
+          _0_3_isSet = span != null;
+          if (_0_3_isSet) {
+            span0 = span == null ? type$.FileSpan._as(span) : span;
+            t1 = trace != null;
+            _0_3 = trace;
           } else {
-            span = _null;
-            t1 = false;
-          }
-          if (t1)
-            if (_0_3.readFinal$0() != null) {
-              trace = _0_3.readFinal$0();
-              t1 = true;
-            } else {
-              trace = _null;
-              t1 = false;
-            }
-          else {
-            trace = _null;
+            span0 = _null;
+            _0_3 = span0;
             t1 = false;
           }
           if (t1) {
-            t1 = A.SassRuntimeException$(message, span, trace, _null);
+            if (_0_3_isSet)
+              trace = _0_3;
+            t1 = A.SassRuntimeException$(message, span0, trace == null ? type$.Trace._as(trace) : trace, _null);
             break $label0$0;
           }
-          if (_0_1.readFinal$0() != null) {
-            span = _0_1.readFinal$0();
-            t1 = true;
-          } else {
+          if (span != null)
+            t1 = (_0_3_isSet ? _0_3 : trace) == null;
+          else {
             span = _null;
             t1 = false;
           }
-          if (t1 && _0_3.readFinal$0() == null) {
+          if (t1) {
             t1 = A.SassException$(message, span, _null);
             break $label0$0;
           }
@@ -52682,7 +54571,7 @@ self.util = _cliPkgRequires.util;
         }
         throw A.wrapException(t1);
       }
-      if (deprecation.isFuture && !_this.futureDeprecations.contains$1(0, deprecation))
+      if (_this.silenceDeprecations.contains$1(0, deprecation))
         return;
       if (_this.limitRepetition) {
         t1 = _this._warningCounts;
@@ -52698,40 +54587,26 @@ self.util = _cliPkgRequires.util;
       return this._inner.debug$2(0, message, span);
     },
     summarize$1$js(js) {
-      var t2, total,
-        t1 = this._warningCounts;
-      t1 = t1.get$values(t1);
-      t2 = A._instanceType(t1);
-      total = A.IterableIntegerExtension_get_sum(new A.MappedIterable(new A.WhereIterable(t1, new A.DeprecationHandlingLogger_summarize_closure(), t2._eval$1("WhereIterable<Iterable.E>")), new A.DeprecationHandlingLogger_summarize_closure0(), t2._eval$1("MappedIterable<Iterable.E,int>")));
+      var t1 = this._warningCounts.get$values(0),
+        t2 = A._instanceType(t1),
+        total = A.IterableIntegerExtension_get_sum(new A.MappedIterable(new A.WhereIterable(t1, new A.DeprecationProcessingLogger_summarize_closure(), t2._eval$1("WhereIterable<Iterable.E>")), new A.DeprecationProcessingLogger_summarize_closure0(), t2._eval$1("MappedIterable<Iterable.E,int>")));
       if (total > 0) {
         t1 = js ? "" : string$.x0aRun_i;
         this._inner.warn$1(0, "" + total + string$.x20repet + t1);
       }
     }
   };
-  A.DeprecationHandlingLogger_warnForDeprecation_closure.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature: 186
-  };
-  A.DeprecationHandlingLogger_warnForDeprecation_closure0.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 187
-  };
-  A.DeprecationHandlingLogger_summarize_closure.prototype = {
+  A.DeprecationProcessingLogger_summarize_closure.prototype = {
     call$1(count) {
       return count > 5;
     },
-    $signature: 47
+    $signature: 45
   };
-  A.DeprecationHandlingLogger_summarize_closure0.prototype = {
+  A.DeprecationProcessingLogger_summarize_closure0.prototype = {
     call$1(count) {
       return count - 5;
     },
-    $signature: 191
+    $signature: 150
   };
   A.StderrLogger.prototype = {
     warn$4$deprecation$span$trace(_, message, deprecation, span, trace) {
@@ -52756,27 +54631,29 @@ self.util = _cliPkgRequires.util;
         result._contents = t1 + (A.indent(B.JSString_methods.trimRight$0(trace.toString$0(0)), 4) + "\n");
       A.printError(result);
     },
-    warn$1($receiver, message) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, null, null);
+    warn$1(_, message) {
+      return this.warn$4$deprecation$span$trace(0, message, false, null, null);
     },
-    warn$3$span$trace($receiver, message, span, trace) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, span, trace);
+    warn$3$span$trace(_, message, span, trace) {
+      return this.warn$4$deprecation$span$trace(0, message, false, span, trace);
     },
-    warn$2$span($receiver, message, span) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, span, null);
+    warn$2$span(_, message, span) {
+      return this.warn$4$deprecation$span$trace(0, message, false, span, null);
     },
-    warn$2$trace($receiver, message, trace) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, null, trace);
+    warn$2$trace(_, message, trace) {
+      return this.warn$4$deprecation$span$trace(0, message, false, null, trace);
     },
     debug$2(_, message, span) {
-      var url, t3,
+      var url, t3, t4,
         t1 = span.file,
         t2 = span._file$_start;
       if (A.FileLocation$_(t1, t2).file.url == null)
         url = "-";
       else {
-        t3 = A.FileLocation$_(t1, t2);
-        url = $.$get$context().prettyUri$1(t3.file.url);
+        t3 = A.FileLocation$_(t1, t2).file.url;
+        t4 = $.$get$context();
+        t3.toString;
+        url = t4.prettyUri$1(t3);
       }
       t1 = A.FileLocation$_(t1, t2);
       t1 = t1.file.getLine$1(t1.offset);
@@ -52790,14 +54667,11 @@ self.util = _cliPkgRequires.util;
       this._emittedWarning = true;
       this._tracking$_logger.warn$4$deprecation$span$trace(0, message, deprecation, span, trace);
     },
-    warn$3$span$trace($receiver, message, span, trace) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, span, trace);
+    warn$1(_, message) {
+      return this.warn$4$deprecation$span$trace(0, message, false, null, null);
     },
-    warn$2$span($receiver, message, span) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, span, null);
-    },
-    warn$2$trace($receiver, message, trace) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, null, trace);
+    warn$3$span$trace(_, message, span, trace) {
+      return this.warn$4$deprecation$span$trace(0, message, false, span, trace);
     },
     debug$2(_, message, span) {
       this._emittedDebug = true;
@@ -52876,58 +54750,37 @@ self.util = _cliPkgRequires.util;
       return this._forwarded_view$_inner.get$transitivelyContainsExtensions();
     },
     setVariable$3($name, value, nodeWithSpan) {
-      var shownVariables, t2, _1_0, hiddenVariables, _2_0, prefix, _null = null,
+      var t2, _1_0, _2_0,
         _s19_ = "Undefined variable.",
         t1 = this._rule,
         _0_0 = t1.shownVariables;
-      if (_0_0 != null) {
-        shownVariables = _0_0;
-        t2 = true;
-      } else {
-        shownVariables = _null;
+      if (_0_0 != null)
+        t2 = !_0_0._base.contains$1(0, $name);
+      else
         t2 = false;
-      }
-      if (t2 && !shownVariables._base.contains$1(0, $name))
-        throw A.wrapException(A.SassScriptException$(_s19_, _null));
+      if (t2)
+        throw A.wrapException(A.SassScriptException$(_s19_, null));
       else {
         _1_0 = t1.hiddenVariables;
-        if (_1_0 != null) {
-          hiddenVariables = _1_0;
-          t2 = true;
-        } else {
-          hiddenVariables = _null;
+        if (_1_0 != null)
+          t2 = _1_0._base.contains$1(0, $name);
+        else
           t2 = false;
-        }
-        if (t2 && hiddenVariables._base.contains$1(0, $name))
-          throw A.wrapException(A.SassScriptException$(_s19_, _null));
+        if (t2)
+          throw A.wrapException(A.SassScriptException$(_s19_, null));
       }
       _2_0 = t1.prefix;
       if (_2_0 != null) {
-        prefix = _2_0;
-        t1 = true;
-      } else {
-        prefix = _null;
-        t1 = false;
-      }
-      if (t1) {
-        if (!B.JSString_methods.startsWith$1($name, prefix))
-          throw A.wrapException(A.SassScriptException$(_s19_, _null));
-        $name = B.JSString_methods.substring$1($name, prefix.length);
+        if (!B.JSString_methods.startsWith$1($name, _2_0))
+          throw A.wrapException(A.SassScriptException$(_s19_, null));
+        $name = B.JSString_methods.substring$1($name, _2_0.length);
       }
       return this._forwarded_view$_inner.setVariable$3($name, value, nodeWithSpan);
     },
     variableIdentity$1($name) {
-      var prefix, t1,
-        _0_0 = this._rule.prefix;
-      if (_0_0 != null) {
-        prefix = _0_0;
-        t1 = true;
-      } else {
-        prefix = null;
-        t1 = false;
-      }
-      if (t1)
-        $name = B.JSString_methods.substring$1($name, prefix.length);
+      var _0_0 = this._rule.prefix;
+      if (_0_0 != null)
+        $name = B.JSString_methods.substring$1($name, _0_0.length);
       return this._forwarded_view$_inner.variableIdentity$1($name);
     },
     $eq(_, other) {
@@ -53073,23 +54926,26 @@ self.util = _cliPkgRequires.util;
       t2.expectDone$0();
       return new A.AtRootQuery(include, atRules, atRules.contains$1(0, "all"), atRules.contains$1(0, "rule"));
     },
-    $signature: 346
+    $signature: 515
   };
   A._disallowedFunctionNames_closure.prototype = {
     call$1($function) {
       return $function.name;
     },
-    $signature: 347
+    $signature: 514
   };
   A.CssParser.prototype = {
     get$plainCss() {
       return true;
     },
     silentComment$0() {
-      var t1 = this.scanner,
-        t2 = t1._string_scanner$_position;
-      this.super$Parser$silentComment();
-      this.error$2(0, string$.Silent, t1.spanFrom$1(new A._SpanScannerState(t1, t2)));
+      var t1, t2, _this = this;
+      if (_this._inExpression)
+        return false;
+      t1 = _this.scanner;
+      t2 = t1._string_scanner$_position;
+      _this.super$Parser$silentComment();
+      _this.error$2(0, string$.Silent, t1.spanFrom$1(new A._SpanScannerState(t1, t2)));
     },
     atRule$2$root(child, root) {
       var $name, _0_0, _this = this,
@@ -53101,7 +54957,7 @@ self.util = _cliPkgRequires.util;
       _0_0 = $name.get$asPlain();
       $label0$0: {
         if ("at-root" === _0_0 || "content" === _0_0 || "debug" === _0_0 || "each" === _0_0 || "error" === _0_0 || "extend" === _0_0 || "for" === _0_0 || "function" === _0_0 || "if" === _0_0 || "include" === _0_0 || "mixin" === _0_0 || "return" === _0_0 || "warn" === _0_0 || "while" === _0_0)
-          _this._forbiddenAtRoot$1(start);
+          _this._forbiddenAtRule$1(start);
         if ("import" === _0_0) {
           t1 = _this._cssImportRule$1(start);
           break $label0$0;
@@ -53123,7 +54979,7 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    _forbiddenAtRoot$1(start) {
+    _forbiddenAtRule$1(start) {
       this.almostAnyValue$0();
       this.error$2(0, "This at-rule isn't allowed in plain CSS.", this.scanner.spanFrom$1(start));
     },
@@ -53159,22 +55015,15 @@ self.util = _cliPkgRequires.util;
       return new A.ParenthesizedExpression(expression, t1.spanFrom$1(new A._SpanScannerState(t1, t2)));
     },
     identifierLike$0() {
-      var specialFunction, t2, allowEmptySecondArg, $arguments, t3, t4, _this = this, _null = null,
+      var t2, allowEmptySecondArg, $arguments, t3, t4, _this = this,
         t1 = _this.scanner,
         start = new A._SpanScannerState(t1, t1._string_scanner$_position),
         identifier = _this.interpolatedIdentifier$0(),
         plain = identifier.get$asPlain(),
         lower = plain.toLowerCase(),
         _0_0 = _this.trySpecialFunction$2(lower, start);
-      if (_0_0 != null) {
-        specialFunction = _0_0;
-        t2 = true;
-      } else {
-        specialFunction = _null;
-        t2 = false;
-      }
-      if (t2)
-        return specialFunction;
+      if (_0_0 != null)
+        return _0_0;
       t2 = t1._string_scanner$_position;
       if (t1.scanChar$1(46))
         return _this.namespacedExpression$2(plain, start);
@@ -53201,7 +55050,10 @@ self.util = _cliPkgRequires.util;
         _this.error$2(0, string$.This_f, t1.spanFrom$1(start));
       t2 = t1.spanFrom$1(new A._SpanScannerState(t1, t2));
       t3 = type$.Expression;
-      return new A.FunctionExpression(_null, plain, new A.ArgumentInvocation(A.List_List$unmodifiable($arguments, t3), A.ConstantMap_ConstantMap$from(B.Map_empty6, type$.String, t3), _null, _null, t2), t1.spanFrom$1(start));
+      t4 = A.List_List$unmodifiable($arguments, t3);
+      t3 = A.ConstantMap_ConstantMap$from(B.Map_empty6, type$.String, t3);
+      t1 = t1.spanFrom$1(start);
+      return new A.FunctionExpression(null, A.stringReplaceAllUnchecked(plain, "_", "-"), plain, new A.ArgumentInvocation(t4, t3, null, null, t2), t1);
     },
     namespacedExpression$2(namespace, start) {
       var expression = this.super$StylesheetParser$namespacedExpression(namespace, start);
@@ -53273,14 +55125,14 @@ self.util = _cliPkgRequires.util;
       t2.expectDone$0();
       return selectors;
     },
-    $signature: 26
+    $signature: 124
   };
   A.MediaQueryParser.prototype = {
     parse$0() {
       return this.wrapSpanFormatException$1(new A.MediaQueryParser_parse_closure(this));
     },
     _mediaQuery$0() {
-      var conditions, conjunction, identifier1, identifier2, type, modifier, _this = this, _s3_ = "and", _null = null;
+      var conditions, conjunction, t1, identifier1, identifier2, type, modifier, _this = this, _s3_ = "and", _null = null;
       if (_this.scanner.peekChar$0() === 40) {
         conditions = A._setArrayType([_this._mediaInParens$0()], type$.JSArray_String);
         _this.whitespace$0();
@@ -53288,12 +55140,14 @@ self.util = _cliPkgRequires.util;
           _this.expectWhitespace$0();
           B.JSArray_methods.addAll$1(conditions, _this._mediaLogicSequence$1(_s3_));
           conjunction = true;
-        } else if (_this.scanIdentifier$1("or")) {
-          _this.expectWhitespace$0();
-          B.JSArray_methods.addAll$1(conditions, _this._mediaLogicSequence$1("or"));
-          conjunction = false;
-        } else
-          conjunction = true;
+        } else {
+          t1 = _this.scanIdentifier$1("or");
+          if (t1) {
+            _this.expectWhitespace$0();
+            B.JSArray_methods.addAll$1(conditions, _this._mediaLogicSequence$1("or"));
+          }
+          conjunction = !t1;
+        }
         return A.CssMediaQuery$condition(conditions, conjunction);
       }
       identifier1 = _this.identifier$0();
@@ -53361,7 +55215,7 @@ self.util = _cliPkgRequires.util;
       t2.expectDone$0();
       return queries;
     },
-    $signature: 348
+    $signature: 509
   };
   A.Parser.prototype = {
     _parseIdentifier$0() {
@@ -53419,10 +55273,8 @@ self.util = _cliPkgRequires.util;
       if (t1.peekChar$0() !== 47)
         return false;
       _0_0 = t1.peekChar$1(1);
-      if (47 === _0_0) {
-        this.silentComment$0();
-        return true;
-      }
+      if (47 === _0_0)
+        return this.silentComment$0();
       if (42 === _0_0) {
         this.loudComment$0();
         return true;
@@ -53457,6 +55309,7 @@ self.util = _cliPkgRequires.util;
           break;
         t1.readChar$0();
       }
+      return true;
     },
     loudComment$0() {
       var next,
@@ -53533,12 +55386,14 @@ self.util = _cliPkgRequires.util;
             t2 = true;
           if (t2)
             break;
-          text._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t2 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          text._contents += t2;
           continue;
         }
         if (95 === _1_0 && normalize) {
           t1.readChar$0();
-          text._contents += A.Primitives_stringFromCharCode(45);
+          t2 = A.Primitives_stringFromCharCode(45);
+          text._contents += t2;
           continue;
         }
         if (_1_0 !== 95) {
@@ -53554,11 +55409,13 @@ self.util = _cliPkgRequires.util;
         else
           t2 = true;
         if (t2) {
-          text._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t2 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          text._contents += t2;
           continue;
         }
         if (92 === _1_0) {
-          text._contents += this.escape$0();
+          t2 = this.escape$0();
+          text._contents += t2;
           continue;
         }
         break;
@@ -53587,17 +55444,20 @@ self.util = _cliPkgRequires.util;
           if (t2 === 10 || t2 === 13 || t2 === 12) {
             t1.readChar$0();
             t1.readChar$0();
-          } else
-            buffer._contents += A.Primitives_stringFromCharCode(A.consumeEscapedCharacter(t1));
+          } else {
+            t2 = A.Primitives_stringFromCharCode(A.consumeEscapedCharacter(t1));
+            buffer._contents += t2;
+          }
           continue;
         }
-        buffer._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+        t2 = A.Primitives_stringFromCharCode(t1.readChar$0());
+        buffer._contents += t2;
       }
       t1 = buffer._contents;
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     },
     declarationValue$1$allowEmpty(allowEmpty) {
-      var t1, t2, wroteNewline, next, start, end, t3, _0_0, url, _this = this,
+      var t1, t2, wroteNewline, next, t3, start, end, _0_0, _this = this,
         buffer = new A.StringBuffer(""),
         brackets = A._setArrayType([], type$.JSArray_int);
       for (t1 = _this.scanner, t2 = _this.get$string(), wroteNewline = false; true;) {
@@ -53605,7 +55465,8 @@ self.util = _cliPkgRequires.util;
         if (next == null)
           break;
         if (92 === next) {
-          buffer._contents += _this.escape$1$identifierStart(true);
+          t3 = _this.escape$1$identifierStart(true);
+          buffer._contents += t3;
           wroteNewline = false;
           continue;
         }
@@ -53624,8 +55485,10 @@ self.util = _cliPkgRequires.util;
             t3.call$0();
             end = t1._string_scanner$_position;
             buffer._contents += B.JSString_methods.substring$2(t1.string, start, end);
-          } else
-            buffer._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          } else {
+            t3 = A.Primitives_stringFromCharCode(t1.readChar$0());
+            buffer._contents += t3;
+          }
           wroteNewline = false;
           continue;
         }
@@ -53635,8 +55498,10 @@ self.util = _cliPkgRequires.util;
             t3 = !(t3 === 32 || t3 === 9 || t3 === 10 || t3 === 13 || t3 === 12);
           } else
             t3 = true;
-          if (t3)
-            buffer._contents += A.Primitives_stringFromCharCode(32);
+          if (t3) {
+            t3 = A.Primitives_stringFromCharCode(32);
+            buffer._contents += t3;
+          }
           t1.readChar$0();
           continue;
         }
@@ -53649,7 +55514,8 @@ self.util = _cliPkgRequires.util;
           continue;
         }
         if (40 === next || 123 === next || 91 === next) {
-          buffer._contents += A.Primitives_stringFromCharCode(next);
+          t3 = A.Primitives_stringFromCharCode(next);
+          buffer._contents += t3;
           brackets.push(A.opposite(t1.readChar$0()));
           wroteNewline = false;
           continue;
@@ -53657,7 +55523,8 @@ self.util = _cliPkgRequires.util;
         if (41 === next || 125 === next || 93 === next) {
           if (brackets.length === 0)
             break;
-          buffer._contents += A.Primitives_stringFromCharCode(next);
+          t3 = A.Primitives_stringFromCharCode(next);
+          buffer._contents += t3;
           t1.expectChar$1(brackets.pop());
           wroteNewline = false;
           continue;
@@ -53665,29 +55532,28 @@ self.util = _cliPkgRequires.util;
         if (59 === next) {
           if (brackets.length === 0)
             break;
-          buffer._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t3 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          buffer._contents += t3;
           continue;
         }
         if (117 === next || 85 === next) {
           _0_0 = _this.tryUrl$0();
-          if (_0_0 != null) {
-            url = _0_0;
-            t3 = true;
-          } else {
-            url = null;
-            t3 = false;
+          if (_0_0 != null)
+            buffer._contents += _0_0;
+          else {
+            t3 = A.Primitives_stringFromCharCode(t1.readChar$0());
+            buffer._contents += t3;
           }
-          if (t3)
-            buffer._contents += A.S(url);
-          else
-            buffer._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
           wroteNewline = false;
           continue;
         }
-        if (_this.lookingAtIdentifier$0())
-          buffer._contents += _this.identifier$0();
-        else
-          buffer._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+        if (_this.lookingAtIdentifier$0()) {
+          t3 = _this.identifier$0();
+          buffer._contents += t3;
+        } else {
+          t3 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          buffer._contents += t3;
+        }
         wroteNewline = false;
       }
       if (brackets.length !== 0)
@@ -53718,7 +55584,8 @@ self.util = _cliPkgRequires.util;
         if (_0_0 == null)
           break;
         if (92 === _0_0) {
-          buffer._contents += _this.escape$0();
+          t2 = _this.escape$0();
+          buffer._contents += t2;
           continue;
         }
         if (37 !== _0_0)
@@ -53732,7 +55599,8 @@ self.util = _cliPkgRequires.util;
         else
           t2 = true;
         if (t2) {
-          buffer._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t2 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          buffer._contents += t2;
           continue;
         }
         if (_0_0 === 32 || _0_0 === 9 || _0_0 === 10 || _0_0 === 13 || _0_0 === 12) {
@@ -53742,7 +55610,8 @@ self.util = _cliPkgRequires.util;
           continue;
         }
         if (41 === _0_0) {
-          t2 = buffer._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t2 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          t2 = buffer._contents += t2;
           return t2.charCodeAt(0) == 0 ? t2 : t2;
         }
         break;
@@ -53844,18 +55713,16 @@ self.util = _cliPkgRequires.util;
       return true;
     },
     scanIdentChar$2$caseSensitive(char, caseSensitive) {
-      var next, t3,
+      var t3,
         t1 = new A.Parser_scanIdentChar_matches(caseSensitive, char),
         t2 = this.scanner,
         _0_0 = t2.peekChar$0();
       if (_0_0 != null) {
-        next = _0_0;
-        t3 = true;
-      } else {
-        next = null;
+        t3 = t1.call$1(_0_0);
+        t3 = t3;
+      } else
         t3 = false;
-      }
-      if (t3 && t1.call$1(next)) {
+      if (t3) {
         t2.readChar$0();
         return true;
       }
@@ -53899,11 +55766,9 @@ self.util = _cliPkgRequires.util;
               t1 = _0_0 === 95 || A.CharacterExtension_get_isAlphabetic(_0_0) || _0_0 >= 128;
             else
               t1 = false;
-            if (t1 || 92 === _0_0 || 45 === _0_0) {
-              t1 = true;
+            t1 = t1 || 92 === _0_0 || 45 === _0_0;
+            if (t1)
               break $label1$1;
-            }
-            t1 = false;
             break $label1$1;
           }
           break $label0$0;
@@ -53947,7 +55812,7 @@ self.util = _cliPkgRequires.util;
     },
     _consumeIdentifier$2(text, caseSensitive) {
       var t1, t2, t3;
-      for (t1 = new A.CodeUnits(text), t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = new A.CodeUnits(text), t2 = type$.CodeUnits, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t2 = t2._eval$1("ListBase.E"); t1.moveNext$0();) {
         t3 = t1.__internal$_current;
         if (!this.scanIdentChar$2$caseSensitive(t3 == null ? t2._as(t3) : t3, caseSensitive))
           return false;
@@ -53960,15 +55825,15 @@ self.util = _cliPkgRequires.util;
         $name = '"' + text + '"';
       t1 = this.scanner;
       start = t1._string_scanner$_position;
-      for (t2 = new A.CodeUnits(text), t2 = new A.ListIterator(t2, t2.get$length(t2)), t3 = "Expected " + $name, t4 = t3 + ".", t5 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
+      for (t2 = new A.CodeUnits(text), t3 = type$.CodeUnits, t2 = new A.ListIterator(t2, t2.get$length(0), t3._eval$1("ListIterator<ListBase.E>")), t4 = "Expected " + $name, t5 = t4 + ".", t3 = t3._eval$1("ListBase.E"); t2.moveNext$0();) {
         t6 = t2.__internal$_current;
-        if (this.scanIdentChar$2$caseSensitive(t6 == null ? t5._as(t6) : t6, false))
+        if (this.scanIdentChar$2$caseSensitive(t6 == null ? t3._as(t6) : t6, false))
           continue;
-        t1.error$2$position(0, t4, start);
+        t1.error$2$position(0, t5, start);
       }
       if (!this.lookingAtIdentifierBody$0())
         return;
-      t1.error$2$position(0, t3, start);
+      t1.error$2$position(0, t4, start);
     },
     expectIdentifier$1(text) {
       return this.expectIdentifier$2$name(text, null);
@@ -53990,8 +55855,8 @@ self.util = _cliPkgRequires.util;
       else
         A.throwWithTrace(exception, this.get$error(this), trace);
     },
-    error$2($receiver, message, span) {
-      return this.error$3($receiver, message, span, null);
+    error$2(_, message, span) {
+      return this.error$3(0, message, span, null);
     },
     withErrorMessage$1$2(message, callback) {
       var error, stackTrace, t1, exception;
@@ -54116,26 +55981,26 @@ self.util = _cliPkgRequires.util;
       t1.scanner.expectDone$0();
       return result;
     },
-    $signature: 22
+    $signature: 26
   };
   A.Parser_escape_closure.prototype = {
     call$1(char) {
       return char === 32 || char === 9 || char === 10 || char === 13 || char === 12;
     },
-    $signature: 34
+    $signature: 30
   };
   A.Parser_scanIdentChar_matches.prototype = {
     call$1(actual) {
       var t1 = this.char;
       return this.caseSensitive ? actual === t1 : A.characterEqualsIgnoreCase(t1, actual);
     },
-    $signature: 47
+    $signature: 45
   };
   A.Parser_spanFrom_closure.prototype = {
     call$0() {
       return this.$this._interpolationMap.mapSpan$1(this.span);
     },
-    $signature: 33
+    $signature: 27
   };
   A.SassParser.prototype = {
     get$currentIndentation() {
@@ -54152,7 +56017,8 @@ self.util = _cliPkgRequires.util;
         buffer = new A.InterpolationBuffer(t3, A._setArrayType([], type$.JSArray_Object));
       do {
         buffer.addInterpolation$1(this.almostAnyValue$1$omitComments(true));
-        t4 = t3._contents += A.Primitives_stringFromCharCode(10);
+        t4 = A.Primitives_stringFromCharCode(10);
+        t4 = t3._contents += t4;
       } while (B.JSString_methods.endsWith$1(B.JSString_methods.trimRight$0(t4.charCodeAt(0) == 0 ? t4 : t4), ",") && this.scanCharIf$1(new A.SassParser_styleRuleSelector_closure()));
       return buffer.interpolation$1(t1.spanFrom$1(new A._SpanScannerState(t1, t2)));
     },
@@ -54257,7 +56123,7 @@ self.util = _cliPkgRequires.util;
       return children;
     },
     statements$1(statement) {
-      var statements, t2, _1_0, child, t3,
+      var statements, t2, _1_0,
         t1 = this.scanner,
         _0_0 = t1.peekChar$0();
       if (9 === _0_0 || 32 === _0_0)
@@ -54265,15 +56131,8 @@ self.util = _cliPkgRequires.util;
       statements = A._setArrayType([], type$.JSArray_Statement);
       for (t2 = t1.string.length; t1._string_scanner$_position !== t2;) {
         _1_0 = this._child$1(statement);
-        if (_1_0 != null) {
-          child = _1_0;
-          t3 = true;
-        } else {
-          child = null;
-          t3 = false;
-        }
-        if (t3)
-          statements.push(child);
+        if (_1_0 != null)
+          statements.push(_1_0);
         this._readIndentation$0();
       }
       return statements;
@@ -54373,7 +56232,8 @@ self.util = _cliPkgRequires.util;
           t7 = t1.peekChar$0();
           if (t7 === 10 || t7 === 13 || t7 === 12) {
             _this._readIndentation$0();
-            t3._contents += A.Primitives_stringFromCharCode(32);
+            t7 = A.Primitives_stringFromCharCode(32);
+            t3._contents += t7;
           } else {
             end = t1._string_scanner$_position;
             t3._contents += B.JSString_methods.substring$2(t5, beginningOfComment, end);
@@ -54382,8 +56242,10 @@ self.util = _cliPkgRequires.util;
           t7 = t3._contents += "\n";
           t3._contents = t7 + " * ";
         }
-        for (i = 3; i < _this._currentIndentation - parentIndentation; ++i)
-          t3._contents += A.Primitives_stringFromCharCode(32);
+        for (i = 3; i < _this._currentIndentation - parentIndentation; ++i) {
+          t7 = A.Primitives_stringFromCharCode(32);
+          t3._contents += t7;
+        }
         for (; t1._string_scanner$_position !== t6;) {
           _0_0 = t1.peekChar$0();
           if (10 === _0_0 || 13 === _0_0 || 12 === _0_0)
@@ -54393,11 +56255,14 @@ self.util = _cliPkgRequires.util;
               t7 = _this.singleInterpolation$0();
               buffer._flushText$0();
               t4.push(t7);
-            } else
-              t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+            } else {
+              t7 = A.Primitives_stringFromCharCode(t1.readChar$0());
+              t3._contents += t7;
+            }
             continue;
           }
-          t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t7 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          t3._contents += t7;
         }
         if (_this._peekIndentation$0() <= parentIndentation)
           break;
@@ -54516,17 +56381,10 @@ self.util = _cliPkgRequires.util;
       return currentIndentation;
     },
     _peekIndentation$0() {
-      var cached, t1, t2, t3, start, containsTab, containsSpace, nextIndentation, _1_0, t4, _this = this,
+      var t1, t2, t3, start, containsTab, containsSpace, nextIndentation, _1_0, t4, _this = this,
         _0_0 = _this._nextIndentation;
-      if (_0_0 != null) {
-        cached = _0_0;
-        t1 = true;
-      } else {
-        cached = null;
-        t1 = false;
-      }
-      if (t1)
-        return cached;
+      if (_0_0 != null)
+        return _0_0;
       t1 = _this.scanner;
       t2 = t1._string_scanner$_position;
       t3 = t1.string.length;
@@ -54541,33 +56399,32 @@ self.util = _cliPkgRequires.util;
       containsTab = A._Cell$();
       containsSpace = A._Cell$();
       nextIndentation = A._Cell$();
-      t2 = nextIndentation.__late_helper$_name;
       do {
-        containsSpace._value = containsTab._value = false;
-        nextIndentation._value = 0;
+        containsSpace.__late_helper$_value = containsTab.__late_helper$_value = false;
+        nextIndentation.__late_helper$_value = 0;
         for (; true;) {
           $label0$0: {
             _1_0 = t1.peekChar$0();
             if (32 === _1_0) {
-              containsSpace._value = true;
+              containsSpace.__late_helper$_value = true;
               break $label0$0;
             }
             if (9 === _1_0) {
-              containsTab._value = true;
+              containsTab.__late_helper$_value = true;
               break $label0$0;
             }
             break;
           }
-          t4 = nextIndentation._value;
-          if (t4 === nextIndentation)
-            A.throwExpression(A.LateError$localNI(t2));
-          nextIndentation._value = t4 + 1;
+          t2 = nextIndentation.__late_helper$_value;
+          if (t2 === nextIndentation)
+            A.throwExpression(A.LateError$localNI(""));
+          nextIndentation.__late_helper$_value = t2 + 1;
           t1.readChar$0();
         }
-        t4 = t1._string_scanner$_position;
-        if (t4 === t3) {
+        t2 = t1._string_scanner$_position;
+        if (t2 === t3) {
           _this._nextIndentation = 0;
-          _this._nextIndentationEnd = new A._SpanScannerState(t1, t4);
+          _this._nextIndentationEnd = new A._SpanScannerState(t1, t2);
           t1.set$state(start);
           return 0;
         }
@@ -54605,21 +56462,13 @@ self.util = _cliPkgRequires.util;
     call$1(char) {
       return char === 10 || char === 13 || char === 12;
     },
-    $signature: 34
+    $signature: 30
   };
   A.SassParser_children_closure.prototype = {
     call$0() {
-      var parsedChild, t1,
-        _0_0 = this.$this._child$1(this.child);
-      if (_0_0 != null) {
-        parsedChild = _0_0;
-        t1 = true;
-      } else {
-        parsedChild = null;
-        t1 = false;
-      }
-      if (t1)
-        this.children.push(parsedChild);
+      var _0_0 = this.$this._child$1(this.child);
+      if (_0_0 != null)
+        this.children.push(_0_0);
     },
     $signature: 0
   };
@@ -54627,13 +56476,13 @@ self.util = _cliPkgRequires.util;
     call$1(char) {
       return char === 10 || char === 13 || char === 12;
     },
-    $signature: 34
+    $signature: 30
   };
   A.SassParser__peekIndentation_closure0.prototype = {
     call$1(char) {
       return char === 10 || char === 13 || char === 12;
     },
-    $signature: 34
+    $signature: 30
   };
   A.ScssParser.prototype = {
     get$indented() {
@@ -54676,7 +56525,7 @@ self.util = _cliPkgRequires.util;
         if (_this.scanIdentifier$2$caseSensitive("else", true))
           return true;
         if (_this.scanIdentifier$2$caseSensitive("elseif", true)) {
-          A.WarnForDeprecation_warnForDeprecation(_this.logger, B.Deprecation_JAZ, string$.x40elsei, t1.spanFrom$1(new A._SpanScannerState(t1, t3)), null);
+          A.WarnForDeprecation_warnForDeprecation(_this.logger, B.Deprecation_EJz, string$.x40elsei, t1.spanFrom$1(new A._SpanScannerState(t1, t3)), null);
           t1.set$position(t1._string_scanner$_position - 2);
           return true;
         }
@@ -54721,7 +56570,7 @@ self.util = _cliPkgRequires.util;
         }
     },
     statements$1(statement) {
-      var t1, t2, _0_0, child, t3, _1_0, _this = this,
+      var t1, t2, _0_0, _1_0, _this = this,
         statements = A._setArrayType([], type$.JSArray_Statement);
       _this.whitespaceWithoutComments$0();
       for (t1 = _this.scanner, t2 = t1.string.length; t1._string_scanner$_position !== t2;)
@@ -54741,15 +56590,8 @@ self.util = _cliPkgRequires.util;
                 break;
               default:
                 _0_0 = statement.call$0();
-                if (_0_0 != null) {
-                  child = _0_0;
-                  t3 = true;
-                } else {
-                  child = null;
-                  t3 = false;
-                }
-                if (t3)
-                  statements.push(child);
+                if (_0_0 != null)
+                  statements.push(_0_0);
             }
             break;
           case 59:
@@ -54758,15 +56600,8 @@ self.util = _cliPkgRequires.util;
             break;
           default:
             _1_0 = statement.call$0();
-            if (_1_0 != null) {
-              child = _1_0;
-              t3 = true;
-            } else {
-              child = null;
-              t3 = false;
-            }
-            if (t3)
-              statements.push(child);
+            if (_1_0 != null)
+              statements.push(_1_0);
         }
       return statements;
     },
@@ -54811,14 +56646,18 @@ self.util = _cliPkgRequires.util;
                 t5 = this.singleInterpolation$0();
                 buffer._flushText$0();
                 t4.push(t5);
-              } else
-                t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+              } else {
+                t5 = A.Primitives_stringFromCharCode(t1.readChar$0());
+                t3._contents += t5;
+              }
               break;
             case 42:
-              t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+              t5 = A.Primitives_stringFromCharCode(t1.readChar$0());
+              t3._contents += t5;
               if (t1.peekChar$0() !== 47)
                 continue $label0$1;
-              t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+              t5 = A.Primitives_stringFromCharCode(t1.readChar$0());
+              t3._contents += t5;
               endPosition = t1._string_scanner$_position;
               t5 = t1._sourceFile;
               t6 = new A._SpanScannerState(t1, t2).position;
@@ -54837,15 +56676,19 @@ self.util = _cliPkgRequires.util;
               return new A.LoudComment(t2);
             case 13:
               t1.readChar$0();
-              if (t1.peekChar$0() !== 10)
-                t3._contents += A.Primitives_stringFromCharCode(10);
+              if (t1.peekChar$0() !== 10) {
+                t5 = A.Primitives_stringFromCharCode(10);
+                t3._contents += t5;
+              }
               break;
             case 12:
               t1.readChar$0();
-              t3._contents += A.Primitives_stringFromCharCode(10);
+              t5 = A.Primitives_stringFromCharCode(10);
+              t3._contents += t5;
               break;
             default:
-              t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+              t5 = A.Primitives_stringFromCharCode(t1.readChar$0());
+              t3._contents += t5;
           }
     }
   };
@@ -54880,6 +56723,7 @@ self.util = _cliPkgRequires.util;
     },
     _complexSelector$1$lineBreak(lineBreak) {
       var t4, lastCompound, initialCombinators, _0_0, t5, result, _this = this,
+        _s18_ = "expected selector.",
         t1 = _this.scanner,
         t2 = t1._string_scanner$_position,
         componentStart = new A._SpanScannerState(t1, t2),
@@ -54892,19 +56736,19 @@ self.util = _cliPkgRequires.util;
         if (43 === _0_0) {
           t5 = t1._string_scanner$_position;
           t1.readChar$0();
-          combinators.push(new A.CssValue(B.Combinator_4QF, _this.spanFrom$1(new A._SpanScannerState(t1, t5)), t4));
+          combinators.push(new A.CssValue(B.Combinator_gRV, _this.spanFrom$1(new A._SpanScannerState(t1, t5)), t4));
           continue;
         }
         if (62 === _0_0) {
           t5 = t1._string_scanner$_position;
           t1.readChar$0();
-          combinators.push(new A.CssValue(B.Combinator_Cht, _this.spanFrom$1(new A._SpanScannerState(t1, t5)), t4));
+          combinators.push(new A.CssValue(B.Combinator_8I8, _this.spanFrom$1(new A._SpanScannerState(t1, t5)), t4));
           continue;
         }
         if (126 === _0_0) {
           t5 = t1._string_scanner$_position;
           t1.readChar$0();
-          combinators.push(new A.CssValue(B.Combinator_Htt, _this.spanFrom$1(new A._SpanScannerState(t1, t5)), t4));
+          combinators.push(new A.CssValue(B.Combinator_y18, _this.spanFrom$1(new A._SpanScannerState(t1, t5)), t4));
           continue;
         }
         if (_0_0 == null)
@@ -54953,14 +56797,17 @@ self.util = _cliPkgRequires.util;
         }
         break;
       }
-      if (lastCompound != null) {
+      t3 = combinators.length !== 0;
+      if (t3 && _this._plainCss)
+        t1.error$1(0, _s18_);
+      else if (lastCompound != null) {
         t3 = _this.spanFrom$1(componentStart);
         components.push(new A.ComplexSelectorComponent(lastCompound, A.List_List$unmodifiable(combinators, t4), t3));
-      } else if (combinators.length !== 0)
+      } else if (t3)
         initialCombinators = combinators;
       else
-        t1.error$1(0, "expected selector.");
-      t3 = initialCombinators == null ? B.List_empty1 : initialCombinators;
+        t1.error$1(0, _s18_);
+      t3 = initialCombinators == null ? B.List_empty0 : initialCombinators;
       return A.ComplexSelector$(t3, components, _this.spanFrom$1(new A._SpanScannerState(t1, t2)), lineBreak);
     },
     _complexSelector$0() {
@@ -54971,12 +56818,8 @@ self.util = _cliPkgRequires.util;
         t1 = _this.scanner,
         t2 = t1._string_scanner$_position,
         components = A._setArrayType([_this._simpleSelector$0()], type$.JSArray_SimpleSelector);
-      while (true) {
-        t3 = t1.peekChar$0();
-        if (!(t3 === 42 || t3 === 91 || t3 === 46 || t3 === 35 || t3 === 37 || t3 === 58))
-          break;
-        components.push(_this._simpleSelector$1$allowParent(false));
-      }
+      for (t3 = _this._plainCss; _this._isSimpleSelectorStart$1(t1.peekChar$0());)
+        components.push(_this._simpleSelector$1$allowParent(t3));
       return A.CompoundSelector$(components, _this.spanFrom$1(new A._SpanScannerState(t1, t2)));
     },
     _simpleSelector$1$allowParent(allowParent) {
@@ -55001,7 +56844,7 @@ self.util = _cliPkgRequires.util;
           t1.expectChar$1(37);
           $name = _this.identifier$0();
           t2 = _this.spanFrom$1(new A._SpanScannerState(t1, t2));
-          if (!_this._allowPlaceholder)
+          if (_this._plainCss)
             _this.error$2(0, string$.Placeh, t1.spanFrom$1(start));
           return new A.PlaceholderSelector($name, t2);
         case 58:
@@ -55018,6 +56861,8 @@ self.util = _cliPkgRequires.util;
             suffix = t3.charCodeAt(0) == 0 ? t3 : t3;
           } else
             suffix = null;
+          if (_this._plainCss && suffix != null)
+            t1.error$3$length$position(0, string$.Parent, t1._string_scanner$_position - t2, t2);
           t2 = _this.spanFrom$1(new A._SpanScannerState(t1, t2));
           if (!allowParent)
             _this.error$2(0, "Parent selectors aren't allowed here.", t1.spanFrom$1(start));
@@ -55069,22 +56914,22 @@ self.util = _cliPkgRequires.util;
         t2 = t1._string_scanner$_position;
       switch (t1.readChar$0()) {
         case 61:
-          return B.AttributeOperator_ES6;
+          return B.AttributeOperator_4QF;
         case 126:
           t1.expectChar$1(61);
-          return B.AttributeOperator_r60;
+          return B.AttributeOperator_yT8;
         case 124:
           t1.expectChar$1(61);
-          return B.AttributeOperator_ivT;
+          return B.AttributeOperator_jqB;
         case 94:
           t1.expectChar$1(61);
-          return B.AttributeOperator_eot;
+          return B.AttributeOperator_cMb;
         case 36:
           t1.expectChar$1(61);
-          return B.AttributeOperator_BGd;
+          return B.AttributeOperator_qhE;
         case 42:
           t1.expectChar$1(61);
-          return B.AttributeOperator_8aB;
+          return B.AttributeOperator_61T;
         default:
           t1.error$2$position(0, 'Expected "]".', t2);
       }
@@ -55192,6 +57037,22 @@ self.util = _cliPkgRequires.util;
         return new A.UniversalSelector(nameOrNamespace, _this.spanFrom$1(start));
       else
         return new A.TypeSelector(new A.QualifiedName(_this.identifier$0(), nameOrNamespace), _this.spanFrom$1(start));
+    },
+    _isSimpleSelectorStart$1(character) {
+      var t1;
+      $label0$0: {
+        if (42 === character || 91 === character || 46 === character || 35 === character || 37 === character || 58 === character) {
+          t1 = true;
+          break $label0$0;
+        }
+        if (38 === character) {
+          t1 = this._plainCss;
+          break $label0$0;
+        }
+        t1 = false;
+        break $label0$0;
+      }
+      return t1;
     }
   };
   A.SelectorParser_parse_closure.prototype = {
@@ -55203,7 +57064,7 @@ self.util = _cliPkgRequires.util;
         t1.error$1(0, "expected selector.");
       return selector;
     },
-    $signature: 354
+    $signature: 497
   };
   A.SelectorParser_parseCompoundSelector_closure.prototype = {
     call$0() {
@@ -55214,7 +57075,7 @@ self.util = _cliPkgRequires.util;
         t1.error$1(0, "expected selector.");
       return compound;
     },
-    $signature: 355
+    $signature: 484
   };
   A.StylesheetParser.prototype = {
     parse$0() {
@@ -55283,7 +57144,7 @@ self.util = _cliPkgRequires.util;
       if (t1)
         _this._assertPublic$2($name, new A.StylesheetParser_variableDeclarationWithoutNamespace_closure(_this, start));
       if (_this.get$plainCss())
-        _this.error$2(0, string$.Sass_v, _this.scanner.spanFrom$1(start));
+        _this.error$2(0, string$.Sassx20v, _this.scanner.spanFrom$1(start));
       _this.whitespace$0();
       t2 = _this.scanner;
       t2.expectChar$1(58);
@@ -55300,7 +57161,7 @@ self.util = _cliPkgRequires.util;
               t5 = flagStart.position;
               t6 = new A._FileSpan(t4, t5, endPosition);
               t6._FileSpan$3(t4, t5, endPosition);
-              A.WarnForDeprecation_warnForDeprecation(t3, B.Deprecation_Auo, string$.x21defau, t6, null);
+              A.WarnForDeprecation_warnForDeprecation(t3, B.Deprecation_zrt, string$.x21defau, t6, null);
             }
             guarded = true;
             break $label0$0;
@@ -55319,7 +57180,7 @@ self.util = _cliPkgRequires.util;
               t5 = flagStart.position;
               t6 = new A._FileSpan(t4, t5, endPosition);
               t6._FileSpan$3(t4, t5, endPosition);
-              A.WarnForDeprecation_warnForDeprecation(t3, B.Deprecation_Auo, string$.x21globas, t6, null);
+              A.WarnForDeprecation_warnForDeprecation(t3, B.Deprecation_zrt, string$.x21globas, t6, null);
             }
             global = true;
             break $label0$0;
@@ -55366,8 +57227,6 @@ self.util = _cliPkgRequires.util;
     },
     _declarationOrStyleRule$0() {
       var t1, t2, declarationOrBuffer, _this = this;
-      if (_this.get$plainCss() && _this._inStyleRule && !_this._stylesheet$_inUnknownAtRule)
-        return _this._propertyOrVariableDeclaration$0();
       if (_this.get$indented() && _this.scanner.scanChar$1(92))
         return _this._styleRule$0();
       t1 = _this.scanner;
@@ -55376,18 +57235,20 @@ self.util = _cliPkgRequires.util;
       return type$.Statement._is(declarationOrBuffer) ? declarationOrBuffer : _this._styleRule$2(type$.InterpolationBuffer._as(declarationOrBuffer), new A._SpanScannerState(t1, t2));
     },
     _declarationOrBuffer$0() {
-      var midBuffer, couldBeSelector, beforeDeclaration, additional, t3, startsWithPunctuation, variableOrInterpolation, t4, $name, postColonWhitespace, exception, _this = this, t1 = {},
-        t2 = _this.scanner,
-        start = new A._SpanScannerState(t2, t2._string_scanner$_position),
-        nameBuffer = new A.InterpolationBuffer(new A.StringBuffer(""), A._setArrayType([], type$.JSArray_Object));
-      if (_this._lookingAtPotentialPropertyHack$0()) {
-        t3 = t2.readChar$0();
-        nameBuffer._interpolation_buffer$_text._contents += A.Primitives_stringFromCharCode(t3);
-        t3 = _this.rawText$1(_this.get$whitespace());
-        nameBuffer._interpolation_buffer$_text._contents += t3;
-        startsWithPunctuation = true;
-      } else
-        startsWithPunctuation = false;
+      var midBuffer, couldBeSelector, beforeDeclaration, value, additional, t2, t3, variableOrInterpolation, t4, t5, $name, postColonWhitespace, _0_0, exception, _1_0, _this = this,
+        t1 = _this.scanner,
+        start = new A._SpanScannerState(t1, t1._string_scanner$_position),
+        nameBuffer = new A.InterpolationBuffer(new A.StringBuffer(""), A._setArrayType([], type$.JSArray_Object)),
+        startsWithPunctuation = _this._lookingAtPotentialPropertyHack$0();
+      if (startsWithPunctuation) {
+        t2 = t1.readChar$0();
+        t3 = nameBuffer._interpolation_buffer$_text;
+        t2 = A.Primitives_stringFromCharCode(t2);
+        t3._contents += t2;
+        t2 = _this.rawText$1(_this.get$whitespace());
+        t3 = nameBuffer._interpolation_buffer$_text;
+        t3._contents += t2;
+      }
       if (!_this._lookingAtInterpolatedIdentifier$0())
         return nameBuffer;
       variableOrInterpolation = startsWithPunctuation ? _this.interpolatedIdentifier$0() : _this._variableDeclarationOrInterpolation$0();
@@ -55396,46 +57257,59 @@ self.util = _cliPkgRequires.util;
       else
         nameBuffer.addInterpolation$1(type$.Interpolation._as(variableOrInterpolation));
       _this._isUseAllowed = false;
-      if (t2.matches$1("/*")) {
-        t3 = _this.rawText$1(_this.get$loudComment());
-        nameBuffer._interpolation_buffer$_text._contents += t3;
+      if (t1.matches$1("/*")) {
+        t2 = _this.rawText$1(_this.get$loudComment());
+        t3 = nameBuffer._interpolation_buffer$_text;
+        t3._contents += t2;
       }
       midBuffer = new A.StringBuffer("");
+      t2 = midBuffer;
       t3 = _this.get$whitespace();
-      midBuffer._contents += _this.rawText$1(t3);
-      t4 = t2._string_scanner$_position;
-      if (!t2.scanChar$1(58)) {
-        if (midBuffer._contents.length !== 0)
-          nameBuffer._interpolation_buffer$_text._contents += A.Primitives_stringFromCharCode(32);
+      t4 = _this.rawText$1(t3);
+      t2._contents += t4;
+      t4 = t1._string_scanner$_position;
+      if (!t1.scanChar$1(58)) {
+        if (midBuffer._contents.length !== 0) {
+          t1 = nameBuffer._interpolation_buffer$_text;
+          t2 = A.Primitives_stringFromCharCode(32);
+          t1._contents += t2;
+        }
         return nameBuffer;
       }
-      midBuffer._contents += A.Primitives_stringFromCharCode(58);
-      $name = nameBuffer.interpolation$1(t2.spanFrom$2(start, new A._SpanScannerState(t2, t4)));
+      t2 = midBuffer;
+      t5 = A.Primitives_stringFromCharCode(58);
+      t2._contents += t5;
+      $name = nameBuffer.interpolation$1(t1.spanFrom$2(start, new A._SpanScannerState(t1, t4)));
       if (B.JSString_methods.startsWith$1($name.get$initialPlain(), "--")) {
-        t1 = _this._interpolatedDeclarationValue$0();
+        t2 = _this._interpolatedDeclarationValue$1$silentComments(false);
         _this.expectStatementSeparator$1("custom property");
-        return A.Declaration$($name, new A.StringExpression(t1, false), t2.spanFrom$1(start));
+        return A.Declaration$($name, new A.StringExpression(t2, false), t1.spanFrom$1(start));
       }
-      if (t2.scanChar$1(58)) {
+      if (t1.scanChar$1(58)) {
         t1 = nameBuffer;
         t2 = t1._interpolation_buffer$_text;
-        t2._contents += A.S(midBuffer);
-        t2._contents += A.Primitives_stringFromCharCode(58);
+        t3 = A.S(midBuffer);
+        t2._contents += t3;
+        t3 = A.Primitives_stringFromCharCode(58);
+        t2._contents += t3;
         return t1;
       } else if (_this.get$indented() && _this._lookingAtInterpolatedIdentifier$0()) {
         t1 = nameBuffer;
-        t1._interpolation_buffer$_text._contents += A.S(midBuffer);
+        t2 = t1._interpolation_buffer$_text;
+        t3 = A.S(midBuffer);
+        t2._contents += t3;
         return t1;
       }
       postColonWhitespace = _this.rawText$1(t3);
-      if (_this.lookingAtChildren$0())
-        return _this._withChildren$3(_this.get$_declarationChild(), start, new A.StylesheetParser__declarationOrBuffer_closure($name));
+      _0_0 = _this._tryDeclarationChildren$2($name, start);
+      if (_0_0 != null)
+        return _0_0;
       midBuffer._contents += postColonWhitespace;
       couldBeSelector = postColonWhitespace.length === 0 && _this._lookingAtInterpolatedIdentifier$0();
-      beforeDeclaration = new A._SpanScannerState(t2, t2._string_scanner$_position);
-      t3 = t1.value = null;
+      beforeDeclaration = new A._SpanScannerState(t1, t1._string_scanner$_position);
+      value = null;
       try {
-        t3 = t1.value = _this._expression$0();
+        value = _this._expression$0();
         if (_this.lookingAtChildren$0()) {
           if (couldBeSelector)
             _this.expectStatementSeparator$0();
@@ -55445,21 +57319,24 @@ self.util = _cliPkgRequires.util;
         if (type$.FormatException._is(A.unwrapException(exception))) {
           if (!couldBeSelector)
             throw exception;
-          t2.set$state(beforeDeclaration);
+          t1.set$state(beforeDeclaration);
           additional = _this.almostAnyValue$0();
-          if (!_this.get$indented() && t2.peekChar$0() === 59)
+          if (!_this.get$indented() && t1.peekChar$0() === 59)
             throw exception;
-          nameBuffer._interpolation_buffer$_text._contents += A.S(midBuffer);
+          t1 = nameBuffer._interpolation_buffer$_text;
+          t2 = A.S(midBuffer);
+          t1._contents += t2;
           nameBuffer.addInterpolation$1(additional);
           return nameBuffer;
         } else
           throw exception;
       }
-      if (_this.lookingAtChildren$0())
-        return _this._withChildren$3(_this.get$_declarationChild(), start, new A.StylesheetParser__declarationOrBuffer_closure0(t1, $name));
+      _1_0 = _this._tryDeclarationChildren$3$value($name, start, value);
+      if (_1_0 != null)
+        return _1_0;
       else {
         _this.expectStatementSeparator$0();
-        return A.Declaration$($name, t3, t2.spanFrom$1(start));
+        return A.Declaration$($name, value, t1.spanFrom$1(start));
       }
     },
     _variableDeclarationOrInterpolation$0() {
@@ -55505,58 +57382,52 @@ self.util = _cliPkgRequires.util;
       return this._styleRule$2(null, null);
     },
     _propertyOrVariableDeclaration$1$parseCustomProperties(parseCustomProperties) {
-      var t3, nameBuffer, variableOrInterpolation, $name, value, _this = this,
-        _s48_ = string$.Nested,
-        t1 = {},
-        t2 = _this.scanner,
-        start = new A._SpanScannerState(t2, t2._string_scanner$_position);
-      t1.name = null;
+      var t2, nameBuffer, t3, $name, variableOrInterpolation, _0_0, value, _1_0, _this = this,
+        t1 = _this.scanner,
+        start = new A._SpanScannerState(t1, t1._string_scanner$_position);
       if (_this._lookingAtPotentialPropertyHack$0()) {
-        t3 = new A.StringBuffer("");
-        nameBuffer = new A.InterpolationBuffer(t3, A._setArrayType([], type$.JSArray_Object));
-        t3._contents += A.Primitives_stringFromCharCode(t2.readChar$0());
-        t3._contents += _this.rawText$1(_this.get$whitespace());
+        t2 = new A.StringBuffer("");
+        nameBuffer = new A.InterpolationBuffer(t2, A._setArrayType([], type$.JSArray_Object));
+        t3 = A.Primitives_stringFromCharCode(t1.readChar$0());
+        t2._contents += t3;
+        t3 = _this.rawText$1(_this.get$whitespace());
+        t2._contents += t3;
         nameBuffer.addInterpolation$1(_this.interpolatedIdentifier$0());
-        t3 = t1.name = nameBuffer.interpolation$1(t2.spanFrom$1(start));
+        $name = nameBuffer.interpolation$1(t1.spanFrom$1(start));
       } else if (!_this.get$plainCss()) {
         variableOrInterpolation = _this._variableDeclarationOrInterpolation$0();
         if (variableOrInterpolation instanceof A.VariableDeclaration)
           return variableOrInterpolation;
-        else {
+        else
           type$.Interpolation._as(variableOrInterpolation);
-          t1.name = variableOrInterpolation;
-        }
-        t3 = variableOrInterpolation;
-      } else {
+        $name = variableOrInterpolation;
+      } else
         $name = _this.interpolatedIdentifier$0();
-        t1.name = $name;
-        t3 = $name;
-      }
       _this.whitespace$0();
-      t2.expectChar$1(58);
-      if (parseCustomProperties && B.JSString_methods.startsWith$1(t3.get$initialPlain(), "--")) {
-        t1 = _this._interpolatedDeclarationValue$0();
-        _this.expectStatementSeparator$1("custom property");
-        return A.Declaration$(t3, new A.StringExpression(t1, false), t2.spanFrom$1(start));
-      }
+      t1.expectChar$1(58);
       _this.whitespace$0();
-      if (_this.lookingAtChildren$0()) {
-        if (_this.get$plainCss())
-          t2.error$1(0, _s48_);
-        return _this._withChildren$3(_this.get$_declarationChild(), start, new A.StylesheetParser__propertyOrVariableDeclaration_closure(t1));
-      }
+      _0_0 = _this._tryDeclarationChildren$2($name, start);
+      if (_0_0 != null)
+        return _0_0;
       value = _this._expression$0();
-      if (_this.lookingAtChildren$0()) {
-        if (_this.get$plainCss())
-          t2.error$1(0, _s48_);
-        return _this._withChildren$3(_this.get$_declarationChild(), start, new A.StylesheetParser__propertyOrVariableDeclaration_closure0(t1, value));
-      } else {
+      _1_0 = _this._tryDeclarationChildren$3$value($name, start, value);
+      if (_1_0 != null)
+        return _1_0;
+      else {
         _this.expectStatementSeparator$0();
-        return A.Declaration$(t3, value, t2.spanFrom$1(start));
+        return A.Declaration$($name, value, t1.spanFrom$1(start));
       }
     },
-    _propertyOrVariableDeclaration$0() {
-      return this._propertyOrVariableDeclaration$1$parseCustomProperties(true);
+    _tryDeclarationChildren$3$value($name, start, value) {
+      var _this = this;
+      if (!_this.lookingAtChildren$0())
+        return null;
+      if (_this.get$plainCss())
+        _this.scanner.error$1(0, string$.Nested);
+      return _this._withChildren$3(_this.get$_declarationChild(), start, new A.StylesheetParser__tryDeclarationChildren_closure($name, value));
+    },
+    _tryDeclarationChildren$2($name, start) {
+      return this._tryDeclarationChildren$3$value($name, start, null);
     },
     _declarationChild$0() {
       return this.scanner.peekChar$0() === 64 ? this._declarationAtRule$0() : this._propertyOrVariableDeclaration$1$parseCustomProperties(false);
@@ -55588,8 +57459,10 @@ self.util = _cliPkgRequires.util;
             _this.error$2(0, string$.x40exten, t1.spanFrom$1(start));
           value = _this.almostAnyValue$0();
           optional = t1.scanChar$1(33);
-          if (optional)
+          if (optional) {
             _this.expectIdentifier$1("optional");
+            _this.whitespace$0();
+          }
           _this.expectStatementSeparator$1("@extend rule");
           return new A.ExtendRule(value, optional, t1.spanFrom$1(start));
         case "for":
@@ -55766,22 +57639,26 @@ self.util = _cliPkgRequires.util;
         t4 = A._setArrayType([], type$.JSArray_Object);
         buffer = new A.InterpolationBuffer(t3, t4);
         t1.expectChar$1(40);
-        t3._contents += A.Primitives_stringFromCharCode(40);
+        t5 = A.Primitives_stringFromCharCode(40);
+        t3._contents += t5;
         _this.whitespace$0();
         t5 = _this._expression$0();
         buffer._flushText$0();
         t4.push(t5);
         if (t1.scanChar$1(58)) {
           _this.whitespace$0();
-          t3._contents += A.Primitives_stringFromCharCode(58);
-          t3._contents += A.Primitives_stringFromCharCode(32);
+          t5 = A.Primitives_stringFromCharCode(58);
+          t3._contents += t5;
+          t5 = A.Primitives_stringFromCharCode(32);
+          t3._contents += t5;
           t5 = _this._expression$0();
           buffer._flushText$0();
           t4.push(t5);
         }
         t1.expectChar$1(41);
         _this.whitespace$0();
-        t3._contents += A.Primitives_stringFromCharCode(41);
+        t4 = A.Primitives_stringFromCharCode(41);
+        t3._contents += t4;
         query = buffer.interpolation$1(t1.spanFrom$1(new A._SpanScannerState(t1, t2)));
         _this.whitespace$0();
         return _this._withChildren$3(_this.get$_statement(), start, new A.StylesheetParser__atRootRule_closure(query));
@@ -55791,17 +57668,18 @@ self.util = _cliPkgRequires.util;
         return A.AtRootRule$(A._setArrayType([_this._styleRule$0()], type$.JSArray_Statement), t1.spanFrom$1(start), null);
     },
     _contentRule$1(start) {
-      var t1, $arguments, t2, t3, _this = this;
+      var t1, beforeWhitespace, $arguments, t2, _this = this;
       if (!_this._stylesheet$_inMixin)
         _this.error$2(0, string$.x40conte, _this.scanner.spanFrom$1(start));
-      _this.whitespace$0();
       t1 = _this.scanner;
-      if (t1.peekChar$0() === 40)
+      beforeWhitespace = A.FileLocation$_(t1._sourceFile, t1._string_scanner$_position);
+      _this.whitespace$0();
+      if (t1.peekChar$0() === 40) {
         $arguments = _this._argumentInvocation$1$mixin(true);
-      else {
-        t2 = A.FileLocation$_(t1._sourceFile, t1._string_scanner$_position);
-        t3 = t2.offset;
-        $arguments = A.ArgumentInvocation$empty(A._FileSpan$(t2.file, t3, t3));
+        _this.whitespace$0();
+      } else {
+        t2 = beforeWhitespace.offset;
+        $arguments = A.ArgumentInvocation$empty(A._FileSpan$(beforeWhitespace.file, t2, t2));
       }
       _this.expectStatementSeparator$1("@content rule");
       return new A.ContentRule($arguments, t1.spanFrom$1(start));
@@ -55833,19 +57711,23 @@ self.util = _cliPkgRequires.util;
       return new A.ErrorRule(value, this.scanner.spanFrom$1(start));
     },
     _functionRule$1(start) {
-      var $name, $arguments, _0_0, _this = this,
+      var t1, t2, $name, $arguments, _0_0, _this = this,
         precedingComment = _this.lastSilentComment;
       _this.lastSilentComment = null;
-      $name = _this.identifier$1$normalize(true);
+      t1 = _this.scanner;
+      t2 = t1._string_scanner$_position;
+      $name = _this.identifier$0();
+      if (B.JSString_methods.startsWith$1($name, "--"))
+        A.WarnForDeprecation_warnForDeprecation(_this.logger, B.Deprecation_HJ0, string$.Sassx20_fm, t1.spanFrom$1(new A._SpanScannerState(t1, t2)), null);
       _this.whitespace$0();
       $arguments = _this._argumentDeclaration$0();
       if (_this._stylesheet$_inMixin || _this._inContentBlock)
-        _this.error$2(0, string$.Mixinscf, _this.scanner.spanFrom$1(start));
+        _this.error$2(0, string$.Mixinscf, t1.spanFrom$1(start));
       else if (_this._inControlDirective)
-        _this.error$2(0, string$.Functi, _this.scanner.spanFrom$1(start));
+        _this.error$2(0, string$.Functi, t1.spanFrom$1(start));
       _0_0 = A.unvendor($name);
       if ("calc" === _0_0 || "element" === _0_0 || "expression" === _0_0 || "url" === _0_0 || "and" === _0_0 || "or" === _0_0 || "not" === _0_0 || "clamp" === _0_0)
-        _this.error$2(0, "Invalid function name.", _this.scanner.spanFrom$1(start));
+        _this.error$2(0, "Invalid function name.", t1.spanFrom$1(start));
       _this.whitespace$0();
       return _this._withChildren$3(_this.get$_functionChild(), start, new A.StylesheetParser__functionRule_closure($name, $arguments, precedingComment));
     },
@@ -55865,7 +57747,7 @@ self.util = _cliPkgRequires.util;
       return _this._withChildren$3(child, start, new A.StylesheetParser__forRule_closure0(t1, _this, wasInControlDirective, variable, from, _this._expression$0()));
     },
     _forwardRule$1(start) {
-      var prefix, _0_0, t1, t2, hiddenVariables, hiddenMixinsAndFunctions, shownVariables, shownMixinsAndFunctions, _1_0, configuration, span, t3, t4, _this = this, _null = null,
+      var prefix, _0_0, shownMixinsAndFunctions, shownVariables, hiddenVariables, hiddenMixinsAndFunctions, _1_0, configuration, span, t1, t2, t3, t4, _this = this, _null = null,
         url = _this._urlString$0();
       _this.whitespace$0();
       if (_this.scanIdentifier$1("as")) {
@@ -55877,19 +57759,15 @@ self.util = _cliPkgRequires.util;
         prefix = _null;
       if (_this.scanIdentifier$1("show")) {
         _0_0 = _this._memberList$0();
-        t1 = _0_0._0;
-        t2 = _0_0._1;
+        shownMixinsAndFunctions = _0_0._0;
+        shownVariables = _0_0._1;
         hiddenVariables = _null;
         hiddenMixinsAndFunctions = hiddenVariables;
-        shownVariables = t2;
-        shownMixinsAndFunctions = t1;
       } else {
         if (_this.scanIdentifier$1("hide")) {
           _1_0 = _this._memberList$0();
-          t1 = _1_0._0;
-          t2 = _1_0._1;
-          hiddenVariables = t2;
-          hiddenMixinsAndFunctions = t1;
+          hiddenMixinsAndFunctions = _1_0._0;
+          hiddenVariables = _1_0._1;
         } else {
           hiddenVariables = _null;
           hiddenMixinsAndFunctions = hiddenVariables;
@@ -55898,6 +57776,7 @@ self.util = _cliPkgRequires.util;
         shownMixinsAndFunctions = shownVariables;
       }
       configuration = _this._stylesheet$_configuration$1$allowGuarded(true);
+      _this.whitespace$0();
       _this.expectStatementSeparator$1("@forward rule");
       span = _this.scanner.spanFrom$1(start);
       if (!_this._isUseAllowed)
@@ -55972,7 +57851,7 @@ self.util = _cliPkgRequires.util;
         argument = _this.importArgument$0();
         t3 = argument instanceof A.DynamicImport;
         if (t3)
-          A.WarnForDeprecation_warnForDeprecation(t2, B.Deprecation_B8J, string$.Sass__, argument.span, null);
+          A.WarnForDeprecation_warnForDeprecation(t2, B.Deprecation_import_null_true_import, string$.Sassx20_i, argument.span, null);
         if ((_this._inControlDirective || _this._stylesheet$_inMixin) && t3)
           _this._disallowedAtRule$1(start);
         imports.push(argument);
@@ -56043,7 +57922,7 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     tryImportModifiers$0() {
-      var t1, start, t2, t3, buffer, identifier, t4, $name, query, endPosition, t5, result, _this = this;
+      var t1, start, t2, t3, buffer, t4, identifier, $name, query, t5, endPosition, result, _this = this;
       if (!_this._lookingAtInterpolatedIdentifier$0() && _this.scanner.peekChar$0() !== 40)
         return null;
       t1 = _this.scanner;
@@ -56053,8 +57932,10 @@ self.util = _cliPkgRequires.util;
       buffer = new A.InterpolationBuffer(t2, t3);
       for (; true;)
         if (_this._lookingAtInterpolatedIdentifier$0()) {
-          if (!(t3.length === 0 && t2._contents.length === 0))
-            t2._contents += A.Primitives_stringFromCharCode(32);
+          if (!(t3.length === 0 && t2._contents.length === 0)) {
+            t4 = A.Primitives_stringFromCharCode(32);
+            t2._contents += t4;
+          }
           identifier = _this.interpolatedIdentifier$0();
           buffer.addInterpolation$1(identifier);
           t4 = identifier.get$asPlain();
@@ -56063,16 +57944,22 @@ self.util = _cliPkgRequires.util;
             if ($name === "supports") {
               query = _this._importSupportsQuery$0();
               t4 = !(query instanceof A.SupportsDeclaration);
-              if (t4)
-                t2._contents += A.Primitives_stringFromCharCode(40);
+              if (t4) {
+                t5 = A.Primitives_stringFromCharCode(40);
+                t2._contents += t5;
+              }
               buffer._flushText$0();
               t3.push(new A.SupportsExpression(query));
-              if (t4)
-                t2._contents += A.Primitives_stringFromCharCode(41);
+              if (t4) {
+                t4 = A.Primitives_stringFromCharCode(41);
+                t2._contents += t4;
+              }
             } else {
-              t2._contents += A.Primitives_stringFromCharCode(40);
+              t4 = A.Primitives_stringFromCharCode(40);
+              t2._contents += t4;
               buffer.addInterpolation$1(_this._interpolatedDeclarationValue$2$allowEmpty$allowSemicolon(true, true));
-              t2._contents += A.Primitives_stringFromCharCode(41);
+              t4 = A.Primitives_stringFromCharCode(41);
+              t2._contents += t4;
             }
             t1.expectChar$1(41);
             _this.whitespace$0();
@@ -56100,8 +57987,10 @@ self.util = _cliPkgRequires.util;
             }
           }
         } else if (t1.peekChar$0() === 40) {
-          if (!(t3.length === 0 && t2._contents.length === 0))
-            t2._contents += A.Primitives_stringFromCharCode(32);
+          if (!(t3.length === 0 && t2._contents.length === 0)) {
+            t4 = A.Primitives_stringFromCharCode(32);
+            t2._contents += t4;
+          }
           buffer.addInterpolation$1(_this._mediaQueryList$0());
           endPosition = t1._string_scanner$_position;
           t1 = t1._sourceFile;
@@ -56139,7 +58028,7 @@ self.util = _cliPkgRequires.util;
         }
     },
     _importSupportsQuery$0() {
-      var t1, t2, _0_0, $function, $name, _this = this;
+      var t1, t2, _0_0, $name, _this = this;
       if (_this.scanIdentifier$1("not")) {
         _this.whitespace$0();
         t1 = _this.scanner;
@@ -56151,15 +58040,8 @@ self.util = _cliPkgRequires.util;
           return _this._supportsCondition$0();
         else {
           _0_0 = _this._tryImportSupportsFunction$0();
-          if (_0_0 != null) {
-            $function = _0_0;
-            t2 = true;
-          } else {
-            $function = null;
-            t2 = false;
-          }
-          if (t2)
-            return $function;
+          if (_0_0 != null)
+            return _0_0;
           t2 = t1._string_scanner$_position;
           $name = _this._expression$0();
           t1.expectChar$1(58);
@@ -56183,17 +58065,15 @@ self.util = _cliPkgRequires.util;
       return new A.SupportsFunction($name, value, t1.spanFrom$1(start));
     },
     _includeRule$1(start) {
-      var name0, namespace, $arguments, t2, t3, contentArguments, contentArguments_, wasInContentBlock, $content, _this = this, _null = null,
+      var name0, namespace, $arguments, t2, t3, contentArguments, contentArguments_, wasInContentBlock, $content, span, _this = this, _null = null,
         $name = _this.identifier$0(),
         t1 = _this.scanner;
       if (t1.scanChar$1(46)) {
         name0 = _this._publicIdentifier$0();
         namespace = $name;
         $name = name0;
-      } else {
-        $name = A.stringReplaceAllUnchecked($name, "_", "-");
+      } else
         namespace = _null;
-      }
       _this.whitespace$0();
       if (t1.peekChar$0() === 40)
         $arguments = _this._argumentInvocation$1$mixin(true);
@@ -56227,18 +58107,22 @@ self.util = _cliPkgRequires.util;
       }
       t1 = t1.spanFrom$2(start, start);
       t2 = $content == null ? $arguments : $content;
-      return new A.IncludeRule(namespace, $name, $arguments, $content, t1.expand$1(0, t2.get$span(t2)));
+      span = t1.expand$1(0, t2.get$span(t2));
+      return new A.IncludeRule(namespace, A.stringReplaceAllUnchecked($name, "_", "-"), $name, $arguments, $content, span);
     },
     mediaRule$1(start) {
       return this._withChildren$3(this.get$_statement(), start, new A.StylesheetParser_mediaRule_closure(this._mediaQueryList$0()));
     },
     _mixinRule$1(start) {
-      var $name, t1, $arguments, t2, t3, _this = this,
+      var t1, t2, $name, $arguments, t3, _this = this,
         precedingComment = _this.lastSilentComment;
       _this.lastSilentComment = null;
-      $name = _this.identifier$1$normalize(true);
-      _this.whitespace$0();
       t1 = _this.scanner;
+      t2 = t1._string_scanner$_position;
+      $name = _this.identifier$0();
+      if (B.JSString_methods.startsWith$1($name, "--"))
+        A.WarnForDeprecation_warnForDeprecation(_this.logger, B.Deprecation_HJ0, string$.Sassx20_m, t1.spanFrom$1(new A._SpanScannerState(t1, t2)), null);
+      _this.whitespace$0();
       if (t1.peekChar$0() === 40)
         $arguments = _this._argumentDeclaration$0();
       else {
@@ -56255,7 +58139,7 @@ self.util = _cliPkgRequires.util;
       return _this._withChildren$3(_this.get$_statement(), start, new A.StylesheetParser__mixinRule_closure(_this, $name, $arguments, precedingComment));
     },
     mozDocumentRule$2(start, $name) {
-      var t5, t6, identifier, _0_0, contents, argument, trailing, endPosition, t7, t8, start0, end, _this = this, _box_0 = {},
+      var t5, t6, identifier, _0_0, argument, trailing, endPosition, t7, t8, start0, end, _this = this, _box_0 = {},
         t1 = _this.scanner,
         t2 = t1._string_scanner$_position,
         t3 = new A.StringBuffer(""),
@@ -56274,24 +58158,19 @@ self.util = _cliPkgRequires.util;
           $label0$0: {
             if ("url" === identifier || "url-prefix" === identifier || "domain" === identifier) {
               _0_0 = _this._tryUrlContents$2$name(new A._SpanScannerState(t1, t6), identifier);
-              if (_0_0 != null) {
-                contents = _0_0;
-                t6 = true;
-              } else {
-                contents = null;
-                t6 = false;
-              }
-              if (t6)
-                buffer.addInterpolation$1(contents);
+              if (_0_0 != null)
+                buffer.addInterpolation$1(_0_0);
               else {
                 t1.expectChar$1(40);
                 _this.whitespace$0();
                 argument = _this.interpolatedString$0();
                 t1.expectChar$1(41);
                 t3._contents += identifier;
-                t3._contents += A.Primitives_stringFromCharCode(40);
+                t6 = A.Primitives_stringFromCharCode(40);
+                t3._contents += t6;
                 buffer.addInterpolation$1(argument.asInterpolation$0());
-                t3._contents += A.Primitives_stringFromCharCode(41);
+                t6 = A.Primitives_stringFromCharCode(41);
+                t3._contents += t6;
               }
               t6 = t3._contents;
               trailing = t6.charCodeAt(0) == 0 ? t6 : t6;
@@ -56304,7 +58183,8 @@ self.util = _cliPkgRequires.util;
               t1.expectChar$1(40);
               buffer.addInterpolation$1(_this.interpolatedString$0().asInterpolation$0());
               t1.expectChar$1(41);
-              t3._contents += A.Primitives_stringFromCharCode(41);
+              t6 = A.Primitives_stringFromCharCode(41);
+              t3._contents += t6;
               _box_0.needsDeprecationWarning = true;
               break $label0$0;
             }
@@ -56318,7 +58198,8 @@ self.util = _cliPkgRequires.util;
         _this.whitespace$0();
         if (!t1.scanChar$1(44))
           break;
-        t3._contents += A.Primitives_stringFromCharCode(44);
+        t6 = A.Primitives_stringFromCharCode(44);
+        t3._contents += t6;
         start0 = t1._string_scanner$_position;
         t5.call$0();
         end = t1._string_scanner$_position;
@@ -56334,17 +58215,16 @@ self.util = _cliPkgRequires.util;
     },
     _useRule$1(start) {
       var namespace, configuration, span, t1, _this = this,
-        _s9_ = "@use rule",
         url = _this._urlString$0();
       _this.whitespace$0();
       namespace = _this._useNamespace$2(url, start);
       _this.whitespace$0();
       configuration = _this._stylesheet$_configuration$0();
-      _this.expectStatementSeparator$1(_s9_);
+      _this.whitespace$0();
       span = _this.scanner.spanFrom$1(start);
       if (!_this._isUseAllowed)
         _this.error$2(0, string$.x40use_r, span);
-      _this.expectStatementSeparator$1(_s9_);
+      _this.expectStatementSeparator$1("@use rule");
       t1 = new A.UseRule(url, namespace, configuration == null ? B.List_empty10 : A.List_List$unmodifiable(configuration, type$.ConfiguredVariable), span);
       t1.UseRule$4$configuration(url, namespace, span, configuration);
       return t1;
@@ -56389,19 +58269,18 @@ self.util = _cliPkgRequires.util;
         _this.whitespace$0();
         expression = _this.expressionUntilComma$0();
         t3 = t1._string_scanner$_position;
-        if (allowGuarded && t1.scanChar$1(33))
-          if (_this.identifier$0() === "default") {
+        if (allowGuarded && t1.scanChar$1(33)) {
+          guarded = _this.identifier$0() === "default";
+          if (guarded)
             _this.whitespace$0();
-            guarded = true;
-          } else {
+          else {
             endPosition = t1._string_scanner$_position;
             t4 = t1._sourceFile;
             t5 = new A._FileSpan(t4, t3, endPosition);
             t5._FileSpan$3(t4, t3, endPosition);
             _this.error$2(0, "Invalid flag name.", t5);
-            guarded = false;
           }
-        else
+        } else
           guarded = false;
         endPosition = t1._string_scanner$_position;
         t3 = t1._sourceFile;
@@ -56440,7 +58319,7 @@ self.util = _cliPkgRequires.util;
       _this._stylesheet$_inUnknownAtRule = true;
       t1.value = null;
       t2 = _this.scanner;
-      t3 = t2.peekChar$0() !== 33 && !_this.atEndOfStatement$0() ? t1.value = _this.almostAnyValue$0() : null;
+      t3 = t2.peekChar$0() !== 33 && !_this.atEndOfStatement$0() ? t1.value = _this._interpolatedDeclarationValue$1$allowOpenBrace(false) : null;
       if (_this.lookingAtChildren$0())
         rule = _this._withChildren$3(_this.get$_statement(), start, new A.StylesheetParser_unknownAtRule_closure(t1, $name));
       else {
@@ -56451,7 +58330,7 @@ self.util = _cliPkgRequires.util;
       return rule;
     },
     _disallowedAtRule$1(start) {
-      this.almostAnyValue$0();
+      this._interpolatedDeclarationValue$2$allowEmpty$allowOpenBrace(true, false);
       this.error$2(0, "This at-rule is not allowed here.", this.scanner.spanFrom$1(start));
     },
     _argumentDeclaration$0() {
@@ -56576,7 +58455,7 @@ self.util = _cliPkgRequires.util;
       return this._argumentInvocation$2$allowEmptySecondArg$mixin(false, mixin);
     },
     _expression$3$bracketList$singleEquals$until(bracketList, singleEquals, until) {
-      var t2, beforeBracket, start, wasInParentheses, resetState, resolveOneOperation, resolveOperations, addSingleExpression, addOperator, resolveSpaceExpressions, t3, _3_0, _3_28, _3_32, _3_40, _1_0, t4, _2_0, commaExpressions, spaceExpressions, singleExpression, _this = this,
+      var t2, beforeBracket, start, wasInExpression, wasInParentheses, resetState, resolveOneOperation, resolveOperations, addSingleExpression, addOperator, resolveSpaceExpressions, t3, _3_0, _1_0, t4, _3_28, _2_0, _3_32, _3_40, commaExpressions, spaceExpressions, singleExpression, _this = this,
         _s20_ = "Expected expression.",
         _box_0 = {},
         t1 = until != null;
@@ -56596,7 +58475,9 @@ self.util = _cliPkgRequires.util;
         beforeBracket = null;
       t2 = _this.scanner;
       start = new A._SpanScannerState(t2, t2._string_scanner$_position);
+      wasInExpression = _this._inExpression;
       wasInParentheses = _this._inParentheses;
+      _this._inExpression = true;
       _box_0.operands_ = _box_0.operators_ = _box_0.spaceExpressions_ = _box_0.commaExpressions_ = null;
       _box_0.allowSlash = true;
       _box_0.singleExpression_ = _this._singleExpression$0();
@@ -56611,9 +58492,6 @@ self.util = _cliPkgRequires.util;
         if (t1 && until.call$0())
           break;
         _3_0 = t2.peekChar$0();
-        _3_28 = A._InitializedCell$(new A.StylesheetParser__expression_closure(_3_0));
-        _3_32 = A._InitializedCell$(new A.StylesheetParser__expression_closure0(_3_0));
-        _3_40 = A._InitializedCell$(new A.StylesheetParser__expression_closure1(_3_0));
         if (_3_0 == null)
           break;
         if (40 === _3_0) {
@@ -56643,10 +58521,10 @@ self.util = _cliPkgRequires.util;
         if (61 === _3_0) {
           t2.readChar$0();
           if (singleEquals && t2.peekChar$0() !== 61)
-            addOperator.call$1(B.BinaryOperator_2jN);
+            addOperator.call$1(B.BinaryOperator_wdM);
           else {
             t2.expectChar$1(61);
-            addOperator.call$1(B.BinaryOperator_ql5);
+            addOperator.call$1(B.BinaryOperator_g8k);
           }
           continue;
         }
@@ -56656,7 +58534,7 @@ self.util = _cliPkgRequires.util;
             if (61 === _1_0) {
               t2.readChar$0();
               t2.readChar$0();
-              addOperator.call$1(B.BinaryOperator_ViB);
+              addOperator.call$1(B.BinaryOperator_icU);
               break $label0$1;
             }
             if (_1_0 != null)
@@ -56679,26 +58557,27 @@ self.util = _cliPkgRequires.util;
         }
         if (60 === _3_0) {
           t2.readChar$0();
-          addOperator.call$1(t2.scanChar$1(61) ? B.BinaryOperator_kpg : B.BinaryOperator_U8c);
+          addOperator.call$1(t2.scanChar$1(61) ? B.BinaryOperator_SPQ : B.BinaryOperator_miq);
           continue;
         }
         if (62 === _3_0) {
           t2.readChar$0();
-          addOperator.call$1(t2.scanChar$1(61) ? B.BinaryOperator_7Tg : B.BinaryOperator_cIH);
+          addOperator.call$1(t2.scanChar$1(61) ? B.BinaryOperator_oEm : B.BinaryOperator_bEa);
           continue;
         }
         if (42 === _3_0) {
           t2.readChar$0();
-          addOperator.call$1(B.BinaryOperator_qN2);
+          addOperator.call$1(B.BinaryOperator_2No);
           continue;
         }
-        if (_3_28._readFinal$0() && _box_0.singleExpression_ == null) {
+        _3_28 = 43 === _3_0;
+        if (_3_28 && _box_0.singleExpression_ == null) {
           addSingleExpression.call$1(_this._unaryOperation$0());
           continue;
         }
-        if (_3_28._readFinal$0()) {
+        if (_3_28) {
           t2.readChar$0();
-          addOperator.call$1(B.BinaryOperator_anB);
+          addOperator.call$1(B.BinaryOperator_u15);
           continue;
         }
         if (45 === _3_0) {
@@ -56719,40 +58598,42 @@ self.util = _cliPkgRequires.util;
             addSingleExpression.call$1(_this._unaryOperation$0());
           else {
             t2.readChar$0();
-            addOperator.call$1(B.BinaryOperator_olz);
+            addOperator.call$1(B.BinaryOperator_SjO);
           }
           continue;
         }
-        if (_3_32._readFinal$0() && _box_0.singleExpression_ == null) {
+        _3_32 = 47 === _3_0;
+        if (_3_32 && _box_0.singleExpression_ == null) {
           addSingleExpression.call$1(_this._unaryOperation$0());
           continue;
         }
-        if (_3_32._readFinal$0()) {
+        if (_3_32) {
           t2.readChar$0();
-          addOperator.call$1(B.BinaryOperator_t8B);
+          addOperator.call$1(B.BinaryOperator_U77);
           continue;
         }
         if (37 === _3_0) {
           t2.readChar$0();
-          addOperator.call$1(B.BinaryOperator_OTG);
+          addOperator.call$1(B.BinaryOperator_KNx);
           continue;
         }
         if (_3_0 >= 48 && _3_0 <= 57) {
           addSingleExpression.call$1(_this._number$0());
           continue;
         }
-        if (_3_40._readFinal$0() && t2.peekChar$1(1) === 46)
+        _3_40 = 46 === _3_0;
+        if (_3_40 && t2.peekChar$1(1) === 46)
           break;
-        if (_3_40._readFinal$0()) {
+        if (_3_40) {
           addSingleExpression.call$1(_this._number$0());
           continue;
         }
         if (97 === _3_0 && !_this.get$plainCss() && _this.scanIdentifier$1("and")) {
-          addOperator.call$1(B.BinaryOperator_SNp);
+          addOperator.call$1(B.BinaryOperator_eDt);
           continue;
         }
         if (111 === _3_0 && !_this.get$plainCss() && _this.scanIdentifier$1("or")) {
-          addOperator.call$1(B.BinaryOperator_M6L);
+          addOperator.call$1(B.BinaryOperator_qNM);
           continue;
         }
         if ((117 === _3_0 || 85 === _3_0) && t2.peekChar$1(1) === 43) {
@@ -56801,16 +58682,18 @@ self.util = _cliPkgRequires.util;
         singleExpression = _box_0.singleExpression_;
         if (singleExpression != null)
           commaExpressions.push(singleExpression);
+        _this._inExpression = wasInExpression;
         t1 = t2.spanFrom$1(beforeBracket == null ? start : beforeBracket);
-        return new A.ListExpression(A.List_List$unmodifiable(commaExpressions, type$.Expression), B.ListSeparator_rXA, bracketList, t1);
+        return new A.ListExpression(A.List_List$unmodifiable(commaExpressions, type$.Expression), B.ListSeparator_ECn, bracketList, t1);
       } else if (bracketList && spaceExpressions != null) {
         resolveOperations.call$0();
+        _this._inExpression = wasInExpression;
         t1 = _box_0.singleExpression_;
         t1.toString;
         spaceExpressions.push(t1);
         beforeBracket.toString;
         t2 = t2.spanFrom$1(beforeBracket);
-        return new A.ListExpression(A.List_List$unmodifiable(spaceExpressions, type$.Expression), B.ListSeparator_EVt, true, t2);
+        return new A.ListExpression(A.List_List$unmodifiable(spaceExpressions, type$.Expression), B.ListSeparator_nbm, true, t2);
       } else {
         resolveSpaceExpressions.call$0();
         if (bracketList) {
@@ -56821,6 +58704,7 @@ self.util = _cliPkgRequires.util;
           t2 = t2.spanFrom$1(beforeBracket);
           _box_0.singleExpression_ = new A.ListExpression(A.List_List$unmodifiable(t3, type$.Expression), B.ListSeparator_undecided_null_undecided, true, t2);
         }
+        _this._inExpression = wasInExpression;
         t1 = _box_0.singleExpression_;
         t1.toString;
         return t1;
@@ -56968,7 +58852,7 @@ self.util = _cliPkgRequires.util;
         t1.expectChar$1(41);
         t1 = t1.spanFrom$1(start);
         t2 = A.List_List$unmodifiable(expressions, type$.Expression);
-        return new A.ListExpression(t2, B.ListSeparator_rXA, false, t1);
+        return new A.ListExpression(t2, B.ListSeparator_ECn, false, t1);
       } finally {
         _this._inParentheses = wasInParentheses;
       }
@@ -56990,7 +58874,7 @@ self.util = _cliPkgRequires.util;
       return new A.MapExpression(A.List_List$unmodifiable(pairs, type$.Record_2_Expression_and_Expression), t1);
     },
     _hashExpression$0() {
-      var start, t2, identifier, buffer, _this = this,
+      var start, t2, identifier, buffer, t3, _this = this,
         t1 = _this.scanner;
       if (t1.peekChar$1(1) === 123)
         return _this.identifierLike$0();
@@ -57011,7 +58895,8 @@ self.util = _cliPkgRequires.util;
       }
       t2 = new A.StringBuffer("");
       buffer = new A.InterpolationBuffer(t2, A._setArrayType([], type$.JSArray_Object));
-      t2._contents += A.Primitives_stringFromCharCode(35);
+      t3 = A.Primitives_stringFromCharCode(35);
+      t2._contents += t3;
       buffer.addInterpolation$1(identifier);
       return new A.StringExpression(buffer.interpolation$1(t1.spanFrom$1(start)), false);
     },
@@ -57051,16 +58936,25 @@ self.util = _cliPkgRequires.util;
       return A.SassColor$rgbInternal(red, green, blue, t3, t2 ? new A.SpanColorFormat(t1.spanFrom$1(start)) : null);
     },
     _isHexColor$1(interpolation) {
-      var t1,
-        plain = interpolation.get$asPlain(),
-        _0_2 = A._InitializedCell$(new A.StylesheetParser__isHexColor_closure(plain));
-      if (typeof plain == "string")
-        t1 = 3 === _0_2._readFinal$0() || 4 === _0_2._readFinal$0() || 6 === _0_2._readFinal$0() || 8 === _0_2._readFinal$0();
-      else
+      var _0_2, t1,
+        plain = interpolation.get$asPlain();
+      if (typeof plain == "string") {
+        _0_2 = plain.length;
+        if (3 !== _0_2)
+          if (4 !== _0_2)
+            if (6 !== _0_2)
+              t1 = 8 === _0_2;
+            else
+              t1 = true;
+          else
+            t1 = true;
+        else
+          t1 = true;
+      } else
         t1 = false;
       if (t1) {
         t1 = new A.CodeUnits(plain);
-        return t1.every$1(t1, new A.StylesheetParser__isHexColor_closure0());
+        return t1.every$1(t1, new A.StylesheetParser__isHexColor_closure());
       } else
         return false;
     },
@@ -57095,7 +58989,7 @@ self.util = _cliPkgRequires.util;
         operator = _this._unaryOperatorFor$1(t1.readChar$0());
       if (operator == null)
         t1.error$2$position(0, "Expected unary operator.", t1._string_scanner$_position - 1);
-      else if (_this.get$plainCss() && operator !== B.UnaryOperator_Ix1)
+      else if (_this.get$plainCss() && operator !== B.UnaryOperator_SJr)
         t1.error$3$length$position(0, "Operators aren't allowed in plain CSS.", 1, t1._string_scanner$_position - 1);
       _this.whitespace$0();
       return new A.UnaryOperationExpression(operator, _this._singleExpression$0(), t1.spanFrom$1(new A._SpanScannerState(t1, t2)));
@@ -57104,15 +58998,15 @@ self.util = _cliPkgRequires.util;
       var t1;
       $label0$0: {
         if (43 === character) {
-          t1 = B.UnaryOperator_gg4;
+          t1 = B.UnaryOperator_cLp;
           break $label0$0;
         }
         if (45 === character) {
-          t1 = B.UnaryOperator_TLI;
+          t1 = B.UnaryOperator_AiQ;
           break $label0$0;
         }
         if (47 === character) {
-          t1 = B.UnaryOperator_Ix1;
+          t1 = B.UnaryOperator_SJr;
           break $label0$0;
         }
         t1 = null;
@@ -57239,7 +59133,7 @@ self.util = _cliPkgRequires.util;
         start = new A._SpanScannerState(t1, t1._string_scanner$_position),
         $name = _this.variableName$0();
       if (_this.get$plainCss())
-        _this.error$2(0, string$.Sass_v, t1.spanFrom$1(start));
+        _this.error$2(0, string$.Sassx20v, t1.spanFrom$1(start));
       return new A.VariableExpression(null, $name, t1.spanFrom$1(start));
     },
     _selector$0() {
@@ -57280,8 +59174,10 @@ self.util = _cliPkgRequires.util;
             t1.readChar$0();
             if (second === 13)
               t1.scanChar$1(10);
-          } else
-            t3._contents += A.Primitives_stringFromCharCode(A.consumeEscapedCharacter(t1));
+          } else {
+            t5 = A.Primitives_stringFromCharCode(A.consumeEscapedCharacter(t1));
+            t3._contents += t5;
+          }
           continue;
         }
         if (35 === _0_0 && t1.peekChar$1(1) === 123) {
@@ -57290,12 +59186,13 @@ self.util = _cliPkgRequires.util;
           t4.push(t5);
           continue;
         }
-        t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+        t5 = A.Primitives_stringFromCharCode(t1.readChar$0());
+        t3._contents += t5;
       }
       return new A.StringExpression(buffer.interpolation$1(t1.spanFrom$1(new A._SpanScannerState(t1, t2))), true);
     },
     identifierLike$0() {
-      var invocation, expression, _0_0, color, t3, _1_0, specialFunction, _2_0, _2_2, _2_4, _this = this,
+      var invocation, expression, _0_0, _1_0, _2_0, _2_2, _2_4, _this = this,
         t1 = _this.scanner,
         start = new A._SpanScannerState(t1, t1._string_scanner$_position),
         identifier = _this.interpolatedIdentifier$0(),
@@ -57311,7 +59208,7 @@ self.util = _cliPkgRequires.util;
           expression = _this._singleExpression$0();
           return new A.UnaryOperationExpression(B.UnaryOperator_not_not_not, expression, identifier.span.expand$1(0, expression.get$span(expression)));
         }
-        lower._value = plain.toLowerCase();
+        lower.__late_helper$_value = plain.toLowerCase();
         if (t1.peekChar$0() !== 40) {
           switch (plain) {
             case "false":
@@ -57323,54 +59220,46 @@ self.util = _cliPkgRequires.util;
           }
           _0_0 = $.$get$colorsByName().$index(0, lower._readLocal$0());
           if (_0_0 != null) {
-            color = _0_0;
-            t3 = true;
-          } else {
-            color = null;
-            t3 = false;
-          }
-          if (t3) {
             t1 = identifier.span;
-            return new A.ColorExpression(A.SassColor$rgbInternal(color.get$red(color), color.get$green(color), color.get$blue(color), color._alpha, new A.SpanColorFormat(t1)), t1);
+            return new A.ColorExpression(A.SassColor$rgbInternal(_0_0.get$red(0), _0_0.get$green(0), _0_0.get$blue(0), _0_0._alpha, new A.SpanColorFormat(t1)), t1);
           }
         }
         _1_0 = _this.trySpecialFunction$2(lower._readLocal$0(), start);
-        if (_1_0 != null) {
-          specialFunction = _1_0;
-          t3 = true;
-        } else {
-          specialFunction = null;
-          t3 = false;
-        }
-        if (t3)
-          return specialFunction;
+        if (_1_0 != null)
+          return _1_0;
       }
       _2_0 = t1.peekChar$0();
-      _2_2 = A._InitializedCell$(new A.StylesheetParser_identifierLike_closure(_2_0));
-      _2_4 = A._InitializedCell$(new A.StylesheetParser_identifierLike_closure0(_2_0));
-      if (_2_2._readFinal$0() && t1.peekChar$1(1) === 46)
+      _2_2 = 46 === _2_0;
+      if (_2_2 && t1.peekChar$1(1) === 46)
         return new A.StringExpression(identifier, false);
-      if (_2_2._readFinal$0()) {
+      if (_2_2) {
         t1.readChar$0();
         if (t2)
           return _this.namespacedExpression$2(plain, start);
         _this.error$2(0, string$.Interpn, identifier.span);
       }
-      if (_2_4._readFinal$0() && t2)
-        return new A.FunctionExpression(null, plain, _this._argumentInvocation$1$allowEmptySecondArg(J.$eq$(lower._readLocal$0(), "var")), t1.spanFrom$1(start));
-      if (_2_4._readFinal$0())
+      _2_4 = 40 === _2_0;
+      if (_2_4 && t2) {
+        t2 = _this._argumentInvocation$1$allowEmptySecondArg(J.$eq$(lower._readLocal$0(), "var"));
+        t1 = t1.spanFrom$1(start);
+        return new A.FunctionExpression(null, A.stringReplaceAllUnchecked(plain, "_", "-"), plain, t2, t1);
+      }
+      if (_2_4)
         return new A.InterpolatedFunctionExpression(identifier, _this._argumentInvocation$0(), t1.spanFrom$1(start));
       return new A.StringExpression(identifier, false);
     },
     namespacedExpression$2(namespace, start) {
-      var $name, _this = this,
+      var $name, t2, t3, _this = this,
         t1 = _this.scanner;
       if (t1.peekChar$0() === 36) {
         $name = _this.variableName$0();
         _this._assertPublic$2($name, new A.StylesheetParser_namespacedExpression_closure(_this, start));
         return new A.VariableExpression(namespace, $name, t1.spanFrom$1(start));
       }
-      return new A.FunctionExpression(namespace, _this._publicIdentifier$0(), _this._argumentInvocation$0(), t1.spanFrom$1(start));
+      t2 = _this._publicIdentifier$0();
+      t3 = _this._argumentInvocation$0();
+      t1 = t1.spanFrom$1(start);
+      return new A.FunctionExpression(namespace, A.stringReplaceAllUnchecked(t2, "_", "-"), t2, t3, t1);
     },
     trySpecialFunction$2($name, start) {
       var t1, buffer, t2, next, t3, _this = this,
@@ -57384,14 +59273,16 @@ self.util = _cliPkgRequires.util;
           t1 = new A.StringBuffer("");
           buffer = new A.InterpolationBuffer(t1, A._setArrayType([], type$.JSArray_Object));
           t1._contents = "" + $name;
-          t1._contents += A.Primitives_stringFromCharCode(40);
+          t2 = A.Primitives_stringFromCharCode(40);
+          t1._contents += t2;
           break $label0$0;
         }
         if ("progid" === normalized && _this.scanner.scanChar$1(58)) {
           t1 = new A.StringBuffer("");
           buffer = new A.InterpolationBuffer(t1, A._setArrayType([], type$.JSArray_Object));
           t1._contents = "" + $name;
-          t1._contents += A.Primitives_stringFromCharCode(58);
+          t2 = A.Primitives_stringFromCharCode(58);
+          t1._contents += t2;
           t2 = _this.scanner;
           next = t2.peekChar$0();
           while (true) {
@@ -57405,11 +59296,13 @@ self.util = _cliPkgRequires.util;
               t3 = false;
             if (!t3)
               break;
-            t1._contents += A.Primitives_stringFromCharCode(t2.readChar$0());
+            t3 = A.Primitives_stringFromCharCode(t2.readChar$0());
+            t1._contents += t3;
             next = t2.peekChar$0();
           }
           t2.expectChar$1(40);
-          t1._contents += A.Primitives_stringFromCharCode(40);
+          t2 = A.Primitives_stringFromCharCode(40);
+          t1._contents += t2;
           break $label0$0;
         }
         if ("url" === normalized)
@@ -57419,11 +59312,13 @@ self.util = _cliPkgRequires.util;
       buffer.addInterpolation$1(_this._interpolatedDeclarationValue$1$allowEmpty(true));
       t1 = _this.scanner;
       t1.expectChar$1(41);
-      buffer._interpolation_buffer$_text._contents += A.Primitives_stringFromCharCode(41);
+      t2 = buffer._interpolation_buffer$_text;
+      t3 = A.Primitives_stringFromCharCode(41);
+      t2._contents += t3;
       return new A.StringExpression(buffer.interpolation$1(t1.spanFrom$1(start)), false);
     },
     _tryUrlContents$2$name(start, $name) {
-      var t3, t4, buffer, _0_0, _0_6, t5, endPosition, result, _this = this,
+      var t3, t4, buffer, t5, _0_0, _0_6, endPosition, result, _this = this,
         t1 = _this.scanner,
         t2 = t1._string_scanner$_position;
       if (!t1.scanChar$1(40))
@@ -57433,17 +59328,19 @@ self.util = _cliPkgRequires.util;
       t4 = A._setArrayType([], type$.JSArray_Object);
       buffer = new A.InterpolationBuffer(t3, t4);
       t3._contents = "" + ($name == null ? "url" : $name);
-      t3._contents += A.Primitives_stringFromCharCode(40);
+      t5 = A.Primitives_stringFromCharCode(40);
+      t3._contents += t5;
       for (; true;) {
         _0_0 = t1.peekChar$0();
-        _0_6 = A._InitializedCell$(new A.StylesheetParser__tryUrlContents_closure(_0_0));
         if (_0_0 == null)
           break;
         if (92 === _0_0) {
-          t3._contents += _this.escape$0();
+          t5 = _this.escape$0();
+          t3._contents += t5;
           continue;
         }
-        if (_0_6._readFinal$0() && t1.peekChar$1(1) === 123) {
+        _0_6 = 35 === _0_0;
+        if (_0_6 && t1.peekChar$1(1) === 123) {
           t5 = _this.singleInterpolation$0();
           buffer._flushText$0();
           t4.push(t5);
@@ -57452,7 +59349,7 @@ self.util = _cliPkgRequires.util;
         if (33 !== _0_0)
           if (37 !== _0_0)
             if (38 !== _0_0)
-              if (!_0_6._readFinal$0())
+              if (!_0_6)
                 t5 = _0_0 >= 42 && _0_0 <= 126 || _0_0 >= 128;
               else
                 t5 = true;
@@ -57463,7 +59360,8 @@ self.util = _cliPkgRequires.util;
         else
           t5 = true;
         if (t5) {
-          t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t5 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          t3._contents += t5;
           continue;
         }
         if (_0_0 === 32 || _0_0 === 9 || _0_0 === 10 || _0_0 === 13 || _0_0 === 12) {
@@ -57473,7 +59371,8 @@ self.util = _cliPkgRequires.util;
           continue;
         }
         if (41 === _0_0) {
-          t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t2 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          t3._contents += t2;
           endPosition = t1._string_scanner$_position;
           t2 = t1._sourceFile;
           t5 = start.position;
@@ -57500,233 +59399,302 @@ self.util = _cliPkgRequires.util;
       return this._tryUrlContents$2$name(start, null);
     },
     dynamicUrl$0() {
-      var _0_0, contents, t2, _this = this,
+      var _0_0, _this = this,
         t1 = _this.scanner,
         start = new A._SpanScannerState(t1, t1._string_scanner$_position);
       _this.expectIdentifier$1("url");
       _0_0 = _this._tryUrlContents$1(start);
-      if (_0_0 != null) {
-        contents = _0_0;
-        t2 = true;
-      } else {
-        contents = null;
-        t2 = false;
-      }
-      if (t2)
-        return new A.StringExpression(contents, false);
+      if (_0_0 != null)
+        return new A.StringExpression(_0_0, false);
       return new A.InterpolatedFunctionExpression(A.Interpolation$(A._setArrayType(["url"], type$.JSArray_Object), t1.spanFrom$1(start)), _this._argumentInvocation$0(), t1.spanFrom$1(start));
     },
     almostAnyValue$1$omitComments(omitComments) {
-      var t4, t5, t6, _1_0, commentStart, end, t7, _0_0, contents, t8, _this = this,
+      var t4, t5, t6, _2_0, t7, _0_0, _0_2, start, end, _0_4, identifier, _1_0, _this = this,
         t1 = _this.scanner,
         t2 = t1._string_scanner$_position,
         t3 = new A.StringBuffer(""),
         buffer = new A.InterpolationBuffer(t3, A._setArrayType([], type$.JSArray_Object));
       for (t4 = t1.string, t5 = t4.length, t6 = !omitComments; true;)
         $label0$0: {
-          _1_0 = t1.peekChar$0();
-          if (92 === _1_0) {
-            t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
-            t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          _2_0 = t1.peekChar$0();
+          if (92 === _2_0) {
+            t7 = A.Primitives_stringFromCharCode(t1.readChar$0());
+            t3._contents += t7;
+            t7 = A.Primitives_stringFromCharCode(t1.readChar$0());
+            t3._contents += t7;
             break $label0$0;
           }
-          if (34 === _1_0 || 39 === _1_0) {
+          if (34 === _2_0 || 39 === _2_0) {
             buffer.addInterpolation$1(_this.interpolatedString$0().asInterpolation$0());
             break $label0$0;
           }
-          if (47 === _1_0) {
-            commentStart = t1._string_scanner$_position;
-            if (_this.scanComment$0()) {
-              if (t6) {
+          if (47 === _2_0) {
+            $label1$1: {
+              _0_0 = t1.peekChar$1(1);
+              _0_2 = 42 === _0_0;
+              if (_0_2 && t6) {
+                t7 = _this.get$loudComment();
+                start = t1._string_scanner$_position;
+                t7.call$0();
                 end = t1._string_scanner$_position;
-                t3._contents += B.JSString_methods.substring$2(t4, commentStart, end);
+                t3._contents += B.JSString_methods.substring$2(t4, start, end);
+                break $label1$1;
               }
-            } else
-              t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+              if (_0_2) {
+                _this.loudComment$0();
+                break $label1$1;
+              }
+              _0_4 = 47 === _0_0;
+              if (_0_4 && t6) {
+                t7 = _this.get$silentComment();
+                start = t1._string_scanner$_position;
+                t7.call$0();
+                end = t1._string_scanner$_position;
+                t3._contents += B.JSString_methods.substring$2(t4, start, end);
+                break $label1$1;
+              }
+              if (_0_4) {
+                _this.silentComment$0();
+                break $label1$1;
+              }
+              t7 = A.Primitives_stringFromCharCode(t1.readChar$0());
+              t3._contents += t7;
+            }
             break $label0$0;
           }
-          if (35 === _1_0 && t1.peekChar$1(1) === 123) {
+          if (35 === _2_0 && t1.peekChar$1(1) === 123) {
             buffer.addInterpolation$1(_this.interpolatedIdentifier$0());
             break $label0$0;
           }
-          if (13 === _1_0 || 10 === _1_0 || 12 === _1_0) {
+          if (13 === _2_0 || 10 === _2_0 || 12 === _2_0) {
             if (_this.get$indented())
               break;
-            t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+            t7 = A.Primitives_stringFromCharCode(t1.readChar$0());
+            t3._contents += t7;
             break $label0$0;
           }
-          if (33 === _1_0 || 59 === _1_0 || 123 === _1_0 || 125 === _1_0)
+          if (33 === _2_0 || 59 === _2_0 || 123 === _2_0 || 125 === _2_0)
             break;
-          if (117 === _1_0 || 85 === _1_0) {
+          if (117 === _2_0 || 85 === _2_0) {
             t7 = t1._string_scanner$_position;
-            if (!_this.scanIdentifier$1("url")) {
-              t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+            identifier = _this.identifier$0();
+            if (identifier !== "url" && identifier !== "url-prefix") {
+              t3._contents += identifier;
               continue;
             }
-            _0_0 = _this._tryUrlContents$1(new A._SpanScannerState(t1, t7));
-            if (_0_0 != null) {
-              contents = _0_0;
-              t8 = true;
-            } else {
-              contents = null;
-              t8 = false;
-            }
-            if (t8)
-              buffer.addInterpolation$1(contents);
+            _1_0 = _this._tryUrlContents$2$name(new A._SpanScannerState(t1, t7), identifier);
+            if (_1_0 != null)
+              buffer.addInterpolation$1(_1_0);
             else {
               if ((t7 === 0 ? 1 / t7 < 0 : t7 < 0) || t7 > t5)
                 A.throwExpression(A.ArgumentError$("Invalid position " + t7, null));
               t1._string_scanner$_position = t7;
               t1._lastMatch = null;
-              t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+              t7 = A.Primitives_stringFromCharCode(t1.readChar$0());
+              t3._contents += t7;
             }
             break $label0$0;
           }
-          if (_1_0 == null)
+          if (_2_0 == null)
             break;
           t7 = _this.lookingAtIdentifier$0();
           if (t7) {
-            t3._contents += _this.identifier$0();
+            t7 = _this.identifier$0();
+            t3._contents += t7;
             break $label0$0;
           }
-          t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t7 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          t3._contents += t7;
         }
       return buffer.interpolation$1(t1.spanFrom$1(new A._SpanScannerState(t1, t2)));
     },
     almostAnyValue$0() {
       return this.almostAnyValue$1$omitComments(false);
     },
-    _interpolatedDeclarationValue$3$allowColon$allowEmpty$allowSemicolon(allowColon, allowEmpty, allowSemicolon) {
-      var t4, t5, t6, t7, wroteNewline, _1_0, _1_12, _1_14, _1_16, _1_18, _1_20, t8, start, end, bracket, _0_0, contents, t9, _this = this,
+    _interpolatedDeclarationValue$5$allowColon$allowEmpty$allowOpenBrace$allowSemicolon$silentComments(allowColon, allowEmpty, allowOpenBrace, allowSemicolon, silentComments) {
+      var t4, t5, t6, t7, t8, wroteNewline, _2_0, t9, _0_0, start, end, _2_14_isSet, _2_14, _2_18_isSet, _2_18, _2_20_isSet, _2_20, _2_22, bracket, identifier, _1_0, _this = this, _null = null,
         t1 = _this.scanner,
         t2 = t1._string_scanner$_position,
         t3 = new A.StringBuffer(""),
         buffer = new A.InterpolationBuffer(t3, A._setArrayType([], type$.JSArray_Object)),
         brackets = A._setArrayType([], type$.JSArray_int);
-      for (t4 = t1.string, t5 = t4.length, t6 = !allowColon, t7 = !allowSemicolon, wroteNewline = false; true;)
+      for (t4 = !allowOpenBrace, t5 = t1.string, t6 = t5.length, t7 = !allowColon, t8 = !allowSemicolon, wroteNewline = false; true;)
         $label0$0: {
-          _1_0 = t1.peekChar$0();
-          _1_12 = A._InitializedCell$(new A.StylesheetParser__interpolatedDeclarationValue_closure(_1_0));
-          _1_14 = A._InitializedCell$(new A.StylesheetParser__interpolatedDeclarationValue_closure0(_1_0));
-          _1_16 = A._InitializedCell$(new A.StylesheetParser__interpolatedDeclarationValue_closure1(_1_0));
-          _1_18 = A._InitializedCell$(new A.StylesheetParser__interpolatedDeclarationValue_closure2(_1_0));
-          _1_20 = A._InitializedCell$(new A.StylesheetParser__interpolatedDeclarationValue_closure3(_1_0));
-          if (92 === _1_0) {
-            t3._contents += _this.escape$1$identifierStart(true);
+          _2_0 = t1.peekChar$0();
+          if (92 === _2_0) {
+            t9 = _this.escape$1$identifierStart(true);
+            t3._contents += t9;
             wroteNewline = false;
             break $label0$0;
           }
-          if (34 === _1_0 || 39 === _1_0) {
+          if (34 === _2_0 || 39 === _2_0) {
             buffer.addInterpolation$1(_this.interpolatedString$0().asInterpolation$0());
             wroteNewline = false;
             break $label0$0;
           }
-          if (47 === _1_0 && t1.peekChar$1(1) === 42) {
-            t8 = _this.get$loudComment();
-            start = t1._string_scanner$_position;
-            t8.call$0();
-            end = t1._string_scanner$_position;
-            t3._contents += B.JSString_methods.substring$2(t4, start, end);
+          if (47 === _2_0) {
+            $label1$1: {
+              _0_0 = t1.peekChar$1(1);
+              if (42 === _0_0) {
+                t9 = _this.get$loudComment();
+                start = t1._string_scanner$_position;
+                t9.call$0();
+                end = t1._string_scanner$_position;
+                t3._contents += B.JSString_methods.substring$2(t5, start, end);
+                break $label1$1;
+              }
+              if (47 === _0_0 && silentComments) {
+                _this.silentComment$0();
+                break $label1$1;
+              }
+              t9 = A.Primitives_stringFromCharCode(t1.readChar$0());
+              t3._contents += t9;
+            }
             wroteNewline = false;
             break $label0$0;
           }
-          if (35 === _1_0 && t1.peekChar$1(1) === 123) {
+          if (35 === _2_0 && t1.peekChar$1(1) === 123) {
             buffer.addInterpolation$1(_this.interpolatedIdentifier$0());
             wroteNewline = false;
             break $label0$0;
           }
-          if (_1_12._readFinal$0() || _1_14._readFinal$0())
+          _2_14_isSet = 32 !== _2_0;
+          if (_2_14_isSet) {
+            _2_14 = 9 === _2_0;
+            t9 = _2_14;
+          } else {
+            _2_14 = _null;
+            t9 = true;
+          }
+          if (t9)
             if (!wroteNewline) {
-              t8 = t1.peekChar$1(1);
-              t8 = t8 === 32 || t8 === 9 || t8 === 10 || t8 === 13 || t8 === 12;
+              t9 = t1.peekChar$1(1);
+              t9 = t9 === 32 || t9 === 9 || t9 === 10 || t9 === 13 || t9 === 12;
             } else
-              t8 = false;
+              t9 = false;
           else
-            t8 = false;
-          if (t8) {
+            t9 = false;
+          if (t9) {
             t1.readChar$0();
             break $label0$0;
           }
-          if (_1_12._readFinal$0() || _1_14._readFinal$0()) {
-            t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          if (_2_14_isSet)
+            t9 = _2_14;
+          else
+            t9 = true;
+          if (t9) {
+            t9 = A.Primitives_stringFromCharCode(t1.readChar$0());
+            t3._contents += t9;
             break $label0$0;
           }
-          if ((_1_16._readFinal$0() || _1_18._readFinal$0() || _1_20._readFinal$0()) && _this.get$indented())
+          _2_18_isSet = 10 !== _2_0;
+          if (_2_18_isSet) {
+            _2_18 = 13 === _2_0;
+            _2_20_isSet = !_2_18;
+            if (_2_20_isSet) {
+              _2_20 = 12 === _2_0;
+              t9 = _2_20;
+            } else {
+              _2_20 = _null;
+              t9 = true;
+            }
+          } else {
+            _2_20 = _null;
+            _2_18 = _2_20;
+            _2_20_isSet = false;
+            t9 = true;
+          }
+          if (t9 && _this.get$indented())
             break;
-          if (_1_16._readFinal$0() || _1_18._readFinal$0() || _1_20._readFinal$0()) {
-            t8 = t1.peekChar$1(-1);
-            if (!(t8 === 10 || t8 === 13 || t8 === 12))
+          if (_2_18_isSet)
+            if (!_2_18)
+              t9 = _2_20_isSet ? _2_20 : 12 === _2_0;
+            else
+              t9 = true;
+          else
+            t9 = true;
+          if (t9) {
+            t9 = t1.peekChar$1(-1);
+            if (!(t9 === 10 || t9 === 13 || t9 === 12))
               t3._contents += "\n";
             t1.readChar$0();
             wroteNewline = true;
             break $label0$0;
           }
-          if (40 === _1_0 || 123 === _1_0 || 91 === _1_0) {
+          _2_22 = 123 === _2_0;
+          if (_2_22 && t4)
+            break;
+          if (40 !== _2_0)
+            t9 = _2_22 || 91 === _2_0;
+          else
+            t9 = true;
+          if (t9) {
             bracket = t1.readChar$0();
-            t3._contents += A.Primitives_stringFromCharCode(bracket);
+            t9 = A.Primitives_stringFromCharCode(bracket);
+            t3._contents += t9;
             brackets.push(A.opposite(bracket));
             wroteNewline = false;
             break $label0$0;
           }
-          if (41 === _1_0 || 125 === _1_0 || 93 === _1_0) {
+          if (41 === _2_0 || 125 === _2_0 || 93 === _2_0) {
             if (brackets.length === 0)
               break;
             bracket = brackets.pop();
             t1.expectChar$1(bracket);
-            t3._contents += A.Primitives_stringFromCharCode(bracket);
+            t9 = A.Primitives_stringFromCharCode(bracket);
+            t3._contents += t9;
             wroteNewline = false;
             break $label0$0;
           }
-          if (59 === _1_0) {
+          if (59 === _2_0) {
+            if (t8 && brackets.length === 0)
+              break;
+            t9 = A.Primitives_stringFromCharCode(t1.readChar$0());
+            t3._contents += t9;
+            wroteNewline = false;
+            break $label0$0;
+          }
+          if (58 === _2_0) {
             if (t7 && brackets.length === 0)
               break;
-            t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+            t9 = A.Primitives_stringFromCharCode(t1.readChar$0());
+            t3._contents += t9;
             wroteNewline = false;
             break $label0$0;
           }
-          if (58 === _1_0) {
-            if (t6 && brackets.length === 0)
-              break;
-            t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
-            wroteNewline = false;
-            break $label0$0;
-          }
-          if (117 === _1_0 || 85 === _1_0) {
-            t8 = t1._string_scanner$_position;
-            if (!_this.scanIdentifier$1("url")) {
-              t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          if (117 === _2_0 || 85 === _2_0) {
+            t9 = t1._string_scanner$_position;
+            identifier = _this.identifier$0();
+            if (identifier !== "url" && identifier !== "url-prefix") {
+              t3._contents += identifier;
               wroteNewline = false;
               continue;
             }
-            _0_0 = _this._tryUrlContents$1(new A._SpanScannerState(t1, t8));
-            if (_0_0 != null) {
-              contents = _0_0;
-              t9 = true;
-            } else {
-              contents = null;
-              t9 = false;
-            }
-            if (t9)
-              buffer.addInterpolation$1(contents);
+            _1_0 = _this._tryUrlContents$2$name(new A._SpanScannerState(t1, t9), identifier);
+            if (_1_0 != null)
+              buffer.addInterpolation$1(_1_0);
             else {
-              if ((t8 === 0 ? 1 / t8 < 0 : t8 < 0) || t8 > t5)
-                A.throwExpression(A.ArgumentError$("Invalid position " + t8, null));
-              t1._string_scanner$_position = t8;
+              if ((t9 === 0 ? 1 / t9 < 0 : t9 < 0) || t9 > t6)
+                A.throwExpression(A.ArgumentError$("Invalid position " + t9, _null));
+              t1._string_scanner$_position = t9;
               t1._lastMatch = null;
-              t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+              t9 = A.Primitives_stringFromCharCode(t1.readChar$0());
+              t3._contents += t9;
             }
             wroteNewline = false;
             break $label0$0;
           }
-          if (_1_0 == null)
+          if (_2_0 == null)
             break;
-          t8 = _this.lookingAtIdentifier$0();
-          if (t8) {
-            t3._contents += _this.identifier$0();
+          t9 = _this.lookingAtIdentifier$0();
+          if (t9) {
+            t9 = _this.identifier$0();
+            t3._contents += t9;
             wroteNewline = false;
             break $label0$0;
           }
-          t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t9 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          t3._contents += t9;
           wroteNewline = false;
         }
       if (brackets.length !== 0)
@@ -57736,16 +59704,28 @@ self.util = _cliPkgRequires.util;
       return buffer.interpolation$1(t1.spanFrom$1(new A._SpanScannerState(t1, t2)));
     },
     _interpolatedDeclarationValue$1$allowEmpty(allowEmpty) {
-      return this._interpolatedDeclarationValue$3$allowColon$allowEmpty$allowSemicolon(true, allowEmpty, false);
+      return this._interpolatedDeclarationValue$5$allowColon$allowEmpty$allowOpenBrace$allowSemicolon$silentComments(true, allowEmpty, true, false, true);
+    },
+    _interpolatedDeclarationValue$1$allowOpenBrace(allowOpenBrace) {
+      return this._interpolatedDeclarationValue$5$allowColon$allowEmpty$allowOpenBrace$allowSemicolon$silentComments(true, false, allowOpenBrace, false, true);
     },
     _interpolatedDeclarationValue$2$allowEmpty$allowSemicolon(allowEmpty, allowSemicolon) {
-      return this._interpolatedDeclarationValue$3$allowColon$allowEmpty$allowSemicolon(true, allowEmpty, allowSemicolon);
+      return this._interpolatedDeclarationValue$5$allowColon$allowEmpty$allowOpenBrace$allowSemicolon$silentComments(true, allowEmpty, true, allowSemicolon, true);
+    },
+    _interpolatedDeclarationValue$3$allowColon$allowEmpty$allowSemicolon(allowColon, allowEmpty, allowSemicolon) {
+      return this._interpolatedDeclarationValue$5$allowColon$allowEmpty$allowOpenBrace$allowSemicolon$silentComments(allowColon, allowEmpty, true, allowSemicolon, true);
     },
     _interpolatedDeclarationValue$0() {
-      return this._interpolatedDeclarationValue$3$allowColon$allowEmpty$allowSemicolon(true, false, false);
+      return this._interpolatedDeclarationValue$5$allowColon$allowEmpty$allowOpenBrace$allowSemicolon$silentComments(true, false, true, false, true);
+    },
+    _interpolatedDeclarationValue$2$allowEmpty$allowOpenBrace(allowEmpty, allowOpenBrace) {
+      return this._interpolatedDeclarationValue$5$allowColon$allowEmpty$allowOpenBrace$allowSemicolon$silentComments(true, allowEmpty, allowOpenBrace, false, true);
+    },
+    _interpolatedDeclarationValue$1$silentComments(silentComments) {
+      return this._interpolatedDeclarationValue$5$allowColon$allowEmpty$allowOpenBrace$allowSemicolon$silentComments(true, false, true, false, silentComments);
     },
     interpolatedIdentifier$0() {
-      var _0_0, _this = this,
+      var t4, _0_0, _this = this,
         _s20_ = "Expected identifier.",
         t1 = _this.scanner,
         start = new A._SpanScannerState(t1, t1._string_scanner$_position),
@@ -57753,9 +59733,11 @@ self.util = _cliPkgRequires.util;
         t3 = A._setArrayType([], type$.JSArray_Object),
         buffer = new A.InterpolationBuffer(t2, t3);
       if (t1.scanChar$1(45)) {
-        t2._contents += A.Primitives_stringFromCharCode(45);
+        t4 = A.Primitives_stringFromCharCode(45);
+        t2._contents += t4;
         if (t1.scanChar$1(45)) {
-          t2._contents += A.Primitives_stringFromCharCode(45);
+          t3 = A.Primitives_stringFromCharCode(45);
+          t2._contents += t3;
           _this._interpolatedIdentifierBody$1(buffer);
           return buffer.interpolation$1(t1.spanFrom$1(start));
         }
@@ -57765,11 +59747,13 @@ self.util = _cliPkgRequires.util;
         if (_0_0 == null)
           t1.error$1(0, _s20_);
         if (_0_0 === 95 || A.CharacterExtension_get_isAlphabetic(_0_0) || _0_0 >= 128) {
-          t2._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t3 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          t2._contents += t3;
           break $label0$0;
         }
         if (92 === _0_0) {
-          t2._contents += _this.escape$1$identifierStart(true);
+          t3 = _this.escape$1$identifierStart(true);
+          t2._contents += t3;
           break $label0$0;
         }
         if (35 === _0_0 && t1.peekChar$1(1) === 123) {
@@ -57805,11 +59789,13 @@ self.util = _cliPkgRequires.util;
         else
           t4 = true;
         if (t4) {
-          t3._contents += A.Primitives_stringFromCharCode(t2.readChar$0());
+          t4 = A.Primitives_stringFromCharCode(t2.readChar$0());
+          t3._contents += t4;
           continue;
         }
         if (92 === _0_0) {
-          t3._contents += this.escape$0();
+          t4 = this.escape$0();
+          t3._contents += t4;
           continue;
         }
         if (35 === _0_0 && t2.peekChar$1(1) === 123) {
@@ -57834,7 +59820,7 @@ self.util = _cliPkgRequires.util;
       return contents;
     },
     _mediaQueryList$0() {
-      var _this = this,
+      var t4, _this = this,
         t1 = _this.scanner,
         t2 = t1._string_scanner$_position,
         t3 = new A.StringBuffer(""),
@@ -57845,13 +59831,15 @@ self.util = _cliPkgRequires.util;
         _this.whitespace$0();
         if (!t1.scanChar$1(44))
           break;
-        t3._contents += A.Primitives_stringFromCharCode(44);
-        t3._contents += A.Primitives_stringFromCharCode(32);
+        t4 = A.Primitives_stringFromCharCode(44);
+        t3._contents += t4;
+        t4 = A.Primitives_stringFromCharCode(32);
+        t3._contents += t4;
       }
       return buffer.interpolation$1(t1.spanFrom$1(new A._SpanScannerState(t1, t2)));
     },
     _stylesheet$_mediaQuery$1(buffer) {
-      var identifier1, t1, identifier2, _this = this, _s3_ = "and";
+      var identifier1, t1, t2, identifier2, _this = this, _s3_ = "and";
       if (_this.scanner.peekChar$0() === 40) {
         _this._stylesheet$_mediaInParens$1(buffer);
         _this.whitespace$0();
@@ -57880,7 +59868,8 @@ self.util = _cliPkgRequires.util;
       if (!_this._lookingAtInterpolatedIdentifier$0())
         return;
       t1 = buffer._interpolation_buffer$_text;
-      t1._contents += A.Primitives_stringFromCharCode(32);
+      t2 = A.Primitives_stringFromCharCode(32);
+      t1._contents += t2;
       identifier2 = _this.interpolatedIdentifier$0();
       if (A.equalsIgnoreCase(identifier2.get$asPlain(), _s3_)) {
         _this.expectWhitespace$0();
@@ -57911,9 +59900,11 @@ self.util = _cliPkgRequires.util;
         if (!_this.scanIdentifier$1(operator))
           return;
         _this.expectWhitespace$0();
-        t2 = t1._contents += A.Primitives_stringFromCharCode(32);
+        t2 = A.Primitives_stringFromCharCode(32);
+        t2 = t1._contents += t2;
         t1._contents = t2 + operator;
-        t1._contents += A.Primitives_stringFromCharCode(32);
+        t2 = A.Primitives_stringFromCharCode(32);
+        t1._contents += t2;
       }
     },
     _mediaOrInterp$1(buffer) {
@@ -57929,7 +59920,8 @@ self.util = _cliPkgRequires.util;
         t1 = _this.scanner;
       t1.expectChar$2$name(40, "media condition in parentheses");
       t2 = buffer._interpolation_buffer$_text;
-      t2._contents += A.Primitives_stringFromCharCode(40);
+      t3 = A.Primitives_stringFromCharCode(40);
+      t2._contents += t3;
       _this.whitespace$0();
       if (t1.peekChar$0() === 40) {
         _this._stylesheet$_mediaInParens$1(buffer);
@@ -57954,8 +59946,10 @@ self.util = _cliPkgRequires.util;
         t4.push(t3);
         if (t1.scanChar$1(58)) {
           _this.whitespace$0();
-          t2._contents += A.Primitives_stringFromCharCode(58);
-          t2._contents += A.Primitives_stringFromCharCode(32);
+          t3 = A.Primitives_stringFromCharCode(58);
+          t2._contents += t3;
+          t3 = A.Primitives_stringFromCharCode(32);
+          t2._contents += t3;
           t3 = _this._expression$0();
           buffer._flushText$0();
           t4.push(t3);
@@ -57963,11 +59957,16 @@ self.util = _cliPkgRequires.util;
           next = t1.peekChar$0();
           t3 = 60 !== next;
           if (!t3 || 62 === next || 61 === next) {
-            t2._contents += A.Primitives_stringFromCharCode(32);
-            t2._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
-            if ((!t3 || 62 === next) && t1.scanChar$1(61))
-              t2._contents += A.Primitives_stringFromCharCode(61);
-            t2._contents += A.Primitives_stringFromCharCode(32);
+            t5 = A.Primitives_stringFromCharCode(32);
+            t2._contents += t5;
+            t5 = A.Primitives_stringFromCharCode(t1.readChar$0());
+            t2._contents += t5;
+            if ((!t3 || 62 === next) && t1.scanChar$1(61)) {
+              t5 = A.Primitives_stringFromCharCode(61);
+              t2._contents += t5;
+            }
+            t5 = A.Primitives_stringFromCharCode(32);
+            t2._contents += t5;
             _this.whitespace$0();
             t5 = _this._expressionUntilComparison$0();
             buffer._flushText$0();
@@ -57978,11 +59977,16 @@ self.util = _cliPkgRequires.util;
             } else
               t3 = false;
             if (t3) {
-              t2._contents += A.Primitives_stringFromCharCode(32);
-              t2._contents += A.Primitives_stringFromCharCode(next);
-              if (t1.scanChar$1(61))
-                t2._contents += A.Primitives_stringFromCharCode(61);
-              t2._contents += A.Primitives_stringFromCharCode(32);
+              t3 = A.Primitives_stringFromCharCode(32);
+              t2._contents += t3;
+              t3 = A.Primitives_stringFromCharCode(next);
+              t2._contents += t3;
+              if (t1.scanChar$1(61)) {
+                t3 = A.Primitives_stringFromCharCode(61);
+                t2._contents += t3;
+              }
+              t3 = A.Primitives_stringFromCharCode(32);
+              t2._contents += t3;
               _this.whitespace$0();
               t3 = _this._expressionUntilComparison$0();
               buffer._flushText$0();
@@ -57993,7 +59997,8 @@ self.util = _cliPkgRequires.util;
       }
       t1.expectChar$1(41);
       _this.whitespace$0();
-      t2._contents += A.Primitives_stringFromCharCode(41);
+      t1 = A.Primitives_stringFromCharCode(41);
+      t2._contents += t1;
     },
     _expressionUntilComparison$0() {
       return this._expression$1$until(new A.StylesheetParser__expressionUntilComparison_closure(this));
@@ -58032,13 +60037,13 @@ self.util = _cliPkgRequires.util;
       return condition;
     },
     _supportsConditionInParens$0() {
-      var $name, nameStart, wasInParentheses, identifier, operation, _1_0, contents, identifier0, t2, $arguments, _0_0, _0_4, expression, condition, exception, declaration, _this = this,
+      var $name, nameStart, wasInParentheses, identifier, _1_0, operation, contents, identifier0, t2, $arguments, _0_0, _0_4_isSet, _0_4, condition, exception, declaration, _this = this, _null = null,
         t1 = _this.scanner,
         start = new A._SpanScannerState(t1, t1._string_scanner$_position);
       if (_this._lookingAtInterpolatedIdentifier$0()) {
         identifier0 = _this.interpolatedIdentifier$0();
         t2 = identifier0.get$asPlain();
-        if ((t2 == null ? null : t2.toLowerCase()) === "not")
+        if ((t2 == null ? _null : t2.toLowerCase()) === "not")
           _this.error$2(0, '"not" is not a valid identifier here.', identifier0.span);
         if (t1.scanChar$1(40)) {
           $arguments = _this._interpolatedDeclarationValue$2$allowEmpty$allowSemicolon(true, true);
@@ -58046,22 +60051,19 @@ self.util = _cliPkgRequires.util;
           return new A.SupportsFunction(identifier0, $arguments, t1.spanFrom$1(start));
         } else {
           _0_0 = identifier0.contents;
-          _0_4 = A._InitializedCell$(new A.StylesheetParser__supportsConditionInParens_closure(_0_0));
-          if (_0_0.length === 1)
-            if (type$.Expression._is(_0_4._readFinal$0())) {
-              expression = _0_4._readFinal$0();
-              t2 = true;
-            } else {
-              expression = null;
-              t2 = false;
-            }
-          else {
-            expression = null;
+          _0_4_isSet = _0_0.length === 1;
+          if (_0_4_isSet) {
+            _0_4 = _0_0[0];
+            t2 = _0_4;
+            t2 = type$.Expression._is(t2);
+          } else {
+            _0_4 = _null;
             t2 = false;
           }
-          if (t2)
-            return new A.SupportsInterpolation(expression, t1.spanFrom$1(start));
-          else
+          if (t2) {
+            t2 = _0_4_isSet ? _0_4 : _0_0[0];
+            return new A.SupportsInterpolation(type$.Expression._as(t2), t1.spanFrom$1(start));
+          } else
             _this.error$2(0, "Expected @supports condition.", identifier0.span);
         }
       }
@@ -58088,14 +60090,10 @@ self.util = _cliPkgRequires.util;
           t1.set$state(nameStart);
           _this._inParentheses = wasInParentheses;
           identifier = _this.interpolatedIdentifier$0();
-          operation = null;
           _1_0 = _this._trySupportsOperation$2(identifier, nameStart);
+          operation = null;
           if (_1_0 != null) {
             operation = _1_0;
-            t2 = true;
-          } else
-            t2 = false;
-          if (t2) {
             t1.expectChar$1(41);
             return operation;
           }
@@ -58285,11 +60283,8 @@ self.util = _cliPkgRequires.util;
                 t1 = true;
             else
               t1 = true;
-            if (t1) {
-              t1 = true;
+            if (t1)
               break $label1$1;
-            }
-            t1 = false;
             break $label1$1;
           }
           break $label0$0;
@@ -58370,7 +60365,7 @@ self.util = _cliPkgRequires.util;
       var _this = this,
         t1 = _this.scanner,
         t2 = t1._string_scanner$_position,
-        result = _this.identifier$1$normalize(true);
+        result = _this.identifier$0();
       _this._assertPublic$2(result, new A.StylesheetParser__publicIdentifier_closure(_this, new A._SpanScannerState(t1, t2)));
       return result;
     },
@@ -58393,12 +60388,11 @@ self.util = _cliPkgRequires.util;
       t2.scanChar$1(65279);
       statements = t1.statements$1(new A.StylesheetParser_parse__closure(t1));
       t2.expectDone$0();
-      t4 = t1._globalVariables;
-      t4 = t4.get$values(t4);
+      t4 = t1._globalVariables.get$values(0);
       B.JSArray_methods.addAll$1(statements, A.MappedIterable_MappedIterable(t4, new A.StylesheetParser_parse__closure0(), A._instanceType(t4)._eval$1("Iterable.E"), type$.Statement));
       return A.Stylesheet$internal(statements, t2.spanFrom$1(new A._SpanScannerState(t2, t3)), t1.get$plainCss());
     },
-    $signature: 360
+    $signature: 461
   };
   A.StylesheetParser_parse__closure.prototype = {
     call$0() {
@@ -58410,14 +60404,14 @@ self.util = _cliPkgRequires.util;
       }
       return t1._statement$1$root(true);
     },
-    $signature: 362
+    $signature: 457
   };
   A.StylesheetParser_parse__closure0.prototype = {
     call$1(declaration) {
       var t1 = declaration.expression;
       return A.VariableDeclaration$(declaration.name, new A.NullExpression(t1.get$span(t1)), declaration.span, null, false, true, null);
     },
-    $signature: 363
+    $signature: 455
   };
   A.StylesheetParser_parseArgumentDeclaration_closure.prototype = {
     call$0() {
@@ -58433,14 +60427,14 @@ self.util = _cliPkgRequires.util;
       t2.expectChar$1(123);
       return $arguments;
     },
-    $signature: 364
+    $signature: 445
   };
   A.StylesheetParser_parseVariableDeclaration_closure.prototype = {
     call$0() {
       var t1 = this.$this;
       return t1.lookingAtIdentifier$0() ? t1._variableDeclarationWithNamespace$0() : t1.variableDeclarationWithoutNamespace$0();
     },
-    $signature: 199
+    $signature: 153
   };
   A.StylesheetParser_parseUseRule_closure.prototype = {
     call$0() {
@@ -58452,7 +60446,7 @@ self.util = _cliPkgRequires.util;
       t1.whitespace$0();
       return t1._useRule$1(new A._SpanScannerState(t2, t3));
     },
-    $signature: 366
+    $signature: 443
   };
   A.StylesheetParser__parseSingleProduction_closure.prototype = {
     call$0() {
@@ -58468,31 +60462,19 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return this.$this._statement$0();
     },
-    $signature: 142
+    $signature: 127
   };
   A.StylesheetParser_variableDeclarationWithoutNamespace_closure.prototype = {
     call$0() {
       return this.$this.scanner.spanFrom$1(this.start);
     },
-    $signature: 33
+    $signature: 27
   };
   A.StylesheetParser_variableDeclarationWithoutNamespace_closure0.prototype = {
     call$0() {
       return this.declaration;
     },
-    $signature: 199
-  };
-  A.StylesheetParser__declarationOrBuffer_closure.prototype = {
-    call$2(children, span) {
-      return A.Declaration$nested(this.name, children, span, null);
-    },
-    $signature: 84
-  };
-  A.StylesheetParser__declarationOrBuffer_closure0.prototype = {
-    call$2(children, span) {
-      return A.Declaration$nested(this.name, children, span, this._box_0.value);
-    },
-    $signature: 84
+    $signature: 153
   };
   A.StylesheetParser__styleRule_closure.prototype = {
     call$2(children, span) {
@@ -58503,31 +60485,25 @@ self.util = _cliPkgRequires.util;
       t1._inStyleRule = _this.wasInStyleRule;
       return A.StyleRule$(_this._box_0.interpolation, children, t1.scanner.spanFrom$1(_this.start));
     },
-    $signature: 369
+    $signature: 438
   };
-  A.StylesheetParser__propertyOrVariableDeclaration_closure.prototype = {
+  A.StylesheetParser__tryDeclarationChildren_closure.prototype = {
     call$2(children, span) {
-      return A.Declaration$nested(this._box_0.name, children, span, null);
+      return A.Declaration$nested(this.name, children, span, this.value);
     },
-    $signature: 84
-  };
-  A.StylesheetParser__propertyOrVariableDeclaration_closure0.prototype = {
-    call$2(children, span) {
-      return A.Declaration$nested(this._box_0.name, children, span, this.value);
-    },
-    $signature: 84
+    $signature: 434
   };
   A.StylesheetParser__atRootRule_closure.prototype = {
     call$2(children, span) {
       return A.AtRootRule$(children, span, this.query);
     },
-    $signature: 201
+    $signature: 154
   };
   A.StylesheetParser__atRootRule_closure0.prototype = {
     call$2(children, span) {
       return A.AtRootRule$(children, span, null);
     },
-    $signature: 201
+    $signature: 154
   };
   A.StylesheetParser__eachRule_closure.prototype = {
     call$2(children, span) {
@@ -58535,13 +60511,13 @@ self.util = _cliPkgRequires.util;
       _this.$this._inControlDirective = _this.wasInControlDirective;
       return A.EachRule$(_this.variables, _this.list, children, span);
     },
-    $signature: 372
+    $signature: 432
   };
   A.StylesheetParser__functionRule_closure.prototype = {
     call$2(children, span) {
       return A.FunctionRule$(this.name, this.$arguments, children, span, this.precedingComment);
     },
-    $signature: 373
+    $signature: 431
   };
   A.StylesheetParser__forRule_closure.prototype = {
     call$0() {
@@ -58556,7 +60532,7 @@ self.util = _cliPkgRequires.util;
       } else
         return false;
     },
-    $signature: 1
+    $signature: 22
   };
   A.StylesheetParser__forRule_closure0.prototype = {
     call$2(children, span) {
@@ -58566,7 +60542,7 @@ self.util = _cliPkgRequires.util;
       t1.toString;
       return A.ForRule$(_this.variable, _this.from, _this.to, children, span, t1);
     },
-    $signature: 374
+    $signature: 427
   };
   A.StylesheetParser__memberList_closure.prototype = {
     call$0() {
@@ -58576,19 +60552,19 @@ self.util = _cliPkgRequires.util;
       else
         this.identifiers.add$1(0, t1.identifier$1$normalize(true));
     },
-    $signature: 2
+    $signature: 1
   };
   A.StylesheetParser__includeRule_closure.prototype = {
     call$2(children, span) {
       return A.ContentBlock$(this.contentArguments_, children, span);
     },
-    $signature: 375
+    $signature: 426
   };
   A.StylesheetParser_mediaRule_closure.prototype = {
     call$2(children, span) {
       return A.MediaRule$(this.query, children, span);
     },
-    $signature: 376
+    $signature: 422
   };
   A.StylesheetParser__mixinRule_closure.prototype = {
     call$2(children, span) {
@@ -58596,35 +60572,35 @@ self.util = _cliPkgRequires.util;
       _this.$this._stylesheet$_inMixin = false;
       return A.MixinRule$(_this.name, _this.$arguments, children, span, _this.precedingComment);
     },
-    $signature: 377
+    $signature: 419
   };
   A.StylesheetParser_mozDocumentRule_closure.prototype = {
     call$2(children, span) {
       var _this = this;
       if (_this._box_0.needsDeprecationWarning)
-        A.WarnForDeprecation_warnForDeprecation(_this.$this.logger, B.Deprecation_gJ9, string$.x40_moz_, span, null);
+        A.WarnForDeprecation_warnForDeprecation(_this.$this.logger, B.Deprecation_uNF, string$.x40_moz_, span, null);
       return A.AtRule$(_this.name, span, children, _this.value);
     },
-    $signature: 202
+    $signature: 155
   };
   A.StylesheetParser_supportsRule_closure.prototype = {
     call$2(children, span) {
       return A.SupportsRule$(this.condition, children, span);
     },
-    $signature: 383
+    $signature: 418
   };
   A.StylesheetParser__whileRule_closure.prototype = {
     call$2(children, span) {
       this.$this._inControlDirective = this.wasInControlDirective;
       return A.WhileRule$(this.condition, children, span);
     },
-    $signature: 295
+    $signature: 415
   };
   A.StylesheetParser_unknownAtRule_closure.prototype = {
     call$2(children, span) {
       return A.AtRule$(this.name, span, children, this._box_0.value);
     },
-    $signature: 202
+    $signature: 155
   };
   A.StylesheetParser__expression_resetState.prototype = {
     call$0() {
@@ -58652,15 +60628,15 @@ self.util = _cliPkgRequires.util;
       }
       if (t1.allowSlash) {
         t2 = _this.$this;
-        t2 = !t2._inParentheses && operator === B.BinaryOperator_t8B && t2._isSlashOperand$1(left) && t2._isSlashOperand$1(right);
+        t2 = !t2._inParentheses && operator === B.BinaryOperator_U77 && t2._isSlashOperand$1(left) && t2._isSlashOperand$1(right);
       } else
         t2 = false;
       if (t2)
-        t1.singleExpression_ = new A.BinaryOperationExpression(B.BinaryOperator_t8B, left, right, true);
+        t1.singleExpression_ = new A.BinaryOperationExpression(B.BinaryOperator_U77, left, right, true);
       else {
         t1.singleExpression_ = new A.BinaryOperationExpression(operator, left, right, false);
         t2 = t1.allowSlash = false;
-        if (B.BinaryOperator_anB === operator || B.BinaryOperator_olz === operator) {
+        if (B.BinaryOperator_u15 === operator || B.BinaryOperator_SjO === operator) {
           t3 = _this.$this;
           t4 = t3.scanner.string;
           t5 = right.get$span(right);
@@ -58678,7 +60654,7 @@ self.util = _cliPkgRequires.util;
             t5 = left.toString$0(0);
             t6 = right.toString$0(0);
             t1 = t1.singleExpression_;
-            A.WarnForDeprecation_warnForDeprecation(t3.logger, B.Deprecation_sIK, "This operation is parsed as:\n\n    " + t2 + " " + t7 + " " + t4 + string$.x0a_but_ + t5 + " (" + t7 + t6 + ")\n\nAdd a space after " + t7 + string$.x20to_cl, t1.get$span(t1), null);
+            A.WarnForDeprecation_warnForDeprecation(t3.logger, B.Deprecation_2Vk, "This operation is parsed as:\n\n    " + t2 + " " + t7 + " " + t4 + string$.x0a_but_ + t5 + " (" + t7 + t6 + ")\n\nAdd a space after " + t7 + string$.x20to_cl, t1.get$span(t1), null);
           }
         }
       }
@@ -58720,19 +60696,19 @@ self.util = _cliPkgRequires.util;
       }
       t1.singleExpression_ = expression;
     },
-    $signature: 385
+    $signature: 414
   };
   A.StylesheetParser__expression_addOperator.prototype = {
     call$1(operator) {
       var t2, t3, operators, operands, t4, singleExpression,
         t1 = this.$this;
-      if (t1.get$plainCss() && operator !== B.BinaryOperator_2jN && operator !== B.BinaryOperator_anB && operator !== B.BinaryOperator_olz && operator !== B.BinaryOperator_qN2 && operator !== B.BinaryOperator_t8B) {
+      if (t1.get$plainCss() && operator !== B.BinaryOperator_wdM && operator !== B.BinaryOperator_u15 && operator !== B.BinaryOperator_SjO && operator !== B.BinaryOperator_2No && operator !== B.BinaryOperator_U77) {
         t2 = t1.scanner;
         t3 = operator.operator.length;
         t2.error$3$length$position(0, "Operators aren't allowed in plain CSS.", t3, t2._string_scanner$_position - t3);
       }
       t2 = this._box_0;
-      t2.allowSlash = t2.allowSlash && operator === B.BinaryOperator_t8B;
+      t2.allowSlash = t2.allowSlash && operator === B.BinaryOperator_U77;
       operators = t2.operators_;
       if (operators == null)
         operators = t2.operators_ = A._setArrayType([], type$.JSArray_BinaryOperator);
@@ -58757,7 +60733,7 @@ self.util = _cliPkgRequires.util;
       t1.whitespace$0();
       t2.singleExpression_ = t1._singleExpression$0();
     },
-    $signature: 386
+    $signature: 400
   };
   A.StylesheetParser__expression_resolveSpaceExpressions.prototype = {
     call$0() {
@@ -58773,119 +60749,46 @@ self.util = _cliPkgRequires.util;
       spaceExpressions.push(singleExpression);
       t2 = B.JSArray_methods.get$first(spaceExpressions);
       t2 = t2.get$span(t2).expand$1(0, singleExpression.get$span(singleExpression));
-      t1.singleExpression_ = new A.ListExpression(A.List_List$unmodifiable(spaceExpressions, type$.Expression), B.ListSeparator_EVt, false, t2);
+      t1.singleExpression_ = new A.ListExpression(A.List_List$unmodifiable(spaceExpressions, type$.Expression), B.ListSeparator_nbm, false, t2);
       t1.spaceExpressions_ = null;
     },
     $signature: 0
   };
-  A.StylesheetParser__expression_closure.prototype = {
-    call$0() {
-      return 43 === this._3_0;
-    },
-    $signature: 1
-  };
-  A.StylesheetParser__expression_closure0.prototype = {
-    call$0() {
-      return 47 === this._3_0;
-    },
-    $signature: 1
-  };
-  A.StylesheetParser__expression_closure1.prototype = {
-    call$0() {
-      return 46 === this._3_0;
-    },
-    $signature: 1
-  };
   A.StylesheetParser_expressionUntilComma_closure.prototype = {
     call$0() {
       return this.$this.scanner.peekChar$0() === 44;
     },
-    $signature: 1
+    $signature: 22
   };
   A.StylesheetParser__isHexColor_closure.prototype = {
-    call$0() {
-      var t1 = this._0_0;
-      return (t1 == null ? A._asString(t1) : t1).length;
-    },
-    $signature: 3
-  };
-  A.StylesheetParser__isHexColor_closure0.prototype = {
     call$1(char) {
       return A.CharacterExtension_get_isHex(char);
     },
-    $signature: 47
+    $signature: 45
   };
   A.StylesheetParser__unicodeRange_closure.prototype = {
     call$1(char) {
       return char != null && A.CharacterExtension_get_isHex(char);
     },
-    $signature: 34
+    $signature: 30
   };
   A.StylesheetParser__unicodeRange_closure0.prototype = {
     call$1(char) {
       return char != null && A.CharacterExtension_get_isHex(char);
     },
-    $signature: 34
-  };
-  A.StylesheetParser_identifierLike_closure.prototype = {
-    call$0() {
-      return 46 === this._2_0;
-    },
-    $signature: 1
-  };
-  A.StylesheetParser_identifierLike_closure0.prototype = {
-    call$0() {
-      return 40 === this._2_0;
-    },
-    $signature: 1
+    $signature: 30
   };
   A.StylesheetParser_namespacedExpression_closure.prototype = {
     call$0() {
       return this.$this.scanner.spanFrom$1(this.start);
     },
-    $signature: 33
+    $signature: 27
   };
   A.StylesheetParser_trySpecialFunction_closure.prototype = {
     call$1(contents) {
       return new A.StringExpression(contents, false);
     },
-    $signature: 395
-  };
-  A.StylesheetParser__tryUrlContents_closure.prototype = {
-    call$0() {
-      return 35 === this._0_0;
-    },
-    $signature: 1
-  };
-  A.StylesheetParser__interpolatedDeclarationValue_closure.prototype = {
-    call$0() {
-      return 32 === this._1_0;
-    },
-    $signature: 1
-  };
-  A.StylesheetParser__interpolatedDeclarationValue_closure0.prototype = {
-    call$0() {
-      return 9 === this._1_0;
-    },
-    $signature: 1
-  };
-  A.StylesheetParser__interpolatedDeclarationValue_closure1.prototype = {
-    call$0() {
-      return 10 === this._1_0;
-    },
-    $signature: 1
-  };
-  A.StylesheetParser__interpolatedDeclarationValue_closure2.prototype = {
-    call$0() {
-      return 13 === this._1_0;
-    },
-    $signature: 1
-  };
-  A.StylesheetParser__interpolatedDeclarationValue_closure3.prototype = {
-    call$0() {
-      return 12 === this._1_0;
-    },
-    $signature: 1
+    $signature: 394
   };
   A.StylesheetParser__expressionUntilComparison_closure.prototype = {
     call$0() {
@@ -58905,46 +60808,31 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 1
-  };
-  A.StylesheetParser__supportsConditionInParens_closure.prototype = {
-    call$0() {
-      return this._0_0[0];
-    },
-    $signature: 14
+    $signature: 22
   };
   A.StylesheetParser__publicIdentifier_closure.prototype = {
     call$0() {
       return this.$this.scanner.spanFrom$1(this.start);
     },
-    $signature: 33
+    $signature: 27
   };
   A.StylesheetGraph.prototype = {
     modifiedSince$3(url, since, baseImporter) {
       var node = this._stylesheet_graph$_add$3(url, baseImporter, null);
       if (node == null)
         return true;
-      return new A.StylesheetGraph_modifiedSince_transitiveModificationTime(this).call$1(node)._core$_value > since._core$_value;
+      return new A.StylesheetGraph_modifiedSince_transitiveModificationTime(this).call$1(node)._value > since._value;
     },
     _stylesheet_graph$_add$3(url, baseImporter, baseUrl) {
-      var importer, canonicalUrl, originalUrl, t1, _this = this, _null = null,
+      var importer, canonicalUrl, _this = this,
         result = _this._ignoreErrors$1(new A.StylesheetGraph__add_closure(_this, url, baseImporter, baseUrl));
       if (type$.Record_3_nullable_Object_and_nullable_Object_and_nullable_Object_originalUrl._is(result)) {
         importer = result._0;
         canonicalUrl = result._1;
-        originalUrl = result._2;
-        t1 = true;
-      } else {
-        originalUrl = _null;
-        canonicalUrl = originalUrl;
-        importer = canonicalUrl;
-        t1 = false;
-      }
-      if (t1) {
-        _this.addCanonical$3(importer, canonicalUrl, originalUrl);
+        _this.addCanonical$3(importer, canonicalUrl, result._2);
         return _this._nodes.$index(0, canonicalUrl);
       } else
-        return _null;
+        return null;
     },
     addCanonical$4$recanonicalize(importer, canonicalUrl, originalUrl, recanonicalize) {
       var stylesheet, _this = this,
@@ -58980,8 +60868,8 @@ self.util = _cliPkgRequires.util;
         t8.$indexSet(0, t10, this._nodeFor$4(t10, baseImporter, baseUrl, active));
       }
       t1 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t7);
-      for (t2 = new A.DependencyReport(t2, t3, t4, new A.UnmodifiableSetView0(t5, t6)).imports._base, t2 = t2.get$iterator(t2); t2.moveNext$0();) {
-        t3 = t2.get$current(t2);
+      for (t2 = new A.DependencyReport(t2, t3, t4, new A.UnmodifiableSetView0(t5, t6)).imports._base.get$iterator(0); t2.moveNext$0();) {
+        t3 = t2.get$current(0);
         t1.$indexSet(0, t3, this._nodeFor$5$forImport(t3, baseImporter, baseUrl, active, true));
       }
       return new A._Record_2_imports_modules(t1, t8);
@@ -59004,8 +60892,8 @@ self.util = _cliPkgRequires.util;
     _recanonicalizeImports$2(importer, canonicalUrl) {
       var t1, t2, t3, t4, t5, newUpstream, newUpstreamImports, _this = this,
         changed = A.LinkedHashSet_LinkedHashSet$_empty(type$.StylesheetNode);
-      for (t1 = _this._nodes, t1 = t1.get$values(t1), t1 = t1.get$iterator(t1), t2 = type$.UnmodifiableMapView_of_Uri_and_nullable_StylesheetNode, t3 = type$.Uri, t4 = type$.nullable_StylesheetNode; t1.moveNext$0();) {
-        t5 = t1.get$current(t1);
+      for (t1 = _this._nodes.get$values(0).get$iterator(0), t2 = type$.UnmodifiableMapView_of_Uri_and_nullable_StylesheetNode, t3 = type$.Uri, t4 = type$.nullable_StylesheetNode; t1.moveNext$0();) {
+        t5 = t1.get$current(0);
         newUpstream = _this._recanonicalizeImportsForNode$4$forImport(t5, importer, canonicalUrl, false);
         newUpstreamImports = _this._recanonicalizeImportsForNode$4$forImport(t5, importer, canonicalUrl, true);
         if (newUpstream.__js_helper$_length !== 0 || newUpstreamImports.__js_helper$_length !== 0) {
@@ -59047,36 +60935,29 @@ self.util = _cliPkgRequires.util;
       return newMap;
     },
     _nodeFor$5$forImport(url, baseImporter, baseUrl, active, forImport) {
-      var t2, t3, _1_0, node, t4, stylesheet, _this = this, _null = null, t1 = {},
+      var canonicalUrl, t2, _1_0, stylesheet, t3, t4, node, _this = this, t1 = {},
         result = _this._ignoreErrors$1(new A.StylesheetGraph__nodeFor_closure(_this, url, baseImporter, baseUrl, forImport));
       if (result == null)
-        return _null;
+        return null;
       t1.originalUrl = t1.canonicalUrl = t1.importer = null;
       t1.importer = result._0;
-      t2 = t1.canonicalUrl = result._1;
+      canonicalUrl = t1.canonicalUrl = result._1;
       t1.originalUrl = result._2;
-      t3 = _this._nodes;
-      _1_0 = t3.$index(0, t2);
-      if (_1_0 != null) {
-        node = _1_0;
-        t4 = true;
-      } else {
-        node = _null;
-        t4 = false;
-      }
-      if (t4)
-        return node;
-      if (active.contains$1(0, t2))
-        return _null;
+      t2 = _this._nodes;
+      _1_0 = t2.$index(0, canonicalUrl);
+      if (_1_0 != null)
+        return _1_0;
+      if (active.contains$1(0, canonicalUrl))
+        return null;
       stylesheet = _this._ignoreErrors$1(new A.StylesheetGraph__nodeFor_closure0(t1, _this));
       if (stylesheet == null)
-        return _null;
+        return null;
       active.add$1(0, t1.canonicalUrl);
-      t2 = t1.importer;
+      t3 = t1.importer;
       t4 = t1.canonicalUrl;
-      node = A.StylesheetNode$_(stylesheet, t2, t4, _this._upstreamNodes$3(stylesheet, t2, t4));
+      node = A.StylesheetNode$_(stylesheet, t3, t4, _this._upstreamNodes$3(stylesheet, t3, t4));
       active.remove$1(0, t1.canonicalUrl);
-      t3.$indexSet(0, t1.canonicalUrl, node);
+      t2.$indexSet(0, t1.canonicalUrl, node);
       return node;
     },
     _nodeFor$4(url, baseImporter, baseUrl, active) {
@@ -59099,80 +60980,78 @@ self.util = _cliPkgRequires.util;
     call$1(node) {
       return this.$this._transitiveModificationTimes.putIfAbsent$2(node.canonicalUrl, new A.StylesheetGraph_modifiedSince_transitiveModificationTime_closure(node, this));
     },
-    $signature: 400
+    $signature: 393
   };
   A.StylesheetGraph_modifiedSince_transitiveModificationTime_closure.prototype = {
     call$0() {
       var t2, t3, upstreamTime,
         t1 = this.node,
         latest = t1.importer.modificationTime$1(t1.canonicalUrl);
-      for (t2 = t1._upstream, t2 = t2.get$values(t2), t1 = t1._upstreamImports, t1 = t2.followedBy$1(0, t1.get$values(t1)), t1 = new A.FollowedByIterator(J.get$iterator$ax(t1.__internal$_first), t1._second), t2 = this.transitiveModificationTime; t1.moveNext$0();) {
+      for (t1 = t1._upstream.get$values(0).followedBy$1(0, t1._upstreamImports.get$values(0)), t1 = new A.FollowedByIterator(J.get$iterator$ax(t1.__internal$_first), t1._second), t2 = this.transitiveModificationTime; t1.moveNext$0();) {
         t3 = t1._currentIterator;
         t3 = t3.get$current(t3);
         upstreamTime = t3 == null ? new A.DateTime(Date.now(), false) : t2.call$1(t3);
-        if (upstreamTime._core$_value > latest._core$_value)
+        if (upstreamTime._value > latest._value)
           latest = upstreamTime;
       }
       return latest;
     },
-    $signature: 180
+    $signature: 148
   };
   A.StylesheetGraph__add_closure.prototype = {
     call$0() {
       var _this = this;
       return _this.$this.importCache.canonicalize$3$baseImporter$baseUrl(0, _this.url, _this.baseImporter, _this.baseUrl);
     },
-    $signature: 100
+    $signature: 122
   };
   A.StylesheetGraph_addCanonical_closure.prototype = {
     call$0() {
       var _this = this;
       return _this.$this.importCache.importCanonical$3$originalUrl(_this.importer, _this.canonicalUrl, _this.originalUrl);
     },
-    $signature: 112
+    $signature: 81
   };
   A.StylesheetGraph_reload_closure.prototype = {
     call$0() {
       return this.$this.importCache.importCanonical$2(this.node.importer, this.canonicalUrl);
     },
-    $signature: 112
+    $signature: 81
   };
   A.StylesheetGraph__nodeFor_closure.prototype = {
     call$0() {
       var _this = this;
       return _this.$this.importCache.canonicalize$4$baseImporter$baseUrl$forImport(0, _this.url, _this.baseImporter, _this.baseUrl, _this.forImport);
     },
-    $signature: 100
+    $signature: 122
   };
   A.StylesheetGraph__nodeFor_closure0.prototype = {
     call$0() {
       var t1 = this._box_0;
       return this.$this.importCache.importCanonical$3$originalUrl(t1.importer, t1.canonicalUrl, t1.originalUrl);
     },
-    $signature: 112
+    $signature: 81
   };
   A.StylesheetNode.prototype = {
     StylesheetNode$_$4(_stylesheet, importer, canonicalUrl, allUpstream) {
       var t1, t2;
-      for (t1 = this._upstream, t1 = t1.get$values(t1), t2 = this._upstreamImports, t2 = t1.followedBy$1(0, t2.get$values(t2)), t2 = new A.FollowedByIterator(J.get$iterator$ax(t2.__internal$_first), t2._second); t2.moveNext$0();) {
-        t1 = t2._currentIterator;
-        t1 = t1.get$current(t1);
-        if (t1 != null)
-          t1._downstream.add$1(0, this);
+      for (t1 = this._upstream.get$values(0).followedBy$1(0, this._upstreamImports.get$values(0)), t1 = new A.FollowedByIterator(J.get$iterator$ax(t1.__internal$_first), t1._second); t1.moveNext$0();) {
+        t2 = t1._currentIterator;
+        t2 = t2.get$current(t2);
+        if (t2 != null)
+          t2._downstream.add$1(0, this);
       }
     },
     _replaceUpstream$2(newUpstream, newUpstreamImports) {
       var t3, oldUpstream, newUpstreamSet, _this = this,
-        t1 = _this._upstream,
-        t2 = type$.nullable_StylesheetNode;
-      t1 = A.LinkedHashSet_LinkedHashSet$of(t1.get$values(t1), t2);
-      t3 = _this._upstreamImports;
-      t1.addAll$1(0, t3.get$values(t3));
+        t1 = type$.nullable_StylesheetNode,
+        t2 = A.LinkedHashSet_LinkedHashSet$of(_this._upstream.get$values(0), t1);
+      t2.addAll$1(0, _this._upstreamImports.get$values(0));
       t3 = type$.StylesheetNode;
-      oldUpstream = A.SetExtension_removeNull(t1, t3);
-      t2 = A.LinkedHashSet_LinkedHashSet$of(newUpstream.get$values(newUpstream), t2);
-      t2.addAll$1(0, newUpstreamImports.get$values(newUpstreamImports));
-      newUpstreamSet = A.SetExtension_removeNull(t2, t3);
+      oldUpstream = A.SetExtension_removeNull(t2, t3);
+      t1 = A.LinkedHashSet_LinkedHashSet$of(newUpstream.get$values(0), t1);
+      t1.addAll$1(0, newUpstreamImports.get$values(0));
+      newUpstreamSet = A.SetExtension_removeNull(t1, t3);
       for (t1 = oldUpstream.difference$1(newUpstreamSet), t1 = t1.get$iterator(t1); t1.moveNext$0();)
         t1.get$current(t1)._downstream.remove$1(0, _this);
       for (t1 = newUpstreamSet.difference$1(oldUpstream), t1 = t1.get$iterator(t1); t1.moveNext$0();)
@@ -59182,7 +61061,7 @@ self.util = _cliPkgRequires.util;
     },
     _stylesheet_graph$_remove$0() {
       var t1, t2, t3, t4, _i, url, _this = this;
-      for (t1 = _this._upstream, t1 = A.LinkedHashSet_LinkedHashSet$of(t1.get$values(t1), type$.nullable_StylesheetNode), t2 = _this._upstreamImports, t1.addAll$1(0, t2.get$values(t2)), t1 = A._LinkedHashSetIterator$(t1, t1._collection$_modifications), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = A.LinkedHashSet_LinkedHashSet$of(_this._upstream.get$values(0), type$.nullable_StylesheetNode), t1.addAll$1(0, _this._upstreamImports.get$values(0)), t1 = A._LinkedHashSetIterator$(t1, t1._modifications, A._instanceType(t1)._precomputed1), t2 = t1.$ti._precomputed1; t1.moveNext$0();) {
         t3 = t1._collection$_current;
         if (t3 == null)
           t3 = t2._as(t3);
@@ -59190,8 +61069,8 @@ self.util = _cliPkgRequires.util;
           continue;
         t3._downstream.remove$1(0, _this);
       }
-      for (t1 = _this._downstream, t1 = t1.get$iterator(t1); t1.moveNext$0();) {
-        t2 = t1.get$current(t1);
+      for (t1 = _this._downstream.get$iterator(0); t1.moveNext$0();) {
+        t2 = t1.get$current(0);
         for (t3 = t2._upstream, t4 = A._instanceType(t3)._eval$1("LinkedHashMapKeyIterable<1>"), t4 = A.List_List$of(new A.LinkedHashMapKeyIterable(t3, t4), true, t4._eval$1("Iterable.E")), t3 = t4.length, _i = 0; _i < t3; ++_i) {
           url = t4[_i];
           if (J.$eq$(t2._upstream.$index(0, url), _this)) {
@@ -59239,46 +61118,46 @@ self.util = _cliPkgRequires.util;
       return t1 == null ? this._lazy_file_span$_span = this._builder.call$0() : t1;
     },
     compareTo$1(_, other) {
-      return this.get$span(this).compareTo$1(0, other);
+      return this.get$span(0).compareTo$1(0, other);
     },
     get$context(_) {
-      var t1 = this.get$span(this);
+      var t1 = this.get$span(0);
       return t1.get$context(t1);
     },
     get$end(_) {
-      var t1 = this.get$span(this);
+      var t1 = this.get$span(0);
       return t1.get$end(t1);
     },
     expand$1(_, other) {
-      return this.get$span(this).expand$1(0, other);
+      return this.get$span(0).expand$1(0, other);
     },
     get$file(_) {
-      var t1 = this.get$span(this);
+      var t1 = this.get$span(0);
       return t1.get$file(t1);
     },
     highlight$1$color(color) {
-      return this.get$span(this).highlight$1$color(color);
+      return this.get$span(0).highlight$1$color(color);
     },
     get$length(_) {
-      var t1 = this.get$span(this);
+      var t1 = this.get$span(0);
       return t1.get$length(t1);
     },
     message$2$color(_, message, color) {
-      return this.get$span(this).message$2$color(0, message, color);
+      return this.get$span(0).message$2$color(0, message, color);
     },
-    message$1($receiver, message) {
-      return this.message$2$color($receiver, message, null);
+    message$1(_, message) {
+      return this.message$2$color(0, message, null);
     },
     get$sourceUrl(_) {
-      var t1 = this.get$span(this);
+      var t1 = this.get$span(0);
       return t1.get$sourceUrl(t1);
     },
     get$start(_) {
-      var t1 = this.get$span(this);
+      var t1 = this.get$span(0);
       return t1.get$start(t1);
     },
     get$text() {
-      return this.get$span(this).get$text();
+      return this.get$span(0).get$text();
     },
     $isComparable: 1,
     $isFileSpan: 1,
@@ -59335,7 +61214,7 @@ self.util = _cliPkgRequires.util;
       for (t1 = maps.length, t2 = this._mapsByKey, t3 = $K._eval$1("@<0>")._bind$1($V)._eval$1("MergedMapView<1,2>"), _i = 0; _i < maps.length; maps.length === t1 || (0, A.throwConcurrentModificationError)(maps), ++_i) {
         map = maps[_i];
         if (t3._is(map))
-          for (t4 = map._mapsByKey, t4 = t4.get$values(t4), t4 = new A.MappedIterator(J.get$iterator$ax(t4.__internal$_iterable), t4._f), t5 = A._instanceType(t4)._rest[1]; t4.moveNext$0();) {
+          for (t4 = map._mapsByKey.get$values(0), t5 = A._instanceType(t4), t5 = t5._eval$1("@<1>")._bind$1(t5._rest[1]), t4 = new A.MappedIterator(J.get$iterator$ax(t4.__internal$_iterable), t4._f, t5._eval$1("MappedIterator<1,2>")), t5 = t5._rest[1]; t4.moveNext$0();) {
             t6 = t4.__internal$_current;
             if (t6 == null)
               t6 = t5._as(t6);
@@ -59350,17 +61229,9 @@ self.util = _cliPkgRequires.util;
       return t1 == null ? null : t1.$index(0, key);
     },
     $indexSet(_, key, value) {
-      var child, t1,
-        _0_0 = this._mapsByKey.$index(0, key);
-      if (_0_0 != null) {
-        child = _0_0;
-        t1 = true;
-      } else {
-        child = null;
-        t1 = false;
-      }
-      if (t1)
-        child.$indexSet(0, key, value);
+      var _0_0 = this._mapsByKey.$index(0, key);
+      if (_0_0 != null)
+        _0_0.$indexSet(0, key, value);
       else
         throw A.wrapException(A.UnsupportedError$(string$.New_en));
     },
@@ -59373,17 +61244,15 @@ self.util = _cliPkgRequires.util;
   };
   A.MultiDirWatcher.prototype = {
     watch$1(_, directory) {
-      var t1, t2, t3, t4, isParentOfExistingDir, _i, t5, _0_1, t6, existingWatcher, future, completer;
+      var t1, t2, t3, t4, isParentOfExistingDir, _i, t5, _0_1, existingWatcher, future, completer;
       for (t1 = this._watchers, t2 = A.MapExtensions_get_pairs(t1, type$.nullable_String, type$.Stream_WatchEvent).toList$0(0), t3 = t2.length, t1 = t1._map, t4 = this._group, isParentOfExistingDir = false, _i = 0; _i < t2.length; t2.length === t3 || (0, A.throwConcurrentModificationError)(t2), ++_i) {
         t5 = t2[_i];
-        _0_1 = A._InitializedCell$(new A.MultiDirWatcher_watch_closure(t5));
-        _0_1._readFinal$0().toString;
-        t6 = _0_1._readFinal$0();
-        t6.toString;
+        _0_1 = t5._0;
+        _0_1.toString;
         existingWatcher = t5._1;
         if (!isParentOfExistingDir) {
           t5 = $.$get$context();
-          t5 = t5._isWithinOrEquals$2(t6, directory) === B._PathRelation_equal || t5._isWithinOrEquals$2(t6, directory) === B._PathRelation_within;
+          t5 = t5._isWithinOrEquals$2(_0_1, directory) === B._PathRelation_equal || t5._isWithinOrEquals$2(_0_1, directory) === B._PathRelation_within;
         } else
           t5 = false;
         if (t5) {
@@ -59391,8 +61260,8 @@ self.util = _cliPkgRequires.util;
           t1._asyncComplete$1(null);
           return t1;
         }
-        if ($.$get$context()._isWithinOrEquals$2(directory, t6) === B._PathRelation_within) {
-          t1.remove$1(0, t6);
+        if ($.$get$context()._isWithinOrEquals$2(directory, _0_1) === B._PathRelation_within) {
+          t1.remove$1(0, _0_1);
           t4.remove$1(0, existingWatcher);
           isParentOfExistingDir = true;
         }
@@ -59406,12 +61275,6 @@ self.util = _cliPkgRequires.util;
       return future;
     }
   };
-  A.MultiDirWatcher_watch_closure.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature: 32
-  };
   A.MultiSpan.prototype = {
     get$start(_) {
       var t1 = this._multi_span$_primary;
@@ -59450,16 +61313,15 @@ self.util = _cliPkgRequires.util;
       return new A.MultiSpan(this._multi_span$_primary.expand$1(0, other), this.primaryLabel, this.secondarySpans);
     },
     highlight$1$color(color) {
-      var t1 = color === true || false;
-      return A.Highlighter$multiple(this._multi_span$_primary, this.primaryLabel, this.secondarySpans, t1, null, null).highlight$0();
+      return A.Highlighter$multiple(this._multi_span$_primary, this.primaryLabel, this.secondarySpans, color === true, null, null).highlight$0();
     },
     message$2$color(_, message, color) {
       var t1 = J.$eq$(color, true) || typeof color == "string",
         t2 = typeof color == "string" ? color : null;
       return A.SourceSpanExtension_messageMultiple(this._multi_span$_primary, message, this.primaryLabel, this.secondarySpans, t1, t2, null);
     },
-    message$1($receiver, message) {
-      return this.message$2$color($receiver, message, null);
+    message$1(_, message) {
+      return this.message$2$color(0, message, null);
     },
     $isComparable: 1,
     $isFileSpan: 1,
@@ -59477,11 +61339,15 @@ self.util = _cliPkgRequires.util;
       return this.forSpan$1$2(span, callback, type$.dynamic);
     },
     write$1(_, object) {
-      this._no_source_map_buffer$_buffer._contents += A.S(object);
+      var t1 = this._no_source_map_buffer$_buffer,
+        t2 = A.S(object);
+      t1._contents += t2;
       return null;
     },
     writeCharCode$1(charCode) {
-      this._no_source_map_buffer$_buffer._contents += A.Primitives_stringFromCharCode(charCode);
+      var t1 = this._no_source_map_buffer$_buffer,
+        t2 = A.Primitives_stringFromCharCode(charCode);
+      t1._contents += t2;
       return null;
     },
     toString$0(_) {
@@ -59533,7 +61399,7 @@ self.util = _cliPkgRequires.util;
     call$1(key) {
       return this.$this._view._prefix + key;
     },
-    $signature: 7
+    $signature: 5
   };
   A.PublicMemberMapView.prototype = {
     get$keys(_) {
@@ -59597,7 +61463,9 @@ self.util = _cliPkgRequires.util;
           ++this._column;
     },
     writeCharCode$1(charCode) {
-      this._source_map_buffer$_buffer._contents += A.Primitives_stringFromCharCode(charCode);
+      var t1 = this._source_map_buffer$_buffer,
+        t2 = A.Primitives_stringFromCharCode(charCode);
+      t1._contents += t2;
       if (charCode === 10)
         this._source_map_buffer$_writeLine$0();
       else
@@ -59646,7 +61514,7 @@ self.util = _cliPkgRequires.util;
       t3 = t2 === 0 ? t3.prefixColumn : 0;
       return new A.Entry(entry.source, A.SourceLocation$(t1.offset + this.prefixLength, t1.column + t3, t2 + t4, null), entry.identifierName);
     },
-    $signature: 206
+    $signature: 158
   };
   A.UnprefixedMapView.prototype = {
     get$keys(_) {
@@ -59676,19 +61544,19 @@ self.util = _cliPkgRequires.util;
     call$1(key) {
       return B.JSString_methods.startsWith$1(key, this.$this._unprefixed_map_view$_view._unprefixed_map_view$_prefix);
     },
-    $signature: 10
+    $signature: 4
   };
   A._UnprefixedKeys_iterator_closure0.prototype = {
     call$1(key) {
       return B.JSString_methods.substring$1(key, this.$this._unprefixed_map_view$_view._unprefixed_map_view$_prefix.length);
     },
-    $signature: 7
+    $signature: 5
   };
   A.indent_closure.prototype = {
     call$1(line) {
       return B.JSString_methods.$mul(" ", this.indentation) + line;
     },
-    $signature: 7
+    $signature: 5
   };
   A.flattenVertically_closure.prototype = {
     call$1(inner) {
@@ -59701,7 +61569,7 @@ self.util = _cliPkgRequires.util;
   A.flattenVertically_closure0.prototype = {
     call$1(queue) {
       this.result.push(queue.removeFirst$0());
-      return queue.get$length(queue) === 0;
+      return queue.get$length(0) === 0;
     },
     $signature() {
       return this.T._eval$1("bool(QueueList<0>)");
@@ -59727,18 +61595,10 @@ self.util = _cliPkgRequires.util;
   };
   A.mapAddAll2_closure.prototype = {
     call$2(key, inner) {
-      var innerDestination, t2,
-        t1 = this.destination,
+      var t1 = this.destination,
         _0_0 = t1.$index(0, key);
-      if (_0_0 != null) {
-        innerDestination = _0_0;
-        t2 = true;
-      } else {
-        innerDestination = null;
-        t2 = false;
-      }
-      if (t2)
-        innerDestination.addAll$1(0, inner);
+      if (_0_0 != null)
+        _0_0.addAll$1(0, inner);
       else
         t1.$indexSet(0, key, inner);
     },
@@ -59775,12 +61635,11 @@ self.util = _cliPkgRequires.util;
       return this;
     },
     sassIndexToListIndex$2(sassIndex, $name) {
-      var t1, t2, index,
+      var t1, index,
         indexValue = sassIndex.assertNumber$1($name);
       if (indexValue.get$hasUnits()) {
         t1 = indexValue.get$unitString();
-        t2 = indexValue.unitSuggestion$1($name);
-        A.EvaluationContext_current().warn$2(0, "$" + $name + ": Passing a number with unit " + t1 + string$.x20is_de + t2 + string$.x0a_Morex3a, B.Deprecation_8WR);
+        A.warnForDeprecation("$" + $name + ": Passing a number with unit " + t1 + string$.x20is_de + indexValue.unitSuggestion$1($name) + string$.x0a_Morex3a, B.Deprecation_2jN);
       }
       index = indexValue.assertInt$1($name);
       if (index === 0)
@@ -59817,18 +61676,10 @@ self.util = _cliPkgRequires.util;
       return A.throwExpression(A.SassScriptException$(this.toString$0(0) + " is not a string.", $name));
     },
     _selectorString$1($name) {
-      var string, t1,
-        _0_0 = this._selectorStringOrNull$0();
-      if (_0_0 != null) {
-        string = _0_0;
-        t1 = true;
-      } else {
-        string = null;
-        t1 = false;
-      }
-      if (t1)
-        return string;
-      throw A.wrapException(A.SassScriptException$(this.toString$0(0) + string$.x20is_noa, $name));
+      var _0_0 = this._selectorStringOrNull$0();
+      if (_0_0 != null)
+        return _0_0;
+      throw A.wrapException(A.SassScriptException$(this.toString$0(0) + string$.x20is_noav, $name));
     },
     _selectorStringOrNull$0() {
       var t1, t2, result, _1_0, _i, complex, string, compound, _this = this, _null = null;
@@ -59843,14 +61694,14 @@ self.util = _cliPkgRequires.util;
       result = A._setArrayType([], type$.JSArray_String);
       $label0$1: {
         _1_0 = _this._separator;
-        if (B.ListSeparator_rXA === _1_0) {
+        if (B.ListSeparator_ECn === _1_0) {
           for (_i = 0; _i < t2; ++_i) {
             complex = t1[_i];
             if (complex instanceof A.SassString) {
               result.push(complex._string$_text);
               continue;
             }
-            if (complex instanceof A.SassList && B.ListSeparator_EVt === complex._separator) {
+            if (complex instanceof A.SassList && B.ListSeparator_nbm === complex._separator) {
               string = complex._selectorStringOrNull$0();
               if (string == null)
                 return _null;
@@ -59861,7 +61712,7 @@ self.util = _cliPkgRequires.util;
           }
           break $label0$1;
         }
-        if (B.ListSeparator_zg9 === _1_0)
+        if (B.ListSeparator_cQA === _1_0)
           return _null;
         for (_i = 0; _i < t2; ++_i) {
           compound = t1[_i];
@@ -59869,8 +61720,9 @@ self.util = _cliPkgRequires.util;
             return _null;
           result.push(compound._string$_text);
         }
+        break $label0$1;
       }
-      return B.JSArray_methods.join$1(result, _1_0 === B.ListSeparator_rXA ? ", " : " ");
+      return B.JSArray_methods.join$1(result, _1_0 === B.ListSeparator_ECn ? ", " : " ");
     },
     withListContents$2$separator(contents, separator) {
       var t1 = separator == null ? this.get$separator(this) : separator,
@@ -59985,143 +61837,11 @@ self.util = _cliPkgRequires.util;
       return B.JSString_methods.get$hashCode(this.name) ^ B.C_ListEquality0.hash$1(this.$arguments);
     }
   };
-  A.SassCalculation_sign_closure.prototype = {
-    call$0() {
-      return type$.SassNumber._as(this._0_0)._number$_value;
-    },
-    $signature: 92
-  };
-  A.SassCalculation_round_closure.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature: 14
-  };
-  A.SassCalculation_round_closure0.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 28
-  };
-  A.SassCalculation_round_closure1.prototype = {
-    call$0() {
-      return this._0_2._readFinal$0() == null;
-    },
-    $signature: 1
-  };
-  A.SassCalculation_round_closure2.prototype = {
-    call$0() {
-      return this._0_0._2;
-    },
-    $signature: 28
-  };
-  A.SassCalculation_round_closure3.prototype = {
-    call$0() {
-      return this._0_5._readFinal$0() == null;
-    },
-    $signature: 1
-  };
-  A.SassCalculation_round_closure4.prototype = {
-    call$0() {
-      return type$.SassString._as(this._0_1._readFinal$0())._string$_text;
-    },
-    $signature: 22
-  };
-  A.SassCalculation_round_closure5.prototype = {
-    call$0() {
-      return "nearest" === this._0_8._readFinal$0();
-    },
-    $signature: 1
-  };
-  A.SassCalculation_round_closure6.prototype = {
-    call$0() {
-      return "up" === this._0_8._readFinal$0();
-    },
-    $signature: 1
-  };
-  A.SassCalculation_round_closure7.prototype = {
-    call$0() {
-      return "down" === this._0_8._readFinal$0();
-    },
-    $signature: 1
-  };
-  A.SassCalculation_round_closure8.prototype = {
-    call$0() {
-      return "to-zero" === this._0_8._readFinal$0();
-    },
-    $signature: 1
-  };
-  A.SassCalculation__roundWithStep_closure0.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature: 22
-  };
-  A.SassCalculation__roundWithStep_closure.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 92
-  };
-  A.SassCalculation__roundWithStep_closure1.prototype = {
-    call$0() {
-      return "nearest" === this._0_1._readFinal$0();
-    },
-    $signature: 1
-  };
-  A.SassCalculation__roundWithStep_closure2.prototype = {
-    call$0() {
-      return "to-zero" === this._0_1._readFinal$0();
-    },
-    $signature: 1
-  };
-  A.SassCalculation__roundWithStep_closure3.prototype = {
-    call$0() {
-      return this._0_2._readFinal$0() > 0;
-    },
-    $signature: 1
-  };
-  A.SassCalculation__roundWithStep_closure4.prototype = {
-    call$0() {
-      return "up" === this._0_1._readFinal$0();
-    },
-    $signature: 1
-  };
-  A.SassCalculation__roundWithStep_closure5.prototype = {
-    call$0() {
-      return "down" === this._0_1._readFinal$0();
-    },
-    $signature: 1
-  };
-  A.SassCalculation__simplify_closure.prototype = {
-    call$0() {
-      return "calc" === this._0_0.name;
-    },
-    $signature: 1
-  };
-  A.SassCalculation__simplify_closure0.prototype = {
-    call$0() {
-      return type$.SassCalculation._as(this._0_0).$arguments;
-    },
-    $signature: 138
-  };
-  A.SassCalculation__simplify_closure1.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_12._readFinal$0()) === 1;
-    },
-    $signature: 1
-  };
-  A.SassCalculation__simplify_closure2.prototype = {
-    call$0() {
-      return J.$index$asx(this._0_12._readFinal$0(), 0);
-    },
-    $signature: 14
-  };
   A.SassCalculation__verifyLength_closure.prototype = {
     call$1(arg) {
       return arg instanceof A.SassString;
     },
-    $signature: 77
+    $signature: 75
   };
   A.CalculationOperation.prototype = {
     $eq(_, other) {
@@ -60195,12 +61915,10 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     get$whiteness(_) {
-      var _this = this;
-      return Math.min(Math.min(_this.get$red(_this), _this.get$green(_this)), _this.get$blue(_this)) / 255 * 100;
+      return Math.min(Math.min(this.get$red(0), this.get$green(0)), this.get$blue(0)) / 255 * 100;
     },
     get$blackness(_) {
-      var _this = this;
-      return 100 - Math.max(Math.max(_this.get$red(_this), _this.get$green(_this)), _this.get$blue(_this)) / 255 * 100;
+      return 100 - Math.max(Math.max(this.get$red(0), this.get$green(0)), this.get$blue(0)) / 255 * 100;
     },
     accept$1$1(visitor) {
       return visitor.visitColor$1(this);
@@ -60219,9 +61937,9 @@ self.util = _cliPkgRequires.util;
     },
     changeHsl$4$alpha$hue$lightness$saturation(alpha, hue, lightness, saturation) {
       var _this = this, _null = null,
-        t1 = hue == null ? _this.get$hue(_this) : hue,
-        t2 = saturation == null ? _this.get$saturation(_this) : saturation,
-        t3 = lightness == null ? _this.get$lightness(_this) : lightness,
+        t1 = hue == null ? _this.get$hue(0) : hue,
+        t2 = saturation == null ? _this.get$saturation(0) : saturation,
+        t3 = lightness == null ? _this.get$lightness(0) : lightness,
         t4 = A.SassColor__handleNullAlpha(alpha == null ? _this._alpha : alpha);
       return new A.SassColor(_null, _null, _null, B.JSNumber_methods.$mod(t1, 360), A.fuzzyAssertRange(t2, 0, 100, "saturation"), A.fuzzyAssertRange(t3, 0, 100, "lightness"), A.fuzzyAssertRange(t4, 0, 1, "alpha"), _null);
     },
@@ -60257,17 +61975,17 @@ self.util = _cliPkgRequires.util;
       var _this = this;
       if (other == null)
         return false;
-      return other instanceof A.SassColor && other.get$red(other) === _this.get$red(_this) && other.get$green(other) === _this.get$green(_this) && other.get$blue(other) === _this.get$blue(_this) && other._alpha === _this._alpha;
+      return other instanceof A.SassColor && other.get$red(0) === _this.get$red(0) && other.get$green(0) === _this.get$green(0) && other.get$blue(0) === _this.get$blue(0) && other._alpha === _this._alpha;
     },
     get$hashCode(_) {
       var _this = this;
-      return B.JSInt_methods.get$hashCode(_this.get$red(_this)) ^ B.JSInt_methods.get$hashCode(_this.get$green(_this)) ^ B.JSInt_methods.get$hashCode(_this.get$blue(_this)) ^ B.JSNumber_methods.get$hashCode(_this._alpha);
+      return B.JSInt_methods.get$hashCode(_this.get$red(0)) ^ B.JSInt_methods.get$hashCode(_this.get$green(0)) ^ B.JSInt_methods.get$hashCode(_this.get$blue(0)) ^ B.JSNumber_methods.get$hashCode(_this._alpha);
     },
     _rgbToHsl$0() {
       var t2, lightness, _this = this,
-        scaledRed = _this.get$red(_this) / 255,
-        scaledGreen = _this.get$green(_this) / 255,
-        scaledBlue = _this.get$blue(_this) / 255,
+        scaledRed = _this.get$red(0) / 255,
+        scaledGreen = _this.get$green(0) / 255,
+        scaledBlue = _this.get$blue(0) / 255,
         max = Math.max(Math.max(scaledRed, scaledGreen), scaledBlue),
         min = Math.min(Math.min(scaledRed, scaledGreen), scaledBlue),
         delta = max - min,
@@ -60295,9 +62013,9 @@ self.util = _cliPkgRequires.util;
     },
     _hslToRgb$0() {
       var _this = this,
-        scaledHue = _this.get$hue(_this) / 360,
-        scaledSaturation = _this.get$saturation(_this) / 100,
-        scaledLightness = _this.get$lightness(_this) / 100,
+        scaledHue = _this.get$hue(0) / 360,
+        scaledSaturation = _this.get$saturation(0) / 100,
+        scaledLightness = _this.get$lightness(0) / 100,
         m2 = scaledLightness <= 0.5 ? scaledLightness * (scaledSaturation + 1) : scaledLightness + scaledSaturation - scaledLightness * scaledSaturation,
         m1 = scaledLightness * 2 - m2;
       _this._red = A.fuzzyRound(A.SassColor__hueToRgb(m1, m2, scaledHue + 0.3333333333333333) * 255);
@@ -60309,7 +62027,7 @@ self.util = _cliPkgRequires.util;
     call$1(hue) {
       return A.fuzzyRound((A.SassColor__hueToRgb(0, 1, hue) * this.factor + this._box_0.scaledWhiteness) * 255);
     },
-    $signature: 210
+    $signature: 159
   };
   A._ColorFormatEnum.prototype = {
     toString$0(_) {
@@ -60395,7 +62113,7 @@ self.util = _cliPkgRequires.util;
     call$1(element) {
       return element.get$isBlank();
     },
-    $signature: 79
+    $signature: 72
   };
   A.ListSeparator.prototype = {
     _enumToString$0() {
@@ -60408,20 +62126,18 @@ self.util = _cliPkgRequires.util;
   A.SassMap.prototype = {
     get$separator(_) {
       var t1 = this._map$_contents;
-      return t1.get$isEmpty(t1) ? B.ListSeparator_undecided_null_undecided : B.ListSeparator_rXA;
+      return t1.get$isEmpty(t1) ? B.ListSeparator_undecided_null_undecided : B.ListSeparator_ECn;
     },
     get$asList() {
-      var t3, t4, t5, key, value, result,
+      var t3, t4, t5, result,
         t1 = type$.JSArray_Value,
         t2 = A._setArrayType([], t1);
       for (t3 = type$.Value, t4 = A.MapExtensions_get_pairs(this._map$_contents, t3, t3), t4 = t4.get$iterator(t4); t4.moveNext$0();) {
         t5 = t4.get$current(t4);
-        key = t5._0;
-        value = t5._1;
-        result = A.List_List$from(A._setArrayType([key, value], t1), false, t3);
+        result = A.List_List$from(A._setArrayType([t5._0, t5._1], t1), false, t3);
         result.fixed$length = Array;
         result.immutable$list = Array;
-        t2.push(new A.SassList(result, B.ListSeparator_EVt, false));
+        t2.push(new A.SassList(result, B.ListSeparator_nbm, false));
       }
       return t2;
     },
@@ -60529,48 +62245,25 @@ self.util = _cliPkgRequires.util;
       return this.assertNumber$1(null);
     },
     assertInt$1($name) {
-      var integer, t1,
-        _0_0 = A.fuzzyAsInt(this._number$_value);
-      if (_0_0 != null) {
-        integer = _0_0;
-        t1 = true;
-      } else {
-        integer = null;
-        t1 = false;
-      }
-      if (t1)
-        return integer;
+      var _0_0 = A.fuzzyAsInt(this._number$_value);
+      if (_0_0 != null)
+        return _0_0;
       throw A.wrapException(A.SassScriptException$(this.toString$0(0) + " is not an int.", $name));
     },
     assertInt$0() {
       return this.assertInt$1(null);
     },
     valueInRange$3(min, max, $name) {
-      var result, t1, _this = this,
+      var _this = this,
         _0_0 = A.fuzzyCheckRange(_this._number$_value, min, max);
-      if (_0_0 != null) {
-        result = _0_0;
-        t1 = true;
-      } else {
-        result = null;
-        t1 = false;
-      }
-      if (t1)
-        return result;
+      if (_0_0 != null)
+        return _0_0;
       throw A.wrapException(A.SassScriptException$("Expected " + _this.toString$0(0) + " to be within " + min + _this.get$unitString() + " and " + max + _this.get$unitString() + ".", $name));
     },
     valueInRangeWithUnit$4(min, max, $name, unit) {
-      var result, t1,
-        _0_0 = A.fuzzyCheckRange(this._number$_value, min, max);
-      if (_0_0 != null) {
-        result = _0_0;
-        t1 = true;
-      } else {
-        result = null;
-        t1 = false;
-      }
-      if (t1)
-        return result;
+      var _0_0 = A.fuzzyCheckRange(this._number$_value, min, max);
+      if (_0_0 != null)
+        return _0_0;
       throw A.wrapException(A.SassScriptException$("Expected " + this.toString$0(0) + " to be within " + min + unit + " and " + max + unit + ".", $name));
     },
     hasCompatibleUnits$1(other) {
@@ -60748,130 +62441,189 @@ self.util = _cliPkgRequires.util;
       return this._coerceUnits$1$2(other, operation, type$.dynamic);
     },
     multiplyUnits$3(value, otherNumerators, otherDenominators) {
-      var _0_0, _0_1, _0_2, _0_3, _0_6, _0_7, _0_9, _0_11, _0_13, numerators_case_0, denominators_case_0, t1, denominators_case_00, t2, t3, denominators_case_1, numerators_case_1, newNumerators, mutableOtherDenominators, _i, numerator, mutableDenominatorUnits, _this = this, _null = null, _box_0 = {};
+      var t1, _0_1, _0_2, _0_3, _0_6, _0_7_isSet, _0_7, _0_9, t2, _0_9_isSet, denominators_case_0, _0_11_isSet, _0_11, _0_13_isSet, _0_10, _0_13, numerators_case_0, t4, t3, numerators_case_1, denominators_case_1, t0, newNumerators, mutableOtherDenominators, _i, numerator, mutableDenominatorUnits, _this = this, _null = null, _box_0 = {};
       _box_0.value = value;
-      _0_0 = new A._Record_4([_this.get$numeratorUnits(_this), _this.get$denominatorUnits(_this), otherNumerators, otherDenominators]);
-      _0_1 = A._InitializedCell$(new A.SassNumber_multiplyUnits_closure(_0_0));
-      _0_2 = A._InitializedCell$(new A.SassNumber_multiplyUnits_closure0(_0_0));
-      _0_3 = A._InitializedCell$(new A.SassNumber_multiplyUnits_closure1(_0_0));
-      _0_6 = A._InitializedCell$(new A.SassNumber_multiplyUnits_closure2(_0_3));
-      _0_7 = A._InitializedCell$(new A.SassNumber_multiplyUnits_closure3(_0_0));
-      _0_9 = A._InitializedCell$(new A.SassNumber_multiplyUnits_closure4(_0_7));
-      _0_11 = A._InitializedCell$(new A.SassNumber_multiplyUnits_closure5(_0_1));
-      _0_13 = A._InitializedCell$(new A.SassNumber_multiplyUnits_closure6(_0_2));
-      numerators_case_0 = _0_1._readFinal$0();
-      denominators_case_0 = _0_2._readFinal$0();
-      t1 = _0_6._readFinal$0() && _0_9._readFinal$0();
-      if (!t1)
-        if (_0_11._readFinal$0())
-          if (_0_13._readFinal$0()) {
-            numerators_case_0 = _0_3._readFinal$0();
-            denominators_case_00 = _0_7._readFinal$0();
-            denominators_case_0 = denominators_case_00;
-            t1 = true;
-          } else
-            t1 = false;
-        else
-          t1 = false;
-      else
-        t1 = true;
-      if (t1) {
-        t2 = denominators_case_0;
-        t1 = numerators_case_0;
-        t3 = true;
+      t1 = [_this.get$numeratorUnits(_this), _this.get$denominatorUnits(_this), otherNumerators, otherDenominators];
+      _0_1 = t1[0];
+      _0_2 = t1[1];
+      _0_3 = t1[2];
+      _0_6 = _0_3.length <= 0;
+      _0_7_isSet = _0_6;
+      if (_0_7_isSet) {
+        _0_7 = t1[3];
+        _0_9 = _0_7.length <= 0;
+        t2 = _0_9;
       } else {
-        t2 = _null;
-        t1 = t2;
-        t3 = false;
+        _0_7 = _null;
+        _0_9 = _0_7;
+        t2 = false;
       }
-      if (!t3) {
-        if (_0_11._readFinal$0()) {
-          denominators_case_1 = _0_2._readFinal$0();
-          numerators_case_1 = _0_3._readFinal$0();
-          t3 = _0_9._readFinal$0();
-          t3 = t3;
+      _0_9_isSet = _0_7_isSet;
+      denominators_case_0 = _0_2;
+      _0_11_isSet = !t2;
+      if (_0_11_isSet) {
+        _0_11 = _0_1.length <= 0;
+        _0_13_isSet = _0_11;
+        _0_10 = _0_1;
+        if (_0_13_isSet) {
+          _0_13 = _0_2.length <= 0;
+          t2 = _0_13;
+          if (t2) {
+            if (_0_7_isSet)
+              denominators_case_0 = _0_7;
+            else {
+              _0_7 = t1[3];
+              denominators_case_0 = _0_7;
+              _0_7_isSet = true;
+            }
+            numerators_case_0 = _0_3;
+          } else
+            numerators_case_0 = _0_1;
+        } else {
+          numerators_case_0 = _0_1;
+          _0_13 = _null;
+          t2 = false;
+        }
+        _0_1 = _0_10;
+      } else {
+        numerators_case_0 = _0_1;
+        _0_13 = _null;
+        _0_11 = _0_13;
+        _0_13_isSet = false;
+        t2 = true;
+      }
+      if (t2) {
+        t4 = denominators_case_0;
+        t3 = numerators_case_0;
+      } else {
+        t4 = _null;
+        t3 = t4;
+      }
+      if (!t2) {
+        if (_0_11_isSet)
+          t2 = _0_11;
+        else {
+          _0_11 = _0_1.length <= 0;
+          t2 = _0_11;
+        }
+        if (t2) {
+          if (_0_9_isSet)
+            t2 = _0_9;
+          else {
+            if (_0_7_isSet)
+              t2 = _0_7;
+            else {
+              _0_7 = t1[3];
+              t2 = _0_7;
+              _0_7_isSet = true;
+            }
+            _0_9 = t2.length <= 0;
+            t2 = _0_9;
+          }
+          numerators_case_1 = _0_3;
+          denominators_case_1 = _0_2;
         } else {
           numerators_case_1 = _null;
           denominators_case_1 = numerators_case_1;
+          t2 = false;
+        }
+        if (!t2) {
+          if (_0_13_isSet)
+            t2 = _0_13;
+          else {
+            _0_13 = _0_2.length <= 0;
+            t2 = _0_13;
+          }
+          if (t2) {
+            if (_0_6)
+              denominators_case_1 = _0_7_isSet ? _0_7 : t1[3];
+            t1 = _0_6;
+          } else
+            t1 = false;
+          numerators_case_1 = _0_1;
+        } else
+          t1 = true;
+        if (t1) {
+          t1 = !_this._areAnyConvertible$2(numerators_case_1, denominators_case_1);
+          if (t1) {
+            t3 = denominators_case_1;
+            t2 = numerators_case_1;
+          } else {
+            t2 = t3;
+            t3 = t4;
+          }
+          t0 = t3;
+          t3 = t1;
+          t1 = t2;
+          t2 = t0;
+        } else {
+          t2 = t4;
+          t1 = t3;
           t3 = false;
         }
-        if (!t3) {
-          numerators_case_1 = _0_1._readFinal$0();
-          if (_0_13._readFinal$0())
-            if (_0_6._readFinal$0()) {
-              denominators_case_1 = _0_7._readFinal$0();
-              t3 = true;
-            } else
-              t3 = false;
-          else
-            t3 = false;
-        } else
-          t3 = true;
-        if (t3)
-          if (!_this._areAnyConvertible$2(numerators_case_1, denominators_case_1)) {
-            t2 = denominators_case_1;
-            t1 = numerators_case_1;
-            t3 = true;
-          } else
-            t3 = false;
-        else
-          t3 = false;
-      } else
+      } else {
+        t2 = t4;
+        t1 = t3;
         t3 = true;
+      }
       if (t3)
         return A.SassNumber_SassNumber$withUnits(value, t2, t1);
       newNumerators = A._setArrayType([], type$.JSArray_String);
       mutableOtherDenominators = A._setArrayType(otherDenominators.slice(0), A._arrayInstanceType(otherDenominators));
       for (t1 = _this.get$numeratorUnits(_this), t2 = t1.length, _i = 0; _i < t2; ++_i) {
         numerator = t1[_i];
-        A.removeFirstWhere(mutableOtherDenominators, new A.SassNumber_multiplyUnits_closure7(_box_0, numerator), new A.SassNumber_multiplyUnits_closure8(newNumerators, numerator));
+        A.removeFirstWhere(mutableOtherDenominators, new A.SassNumber_multiplyUnits_closure(_box_0, numerator), new A.SassNumber_multiplyUnits_closure0(newNumerators, numerator));
       }
       t1 = _this.get$denominatorUnits(_this);
       mutableDenominatorUnits = A._setArrayType(t1.slice(0), A._arrayInstanceType(t1));
       for (t1 = otherNumerators.length, _i = 0; _i < t1; ++_i) {
         numerator = otherNumerators[_i];
-        A.removeFirstWhere(mutableDenominatorUnits, new A.SassNumber_multiplyUnits_closure9(_box_0, numerator), new A.SassNumber_multiplyUnits_closure10(newNumerators, numerator));
+        A.removeFirstWhere(mutableDenominatorUnits, new A.SassNumber_multiplyUnits_closure1(_box_0, numerator), new A.SassNumber_multiplyUnits_closure2(newNumerators, numerator));
       }
       t1 = _box_0.value;
       B.JSArray_methods.addAll$1(mutableDenominatorUnits, mutableOtherDenominators);
       return A.SassNumber_SassNumber$withUnits(t1, mutableDenominatorUnits, newNumerators);
     },
     _areAnyConvertible$2(units1, units2) {
-      return J.any$1$ax(units1, new A.SassNumber__areAnyConvertible_closure(units2));
+      return B.JSArray_methods.any$1(units1, new A.SassNumber__areAnyConvertible_closure(units2));
     },
     _unitString$2(numerators, denominators) {
-      var t1, denominator,
-        _0_0 = new A._Record_2(numerators, denominators),
-        _0_4 = A._InitializedCell$(new A.SassNumber__unitString_closure(_0_0)),
-        _0_5 = A._InitializedCell$(new A.SassNumber__unitString_closure0(_0_0)),
-        _0_6 = A._InitializedCell$(new A.SassNumber__unitString_closure1(_0_5)),
-        _0_7 = A._InitializedCell$(new A.SassNumber__unitString_closure2(_0_6));
+      var _0_4, _0_6, t1, _0_7, _0_5, _null = null;
       $label0$0: {
-        if (_0_4._readFinal$0() && _0_7._readFinal$0()) {
-          t1 = "no units";
-          break $label0$0;
-        }
-        if (_0_4._readFinal$0())
-          if (J.$eq$(_0_6._readFinal$0(), 1)) {
-            denominator = J.$index$asx(_0_5._readFinal$0(), 0);
-            t1 = true;
-          } else {
-            denominator = null;
-            t1 = false;
-          }
-        else {
-          denominator = null;
+        _0_4 = numerators.length <= 0;
+        if (_0_4) {
+          _0_6 = denominators.length;
+          t1 = _0_6;
+          _0_7 = t1 <= 0;
+          t1 = _0_7;
+          _0_5 = denominators;
+        } else {
+          _0_5 = _null;
+          _0_6 = _0_5;
+          _0_7 = _0_6;
           t1 = false;
         }
         if (t1) {
-          t1 = A.S(denominator) + "^-1";
+          t1 = "no units";
           break $label0$0;
         }
-        if (_0_4._readFinal$0()) {
+        if (_0_4)
+          t1 = _0_6 === 1;
+        else
+          t1 = false;
+        if (t1) {
+          t1 = (_0_4 ? _0_5 : denominators)[0] + "^-1";
+          break $label0$0;
+        }
+        if (_0_4) {
           t1 = "(" + B.JSArray_methods.join$1(denominators, "*") + ")^-1";
           break $label0$0;
         }
-        if (_0_7._readFinal$0()) {
+        _0_6 = denominators.length;
+        t1 = _0_6;
+        _0_7 = t1 <= 0;
+        t1 = _0_7;
+        if (t1) {
           t1 = B.JSArray_methods.join$1(numerators, "*");
           break $label0$0;
         }
@@ -60909,7 +62661,7 @@ self.util = _cliPkgRequires.util;
         if (type == null)
           t1 = units;
         else {
-          t1 = B.Map_ws7dy.$index(0, type);
+          t1 = B.Map_397RH.$index(0, type);
           t1.toString;
           t1 = A._setArrayType([B.JSArray_methods.get$first(t1)], type$.JSArray_String);
         }
@@ -60925,7 +62677,7 @@ self.util = _cliPkgRequires.util;
     },
     canonicalMultiplierForUnit$1(unit) {
       var t1,
-        innerMap = B.Map_nfuzN.$index(0, unit);
+        innerMap = B.Map_gQqJO.$index(0, unit);
       if (innerMap == null)
         t1 = 1;
       else {
@@ -60948,67 +62700,6 @@ self.util = _cliPkgRequires.util;
       return this.unitSuggestion$2($name, null);
     }
   };
-  A.SassNumber_SassNumber$withUnits_closure0.prototype = {
-    call$0() {
-      return this._0_1._readFinal$0() == null;
-    },
-    $signature: 1
-  };
-  A.SassNumber_SassNumber$withUnits_closure.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature: 96
-  };
-  A.SassNumber_SassNumber$withUnits_closure1.prototype = {
-    call$0() {
-      var t1 = this._0_1._readFinal$0();
-      return J.get$length$asx(t1 == null ? type$.List_String._as(t1) : t1);
-    },
-    $signature: 3
-  };
-  A.SassNumber_SassNumber$withUnits_closure2.prototype = {
-    call$0() {
-      return this._0_4._readFinal$0() <= 0;
-    },
-    $signature: 1
-  };
-  A.SassNumber_SassNumber$withUnits_closure4.prototype = {
-    call$0() {
-      return this._0_7._readFinal$0() == null;
-    },
-    $signature: 1
-  };
-  A.SassNumber_SassNumber$withUnits_closure3.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 96
-  };
-  A.SassNumber_SassNumber$withUnits_closure5.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_7._readFinal$0()) <= 0;
-    },
-    $signature: 1
-  };
-  A.SassNumber_SassNumber$withUnits_closure6.prototype = {
-    call$0() {
-      return this._1_0._0;
-    },
-    $signature: 26
-  };
-  A.SassNumber_SassNumber$withUnits_closure7.prototype = {
-    call$0() {
-      return J.get$length$asx(this._1_1._readFinal$0());
-    },
-    $signature: 3
-  };
-  A.SassNumber_SassNumber$withUnits_closure8.prototype = {
-    call$0() {
-      return J.get$length$asx(this._1_0._1) <= 0;
-    },
-    $signature: 1
-  };
   A.SassNumber__coerceOrConvertValue_compatibilityException.prototype = {
     call$0() {
       var t2, t3, message, t4, type, unit, _this = this,
@@ -61038,7 +62729,7 @@ self.util = _cliPkgRequires.util;
           if (type != null) {
             t1 = _this.$this.toString$0(0);
             t2 = B.JSArray_methods.contains$1(A._setArrayType([97, 101, 105, 111, 117], type$.JSArray_int), type.charCodeAt(0)) ? "an " + type : "a " + type;
-            t3 = B.Map_ws7dy.$index(0, type);
+            t3 = B.Map_397RH.$index(0, type);
             t3.toString;
             t3 = "Expected " + t1 + " to have " + t2 + " unit (" + B.JSArray_methods.join$1(t3, ", ") + ").";
             t2 = _this.name;
@@ -61053,7 +62744,7 @@ self.util = _cliPkgRequires.util;
         return new A.SassScriptException(t1 == null ? t2 : "$" + t1 + ": " + t2);
       }
     },
-    $signature: 415
+    $signature: 382
   };
   A.SassNumber__coerceOrConvertValue_closure.prototype = {
     call$1(oldNumerator) {
@@ -61063,7 +62754,7 @@ self.util = _cliPkgRequires.util;
       this._box_0.value *= factor;
       return true;
     },
-    $signature: 10
+    $signature: 4
   };
   A.SassNumber__coerceOrConvertValue_closure0.prototype = {
     call$0() {
@@ -61079,7 +62770,7 @@ self.util = _cliPkgRequires.util;
       this._box_0.value /= factor;
       return true;
     },
-    $signature: 10
+    $signature: 4
   };
   A.SassNumber__coerceOrConvertValue_closure2.prototype = {
     call$0() {
@@ -61091,63 +62782,15 @@ self.util = _cliPkgRequires.util;
     call$2(num1, num2) {
       return num1 + num2;
     },
-    $signature: 66
+    $signature: 56
   };
   A.SassNumber_minus_closure.prototype = {
     call$2(num1, num2) {
       return num1 - num2;
     },
-    $signature: 66
+    $signature: 56
   };
   A.SassNumber_multiplyUnits_closure.prototype = {
-    call$0() {
-      return this._0_0._values[0];
-    },
-    $signature: 26
-  };
-  A.SassNumber_multiplyUnits_closure0.prototype = {
-    call$0() {
-      return this._0_0._values[1];
-    },
-    $signature: 26
-  };
-  A.SassNumber_multiplyUnits_closure1.prototype = {
-    call$0() {
-      return this._0_0._values[2];
-    },
-    $signature: 26
-  };
-  A.SassNumber_multiplyUnits_closure2.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_3._readFinal$0()) <= 0;
-    },
-    $signature: 1
-  };
-  A.SassNumber_multiplyUnits_closure3.prototype = {
-    call$0() {
-      return this._0_0._values[3];
-    },
-    $signature: 26
-  };
-  A.SassNumber_multiplyUnits_closure4.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_7._readFinal$0()) <= 0;
-    },
-    $signature: 1
-  };
-  A.SassNumber_multiplyUnits_closure5.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_1._readFinal$0()) <= 0;
-    },
-    $signature: 1
-  };
-  A.SassNumber_multiplyUnits_closure6.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_2._readFinal$0()) <= 0;
-    },
-    $signature: 1
-  };
-  A.SassNumber_multiplyUnits_closure7.prototype = {
     call$1(denominator) {
       var factor = A.conversionFactor(this.numerator, denominator);
       if (factor == null)
@@ -61155,15 +62798,15 @@ self.util = _cliPkgRequires.util;
       this._box_0.value /= factor;
       return true;
     },
-    $signature: 10
+    $signature: 4
   };
-  A.SassNumber_multiplyUnits_closure8.prototype = {
+  A.SassNumber_multiplyUnits_closure0.prototype = {
     call$0() {
       return this.newNumerators.push(this.numerator);
     },
     $signature: 0
   };
-  A.SassNumber_multiplyUnits_closure9.prototype = {
+  A.SassNumber_multiplyUnits_closure1.prototype = {
     call$1(denominator) {
       var factor = A.conversionFactor(this.numerator, denominator);
       if (factor == null)
@@ -61171,9 +62814,9 @@ self.util = _cliPkgRequires.util;
       this._box_0.value /= factor;
       return true;
     },
-    $signature: 10
+    $signature: 4
   };
-  A.SassNumber_multiplyUnits_closure10.prototype = {
+  A.SassNumber_multiplyUnits_closure2.prototype = {
     call$0() {
       return this.newNumerators.push(this.numerator);
     },
@@ -61181,50 +62824,19 @@ self.util = _cliPkgRequires.util;
   };
   A.SassNumber__areAnyConvertible_closure.prototype = {
     call$1(unit1) {
-      var innerMap, t1,
-        _0_0 = B.Map_nfuzN.$index(0, unit1);
+      var t1,
+        _0_0 = B.Map_gQqJO.$index(0, unit1);
       $label0$0: {
         if (_0_0 != null) {
-          innerMap = _0_0;
-          t1 = true;
-        } else {
-          innerMap = null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = J.any$1$ax(this.units2, innerMap.get$containsKey());
+          t1 = B.JSArray_methods.any$1(this.units2, _0_0.get$containsKey());
           break $label0$0;
         }
-        t1 = J.contains$1$asx(this.units2, unit1);
+        t1 = B.JSArray_methods.contains$1(this.units2, unit1);
         break $label0$0;
       }
       return t1;
     },
-    $signature: 10
-  };
-  A.SassNumber__unitString_closure.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_0._0) <= 0;
-    },
-    $signature: 1
-  };
-  A.SassNumber__unitString_closure0.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 26
-  };
-  A.SassNumber__unitString_closure1.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_5._readFinal$0());
-    },
-    $signature: 3
-  };
-  A.SassNumber__unitString_closure2.prototype = {
-    call$0() {
-      return this._0_6._readFinal$0() <= 0;
-    },
-    $signature: 1
+    $signature: 4
   };
   A.SassNumber__canonicalizeUnitList_closure.prototype = {
     call$1(unit) {
@@ -61233,31 +62845,31 @@ self.util = _cliPkgRequires.util;
       if (type == null)
         t1 = unit;
       else {
-        t1 = B.Map_ws7dy.$index(0, type);
+        t1 = B.Map_397RH.$index(0, type);
         t1.toString;
         t1 = B.JSArray_methods.get$first(t1);
       }
       return t1;
     },
-    $signature: 7
+    $signature: 5
   };
   A.SassNumber__canonicalMultiplier_closure.prototype = {
     call$2(multiplier, unit) {
       return multiplier * this.$this.canonicalMultiplierForUnit$1(unit);
     },
-    $signature: 220
+    $signature: 160
   };
   A.SassNumber_unitSuggestion_closure.prototype = {
     call$1(unit) {
       return " * 1" + unit;
     },
-    $signature: 7
+    $signature: 5
   };
   A.SassNumber_unitSuggestion_closure0.prototype = {
     call$1(unit) {
       return " / 1" + unit;
     },
-    $signature: 7
+    $signature: 5
   };
   A.ComplexSassNumber.prototype = {
     get$numeratorUnits(_) {
@@ -61400,13 +63012,13 @@ self.util = _cliPkgRequires.util;
     call$1(factor) {
       return new A.SingleUnitSassNumber(this.unit, this.$this._number$_value * factor, null);
     },
-    $signature: 420
+    $signature: 360
   };
   A.SingleUnitSassNumber__coerceValueToUnit_closure.prototype = {
     call$1(factor) {
       return this.$this._number$_value * factor;
     },
-    $signature: 42
+    $signature: 37
   };
   A.SingleUnitSassNumber_multiplyUnits_closure.prototype = {
     call$1(denominator) {
@@ -61416,7 +63028,7 @@ self.util = _cliPkgRequires.util;
       this._box_0.value *= factor;
       return true;
     },
-    $signature: 10
+    $signature: 4
   };
   A.SingleUnitSassNumber_multiplyUnits_closure0.prototype = {
     call$0() {
@@ -61570,11 +63182,10 @@ self.util = _cliPkgRequires.util;
   };
   A.SassString.prototype = {
     get$_sassLength() {
-      var t1, result, _this = this,
+      var result, _this = this,
         value = _this.__SassString__sassLength_FI;
       if (value === $) {
-        t1 = new A.Runes(_this._string$_text);
-        result = t1.get$length(t1);
+        result = new A.Runes(_this._string$_text).get$length(0);
         _this.__SassString__sassLength_FI !== $ && A.throwUnnamedLateFieldADI();
         _this.__SassString__sassLength_FI = result;
         value = result;
@@ -61716,13 +63327,13 @@ self.util = _cliPkgRequires.util;
     call$1(component) {
       return this.$this.visitCompoundSelector$1(component.selector);
     },
-    $signature: 53
+    $signature: 49
   };
   A.AnySelectorVisitor_visitCompoundSelector_closure.prototype = {
     call$1(simple) {
       return simple.accept$1(this.$this);
     },
-    $signature: 16
+    $signature: 13
   };
   A._EvaluateVisitor0.prototype = {
     _EvaluateVisitor$6$functions$importCache$logger$nodeImporter$quietDeps$sourceMap0(functions, importCache, logger, nodeImporter, quietDeps, sourceMap) {
@@ -61732,7 +63343,7 @@ self.util = _cliPkgRequires.util;
         _s7_ = "$module",
         t1 = type$.JSArray_AsyncBuiltInCallable,
         metaFunctions = A._setArrayType([A.BuiltInCallable$function("global-variable-exists", _s20_, new A._EvaluateVisitor_closure12(_this), _s9_), A.BuiltInCallable$function("variable-exists", "$name", new A._EvaluateVisitor_closure13(_this), _s9_), A.BuiltInCallable$function("function-exists", _s20_, new A._EvaluateVisitor_closure14(_this), _s9_), A.BuiltInCallable$function("mixin-exists", _s20_, new A._EvaluateVisitor_closure15(_this), _s9_), A.BuiltInCallable$function("content-exists", "", new A._EvaluateVisitor_closure16(_this), _s9_), A.BuiltInCallable$function("module-variables", _s7_, new A._EvaluateVisitor_closure17(_this), _s9_), A.BuiltInCallable$function("module-functions", _s7_, new A._EvaluateVisitor_closure18(_this), _s9_), A.BuiltInCallable$function("module-mixins", _s7_, new A._EvaluateVisitor_closure19(_this), _s9_), A.BuiltInCallable$function("get-function", "$name, $css: false, $module: null", new A._EvaluateVisitor_closure20(_this), _s9_), A.BuiltInCallable$function("get-mixin", _s20_, new A._EvaluateVisitor_closure21(_this), _s9_), new A.AsyncBuiltInCallable("call", A.ScssParser$("@function call($function, $args...) {", null, _s9_).parseArgumentDeclaration$0(), new A._EvaluateVisitor_closure22(_this), false)], t1),
-        metaMixins = A._setArrayType([A.AsyncBuiltInCallable$mixin("load-css", "$url, $with: null", new A._EvaluateVisitor_closure23(_this), _s9_), A.BuiltInCallable$mixin("apply", "$mixin, $args...", new A._EvaluateVisitor_closure24(_this), true, _s9_)], t1);
+        metaMixins = A._setArrayType([A.AsyncBuiltInCallable$mixin("load-css", "$url, $with: null", new A._EvaluateVisitor_closure23(_this), false, _s9_), A.AsyncBuiltInCallable$mixin("apply", "$mixin, $args...", new A._EvaluateVisitor_closure24(_this), true, _s9_)], t1);
       t1 = type$.AsyncBuiltInCallable;
       t2 = A.List_List$of($.$get$global(), true, t1);
       B.JSArray_methods.addAll$1(t2, $.$get$local());
@@ -61769,8 +63380,9 @@ self.util = _cliPkgRequires.util;
               // Function start
               $async$handler = 4;
               t1 = type$.nullable_Object;
+              t1 = A.runZoned(new A._EvaluateVisitor_run_closure0($async$self, node, importer), A.LinkedHashMap_LinkedHashMap$_literal([B.Symbol__evaluationContext, new A._EvaluationContext0($async$self, node)], t1, t1), type$.FutureOr_Record_2_Set_Uri_loadedUrls_and_CssStylesheet_stylesheet);
               $async$goto = 7;
-              return A._asyncAwait(A.runZoned(new A._EvaluateVisitor_run_closure0($async$self, node, importer), A.LinkedHashMap_LinkedHashMap$_literal([B.Symbol__evaluationContext, new A._EvaluationContext0($async$self, node)], t1, t1), type$.FutureOr_Record_2_Set_Uri_loadedUrls_and_CssStylesheet_stylesheet), $async$run$2);
+              return A._asyncAwait(type$.Future_Record_2_Set_Uri_loadedUrls_and_CssStylesheet_stylesheet._is(t1) ? t1 : A._Future$value(t1, type$.Record_2_Set_Uri_loadedUrls_and_CssStylesheet_stylesheet), $async$run$2);
             case 7:
               // returning from await.
               t1 = $async$result;
@@ -61833,7 +63445,7 @@ self.util = _cliPkgRequires.util;
     _loadModule$body$_EvaluateVisitor(url, stackFrame, nodeWithSpan, callback, baseUrl, configuration, namesInErrors) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.void),
-        $async$returnValue, $async$self = this, _0_0, t2, t1;
+        $async$returnValue, $async$self = this, t2, t1, _0_0;
       var $async$_async_evaluate$_loadModule$7$baseUrl$configuration$namesInErrors = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -61842,17 +63454,13 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               t1 = {};
-              t1.builtInModule = null;
               _0_0 = $async$self._async_evaluate$_builtInModules.$index(0, url);
-              if (_0_0 != null) {
-                t1.builtInModule = _0_0;
-                t2 = true;
-              } else
-                t2 = false;
-              $async$goto = t2 ? 3 : 4;
+              t1.builtInModule = null;
+              $async$goto = _0_0 != null ? 3 : 4;
               break;
             case 3:
               // then
+              t1.builtInModule = _0_0;
               if (configuration instanceof A.ExplicitConfiguration) {
                 t1 = namesInErrors ? "Built-in module " + url.toString$0(0) + " can't be configured." : "Built-in modules can't be configured.";
                 t2 = configuration.nodeWithSpan;
@@ -61887,7 +63495,7 @@ self.util = _cliPkgRequires.util;
     _execute$body$_EvaluateVisitor(importer, stylesheet, configuration, namesInErrors, nodeWithSpan) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Module_AsyncCallable),
-        $async$returnValue, $async$self = this, _0_0, alreadyLoaded, t2, currentConfiguration, t3, message, existingSpan, configurationSpan, environment, css, preModuleComments, extensionStore, module, t1, url;
+        $async$returnValue, $async$self = this, _0_0, currentConfiguration, t2, t3, message, existingSpan, configurationSpan, environment, css, preModuleComments, extensionStore, module, t1, url;
       var $async$_async_evaluate$_execute$5$configuration$namesInErrors$nodeWithSpan = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -61900,13 +63508,6 @@ self.util = _cliPkgRequires.util;
               t1 = $async$self._async_evaluate$_modules;
               _0_0 = t1.$index(0, url);
               if (_0_0 != null) {
-                alreadyLoaded = _0_0;
-                t2 = true;
-              } else {
-                alreadyLoaded = null;
-                t2 = false;
-              }
-              if (t2) {
                 t1 = configuration == null;
                 currentConfiguration = t1 ? $async$self._async_evaluate$_configuration : configuration;
                 t2 = $async$self._async_evaluate$_moduleConfigurations.$index(0, url);
@@ -61914,7 +63515,12 @@ self.util = _cliPkgRequires.util;
                 t2 = t3 == null ? t2 : t3;
                 t3 = currentConfiguration.__originalConfiguration;
                 if (t2 !== (t3 == null ? currentConfiguration : t3) && currentConfiguration instanceof A.ExplicitConfiguration) {
-                  message = namesInErrors ? $.$get$context().prettyUri$1(url) + string$.x20was_a : string$.This_mw;
+                  if (namesInErrors) {
+                    t2 = $.$get$context();
+                    url.toString;
+                    message = t2.prettyUri$1(url) + string$.x20was_a;
+                  } else
+                    message = string$.This_mw;
                   t2 = $async$self._async_evaluate$_moduleNodes.$index(0, url);
                   existingSpan = t2 == null ? null : t2.get$span(t2);
                   if (t1) {
@@ -61927,9 +63533,9 @@ self.util = _cliPkgRequires.util;
                     t1.$indexSet(0, existingSpan, "original load");
                   if (configurationSpan != null)
                     t1.$indexSet(0, configurationSpan, "configuration");
-                  throw A.wrapException(t1.get$isEmpty(t1) ? $async$self._async_evaluate$_exception$1(message) : $async$self._async_evaluate$_multiSpanException$3(message, "new load", t1));
+                  throw A.wrapException(t1.get$isEmpty(0) ? $async$self._async_evaluate$_exception$1(message) : $async$self._async_evaluate$_multiSpanException$3(message, "new load", t1));
                 }
-                $async$returnValue = alreadyLoaded;
+                $async$returnValue = _0_0;
                 // goto return
                 $async$goto = 1;
                 break;
@@ -61971,8 +63577,7 @@ self.util = _cliPkgRequires.util;
           t1 = _this._async_evaluate$_assertInModule$2(_this._async_evaluate$__root, _s5_).children;
           break $label0$0;
         }
-        t1 = _this._async_evaluate$_assertInModule$2(_this._async_evaluate$__root, _s5_);
-        t1 = t1.children;
+        t1 = _this._async_evaluate$_assertInModule$2(_this._async_evaluate$__root, _s5_).children;
         t1 = A.List_List$of(A.SubListIterable$(t1, 0, A.checkNotNullable(_this._async_evaluate$_assertInModule$2(_this._async_evaluate$__endOfImports, _s13_), "count", type$.int), t1.$ti._eval$1("ListBase.E")), true, type$.ModifiableCssNode);
         B.JSArray_methods.addAll$1(t1, _0_0);
         t2 = _this._async_evaluate$_assertInModule$2(_this._async_evaluate$__root, _s5_).children;
@@ -61982,19 +63587,12 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     _async_evaluate$_combineCss$2$clone(root, clone) {
-      var selectors, _0_0, unsatisfiedExtension, t1, imports, css, sorted, t2;
+      var selectors, _0_0, t1, imports, css, sorted, t2;
       if (!B.JSArray_methods.any$1(root.get$upstream(), new A._EvaluateVisitor__combineCss_closure1())) {
         selectors = root.get$extensionStore().get$simpleSelectors();
         _0_0 = A.IterableExtension_get_firstOrNull(root.get$extensionStore().extensionsWhereTarget$1(new A._EvaluateVisitor__combineCss_closure2(selectors)));
-        if (_0_0 != null) {
-          unsatisfiedExtension = _0_0;
-          t1 = true;
-        } else {
-          unsatisfiedExtension = null;
-          t1 = false;
-        }
-        if (t1)
-          this._async_evaluate$_throwForUnsatisfiedExtension$1(unsatisfiedExtension);
+        if (_0_0 != null)
+          this._async_evaluate$_throwForUnsatisfiedExtension$1(_0_0);
         return root.get$css(root);
       }
       t1 = type$.JSArray_CssNode;
@@ -62013,10 +63611,10 @@ self.util = _cliPkgRequires.util;
       return this._async_evaluate$_combineCss$2$clone(root, false);
     },
     _async_evaluate$_extendModules$1(sortedModules) {
-      var t1, t2, t3, originalSelectors, $self, t4, t5, _i, upstream, _0_0, url, t6,
+      var t1, t2, t3, originalSelectors, $self, t4, t5, _i, upstream, _0_0,
         downstreamExtensionStores = A.LinkedHashMap_LinkedHashMap$_empty(type$.Uri, type$.List_ExtensionStore),
         unsatisfiedExtensions = new A._LinkedIdentityHashSet(type$._LinkedIdentityHashSet_Extension);
-      for (t1 = A._ListQueueIterator$(sortedModules), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = A._ListQueueIterator$(sortedModules, sortedModules.$ti._precomputed1), t2 = t1.$ti._precomputed1; t1.moveNext$0();) {
         t3 = t1._collection$_current;
         if (t3 == null)
           t3 = t2._as(t3);
@@ -62032,20 +63630,13 @@ self.util = _cliPkgRequires.util;
         for (t4 = t3.get$upstream(), t5 = t4.length, _i = 0; _i < t4.length; t4.length === t5 || (0, A.throwConcurrentModificationError)(t4), ++_i) {
           upstream = t4[_i];
           _0_0 = upstream.get$url(upstream);
-          if (_0_0 != null) {
-            url = _0_0;
-            t6 = true;
-          } else {
-            url = null;
-            t6 = false;
-          }
-          if (t6)
-            J.add$1$ax(downstreamExtensionStores.putIfAbsent$2(url, new A._EvaluateVisitor__extendModules_closure2()), t3.get$extensionStore());
+          if (_0_0 != null)
+            J.add$1$ax(downstreamExtensionStores.putIfAbsent$2(_0_0, new A._EvaluateVisitor__extendModules_closure2()), t3.get$extensionStore());
         }
         unsatisfiedExtensions.removeAll$1(t3.get$extensionStore().extensionsWhereTarget$1(originalSelectors.get$contains(originalSelectors)));
       }
       if (unsatisfiedExtensions._collection$_length !== 0)
-        this._async_evaluate$_throwForUnsatisfiedExtension$1(unsatisfiedExtensions.get$first(unsatisfiedExtensions));
+        this._async_evaluate$_throwForUnsatisfiedExtension$1(unsatisfiedExtensions.get$first(0));
     },
     _async_evaluate$_throwForUnsatisfiedExtension$1(extension) {
       throw A.wrapException(A.SassException$(string$.The_ta + extension.target.toString$0(0) + ' !optional" to avoid this error.', extension.span, null));
@@ -62116,7 +63707,7 @@ self.util = _cliPkgRequires.util;
     visitAtRootRule$body$_EvaluateVisitor(node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value),
-        $async$returnValue, $async$self = this, unparsedQuery, t1, _1_0, resolved, query, $parent, included, _2_0, grandparent, t2, root, first, rest, innerCopy, outerCopy, _i, copy, _0_0;
+        $async$returnValue, $async$self = this, _1_0, resolved, query, $parent, included, t1, _2_0, root, first, rest, innerCopy, outerCopy, _i, copy, _0_0;
       var $async$visitAtRootRule$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -62125,19 +63716,12 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               _0_0 = node.query;
-              if (_0_0 != null) {
-                unparsedQuery = _0_0;
-                t1 = true;
-              } else {
-                unparsedQuery = null;
-                t1 = false;
-              }
-              $async$goto = t1 ? 3 : 5;
+              $async$goto = _0_0 != null ? 3 : 5;
               break;
             case 3:
               // then
               $async$goto = 6;
-              return A._asyncAwait($async$self._async_evaluate$_performInterpolationWithMap$2$warnForColor(unparsedQuery, true), $async$visitAtRootRule$1);
+              return A._asyncAwait($async$self._async_evaluate$_performInterpolationWithMap$2$warnForColor(_0_0, true), $async$visitAtRootRule$1);
             case 6:
               // returning from await.
               _1_0 = $async$result;
@@ -62149,23 +63733,16 @@ self.util = _cliPkgRequires.util;
               break;
             case 5:
               // else
-              query = B.AtRootQuery_UsS;
+              query = B.AtRootQuery_n2q;
             case 4:
               // join
               $parent = $async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__parent, "__parent");
               included = A._setArrayType([], type$.JSArray_ModifiableCssParentNode);
-              for (t1 = type$.CssStylesheet; !t1._is($parent); $parent = grandparent) {
+              for (t1 = type$.CssStylesheet; !t1._is($parent); $parent = _2_0) {
                 if (!query.excludes$1($parent))
                   included.push($parent);
                 _2_0 = $parent._parent;
-                if (_2_0 != null) {
-                  grandparent = _2_0;
-                  t2 = true;
-                } else {
-                  grandparent = null;
-                  t2 = false;
-                }
-                if (!t2)
+                if (_2_0 == null)
                   throw A.wrapException(A.StateError$(string$.CssNod));
               }
               root = $async$self._async_evaluate$_trimIncluded$1(included);
@@ -62186,13 +63763,6 @@ self.util = _cliPkgRequires.util;
               if (included.length >= 1) {
                 first = included[0];
                 rest = B.JSArray_methods.sublist$1(included, 1);
-                t1 = true;
-              } else {
-                first = null;
-                rest = null;
-                t1 = false;
-              }
-              if (t1) {
                 innerCopy = first.copyWithoutChildren$0();
                 for (t1 = rest.length, outerCopy = innerCopy, _i = 0; _i < rest.length; rest.length === t1 || (0, A.throwConcurrentModificationError)(rest), ++_i, outerCopy = copy) {
                   copy = rest[_i].copyWithoutChildren$0();
@@ -62217,35 +63787,21 @@ self.util = _cliPkgRequires.util;
       return A._asyncStartSync($async$visitAtRootRule$1, $async$completer);
     },
     _async_evaluate$_trimIncluded$1(nodes) {
-      var $parent, t1, innermostContiguous, i, t2, _0_0, grandparent, t3, _1_0, root, _this = this, _null = null, _s5_ = "_root",
+      var $parent, t1, innermostContiguous, i, t2, _0_0, _1_0, root, _this = this, _null = null, _s5_ = "_root",
         _s22_ = " to be an ancestor of ";
       if (nodes.length === 0)
         return _this._async_evaluate$_assertInModule$2(_this._async_evaluate$__root, _s5_);
       $parent = _this._async_evaluate$_assertInModule$2(_this._async_evaluate$__parent, "__parent");
-      for (t1 = nodes.length, innermostContiguous = _null, i = 0; i < t1; ++i, $parent = grandparent) {
-        for (; t2 = nodes[i], $parent !== t2; innermostContiguous = _null, $parent = grandparent) {
+      for (t1 = nodes.length, innermostContiguous = _null, i = 0; i < t1; ++i, $parent = _1_0) {
+        for (; t2 = nodes[i], $parent !== t2; innermostContiguous = _null, $parent = _0_0) {
           _0_0 = $parent._parent;
-          if (_0_0 != null) {
-            grandparent = _0_0;
-            t3 = true;
-          } else {
-            grandparent = _null;
-            t3 = false;
-          }
-          if (!t3)
+          if (_0_0 == null)
             throw A.wrapException(A.ArgumentError$("Expected " + t2.toString$0(0) + _s22_ + _this.toString$0(0) + ".", _null));
         }
         if (innermostContiguous == null)
           innermostContiguous = i;
         _1_0 = $parent._parent;
-        if (_1_0 != null) {
-          grandparent = _1_0;
-          t3 = true;
-        } else {
-          grandparent = _null;
-          t3 = false;
-        }
-        if (!t3)
+        if (_1_0 == null)
           throw A.wrapException(A.ArgumentError$("Expected " + t2.toString$0(0) + _s22_ + _this.toString$0(0) + ".", _null));
       }
       if ($parent !== _this._async_evaluate$_assertInModule$2(_this._async_evaluate$__root, _s5_))
@@ -62344,7 +63900,7 @@ self.util = _cliPkgRequires.util;
     visitDeclaration$body$_EvaluateVisitor(node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value),
-        $async$returnValue, $async$self = this, t2, $name, _0_0, declarationName, t3, _1_0, expression, value, t4, t5, _2_0, oldDeclarationName, t1;
+        $async$returnValue, $async$self = this, t2, _0_0, t3, $name, _1_0, _2_0, value, t4, t5, _3_0, oldDeclarationName, t1;
       var $async$visitDeclaration$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -62357,64 +63913,54 @@ self.util = _cliPkgRequires.util;
                 throw A.wrapException($async$self._async_evaluate$_exception$2(string$.Declarm, node.span));
               if ($async$self._async_evaluate$_declarationName != null && B.JSString_methods.startsWith$1(node.name.get$initialPlain(), "--"))
                 throw A.wrapException($async$self._async_evaluate$_exception$2(string$.Declarw, node.span));
+              t2 = $async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__parent, "__parent")._parent.children;
+              _0_0 = t2.get$last(t2);
+              t2 = $async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__parent, "__parent");
+              if (t2 !== _0_0) {
+                t2 = type$.SourceSpan;
+                t3 = type$.String;
+                $async$self._async_evaluate$_warn$3(string$.Sassx27s, new A.MultiSpan(node.span, "declaration", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([_0_0.get$span(_0_0), "nested rule"], t2, t3), t2, t3)), B.Deprecation_gf0);
+              }
               t2 = node.name;
               $async$goto = 3;
               return A._asyncAwait($async$self._async_evaluate$_interpolationToValue$2$warnForColor(t2, true), $async$visitDeclaration$1);
             case 3:
               // returning from await.
               $name = $async$result;
-              _0_0 = $async$self._async_evaluate$_declarationName;
-              if (_0_0 != null) {
-                declarationName = _0_0;
-                t3 = true;
-              } else {
-                declarationName = null;
-                t3 = false;
-              }
-              if (t3)
-                $name = new A.CssValue(A.S(declarationName) + "-" + A.S($name.value), $name.span, type$.CssValue_String);
-              _1_0 = node.value;
-              if (_1_0 != null) {
-                expression = _1_0;
-                t3 = true;
-              } else {
-                expression = null;
-                t3 = false;
-              }
-              $async$goto = t3 ? 4 : 5;
+              _1_0 = $async$self._async_evaluate$_declarationName;
+              if (_1_0 != null)
+                $name = new A.CssValue(_1_0 + "-" + A.S($name.value), $name.span, type$.CssValue_String);
+              _2_0 = node.value;
+              $async$goto = _2_0 != null ? 4 : 5;
               break;
             case 4:
               // then
               $async$goto = 6;
-              return A._asyncAwait(expression.accept$1($async$self), $async$visitDeclaration$1);
+              return A._asyncAwait(_2_0.accept$1($async$self), $async$visitDeclaration$1);
             case 6:
               // returning from await.
               value = $async$result;
               if (!value.get$isBlank() || value.get$asList().length === 0) {
                 t3 = $async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__parent, "__parent");
-                t4 = expression.get$span(expression);
+                t4 = _2_0.get$span(_2_0);
                 t2 = B.JSString_methods.startsWith$1(t2.get$initialPlain(), "--");
                 if ($async$self._async_evaluate$_sourceMap) {
-                  t5 = A.NullableExtension_andThen(_1_0, $async$self.get$_async_evaluate$_expressionNode());
+                  t5 = A.NullableExtension_andThen(_2_0, $async$self.get$_async_evaluate$_expressionNode());
                   t5 = t5 == null ? null : J.get$span$z(t5);
                 } else
                   t5 = null;
                 t3.addChild$1(A.ModifiableCssDeclaration$($name, new A.CssValue(value, t4, type$.CssValue_Value), node.span, t2, t5));
               } else if (J.startsWith$1$s($name.value, "--"))
-                throw A.wrapException($async$self._async_evaluate$_exception$2("Custom property values may not be empty.", expression.get$span(expression)));
+                throw A.wrapException($async$self._async_evaluate$_exception$2("Custom property values may not be empty.", _2_0.get$span(_2_0)));
             case 5:
               // join
+              _3_0 = node.children;
               t1.children = null;
-              _2_0 = node.children;
-              if (_2_0 != null) {
-                t1.children = _2_0;
-                t2 = true;
-              } else
-                t2 = false;
-              $async$goto = t2 ? 7 : 8;
+              $async$goto = _3_0 != null ? 7 : 8;
               break;
             case 7:
               // then
+              t1.children = _3_0;
               oldDeclarationName = $async$self._async_evaluate$_declarationName;
               $async$self._async_evaluate$_declarationName = $name.value;
               $async$goto = 9;
@@ -62441,7 +63987,7 @@ self.util = _cliPkgRequires.util;
     visitEachRule$body$_EvaluateVisitor(node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value),
-        $async$returnValue, $async$self = this, t2, _box_0, t1, list, nodeWithSpan, _0_0;
+        $async$returnValue, $async$self = this, _box_0, t1, list, nodeWithSpan, _0_0;
       var $async$visitEachRule$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -62462,17 +64008,12 @@ self.util = _cliPkgRequires.util;
                 _box_0.variable = null;
                 if (_0_0.length === 1) {
                   _box_0.variable = _0_0[0];
-                  t1 = true;
-                } else
-                  t1 = false;
-                if (t1) {
                   t1 = new A._EvaluateVisitor_visitEachRule_closure2(_box_0, $async$self, nodeWithSpan);
                   break $label0$0;
                 }
-                t1 = _box_0.variables = null;
+                _box_0.variables = null;
                 _box_0.variables = _0_0;
-                t2 = new A._EvaluateVisitor_visitEachRule_closure3(_box_0, $async$self, nodeWithSpan);
-                t1 = t2;
+                t1 = new A._EvaluateVisitor_visitEachRule_closure3(_box_0, $async$self, nodeWithSpan);
                 break $label0$0;
               }
               $async$returnValue = $async$self._async_evaluate$_environment.scope$1$2$semiGlobal(new A._EvaluateVisitor_visitEachRule_closure4($async$self, list, t1, node), true, type$.nullable_Value);
@@ -62548,7 +64089,7 @@ self.util = _cliPkgRequires.util;
                 complex.accept$1(visitor);
                 t6 = B.JSString_methods.trim$0(visitor._serialize$_buffer.toString$0(0));
                 t7 = complex.accept$1(B.C__IsUselessVisitor) ? "can't" : "shouldn't";
-                $async$self._async_evaluate$_warn$3('The selector "' + t6 + '" is invalid CSS and ' + t7 + string$.x20be_an, new A.MultiSpan(A.SpanExtensions_trimRight(complex.span), "invalid selector", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([t3, "@extend rule"], t4, t5), t4, t5)), B.Deprecation_vrR);
+                $async$self._async_evaluate$_warn$3('The selector "' + t6 + '" is invalid CSS and ' + t7 + string$.x20be_an, new A.MultiSpan(A.SpanExtensions_trimRight(complex.span), "invalid selector", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([t3, "@extend rule"], t4, t5), t4, t5)), B.Deprecation_ido);
               }
               $async$goto = 3;
               return A._asyncAwait($async$self._async_evaluate$_performInterpolationWithMap$2$warnForColor(node.selector, true), $async$visitExtendRule$1);
@@ -62557,7 +64098,7 @@ self.util = _cliPkgRequires.util;
               _0_0 = $async$result;
               targetText = _0_0._0;
               targetMap = _0_0._1;
-              for (t1 = A.SelectorList_SelectorList$parse(A.trimAscii(targetText, true), false, true, targetMap, $async$self._async_evaluate$_logger).components, t2 = t1.length, t3 = styleRule._style_rule$_selector._box$_inner, _i = 0; _i < t2; ++_i) {
+              for (t1 = A.SelectorList_SelectorList$parse(A.trimAscii(targetText, true), false, targetMap, $async$self._async_evaluate$_logger, false).components, t2 = t1.length, t3 = styleRule._style_rule$_selector._box$_inner, _i = 0; _i < t2; ++_i) {
                 complex = t1[_i];
                 compound = complex.get$singleCompound();
                 if (compound == null)
@@ -62585,7 +64126,7 @@ self.util = _cliPkgRequires.util;
     visitAtRule$body$_EvaluateVisitor(node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value),
-        $async$returnValue, $async$self = this, $name, value, children, wasInKeyframes, wasInUnknownAtRule;
+        $async$returnValue, $async$self = this, $name, t1, value, children, wasInKeyframes, wasInUnknownAtRule;
       var $async$visitAtRule$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -62600,8 +64141,9 @@ self.util = _cliPkgRequires.util;
             case 3:
               // returning from await.
               $name = $async$result;
+              t1 = A.NullableExtension_andThen(node.value, new A._EvaluateVisitor_visitAtRule_closure2($async$self));
               $async$goto = 4;
-              return A._asyncAwait(A.NullableExtension_andThen(node.value, new A._EvaluateVisitor_visitAtRule_closure2($async$self)), $async$visitAtRule$1);
+              return A._asyncAwait(type$.Future_nullable_CssValue_String._is(t1) ? t1 : A._Future$value(t1, type$.nullable_CssValue_String), $async$visitAtRule$1);
             case 4:
               // returning from await.
               value = $async$result;
@@ -62764,7 +64306,7 @@ self.util = _cliPkgRequires.util;
     _addForwardConfiguration$body$_EvaluateVisitor(configuration, node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Configuration),
-        $async$returnValue, $async$self = this, t2, t3, _i, variable, t4, oldValue, t5, variableNodeWithSpan, t1, newValues, $async$temp1, $async$temp2, $async$temp3;
+        $async$returnValue, $async$self = this, t2, t3, t4, t5, _i, variable, t6, oldValue, t7, variableNodeWithSpan, t8, t1, newValues, $async$temp1, $async$temp2, $async$temp3;
       var $async$_async_evaluate$_addForwardConfiguration$2 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -62774,7 +64316,7 @@ self.util = _cliPkgRequires.util;
               // Function start
               t1 = configuration._configuration$_values;
               newValues = A.LinkedHashMap_LinkedHashMap$of(new A.UnmodifiableMapView(t1, type$.UnmodifiableMapView_String_ConfiguredValue), type$.String, type$.ConfiguredValue);
-              t2 = node.configuration, t3 = t2.length, _i = 0;
+              t2 = node.configuration, t3 = t2.length, t4 = type$._Future_Value, t5 = type$.Future_Value, _i = 0;
             case 3:
               // for condition
               if (!(_i < t3)) {
@@ -62784,28 +64326,36 @@ self.util = _cliPkgRequires.util;
               }
               variable = t2[_i];
               if (variable.isGuarded) {
-                t4 = variable.name;
-                oldValue = t1.get$isEmpty(t1) ? null : t1.remove$1(0, t4);
+                t6 = variable.name;
+                oldValue = t1.get$isEmpty(t1) ? null : t1.remove$1(0, t6);
                 if (oldValue != null)
-                  t5 = true;
+                  t7 = !oldValue.value.$eq(0, B.C__SassNull);
                 else {
                   oldValue = null;
-                  t5 = false;
+                  t7 = false;
                 }
-                if (t5 && !oldValue.value.$eq(0, B.C__SassNull)) {
-                  newValues.$indexSet(0, t4, oldValue);
+                if (t7) {
+                  newValues.$indexSet(0, t6, oldValue);
                   // goto for update
                   $async$goto = 4;
                   break;
                 }
               }
-              t4 = variable.expression;
-              variableNodeWithSpan = $async$self._async_evaluate$_expressionNode$1(t4);
+              t6 = variable.expression;
+              variableNodeWithSpan = $async$self._async_evaluate$_expressionNode$1(t6);
+              t7 = variable.name;
+              t6 = t6.accept$1($async$self);
+              if (!t5._is(t6)) {
+                t8 = new A._Future($.Zone__current, t4);
+                t8._state = 8;
+                t8._resultOrListeners = t6;
+                t6 = t8;
+              }
               $async$temp1 = newValues;
-              $async$temp2 = variable.name;
+              $async$temp2 = t7;
               $async$temp3 = A;
               $async$goto = 6;
-              return A._asyncAwait(t4.accept$1($async$self), $async$_async_evaluate$_addForwardConfiguration$2);
+              return A._asyncAwait(t6, $async$_async_evaluate$_addForwardConfiguration$2);
             case 6:
               // returning from await.
               $async$temp1.$indexSet(0, $async$temp2, new $async$temp3.ConfiguredValue($async$self._async_evaluate$_withoutSlash$2($async$result, variableNodeWithSpan), variable.span, variableNodeWithSpan));
@@ -62840,8 +64390,7 @@ self.util = _cliPkgRequires.util;
         t1 = _this._async_evaluate$__root;
       if (t1 == null)
         return;
-      t1 = _this._async_evaluate$_assertInModule$2(t1, _s5_).children;
-      if (t1.get$length(t1) === 0 || !module.get$transitivelyContainsCss())
+      if (_this._async_evaluate$_assertInModule$2(t1, _s5_).children.get$length(0) === 0 || !module.get$transitivelyContainsCss())
         return;
       t1 = _this._async_evaluate$_preModuleComments;
       if (t1 == null)
@@ -62953,8 +64502,9 @@ self.util = _cliPkgRequires.util;
               break;
             case 5:
               // after for
+              t1 = A.NullableExtension_andThen(clause, new A._EvaluateVisitor_visitIfRule_closure0($async$self));
               $async$goto = 7;
-              return A._asyncAwait(A.NullableExtension_andThen(clause, new A._EvaluateVisitor_visitIfRule_closure0($async$self)), $async$visitIfRule$1);
+              return A._asyncAwait(type$.Future_nullable_Value._is(t1) ? t1 : A._Future$value(t1, type$.nullable_Value), $async$visitIfRule$1);
             case 7:
               // returning from await.
               $async$returnValue = $async$result;
@@ -63044,7 +64594,7 @@ self.util = _cliPkgRequires.util;
     _loadStylesheet$body$_EvaluateVisitor(url, span, baseUrl, forImport) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Record_3_Stylesheet_and_nullable_AsyncImporter_importer_and_bool_isDependency),
-        $async$returnValue, $async$handler = 2, $async$currentError, $async$next = [], $async$self = this, importCache, _0_0, importer, canonicalUrl, originalUrl, _1_0, isDependency, stylesheet, _2_0, result, _3_0, error, stackTrace, error0, stackTrace0, message, t1, t2, t3, t4, exception, message0, $async$exception;
+        $async$returnValue, $async$handler = 2, $async$currentError, $async$next = [], $async$self = this, _0_0, importCache, _1_0, importer, canonicalUrl, originalUrl, isDependency, _2_0, stylesheet, error, stackTrace, error0, stackTrace0, message, t1, t2, t3, t4, exception, message0, $async$exception;
       var $async$_async_evaluate$_loadStylesheet$4$baseUrl$forImport = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1) {
           $async$currentError = $async$result;
@@ -63057,58 +64607,46 @@ self.util = _cliPkgRequires.util;
               baseUrl = baseUrl;
               $async$handler = 4;
               $async$self._async_evaluate$_importSpan = span;
-              importCache = null;
               _0_0 = $async$self._async_evaluate$_importCache;
-              if (_0_0 != null) {
-                importCache = _0_0;
-                t1 = true;
-              } else
-                t1 = false;
-              $async$goto = t1 ? 7 : 9;
+              importCache = null;
+              $async$goto = _0_0 != null ? 7 : 8;
               break;
             case 7:
               // then
+              importCache = _0_0;
               if (baseUrl == null) {
                 t1 = $async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__stylesheet, "_stylesheet").span;
                 baseUrl = t1.get$sourceUrl(t1);
               }
+              $async$goto = 9;
+              return A._asyncAwait(J.canonicalize$4$baseImporter$baseUrl$forImport$x(importCache, A.Uri_parse(url), $async$self._async_evaluate$_importer, baseUrl, forImport), $async$_async_evaluate$_loadStylesheet$4$baseUrl$forImport);
+            case 9:
+              // returning from await.
+              _1_0 = $async$result;
               importer = null;
               canonicalUrl = null;
               originalUrl = null;
-              $async$goto = 10;
-              return A._asyncAwait(J.canonicalize$4$baseImporter$baseUrl$forImport$x(importCache, A.Uri_parse(url), $async$self._async_evaluate$_importer, baseUrl, forImport), $async$_async_evaluate$_loadStylesheet$4$baseUrl$forImport);
-            case 10:
-              // returning from await.
-              _1_0 = $async$result;
-              if (type$.Record_3_nullable_Object_and_nullable_Object_and_nullable_Object_originalUrl._is(_1_0)) {
-                importer = _1_0._0;
-                canonicalUrl = _1_0._1;
-                originalUrl = _1_0._2;
-                t1 = true;
-              } else
-                t1 = false;
-              $async$goto = t1 ? 11 : 12;
+              $async$goto = type$.Record_3_nullable_Object_and_nullable_Object_and_nullable_Object_originalUrl._is(_1_0) ? 10 : 11;
               break;
-            case 11:
+            case 10:
               // then
+              importer = _1_0._0;
+              canonicalUrl = _1_0._1;
+              originalUrl = _1_0._2;
               $async$self._async_evaluate$_loadedUrls.add$1(0, canonicalUrl);
               isDependency = $async$self._async_evaluate$_inDependency || !J.$eq$(importer, $async$self._async_evaluate$_importer);
-              stylesheet = null;
               t1 = importCache;
               t2 = importer;
               t3 = canonicalUrl;
               t4 = originalUrl;
-              $async$goto = 13;
+              $async$goto = 12;
               return A._asyncAwait(t1.importCanonical$4$originalUrl$quiet(t2, t3, t4, $async$self._async_evaluate$_quietDeps && isDependency), $async$_async_evaluate$_loadStylesheet$4$baseUrl$forImport);
-            case 13:
+            case 12:
               // returning from await.
               _2_0 = $async$result;
+              stylesheet = null;
               if (_2_0 != null) {
                 stylesheet = _2_0;
-                t1 = true;
-              } else
-                t1 = false;
-              if (t1) {
                 t1 = stylesheet;
                 t2 = importer;
                 $async$returnValue = new A._Record_3_importer_isDependency(t1, t2, isDependency);
@@ -63117,43 +64655,12 @@ self.util = _cliPkgRequires.util;
                 $async$goto = 5;
                 break;
               }
-            case 12:
+            case 11:
               // join
-              // goto join
-              $async$goto = 8;
-              break;
-            case 9:
-              // else
-              result = null;
-              t1 = baseUrl;
-              if (t1 == null) {
-                t1 = $async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__stylesheet, "_stylesheet").span;
-                t1 = t1.get$sourceUrl(t1);
-              }
-              $async$goto = 14;
-              return A._asyncAwait($async$self._async_evaluate$_importLikeNode$3(url, t1, forImport), $async$_async_evaluate$_loadStylesheet$4$baseUrl$forImport);
-            case 14:
-              // returning from await.
-              _3_0 = $async$result;
-              if (_3_0 != null) {
-                result = _3_0;
-                t1 = true;
-              } else
-                t1 = false;
-              if (t1) {
-                t1 = result._0.span;
-                t2 = $async$self._async_evaluate$_loadedUrls;
-                A.NullableExtension_andThen(t1.get$sourceUrl(t1), t2.get$add(t2));
-                t2 = result;
-                $async$returnValue = t2;
-                $async$next = [1];
-                // goto finally
-                $async$goto = 5;
-                break;
-              }
             case 8:
               // join
-              if (B.JSString_methods.startsWith$1(url, "package:") && true)
+              t1 = B.JSString_methods.startsWith$1(url, "package:");
+              if (t1)
                 throw A.wrapException(string$.x22packa);
               else
                 throw A.wrapException("Can't find stylesheet to import.");
@@ -63210,43 +64717,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$_async_evaluate$_loadStylesheet$4$baseUrl$forImport, $async$completer);
     },
-    _async_evaluate$_importLikeNode$3(originalUrl, previous, forImport) {
-      return this._importLikeNode$body$_EvaluateVisitor(originalUrl, previous, forImport);
-    },
-    _importLikeNode$body$_EvaluateVisitor(originalUrl, previous, forImport) {
-      var $async$goto = 0,
-        $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Record_3_Stylesheet_and_nullable_AsyncImporter_importer_and_bool_isDependency),
-        $async$returnValue, $async$self = this, result, isDependency, url, t1, t2;
-      var $async$_async_evaluate$_importLikeNode$3 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
-        if ($async$errorCode === 1)
-          return A._asyncRethrow($async$result, $async$completer);
-        while (true)
-          switch ($async$goto) {
-            case 0:
-              // Function start
-              result = $async$self._async_evaluate$_nodeImporter.loadRelative$3(originalUrl, previous, forImport);
-              isDependency = $async$self._async_evaluate$_inDependency;
-              url = result._1;
-              t1 = J.startsWith$1$s(url, "file") ? A.Syntax_forPath(url) : B.Syntax_SCSS_scss;
-              t2 = $async$self._async_evaluate$_quietDeps && isDependency ? $.$get$Logger_quiet() : $async$self._async_evaluate$_logger;
-              $async$returnValue = new A._Record_3_importer_isDependency(A.Stylesheet_Stylesheet$parse(result._0, t1, t2, url), null, isDependency);
-              // goto return
-              $async$goto = 1;
-              break;
-            case 1:
-              // return
-              return A._asyncReturn($async$returnValue, $async$completer);
-          }
-      });
-      return A._asyncStartSync($async$_async_evaluate$_importLikeNode$3, $async$completer);
-    },
     _visitStaticImport$1($import) {
       return this._visitStaticImport$body$_EvaluateVisitor($import);
     },
     _visitStaticImport$body$_EvaluateVisitor($import) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.void),
-        $async$self = this, t1, node, $async$temp1, $async$temp2;
+        $async$self = this, t1, t2, node, $async$temp1, $async$temp2;
       var $async$_visitStaticImport$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -63254,14 +64731,16 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              $async$temp1 = A;
               $async$goto = 2;
               return A._asyncAwait($async$self._async_evaluate$_interpolationToValue$1($import.url), $async$_visitStaticImport$1);
             case 2:
               // returning from await.
-              $async$temp2 = $async$result;
+              t1 = $async$result;
+              t2 = A.NullableExtension_andThen($import.modifiers, $async$self.get$_async_evaluate$_interpolationToValue());
+              $async$temp1 = A;
+              $async$temp2 = t1;
               $async$goto = 3;
-              return A._asyncAwait(A.NullableExtension_andThen($import.modifiers, $async$self.get$_async_evaluate$_interpolationToValue()), $async$_visitStaticImport$1);
+              return A._asyncAwait(type$.Future_nullable_CssValue_String._is(t2) ? t2 : A._Future$value(t2, type$.nullable_CssValue_String), $async$_visitStaticImport$1);
             case 3:
               // returning from await.
               node = new $async$temp1.ModifiableCssImport($async$temp2, $async$result, $import.span);
@@ -63286,7 +64765,7 @@ self.util = _cliPkgRequires.util;
     _applyMixin$body$_EvaluateVisitor(mixin, contentCallable, $arguments, nodeWithSpan, nodeWithSpanWithoutContent) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.void),
-        $async$self = this, _1_8, t1, _0_0;
+        $async$self = this, t1, _0_0, _1_8, t2;
       var $async$_async_evaluate$_applyMixin$5 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -63294,7 +64773,6 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              _1_8 = A._InitializedCell$(new A._EvaluateVisitor__applyMixin_closure2(mixin));
               if (mixin == null)
                 throw A.wrapException($async$self._async_evaluate$_exception$2("Undefined mixin.", nodeWithSpan.get$span(nodeWithSpan)));
               t1 = type$.AsyncBuiltInCallable._is(mixin);
@@ -63316,7 +64794,7 @@ self.util = _cliPkgRequires.util;
             case 6:
               // then
               $async$goto = 8;
-              return A._asyncAwait($async$self._async_evaluate$_environment.withContent$2(contentCallable, new A._EvaluateVisitor__applyMixin_closure3($async$self, $arguments, mixin, nodeWithSpanWithoutContent)), $async$_async_evaluate$_applyMixin$5);
+              return A._asyncAwait($async$self._async_evaluate$_environment.withContent$2(contentCallable, new A._EvaluateVisitor__applyMixin_closure1($async$self, $arguments, mixin, nodeWithSpanWithoutContent)), $async$_async_evaluate$_applyMixin$5);
             case 8:
               // returning from await.
               // goto break $label0$0
@@ -63325,14 +64803,22 @@ self.util = _cliPkgRequires.util;
             case 7:
               // join
               t1 = type$.UserDefinedCallable_AsyncEnvironment._is(mixin);
-              if (t1 && _1_8._readFinal$0() instanceof A.MixinRule && !_1_8._readFinal$0().get$hasContent() && contentCallable != null)
+              if (t1) {
+                _1_8 = mixin.declaration;
+                if (_1_8 instanceof A.MixinRule)
+                  t2 = !type$.MixinRule._as(_1_8).get$hasContent() && contentCallable != null;
+                else
+                  t2 = false;
+              } else
+                t2 = false;
+              if (t2)
                 throw A.wrapException(A.MultiSpanSassRuntimeException$("Mixin doesn't accept a content block.", nodeWithSpanWithoutContent.get$span(nodeWithSpanWithoutContent), "invocation", A.LinkedHashMap_LinkedHashMap$_literal([mixin.declaration.$arguments.get$spanWithName(), "declaration"], type$.FileSpan, type$.String), $async$self._async_evaluate$_stackTrace$1(nodeWithSpanWithoutContent.get$span(nodeWithSpanWithoutContent)), null));
               $async$goto = t1 ? 9 : 10;
               break;
             case 9:
               // then
               $async$goto = 11;
-              return A._asyncAwait($async$self._async_evaluate$_runUserDefinedCallable$1$4($arguments, mixin, nodeWithSpanWithoutContent, new A._EvaluateVisitor__applyMixin_closure4($async$self, contentCallable, mixin, nodeWithSpanWithoutContent), type$.Null), $async$_async_evaluate$_applyMixin$5);
+              return A._asyncAwait($async$self._async_evaluate$_runUserDefinedCallable$1$4($arguments, mixin, nodeWithSpanWithoutContent, new A._EvaluateVisitor__applyMixin_closure2($async$self, contentCallable, mixin, nodeWithSpanWithoutContent), type$.Null), $async$_async_evaluate$_applyMixin$5);
             case 11:
               // returning from await.
               // goto break $label0$0
@@ -63355,7 +64841,7 @@ self.util = _cliPkgRequires.util;
     visitIncludeRule$body$_EvaluateVisitor(node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value),
-        $async$returnValue, $async$self = this;
+        $async$returnValue, $async$self = this, mixin;
       var $async$visitIncludeRule$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -63363,8 +64849,11 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
+              mixin = $async$self._async_evaluate$_addExceptionSpan$2(node, new A._EvaluateVisitor_visitIncludeRule_closure2($async$self, node));
+              if (B.JSString_methods.startsWith$1(node.originalName, "--") && mixin instanceof A.UserDefinedCallable && !B.JSString_methods.startsWith$1(mixin.declaration.originalName, "--"))
+                $async$self._async_evaluate$_warn$3(string$.Sassx20_m, node.get$nameSpan(), B.Deprecation_HJ0);
               $async$goto = 3;
-              return A._asyncAwait($async$self._async_evaluate$_applyMixin$5($async$self._async_evaluate$_addExceptionSpan$2(node, new A._EvaluateVisitor_visitIncludeRule_closure2($async$self, node)), A.NullableExtension_andThen(node.content, new A._EvaluateVisitor_visitIncludeRule_closure3($async$self)), node.$arguments, node, new A._FakeAstNode(new A._EvaluateVisitor_visitIncludeRule_closure4(node))), $async$visitIncludeRule$1);
+              return A._asyncAwait($async$self._async_evaluate$_applyMixin$5(mixin, A.NullableExtension_andThen(node.content, new A._EvaluateVisitor_visitIncludeRule_closure3($async$self)), node.$arguments, node, new A._FakeAstNode(new A._EvaluateVisitor_visitIncludeRule_closure4(node))), $async$visitIncludeRule$1);
             case 3:
               // returning from await.
               $async$returnValue = null;
@@ -63515,7 +65004,7 @@ self.util = _cliPkgRequires.util;
     _visitMediaQueries$body$_EvaluateVisitor(interpolation) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.List_CssMediaQuery),
-        $async$returnValue, $async$self = this, _0_0, resolved, map;
+        $async$returnValue, $async$self = this, _0_0;
       var $async$_visitMediaQueries$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -63528,9 +65017,7 @@ self.util = _cliPkgRequires.util;
             case 3:
               // returning from await.
               _0_0 = $async$result;
-              resolved = _0_0._0;
-              map = _0_0._1;
-              $async$returnValue = A.CssMediaQuery_parseList(resolved, map, $async$self._async_evaluate$_logger);
+              $async$returnValue = A.CssMediaQuery_parseList(_0_0._0, _0_0._1, $async$self._async_evaluate$_logger);
               // goto return
               $async$goto = 1;
               break;
@@ -63542,26 +65029,23 @@ self.util = _cliPkgRequires.util;
       return A._asyncStartSync($async$_visitMediaQueries$1, $async$completer);
     },
     _async_evaluate$_mergeMediaQueries$2(queries1, queries2) {
-      var t1, t2, t3, t4, _0_0, result, t5,
+      var t1, t2, t3, t4, _0_0, t5, result,
         queries = A._setArrayType([], type$.JSArray_CssMediaQuery);
       for (t1 = J.get$iterator$ax(queries1), t2 = J.getInterceptor$ax(queries2); t1.moveNext$0();) {
         t3 = t1.get$current(t1);
-        for (t4 = t2.get$iterator(queries2); t4.moveNext$0();) {
-          _0_0 = t3.merge$1(t4.get$current(t4));
-          if (B._SingletonCssMediaQueryMergeResult_0 === _0_0)
-            continue;
-          if (B._SingletonCssMediaQueryMergeResult_1 === _0_0)
-            return null;
-          if (_0_0 instanceof A.MediaQuerySuccessfulMergeResult) {
-            result = _0_0;
-            t5 = true;
-          } else {
-            result = null;
-            t5 = false;
+        for (t4 = t2.get$iterator(queries2); t4.moveNext$0();)
+          $label0$1: {
+            _0_0 = t3.merge$1(t4.get$current(t4));
+            if (B._SingletonCssMediaQueryMergeResult_0 === _0_0)
+              continue;
+            if (B._SingletonCssMediaQueryMergeResult_1 === _0_0)
+              return null;
+            t5 = _0_0 instanceof A.MediaQuerySuccessfulMergeResult;
+            result = t5 ? _0_0 : null;
+            if (t5)
+              queries.push(result.query);
+            break $label0$1;
           }
-          if (t5)
-            queries.push(result.query);
-        }
       }
       return queries;
     },
@@ -63571,7 +65055,7 @@ self.util = _cliPkgRequires.util;
     visitReturnRule$body$_EvaluateVisitor(node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Value),
-        $async$returnValue, $async$self = this, t1;
+        $async$returnValue, $async$self = this, t1, t2;
       var $async$visitReturnRule$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -63580,8 +65064,9 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               t1 = node.expression;
+              t2 = t1.accept$1($async$self);
               $async$goto = 3;
-              return A._asyncAwait(t1.accept$1($async$self), $async$visitReturnRule$1);
+              return A._asyncAwait(type$.Future_Value._is(t2) ? t2 : A._Future$value(t2, type$.Value), $async$visitReturnRule$1);
             case 3:
               // returning from await.
               $async$returnValue = $async$self._async_evaluate$_withoutSlash$2($async$result, t1);
@@ -63626,7 +65111,7 @@ self.util = _cliPkgRequires.util;
     visitStyleRule$body$_EvaluateVisitor(node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value),
-        $async$returnValue, $async$self = this, t1, _0_0, selectorText, selectorMap, t2, parsedSelector, rule, oldAtRootExcludingStyleRule, t3, t4, t5, _i, complex, visitor, t6, t7, t8, t9;
+        $async$returnValue, $async$self = this, t1, _0_0, selectorText, selectorMap, parsedSelector, nest, t2, _i, _1_0, first, t3, rule, oldAtRootExcludingStyleRule;
       var $async$visitStyleRule$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -63635,7 +65120,9 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               if ($async$self._async_evaluate$_declarationName != null)
-                throw A.wrapException($async$self._async_evaluate$_exception$2(string$.Style_, node.span));
+                throw A.wrapException($async$self._async_evaluate$_exception$2(string$.Style_n, node.span));
+              else if ($async$self._async_evaluate$_inKeyframes && $async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__parent, "__parent") instanceof A.ModifiableCssKeyframeBlock)
+                throw A.wrapException($async$self._async_evaluate$_exception$2(string$.Style_k, node.span));
               t1 = node.selector;
               $async$goto = 3;
               return A._asyncAwait($async$self._async_evaluate$_performInterpolationWithMap$2$warnForColor(t1, true), $async$visitStyleRule$1);
@@ -63649,7 +65136,7 @@ self.util = _cliPkgRequires.util;
             case 4:
               // then
               $async$goto = 6;
-              return A._asyncAwait($async$self._async_evaluate$_withParent$2$4$scopeWhen$through(A.ModifiableCssKeyframeBlock$(new A.CssValue(A.List_List$unmodifiable(A.KeyframeSelectorParser$(selectorText, selectorMap, $async$self._async_evaluate$_logger).parse$0(), type$.String), t1.span, type$.CssValue_List_String), node.span), new A._EvaluateVisitor_visitStyleRule_closure4($async$self, node), node.hasDeclarations, new A._EvaluateVisitor_visitStyleRule_closure5(), type$.ModifiableCssKeyframeBlock, type$.Null), $async$visitStyleRule$1);
+              return A._asyncAwait($async$self._async_evaluate$_withParent$2$4$scopeWhen$through(A.ModifiableCssKeyframeBlock$(new A.CssValue(A.List_List$unmodifiable(A.KeyframeSelectorParser$(selectorText, selectorMap, $async$self._async_evaluate$_logger).parse$0(), type$.String), t1.span, type$.CssValue_List_String), node.span), new A._EvaluateVisitor_visitStyleRule_closure3($async$self, node), node.hasDeclarations, new A._EvaluateVisitor_visitStyleRule_closure4(), type$.ModifiableCssKeyframeBlock, type$.Null), $async$visitStyleRule$1);
             case 6:
               // returning from await.
               $async$returnValue = null;
@@ -63658,48 +65145,43 @@ self.util = _cliPkgRequires.util;
               break;
             case 5:
               // join
-              t1 = A.SelectorList_SelectorList$parse(selectorText, !$async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__stylesheet, "_stylesheet").plainCss, !$async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__stylesheet, "_stylesheet").plainCss, selectorMap, $async$self._async_evaluate$_logger);
-              t2 = $async$self._async_evaluate$_styleRuleIgnoringAtRoot;
-              t2 = t2 == null ? null : t2.originalSelector;
-              parsedSelector = t1.resolveParentSelectors$2$implicitParent(t2, !$async$self._async_evaluate$_atRootExcludingStyleRule);
-              rule = A.ModifiableCssStyleRule$($async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__extensionStore, "_extensionStore").addSelector$2(parsedSelector, $async$self._async_evaluate$_mediaQueries), node.span, parsedSelector);
+              parsedSelector = A.SelectorList_SelectorList$parse(selectorText, true, selectorMap, $async$self._async_evaluate$_logger, $async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__stylesheet, "_stylesheet").plainCss);
+              t1 = $async$self._async_evaluate$_atRootExcludingStyleRule ? null : $async$self._async_evaluate$_styleRuleIgnoringAtRoot;
+              t1 = t1 == null ? null : t1.fromPlainCss;
+              nest = t1 !== true;
+              if (nest) {
+                if ($async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__stylesheet, "_stylesheet").plainCss)
+                  for (t1 = parsedSelector.components, t2 = t1.length, _i = 0; _i < t2; ++_i) {
+                    _1_0 = t1[_i].leadingCombinators;
+                    if (_1_0.length >= 1) {
+                      first = _1_0[0];
+                      t3 = $async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__stylesheet, "_stylesheet");
+                      t3 = t3.plainCss;
+                    } else {
+                      first = null;
+                      t3 = false;
+                    }
+                    if (t3)
+                      throw A.wrapException($async$self._async_evaluate$_exception$2(string$.Top_lel, first.span));
+                  }
+                t1 = $async$self._async_evaluate$_styleRuleIgnoringAtRoot;
+                t1 = t1 == null ? null : t1.originalSelector;
+                parsedSelector = parsedSelector.nestWithin$3$implicitParent$preserveParentSelectors(t1, !$async$self._async_evaluate$_atRootExcludingStyleRule, $async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__stylesheet, "_stylesheet").plainCss);
+              }
+              rule = A.ModifiableCssStyleRule$($async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__extensionStore, "_extensionStore").addSelector$2(parsedSelector, $async$self._async_evaluate$_mediaQueries), node.span, $async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__stylesheet, "_stylesheet").plainCss, parsedSelector);
               oldAtRootExcludingStyleRule = $async$self._async_evaluate$_atRootExcludingStyleRule;
-              $async$self._async_evaluate$_atRootExcludingStyleRule = false;
+              t1 = $async$self._async_evaluate$_atRootExcludingStyleRule = false;
+              t2 = nest ? new A._EvaluateVisitor_visitStyleRule_closure5() : null;
               $async$goto = 7;
-              return A._asyncAwait($async$self._async_evaluate$_withParent$2$4$scopeWhen$through(rule, new A._EvaluateVisitor_visitStyleRule_closure6($async$self, rule, node), node.hasDeclarations, new A._EvaluateVisitor_visitStyleRule_closure7(), type$.ModifiableCssStyleRule, type$.Null), $async$visitStyleRule$1);
+              return A._asyncAwait($async$self._async_evaluate$_withParent$2$4$scopeWhen$through(rule, new A._EvaluateVisitor_visitStyleRule_closure6($async$self, rule, node), node.hasDeclarations, t2, type$.ModifiableCssStyleRule, type$.Null), $async$visitStyleRule$1);
             case 7:
               // returning from await.
               $async$self._async_evaluate$_atRootExcludingStyleRule = oldAtRootExcludingStyleRule;
-              if (!rule.accept$1(B._IsInvisibleVisitor_false_false))
-                for (t1 = parsedSelector.components, t2 = t1.length, t3 = type$.SourceSpan, t4 = type$.String, t5 = rule.children, _i = 0; _i < t2; ++_i) {
-                  complex = t1[_i];
-                  if (!complex.accept$1(B._IsBogusVisitor_true))
-                    continue;
-                  if (complex.accept$1(B.C__IsUselessVisitor)) {
-                    visitor = A._SerializeVisitor$(null, true, null, true, false, null, true);
-                    complex.accept$1(visitor);
-                    $async$self._async_evaluate$_warn$3('The selector "' + B.JSString_methods.trim$0(visitor._serialize$_buffer.toString$0(0)) + string$.x22x20is_ix20, A.SpanExtensions_trimRight(complex.span), B.Deprecation_vrR);
-                  } else if (complex.leadingCombinators.length !== 0) {
-                    visitor = A._SerializeVisitor$(null, true, null, true, false, null, true);
-                    complex.accept$1(visitor);
-                    $async$self._async_evaluate$_warn$3('The selector "' + B.JSString_methods.trim$0(visitor._serialize$_buffer.toString$0(0)) + string$.x22x20is_ix0a, A.SpanExtensions_trimRight(complex.span), B.Deprecation_vrR);
-                  } else {
-                    visitor = A._SerializeVisitor$(null, true, null, true, false, null, true);
-                    complex.accept$1(visitor);
-                    t6 = B.JSString_methods.trim$0(visitor._serialize$_buffer.toString$0(0));
-                    t7 = complex.accept$1(B._IsBogusVisitor_false) ? string$.x20It_wi : "";
-                    t8 = A.SpanExtensions_trimRight(complex.span);
-                    if (t5.get$length(t5) === 0)
-                      A.throwExpression(A.IterableElementError_noElement());
-                    t9 = J.get$span$z(t5.$index(0, 0));
-                    $async$self._async_evaluate$_warn$3('The selector "' + t6 + string$.x22x20is_o + t7 + string$.x0aThis_, new A.MultiSpan(t8, "invalid selector", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([t9, "this is not a style rule" + (t5.every$1(t5, new A._EvaluateVisitor_visitStyleRule_closure8()) ? "\n(try converting to a //-style comment)" : "")], t3, t4), t3, t4)), B.Deprecation_vrR);
-                  }
-                }
+              $async$self._async_evaluate$_warnForBogusCombinators$1(rule);
               if (($async$self._async_evaluate$_atRootExcludingStyleRule ? null : $async$self._async_evaluate$_styleRuleIgnoringAtRoot) == null) {
                 t1 = $async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__parent, "__parent").children;
                 t1 = !t1.get$isEmpty(t1);
-              } else
-                t1 = false;
+              }
               if (t1) {
                 t1 = $async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__parent, "__parent").children;
                 t1.get$last(t1).isGroupEnd = true;
@@ -63715,6 +65197,36 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$visitStyleRule$1, $async$completer);
     },
+    _async_evaluate$_warnForBogusCombinators$1(rule) {
+      var t1, t2, t3, t4, t5, _i, complex, visitor, t6, t7, t8, t9, _this = this, _null = null;
+      if (!rule.accept$1(B._IsInvisibleVisitor_false_false))
+        for (t1 = rule._style_rule$_selector._box$_inner.value.components, t2 = t1.length, t3 = type$.SourceSpan, t4 = type$.String, t5 = rule.children, _i = 0; _i < t2; ++_i) {
+          complex = t1[_i];
+          if (!complex.accept$1(B._IsBogusVisitor_true))
+            continue;
+          if (complex.accept$1(B.C__IsUselessVisitor)) {
+            visitor = A._SerializeVisitor$(_null, true, _null, true, false, _null, true);
+            complex.accept$1(visitor);
+            _this._async_evaluate$_warn$3('The selector "' + B.JSString_methods.trim$0(visitor._serialize$_buffer.toString$0(0)) + string$.x22x20is_ix20, A.SpanExtensions_trimRight(complex.span), B.Deprecation_ido);
+          } else if (complex.leadingCombinators.length !== 0) {
+            if (!_this._async_evaluate$_assertInModule$2(_this._async_evaluate$__stylesheet, "_stylesheet").plainCss) {
+              visitor = A._SerializeVisitor$(_null, true, _null, true, false, _null, true);
+              complex.accept$1(visitor);
+              _this._async_evaluate$_warn$3('The selector "' + B.JSString_methods.trim$0(visitor._serialize$_buffer.toString$0(0)) + string$.x22x20is_ix0a, A.SpanExtensions_trimRight(complex.span), B.Deprecation_ido);
+            }
+          } else {
+            visitor = A._SerializeVisitor$(_null, true, _null, true, false, _null, true);
+            complex.accept$1(visitor);
+            t6 = B.JSString_methods.trim$0(visitor._serialize$_buffer.toString$0(0));
+            t7 = complex.accept$1(B._IsBogusVisitor_false) ? string$.x20It_wi : "";
+            t8 = A.SpanExtensions_trimRight(complex.span);
+            if (t5.get$length(0) === 0)
+              A.throwExpression(A.IterableElementError_noElement());
+            t9 = J.get$span$z(t5.$index(0, 0));
+            _this._async_evaluate$_warn$3('The selector "' + t6 + string$.x22x20is_o + t7 + string$.x0aThis_, new A.MultiSpan(t8, "invalid selector", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([t9, "this is not a style rule" + (t5.every$1(t5, new A._EvaluateVisitor__warnForBogusCombinators_closure0()) ? "\n(try converting to a //-style comment)" : "")], t3, t4), t3, t4)), B.Deprecation_ido);
+          }
+        }
+    },
     visitSupportsRule$1(node) {
       return this.visitSupportsRule$body$_EvaluateVisitor(node);
     },
@@ -63759,7 +65271,7 @@ self.util = _cliPkgRequires.util;
     _visitSupportsCondition$body$_EvaluateVisitor(condition) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.String),
-        $async$returnValue, $async$self = this, operation, t1, t2, negation, interpolation, $function, anything, _box_0, $async$temp1, $async$temp2;
+        $async$returnValue, $async$self = this, t1, _box_0, $async$temp1, $async$temp2;
       var $async$_async_evaluate$_visitSupportsCondition$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -63768,51 +65280,35 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               _box_0 = {};
-              if (condition instanceof A.SupportsOperation) {
-                operation = condition;
-                t1 = true;
-              } else {
-                operation = null;
-                t1 = false;
-              }
-              $async$goto = t1 ? 4 : 5;
+              $async$goto = condition instanceof A.SupportsOperation ? 4 : 5;
               break;
             case 4:
               // then
-              t1 = operation.left;
-              t2 = operation.operator;
+              t1 = condition.operator;
               $async$temp1 = A;
               $async$goto = 6;
-              return A._asyncAwait($async$self._async_evaluate$_parenthesize$2(t1, t2), $async$_async_evaluate$_visitSupportsCondition$1);
+              return A._asyncAwait($async$self._async_evaluate$_parenthesize$2(condition.left, t1), $async$_async_evaluate$_visitSupportsCondition$1);
             case 6:
               // returning from await.
-              $async$temp1 = $async$temp1.S($async$result) + " " + t2 + " ";
+              $async$temp1 = $async$temp1.S($async$result) + " " + t1 + " ";
               $async$temp2 = A;
               $async$goto = 7;
-              return A._asyncAwait($async$self._async_evaluate$_parenthesize$2(operation.right, t2), $async$_async_evaluate$_visitSupportsCondition$1);
+              return A._asyncAwait($async$self._async_evaluate$_parenthesize$2(condition.right, t1), $async$_async_evaluate$_visitSupportsCondition$1);
             case 7:
               // returning from await.
-              t2 = $async$temp1 + $async$temp2.S($async$result);
-              t1 = t2;
+              t1 = $async$temp1 + $async$temp2.S($async$result);
               // goto break $label0$0
               $async$goto = 3;
               break;
             case 5:
               // join
-              if (condition instanceof A.SupportsNegation) {
-                negation = condition;
-                t1 = true;
-              } else {
-                negation = null;
-                t1 = false;
-              }
-              $async$goto = t1 ? 8 : 9;
+              $async$goto = condition instanceof A.SupportsNegation ? 8 : 9;
               break;
             case 8:
               // then
               $async$temp1 = A;
               $async$goto = 10;
-              return A._asyncAwait($async$self._async_evaluate$_parenthesize$1(negation.condition), $async$_async_evaluate$_visitSupportsCondition$1);
+              return A._asyncAwait($async$self._async_evaluate$_parenthesize$1(condition.condition), $async$_async_evaluate$_visitSupportsCondition$1);
             case 10:
               // returning from await.
               t1 = "not " + $async$temp1.S($async$result);
@@ -63821,19 +65317,12 @@ self.util = _cliPkgRequires.util;
               break;
             case 9:
               // join
-              if (condition instanceof A.SupportsInterpolation) {
-                interpolation = condition;
-                t1 = true;
-              } else {
-                interpolation = null;
-                t1 = false;
-              }
-              $async$goto = t1 ? 11 : 12;
+              $async$goto = condition instanceof A.SupportsInterpolation ? 11 : 12;
               break;
             case 11:
               // then
               $async$goto = 13;
-              return A._asyncAwait($async$self._evaluateToCss$2$quote(interpolation.expression, false), $async$_async_evaluate$_visitSupportsCondition$1);
+              return A._asyncAwait($async$self._evaluateToCss$2$quote(condition.expression, false), $async$_async_evaluate$_visitSupportsCondition$1);
             case 13:
               // returning from await.
               t1 = $async$result;
@@ -63843,15 +65332,11 @@ self.util = _cliPkgRequires.util;
             case 12:
               // join
               _box_0.declaration = null;
-              if (condition instanceof A.SupportsDeclaration) {
-                _box_0.declaration = condition;
-                t1 = true;
-              } else
-                t1 = false;
-              $async$goto = t1 ? 14 : 15;
+              $async$goto = condition instanceof A.SupportsDeclaration ? 14 : 15;
               break;
             case 14:
               // then
+              _box_0.declaration = condition;
               $async$goto = 16;
               return A._asyncAwait($async$self._async_evaluate$_withSupportsDeclaration$1$1(new A._EvaluateVisitor__visitSupportsCondition_closure0(_box_0, $async$self), type$.String), $async$_async_evaluate$_visitSupportsCondition$1);
             case 16:
@@ -63862,26 +65347,19 @@ self.util = _cliPkgRequires.util;
               break;
             case 15:
               // join
-              if (condition instanceof A.SupportsFunction) {
-                $function = condition;
-                t1 = true;
-              } else {
-                $function = null;
-                t1 = false;
-              }
-              $async$goto = t1 ? 17 : 18;
+              $async$goto = condition instanceof A.SupportsFunction ? 17 : 18;
               break;
             case 17:
               // then
               $async$temp1 = A;
               $async$goto = 19;
-              return A._asyncAwait($async$self._async_evaluate$_performInterpolation$1($function.name), $async$_async_evaluate$_visitSupportsCondition$1);
+              return A._asyncAwait($async$self._async_evaluate$_performInterpolation$1(condition.name), $async$_async_evaluate$_visitSupportsCondition$1);
             case 19:
               // returning from await.
               $async$temp1 = $async$temp1.S($async$result) + "(";
               $async$temp2 = A;
               $async$goto = 20;
-              return A._asyncAwait($async$self._async_evaluate$_performInterpolation$1($function.$arguments), $async$_async_evaluate$_visitSupportsCondition$1);
+              return A._asyncAwait($async$self._async_evaluate$_performInterpolation$1(condition.$arguments), $async$_async_evaluate$_visitSupportsCondition$1);
             case 20:
               // returning from await.
               t1 = $async$temp1 + $async$temp2.S($async$result) + ")";
@@ -63890,20 +65368,13 @@ self.util = _cliPkgRequires.util;
               break;
             case 18:
               // join
-              if (condition instanceof A.SupportsAnything) {
-                anything = condition;
-                t1 = true;
-              } else {
-                anything = null;
-                t1 = false;
-              }
-              $async$goto = t1 ? 21 : 22;
+              $async$goto = condition instanceof A.SupportsAnything ? 21 : 22;
               break;
             case 21:
               // then
               $async$temp1 = A;
               $async$goto = 23;
-              return A._asyncAwait($async$self._async_evaluate$_performInterpolation$1(anything.contents), $async$_async_evaluate$_visitSupportsCondition$1);
+              return A._asyncAwait($async$self._async_evaluate$_performInterpolation$1(condition.contents), $async$_async_evaluate$_visitSupportsCondition$1);
             case 23:
               // returning from await.
               t1 = "(" + $async$temp1.S($async$result) + ")";
@@ -63945,8 +65416,9 @@ self.util = _cliPkgRequires.util;
               oldInSupportsDeclaration = $async$self._async_evaluate$_inSupportsDeclaration;
               $async$self._async_evaluate$_inSupportsDeclaration = true;
               $async$handler = 3;
+              t1 = callback.call$0();
               $async$goto = 6;
-              return A._asyncAwait(callback.call$0(), $async$_async_evaluate$_withSupportsDeclaration$1$1);
+              return A._asyncAwait($T._eval$1("Future<0>")._is(t1) ? t1 : A._Future$value(t1, $T), $async$_async_evaluate$_withSupportsDeclaration$1$1);
             case 6:
               // returning from await.
               t1 = $async$result;
@@ -64041,7 +65513,7 @@ self.util = _cliPkgRequires.util;
     visitVariableDeclaration$body$_EvaluateVisitor(node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value),
-        $async$returnValue, $async$self = this, t2, t3, value, t1, $async$temp1, $async$temp2, $async$temp3;
+        $async$returnValue, $async$self = this, t2, value, t1, $async$temp1, $async$temp2, $async$temp3;
       var $async$visitVariableDeclaration$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -64052,18 +65524,15 @@ self.util = _cliPkgRequires.util;
               t1 = {};
               if (node.isGuarded) {
                 if (node.namespace == null && $async$self._async_evaluate$_environment._async_environment$_variables.length === 1) {
-                  t1.override = null;
                   t2 = $async$self._async_evaluate$_configuration._configuration$_values;
                   t2 = t2.get$isEmpty(t2) ? null : t2.remove$1(0, node.name);
+                  t1.override = null;
                   if (t2 != null) {
                     t1.override = t2;
-                    t3 = t2;
-                    t2 = true;
-                  } else {
+                    t2 = !t2.value.$eq(0, B.C__SassNull);
+                  } else
                     t2 = false;
-                    t3 = null;
-                  }
-                  if (t2 && !t3.value.$eq(0, B.C__SassNull)) {
+                  if (t2) {
                     $async$self._async_evaluate$_addExceptionSpan$2(node, new A._EvaluateVisitor_visitVariableDeclaration_closure2(t1, $async$self, node));
                     $async$returnValue = null;
                     // goto return
@@ -64081,14 +65550,15 @@ self.util = _cliPkgRequires.util;
               }
               if (node.isGlobal && !$async$self._async_evaluate$_environment.globalVariableExists$1(node.name)) {
                 t1 = $async$self._async_evaluate$_environment._async_environment$_variables.length === 1 ? string$.As_of_S : string$.As_of_R + A.declarationName(node.span) + ": null` at the stylesheet root.";
-                $async$self._async_evaluate$_warn$3(t1, node.span, B.Deprecation_hzy);
+                $async$self._async_evaluate$_warn$3(t1, node.span, B.Deprecation_2nU);
               }
               t1 = node.expression;
+              t2 = t1.accept$1($async$self);
               $async$temp1 = node;
               $async$temp2 = A;
               $async$temp3 = node;
               $async$goto = 3;
-              return A._asyncAwait(t1.accept$1($async$self), $async$visitVariableDeclaration$1);
+              return A._asyncAwait(type$.Future_Value._is(t2) ? t2 : A._Future$value(t2, type$.Value), $async$visitVariableDeclaration$1);
             case 3:
               // returning from await.
               $async$self._async_evaluate$_addExceptionSpan$2($async$temp1, new $async$temp2._EvaluateVisitor_visitVariableDeclaration_closure4($async$self, $async$temp3, $async$self._async_evaluate$_withoutSlash$2($async$result, t1)));
@@ -64109,7 +65579,7 @@ self.util = _cliPkgRequires.util;
     visitUseRule$body$_EvaluateVisitor(node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value),
-        $async$returnValue, $async$self = this, values, _i, variable, t3, variableNodeWithSpan, configuration, t1, t2, $async$temp1, $async$temp2, $async$temp3;
+        $async$returnValue, $async$self = this, values, t3, t4, _i, variable, t5, variableNodeWithSpan, t6, t7, configuration, t1, t2, $async$temp1, $async$temp2, $async$temp3;
       var $async$visitUseRule$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -64124,7 +65594,7 @@ self.util = _cliPkgRequires.util;
             case 3:
               // then
               values = A.LinkedHashMap_LinkedHashMap$_empty(type$.String, type$.ConfiguredValue);
-              _i = 0;
+              t3 = type$._Future_Value, t4 = type$.Future_Value, _i = 0;
             case 6:
               // for condition
               if (!(_i < t2)) {
@@ -64133,13 +65603,21 @@ self.util = _cliPkgRequires.util;
                 break;
               }
               variable = t1[_i];
-              t3 = variable.expression;
-              variableNodeWithSpan = $async$self._async_evaluate$_expressionNode$1(t3);
+              t5 = variable.expression;
+              variableNodeWithSpan = $async$self._async_evaluate$_expressionNode$1(t5);
+              t6 = variable.name;
+              t5 = t5.accept$1($async$self);
+              if (!t4._is(t5)) {
+                t7 = new A._Future($.Zone__current, t3);
+                t7._state = 8;
+                t7._resultOrListeners = t5;
+                t5 = t7;
+              }
               $async$temp1 = values;
-              $async$temp2 = variable.name;
+              $async$temp2 = t6;
               $async$temp3 = A;
               $async$goto = 9;
-              return A._asyncAwait(t3.accept$1($async$self), $async$visitUseRule$1);
+              return A._asyncAwait(t5, $async$visitUseRule$1);
             case 9:
               // returning from await.
               $async$temp1.$indexSet(0, $async$temp2, new $async$temp3.ConfiguredValue($async$self._async_evaluate$_withoutSlash$2($async$result, variableNodeWithSpan), variable.span, variableNodeWithSpan));
@@ -64215,7 +65693,7 @@ self.util = _cliPkgRequires.util;
       var t1, _this = this;
       if (_this._async_evaluate$_assertInModule$2(_this._async_evaluate$__stylesheet, "_stylesheet").plainCss) {
         t1 = node.operator;
-        t1 = t1 !== B.BinaryOperator_2jN && t1 !== B.BinaryOperator_t8B;
+        t1 = t1 !== B.BinaryOperator_wdM && t1 !== B.BinaryOperator_U77;
       } else
         t1 = false;
       if (t1)
@@ -64223,43 +65701,48 @@ self.util = _cliPkgRequires.util;
       return _this._addExceptionSpanAsync$1$2(node, new A._EvaluateVisitor_visitBinaryOperationExpression_closure0(_this, node), type$.Value);
     },
     _async_evaluate$_slash$3(left, right, node) {
-      var t1, _null = null,
+      var t1, right0, _1_2, _1_1, _null = null,
         result = left.dividedBy$1(right),
-        _1_0 = new A._Record_2(left, right),
-        _1_1 = A._InitializedCell$(new A._EvaluateVisitor__slash_closure1(_1_0)),
-        _1_2 = A._InitializedCell$(new A._EvaluateVisitor__slash_closure2(_1_0));
-      if (_1_1._readFinal$0() instanceof A.SassNumber) {
-        left = _1_1._readFinal$0();
-        if (_1_2._readFinal$0() instanceof A.SassNumber) {
-          right = _1_2._readFinal$0();
+        _1_2_isSet = left instanceof A.SassNumber;
+      if (_1_2_isSet) {
+        t1 = type$.SassNumber;
+        t1._as(left);
+        if (right instanceof A.SassNumber) {
+          t1._as(right);
           t1 = node.allowsSlash && this._async_evaluate$_operandAllowsSlash$1(node.left) && this._async_evaluate$_operandAllowsSlash$1(node.right);
+          right0 = right;
+          _1_2 = right0;
         } else {
-          right = _null;
+          right0 = _null;
+          _1_2 = right;
           t1 = false;
         }
+        _1_1 = left;
       } else {
-        right = _null;
-        left = right;
+        right0 = _null;
+        _1_2 = right0;
+        _1_1 = left;
+        left = _1_2;
         t1 = false;
       }
       if (t1)
-        return type$.SassNumber._as(result).withSlash$2(left, right);
-      if (_1_1._readFinal$0() instanceof A.SassNumber && _1_2._readFinal$0() instanceof A.SassNumber) {
-        this._async_evaluate$_warn$3(string$.Using__o + A.S(new A._EvaluateVisitor__slash_recommendation0().call$1(node)) + " or " + A.expressionToCalc(node).toString$0(0) + string$.x0a_Morex20, node.get$span(node), B.Deprecation_xHK);
+        return type$.SassNumber._as(result).withSlash$2(left, right0);
+      if (_1_1 instanceof A.SassNumber)
+        t1 = (_1_2_isSet ? _1_2 : right) instanceof A.SassNumber;
+      else
+        t1 = false;
+      if (t1) {
+        this._async_evaluate$_warn$3(string$.Using__o + A.S(new A._EvaluateVisitor__slash_recommendation0().call$1(node)) + " or " + A.expressionToCalc(node).toString$0(0) + string$.x0a_Morex20, node.get$span(0), B.Deprecation_oJv);
         return result;
       }
       return result;
     },
     _async_evaluate$_operandAllowsSlash$1(node) {
-      var t1, t2;
+      var t1;
       if (node instanceof A.FunctionExpression)
         if (node.namespace == null) {
-          t1 = node.originalName;
-          if (B.Set_WfnXb.contains$1(0, A.stringReplaceAllUnchecked(t1, "_", "-").toLowerCase())) {
-            t2 = this._async_evaluate$_environment;
-            t1 = t2.getFunction$1(A.stringReplaceAllUnchecked(t1, "_", "-")) == null;
-          } else
-            t1 = false;
+          t1 = node.name;
+          t1 = B.Set_yHF81.contains$1(0, t1.toLowerCase()) && this._async_evaluate$_environment.getFunction$1(t1) == null;
         } else
           t1 = false;
       else
@@ -64422,8 +65905,9 @@ self.util = _cliPkgRequires.util;
             case 4:
               // returning from await.
               result = $async$result.get$isTruthy() ? ifTrue : ifFalse;
+              t1 = result.accept$1($async$self);
               $async$goto = 5;
-              return A._asyncAwait(result.accept$1($async$self), $async$visitIfExpression$1);
+              return A._asyncAwait(type$.Future_Value._is(t1) ? t1 : A._Future$value(t1, type$.Value), $async$visitIfExpression$1);
             case 5:
               // returning from await.
               $async$returnValue = $async$self._async_evaluate$_withoutSlash$2($async$result, $async$self._async_evaluate$_expressionNode$1(result));
@@ -64631,62 +66115,65 @@ self.util = _cliPkgRequires.util;
               t1 = {};
               $function = $async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__stylesheet, "_stylesheet").plainCss ? null : $async$self._async_evaluate$_addExceptionSpan$2(node, new A._EvaluateVisitor_visitFunctionExpression_closure2($async$self, node));
               t1.$function = $function;
-              $async$goto = $function == null ? 3 : 4;
+              $async$goto = $function == null ? 3 : 5;
               break;
             case 3:
               // then
               if (node.namespace != null)
                 throw A.wrapException($async$self._async_evaluate$_exception$2("Undefined function.", node.span));
-              t2 = node.originalName;
-              _0_0 = A.stringReplaceAllUnchecked(t2, "_", "-").toLowerCase();
+              t2 = node.name;
+              _0_0 = t2.toLowerCase();
               if ("min" === _0_0 || "max" === _0_0 || "round" === _0_0 || "abs" === _0_0) {
                 t3 = node.$arguments;
                 t4 = t3.named;
                 t3 = t4.get$isEmpty(t4) && t3.rest == null && B.JSArray_methods.every$1(t3.positional, new A._EvaluateVisitor_visitFunctionExpression_closure3());
               } else
                 t3 = false;
-              $async$goto = t3 ? 5 : 6;
-              break;
-            case 5:
-              // then
-              $async$goto = 7;
-              return A._asyncAwait($async$self._async_evaluate$_visitCalculation$2$inLegacySassFunction(node, true), $async$visitFunctionExpression$1);
-            case 7:
-              // returning from await.
-              $async$returnValue = $async$result;
-              // goto return
-              $async$goto = 1;
+              $async$goto = t3 ? 6 : 7;
               break;
             case 6:
-              // join
-              $async$goto = "calc" === _0_0 || "clamp" === _0_0 || "hypot" === _0_0 || "sin" === _0_0 || "cos" === _0_0 || "tan" === _0_0 || "asin" === _0_0 || "acos" === _0_0 || "atan" === _0_0 || "sqrt" === _0_0 || "exp" === _0_0 || "sign" === _0_0 || "mod" === _0_0 || "rem" === _0_0 || "atan2" === _0_0 || "pow" === _0_0 || "log" === _0_0 ? 8 : 9;
-              break;
-            case 8:
               // then
-              $async$goto = 10;
-              return A._asyncAwait($async$self._async_evaluate$_visitCalculation$1(node), $async$visitFunctionExpression$1);
-            case 10:
+              $async$goto = 8;
+              return A._asyncAwait($async$self._async_evaluate$_visitCalculation$2$inLegacySassFunction(node, true), $async$visitFunctionExpression$1);
+            case 8:
               // returning from await.
               $async$returnValue = $async$result;
               // goto return
               $async$goto = 1;
               break;
-            case 9:
+            case 7:
               // join
-              if ($async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__stylesheet, "_stylesheet").plainCss)
-                $function = null;
-              else {
-                t3 = $async$self._async_evaluate$_builtInFunctions.$index(0, A.stringReplaceAllUnchecked(t2, "_", "-"));
-                $function = t3;
-              }
-              t1.$function = $function == null ? new A.PlainCssCallable(t2) : $function;
+              $async$goto = "calc" === _0_0 || "clamp" === _0_0 || "hypot" === _0_0 || "sin" === _0_0 || "cos" === _0_0 || "tan" === _0_0 || "asin" === _0_0 || "acos" === _0_0 || "atan" === _0_0 || "sqrt" === _0_0 || "exp" === _0_0 || "sign" === _0_0 || "mod" === _0_0 || "rem" === _0_0 || "atan2" === _0_0 || "pow" === _0_0 || "log" === _0_0 ? 9 : 10;
+              break;
+            case 9:
+              // then
+              $async$goto = 11;
+              return A._asyncAwait($async$self._async_evaluate$_visitCalculation$1(node), $async$visitFunctionExpression$1);
+            case 11:
+              // returning from await.
+              $async$returnValue = $async$result;
+              // goto return
+              $async$goto = 1;
+              break;
+            case 10:
+              // join
+              $function = $async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__stylesheet, "_stylesheet").plainCss ? null : $async$self._async_evaluate$_builtInFunctions.$index(0, t2);
+              t2 = t1.$function = $function == null ? new A.PlainCssCallable(node.originalName) : $function;
+              // goto join
+              $async$goto = 4;
+              break;
+            case 5:
+              // else
+              t2 = $function;
             case 4:
               // join
+              if (B.JSString_methods.startsWith$1(node.originalName, "--") && t2 instanceof A.UserDefinedCallable && !B.JSString_methods.startsWith$1(t2.declaration.originalName, "--"))
+                $async$self._async_evaluate$_warn$3(string$.Sassx20_ff, node.get$nameSpan(), B.Deprecation_HJ0);
               oldInFunction = $async$self._async_evaluate$_inFunction;
               $async$self._async_evaluate$_inFunction = true;
-              $async$goto = 11;
+              $async$goto = 12;
               return A._asyncAwait($async$self._async_evaluate$_addErrorSpan$1$2(node, new A._EvaluateVisitor_visitFunctionExpression_closure4(t1, $async$self, node), type$.Value), $async$visitFunctionExpression$1);
-            case 11:
+            case 12:
               // returning from await.
               result = $async$result;
               $async$self._async_evaluate$_inFunction = oldInFunction;
@@ -64750,7 +66237,7 @@ self.util = _cliPkgRequires.util;
               // after for
               $arguments = t3;
               if ($async$self._async_evaluate$_inSupportsDeclaration) {
-                $async$returnValue = new A.SassCalculation(A.stringReplaceAllUnchecked(node.originalName, "_", "-"), A.List_List$unmodifiable($arguments, type$.Object));
+                $async$returnValue = new A.SassCalculation(node.name, A.List_List$unmodifiable($arguments, type$.Object));
                 // goto return
                 $async$goto = 1;
                 break;
@@ -64759,7 +66246,8 @@ self.util = _cliPkgRequires.util;
               $async$self._async_evaluate$_callableNode = node;
               try {
                 t1 = null;
-                _0_0 = A.stringReplaceAllUnchecked(node.originalName, "_", "-").toLowerCase();
+                t3 = node.name;
+                _0_0 = t3.toLowerCase();
                 $label0$0: {
                   if ("calc" === _0_0) {
                     t1 = A.SassCalculation_calc(J.$index$asx($arguments, 0));
@@ -64845,7 +66333,7 @@ self.util = _cliPkgRequires.util;
                     t1 = A.SassCalculation_clamp(J.$index$asx($arguments, 0), A.ListExtensions_elementAtOrNull($arguments, 1), A.ListExtensions_elementAtOrNull($arguments, 2));
                     break $label0$0;
                   }
-                  t3 = A.UnsupportedError$('Unknown calculation name "' + node.get$name(node) + '".');
+                  t3 = A.UnsupportedError$('Unknown calculation name "' + t3 + '".');
                   t1 = A.throwExpression(t3);
                 }
                 t1 = t1;
@@ -64874,10 +66362,11 @@ self.util = _cliPkgRequires.util;
       return A._asyncStartSync($async$_async_evaluate$_visitCalculation$2$inLegacySassFunction, $async$completer);
     },
     _async_evaluate$_checkCalculationArguments$1(node) {
-      var _0_0,
+      var t1, _0_0,
         check = new A._EvaluateVisitor__checkCalculationArguments_check0(this, node);
       $label0$0: {
-        _0_0 = A.stringReplaceAllUnchecked(node.originalName, "_", "-").toLowerCase();
+        t1 = node.name;
+        _0_0 = t1.toLowerCase();
         if ("calc" === _0_0 || "sqrt" === _0_0 || "sin" === _0_0 || "cos" === _0_0 || "tan" === _0_0 || "asin" === _0_0 || "acos" === _0_0 || "atan" === _0_0 || "abs" === _0_0 || "exp" === _0_0 || "sign" === _0_0) {
           check.call$1(1);
           break $label0$0;
@@ -64894,7 +66383,7 @@ self.util = _cliPkgRequires.util;
           check.call$1(3);
           break $label0$0;
         }
-        throw A.wrapException(A.UnsupportedError$('Unknown calculation name "' + node.get$name(node) + '".'));
+        throw A.wrapException(A.UnsupportedError$('Unknown calculation name "' + t1 + '".'));
       }
     },
     _async_evaluate$_verifyCompatibleNumbers$2(args, nodesWithSpans) {
@@ -64931,7 +66420,7 @@ self.util = _cliPkgRequires.util;
     _visitCalculationExpression$body$_EvaluateVisitor(node, inLegacySassFunction) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Object),
-        $async$returnValue, $async$self = this, inner, t1, result, t2, _0_0, _1_0, t3, _i, i, _box_0, $async$temp1;
+        $async$returnValue, $async$self = this, result, t2, _0_0, _1_0, t3, _i, i, _box_0, t1, inner, $async$temp1;
       var $async$_async_evaluate$_visitCalculationExpression$2$inLegacySassFunction = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -64940,13 +66429,8 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               _box_0 = {};
-              if (node instanceof A.ParenthesizedExpression) {
-                inner = node.expression;
-                t1 = true;
-              } else {
-                inner = null;
-                t1 = false;
-              }
+              t1 = node instanceof A.ParenthesizedExpression;
+              inner = t1 ? node.expression : null;
               $async$goto = t1 ? 3 : 4;
               break;
             case 3:
@@ -65017,13 +66501,12 @@ self.util = _cliPkgRequires.util;
             case 7:
               // join
               _box_0.right = _box_0.left = _box_0.operator = null;
-              if (node instanceof A.BinaryOperationExpression) {
+              t1 = node instanceof A.BinaryOperationExpression;
+              if (t1) {
                 _box_0.operator = node.operator;
                 _box_0.left = node.left;
                 _box_0.right = node.right;
-                t1 = true;
-              } else
-                t1 = false;
+              }
               $async$goto = t1 ? 10 : 11;
               break;
             case 10:
@@ -65050,25 +66533,11 @@ self.util = _cliPkgRequires.util;
               _1_0 = $async$result;
               $label1$1: {
                 if (_1_0 instanceof A.SassNumber) {
-                  result = _1_0;
-                  t1 = true;
-                } else {
-                  result = null;
-                  t1 = false;
-                }
-                if (t1) {
-                  t1 = result;
+                  t1 = _1_0;
                   break $label1$1;
                 }
                 if (_1_0 instanceof A.SassCalculation) {
-                  result = _1_0;
-                  t1 = true;
-                } else {
-                  result = null;
-                  t1 = false;
-                }
-                if (t1) {
-                  t1 = result;
+                  t1 = _1_0;
                   break $label1$1;
                 }
                 if (_1_0 instanceof A.SassString) {
@@ -65090,7 +66559,7 @@ self.util = _cliPkgRequires.util;
               break;
             case 14:
               // join
-              $async$goto = node instanceof A.ListExpression && !node.hasBrackets && B.ListSeparator_EVt === node.separator && node.contents.length >= 2 ? 16 : 17;
+              $async$goto = node instanceof A.ListExpression && !node.hasBrackets && B.ListSeparator_nbm === node.separator && node.contents.length >= 2 ? 16 : 17;
               break;
             case 16:
               // then
@@ -65140,7 +66609,7 @@ self.util = _cliPkgRequires.util;
     _async_evaluate$_checkWhitespaceAroundCalculationOperator$1(node) {
       var t2, t3, t4, textBetweenOperands, first, last,
         t1 = node.operator;
-      if (t1 !== B.BinaryOperator_anB && t1 !== B.BinaryOperator_olz)
+      if (t1 !== B.BinaryOperator_u15 && t1 !== B.BinaryOperator_SjO)
         return;
       t1 = node.left;
       t2 = t1.get$span(t1);
@@ -65172,20 +66641,20 @@ self.util = _cliPkgRequires.util;
     _async_evaluate$_binaryOperatorToCalculationOperator$2(operator, node) {
       var t1;
       $label0$0: {
-        if (B.BinaryOperator_anB === operator) {
-          t1 = B.CalculationOperator_IyK;
+        if (B.BinaryOperator_u15 === operator) {
+          t1 = B.CalculationOperator_g2q;
           break $label0$0;
         }
-        if (B.BinaryOperator_olz === operator) {
-          t1 = B.CalculationOperator_2bx;
+        if (B.BinaryOperator_SjO === operator) {
+          t1 = B.CalculationOperator_CxF;
           break $label0$0;
         }
-        if (B.BinaryOperator_qN2 === operator) {
-          t1 = B.CalculationOperator_jFr;
+        if (B.BinaryOperator_2No === operator) {
+          t1 = B.CalculationOperator_171;
           break $label0$0;
         }
-        if (B.BinaryOperator_t8B === operator) {
-          t1 = B.CalculationOperator_OvN;
+        if (B.BinaryOperator_U77 === operator) {
+          t1 = B.CalculationOperator_Qf1;
           break $label0$0;
         }
         t1 = A.throwExpression(this._async_evaluate$_exception$2(string$.This_o, node.get$operatorSpan()));
@@ -65203,10 +66672,13 @@ self.util = _cliPkgRequires.util;
         t1 = node.contents;
         previousNode = t1[t2];
         currentNode = t1[i];
-        _0_2 = A._InitializedCell$(new A._EvaluateVisitor__checkAdjacentCalculationValues_closure0(currentNode));
-        if (currentNode instanceof A.UnaryOperationExpression)
-          t1 = B.UnaryOperator_TLI === _0_2._readFinal$0() || B.UnaryOperator_gg4 === _0_2._readFinal$0();
-        else
+        if (currentNode instanceof A.UnaryOperationExpression) {
+          _0_2 = currentNode.operator;
+          if (B.UnaryOperator_AiQ !== _0_2)
+            t1 = B.UnaryOperator_cLp === _0_2;
+          else
+            t1 = true;
+        } else
           t1 = false;
         if (!t1)
           t1 = currentNode instanceof A.NumberExpression && currentNode.value < 0;
@@ -65303,7 +66775,7 @@ self.util = _cliPkgRequires.util;
     _runFunctionCallable$body$_EvaluateVisitor($arguments, callable, nodeWithSpan) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Value),
-        $async$returnValue, $async$handler = 2, $async$currentError, $async$self = this, buffer, first, argument, restArg, rest, error, t1, t2, _i, exception, $async$exception, $async$temp1, $async$temp2;
+        $async$returnValue, $async$handler = 2, $async$currentError, $async$self = this, buffer, first, argument, restArg, rest, error, t1, t2, _i, t3, t4, exception, $async$exception, $async$temp1;
       var $async$_async_evaluate$_runFunctionCallable$3 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1) {
           $async$currentError = $async$result;
@@ -65370,13 +66842,14 @@ self.util = _cliPkgRequires.util;
                 first = false;
               else
                 buffer._contents += ", ";
-              $async$temp1 = buffer;
-              $async$temp2 = A;
+              t3 = buffer;
+              $async$temp1 = A;
               $async$goto = 21;
               return A._asyncAwait($async$self._evaluateToCss$1(argument), $async$_async_evaluate$_runFunctionCallable$3);
             case 21:
               // returning from await.
-              $async$temp1._contents += $async$temp2.S($async$result);
+              t4 = $async$temp1.S($async$result);
+              t3._contents += t4;
             case 19:
               // for update
               ++_i;
@@ -65397,7 +66870,9 @@ self.util = _cliPkgRequires.util;
               rest = $async$result;
               if (!first)
                 buffer._contents += ", ";
-              buffer._contents += $async$self._async_evaluate$_serialize$2(rest, restArg);
+              t1 = buffer;
+              t2 = $async$self._async_evaluate$_serialize$2(rest, restArg);
+              t1._contents += t2;
             case 23:
               // join
               $async$handler = 2;
@@ -65426,9 +66901,11 @@ self.util = _cliPkgRequires.util;
               break;
             case 17:
               // after finally
-              buffer._contents += A.Primitives_stringFromCharCode(41);
-              t1 = buffer._contents;
-              $async$returnValue = new A.SassString(t1.charCodeAt(0) == 0 ? t1 : t1, false);
+              t1 = buffer;
+              t2 = A.Primitives_stringFromCharCode(41);
+              t1._contents += t2;
+              t2 = buffer._contents;
+              $async$returnValue = new A.SassString(t2.charCodeAt(0) == 0 ? t2 : t2, false);
               // goto return
               $async$goto = 1;
               break;
@@ -65460,7 +66937,7 @@ self.util = _cliPkgRequires.util;
     _runBuiltInCallable$body$_EvaluateVisitor($arguments, callable, nodeWithSpan) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Value),
-        $async$returnValue, $async$handler = 2, $async$currentError, $async$self = this, result, error, stackTrace, message, namedSet, _0_0, declaredArguments, i, t1, argument, t2, t3, rest, argumentList, exception, message0, _box_0, evaluated, oldCallableNode, $async$exception;
+        $async$returnValue, $async$handler = 2, $async$currentError, $async$self = this, result, error, stackTrace, message, namedSet, _0_0, declaredArguments, i, t1, t2, t3, argument, t4, t5, t6, t7, rest, argumentList, exception, message0, _box_0, evaluated, oldCallableNode, $async$exception;
       var $async$_async_evaluate$_runBuiltInCallable$3 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1) {
           $async$currentError = $async$result;
@@ -65485,7 +66962,7 @@ self.util = _cliPkgRequires.util;
               _box_0.callback = _0_0._1;
               $async$self._async_evaluate$_addExceptionSpan$2(nodeWithSpan, new A._EvaluateVisitor__runBuiltInCallable_closure2(_box_0, evaluated, namedSet));
               declaredArguments = _box_0.overload.$arguments;
-              i = J.get$length$asx(evaluated._values[2]), t1 = declaredArguments.length;
+              i = J.get$length$asx(evaluated._values[2]), t1 = declaredArguments.length, t2 = type$._Future_Value, t3 = type$.Future_Value;
             case 4:
               // for condition
               if (!(i < t1)) {
@@ -65494,21 +66971,28 @@ self.util = _cliPkgRequires.util;
                 break;
               }
               argument = declaredArguments[i];
-              t2 = evaluated._values[2];
-              t3 = evaluated._values[0].remove$1(0, argument.name);
-              $async$goto = t3 == null ? 7 : 8;
+              t4 = evaluated._values[2];
+              t5 = evaluated._values[0].remove$1(0, argument.name);
+              $async$goto = t5 == null ? 7 : 8;
               break;
             case 7:
               // then
-              t3 = argument.defaultValue;
+              t5 = argument.defaultValue;
+              t6 = t5.accept$1($async$self);
+              if (!t3._is(t6)) {
+                t7 = new A._Future($.Zone__current, t2);
+                t7._state = 8;
+                t7._resultOrListeners = t6;
+                t6 = t7;
+              }
               $async$goto = 9;
-              return A._asyncAwait(t3.accept$1($async$self), $async$_async_evaluate$_runBuiltInCallable$3);
+              return A._asyncAwait(t6, $async$_async_evaluate$_runBuiltInCallable$3);
             case 9:
               // returning from await.
-              t3 = $async$self._async_evaluate$_withoutSlash$2($async$result, t3);
+              t5 = $async$self._async_evaluate$_withoutSlash$2($async$result, t5);
             case 8:
               // join
-              J.add$1$ax(t2, t3);
+              J.add$1$ax(t4, t5);
             case 5:
               // for update
               ++i;
@@ -65524,7 +67008,7 @@ self.util = _cliPkgRequires.util;
                 } else
                   rest = B.List_empty8;
                 t1 = evaluated._values[0];
-                argumentList = A.SassArgumentList$(rest, t1, evaluated._values[4] === B.ListSeparator_undecided_null_undecided ? B.ListSeparator_rXA : evaluated._values[4]);
+                argumentList = A.SassArgumentList$(rest, t1, evaluated._values[4] === B.ListSeparator_undecided_null_undecided ? B.ListSeparator_ECn : evaluated._values[4]);
                 J.add$1$ax(evaluated._values[2], argumentList);
               } else
                 argumentList = null;
@@ -65608,7 +67092,7 @@ self.util = _cliPkgRequires.util;
     _evaluateArguments$body$_EvaluateVisitor($arguments) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Record_5_Map_String_Value_named_and_Map_String_AstNode_namedNodes_and_List_Value_positional_and_List_AstNode_positionalNodes_and_ListSeparator_separator),
-        $async$returnValue, $async$self = this, t1, t2, _i, expression, nodeForSpan, named, namedNodes, t3, t4, $name, value, restArgs, rest, restNodeForSpan, t5, separator, keywordRestArgs, keywordRest, keywordRestNodeForSpan, positional, positionalNodes, $async$temp1, $async$temp2;
+        $async$returnValue, $async$self = this, t1, t2, t3, t4, _i, expression, nodeForSpan, t5, t6, named, namedNodes, $name, value, t7, restArgs, rest, restNodeForSpan, separator, keywordRestArgs, keywordRest, keywordRestNodeForSpan, positional, positionalNodes, $async$temp1, $async$temp2;
       var $async$_async_evaluate$_evaluateArguments$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -65618,7 +67102,7 @@ self.util = _cliPkgRequires.util;
               // Function start
               positional = A._setArrayType([], type$.JSArray_Value);
               positionalNodes = A._setArrayType([], type$.JSArray_AstNode);
-              t1 = $arguments.positional, t2 = t1.length, _i = 0;
+              t1 = $arguments.positional, t2 = t1.length, t3 = type$._Future_Value, t4 = type$.Future_Value, _i = 0;
             case 3:
               // for condition
               if (!(_i < t2)) {
@@ -65628,9 +67112,16 @@ self.util = _cliPkgRequires.util;
               }
               expression = t1[_i];
               nodeForSpan = $async$self._async_evaluate$_expressionNode$1(expression);
+              t5 = expression.accept$1($async$self);
+              if (!t4._is(t5)) {
+                t6 = new A._Future($.Zone__current, t3);
+                t6._state = 8;
+                t6._resultOrListeners = t5;
+                t5 = t6;
+              }
               $async$temp1 = positional;
               $async$goto = 6;
-              return A._asyncAwait(expression.accept$1($async$self), $async$_async_evaluate$_evaluateArguments$1);
+              return A._asyncAwait(t5, $async$_async_evaluate$_evaluateArguments$1);
             case 6:
               // returning from await.
               $async$temp1.push($async$self._async_evaluate$_withoutSlash$2($async$result, nodeForSpan));
@@ -65647,22 +67138,29 @@ self.util = _cliPkgRequires.util;
               named = A.LinkedHashMap_LinkedHashMap$_empty(t1, type$.Value);
               t2 = type$.AstNode;
               namedNodes = A.LinkedHashMap_LinkedHashMap$_empty(t1, t2);
-              t3 = A.MapExtensions_get_pairs($arguments.named, t1, type$.Expression), t3 = t3.get$iterator(t3);
+              t5 = A.MapExtensions_get_pairs($arguments.named, t1, type$.Expression), t5 = t5.get$iterator(t5);
             case 7:
               // for condition
-              if (!t3.moveNext$0()) {
+              if (!t5.moveNext$0()) {
                 // goto after for
                 $async$goto = 8;
                 break;
               }
-              t4 = t3.get$current(t3);
-              $name = t4._0;
-              value = t4._1;
+              t6 = t5.get$current(t5);
+              $name = t6._0;
+              value = t6._1;
               nodeForSpan = $async$self._async_evaluate$_expressionNode$1(value);
+              t6 = value.accept$1($async$self);
+              if (!t4._is(t6)) {
+                t7 = new A._Future($.Zone__current, t3);
+                t7._state = 8;
+                t7._resultOrListeners = t6;
+                t6 = t7;
+              }
               $async$temp1 = named;
               $async$temp2 = $name;
               $async$goto = 9;
-              return A._asyncAwait(value.accept$1($async$self), $async$_async_evaluate$_evaluateArguments$1);
+              return A._asyncAwait(t6, $async$_async_evaluate$_evaluateArguments$1);
             case 9:
               // returning from await.
               $async$temp1.$indexSet(0, $async$temp2, $async$self._async_evaluate$_withoutSlash$2($async$result, nodeForSpan));
@@ -65888,12 +67386,6 @@ self.util = _cliPkgRequires.util;
               $label1$1: {
                 if (_0_0 instanceof A.SassString) {
                   text = _0_0._string$_text;
-                  t5 = true;
-                } else {
-                  text = null;
-                  t5 = false;
-                }
-                if (t5) {
                   t5 = text;
                   break $label1$1;
                 }
@@ -66153,7 +67645,7 @@ self.util = _cliPkgRequires.util;
     visitCssStyleRule$body$_EvaluateVisitor(node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.void),
-        $async$self = this, t1, styleRule, t2, t3, t4, originalSelector, rule, oldAtRootExcludingStyleRule, _0_0, _0_1, lastChild;
+        $async$self = this, t1, styleRule, t2, nest, t3, originalSelector, rule, oldAtRootExcludingStyleRule, _0_1, lastChild;
       var $async$visitCssStyleRule$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -66162,26 +67654,36 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               if ($async$self._async_evaluate$_declarationName != null)
-                throw A.wrapException($async$self._async_evaluate$_exception$2(string$.Style_, node.span));
+                throw A.wrapException($async$self._async_evaluate$_exception$2(string$.Style_n, node.span));
+              else if ($async$self._async_evaluate$_inKeyframes && $async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__parent, "__parent") instanceof A.ModifiableCssKeyframeBlock)
+                throw A.wrapException($async$self._async_evaluate$_exception$2(string$.Style_k, node.span));
               t1 = $async$self._async_evaluate$_atRootExcludingStyleRule;
               styleRule = t1 ? null : $async$self._async_evaluate$_styleRuleIgnoringAtRoot;
-              t2 = node._style_rule$_selector._box$_inner.value;
-              t3 = styleRule == null;
-              t4 = t3 ? null : styleRule.originalSelector;
-              originalSelector = t2.resolveParentSelectors$2$implicitParent(t4, !t1);
-              rule = A.ModifiableCssStyleRule$($async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__extensionStore, "_extensionStore").addSelector$2(originalSelector, $async$self._async_evaluate$_mediaQueries), node.span, originalSelector);
+              t2 = t1 ? null : $async$self._async_evaluate$_styleRuleIgnoringAtRoot;
+              t2 = t2 == null ? null : t2.fromPlainCss;
+              nest = t2 !== true;
+              t2 = node._style_rule$_selector._box$_inner;
+              if (nest) {
+                t2 = t2.value;
+                t3 = styleRule == null ? null : styleRule.originalSelector;
+                originalSelector = t2.nestWithin$3$implicitParent$preserveParentSelectors(t3, !t1, node.fromPlainCss);
+              } else
+                originalSelector = t2.value;
+              rule = A.ModifiableCssStyleRule$($async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__extensionStore, "_extensionStore").addSelector$2(originalSelector, $async$self._async_evaluate$_mediaQueries), node.span, node.fromPlainCss, originalSelector);
               oldAtRootExcludingStyleRule = $async$self._async_evaluate$_atRootExcludingStyleRule;
               $async$self._async_evaluate$_atRootExcludingStyleRule = false;
+              t1 = nest ? new A._EvaluateVisitor_visitCssStyleRule_closure1() : null;
               $async$goto = 2;
-              return A._asyncAwait($async$self._async_evaluate$_withParent$2$4$scopeWhen$through(rule, new A._EvaluateVisitor_visitCssStyleRule_closure2($async$self, rule, node), false, new A._EvaluateVisitor_visitCssStyleRule_closure3(), type$.ModifiableCssStyleRule, type$.Null), $async$visitCssStyleRule$1);
+              return A._asyncAwait($async$self._async_evaluate$_withParent$2$4$scopeWhen$through(rule, new A._EvaluateVisitor_visitCssStyleRule_closure2($async$self, rule, node), false, t1, type$.ModifiableCssStyleRule, type$.Null), $async$visitCssStyleRule$1);
             case 2:
               // returning from await.
               $async$self._async_evaluate$_atRootExcludingStyleRule = oldAtRootExcludingStyleRule;
-              _0_0 = $async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__parent, "__parent").children;
-              _0_1 = A._InitializedCell$(new A._EvaluateVisitor_visitCssStyleRule_closure4(_0_0));
-              if (_0_1._readFinal$0() >= 1) {
-                lastChild = J.elementAt$1$ax(_0_0._collection$_source, _0_1._readFinal$0() - 1);
-                t1 = t3;
+              t1 = $async$self._async_evaluate$_assertInModule$2($async$self._async_evaluate$__parent, "__parent").children._collection$_source;
+              t2 = J.getInterceptor$asx(t1);
+              _0_1 = t2.get$length(t1);
+              if (_0_1 >= 1) {
+                lastChild = t2.elementAt$1(t1, _0_1 - 1);
+                t1 = styleRule == null;
               } else {
                 lastChild = null;
                 t1 = false;
@@ -66266,7 +67768,7 @@ self.util = _cliPkgRequires.util;
     _handleReturn$body$_EvaluateVisitor(list, callback) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value),
-        $async$returnValue, t1, _i, _0_0, result, t2;
+        $async$returnValue, t1, _i, _0_0;
       var $async$_async_evaluate$_handleReturn$1$2 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -66288,14 +67790,7 @@ self.util = _cliPkgRequires.util;
               // returning from await.
               _0_0 = $async$result;
               if (_0_0 != null) {
-                result = _0_0;
-                t2 = true;
-              } else {
-                result = null;
-                t2 = false;
-              }
-              if (t2) {
-                $async$returnValue = result;
+                $async$returnValue = _0_0;
                 // goto return
                 $async$goto = 1;
                 break;
@@ -66398,7 +67893,7 @@ self.util = _cliPkgRequires.util;
     _performInterpolation$body$_EvaluateVisitor(interpolation, warnForColor) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.String),
-        $async$returnValue, $async$self = this, result;
+        $async$returnValue, $async$self = this;
       var $async$_async_evaluate$_performInterpolation$2$warnForColor = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -66410,8 +67905,7 @@ self.util = _cliPkgRequires.util;
               return A._asyncAwait($async$self._async_evaluate$_performInterpolationHelper$3$sourceMap$warnForColor(interpolation, false, warnForColor), $async$_async_evaluate$_performInterpolation$2$warnForColor);
             case 3:
               // returning from await.
-              result = $async$result._0;
-              $async$returnValue = result;
+              $async$returnValue = $async$result._0;
               // goto return
               $async$goto = 1;
               break;
@@ -66504,7 +67998,7 @@ self.util = _cliPkgRequires.util;
                 result0 = new A.Interpolation(result0, t6);
                 result0.Interpolation$2(t9, t6);
                 t9 = $.$get$namesByColor();
-                $async$self._async_evaluate$_warn$2(string$.You_pr + A.S(t9.$index(0, result)) + string$.x20in_in + result.toString$0(0) + string$.x2c_whicw + A.S(t9.$index(0, result)) + string$.x22x29__If + new A.BinaryOperationExpression(B.BinaryOperator_anB, new A.StringExpression(result0, true), value, false).toString$0(0) + "'.", value.get$span(value));
+                $async$self._async_evaluate$_warn$2(string$.You_pr + A.S(t9.$index(0, result)) + string$.x20in_in + result.toString$0(0) + string$.x2c_whicw + A.S(t9.$index(0, result)) + string$.x22x29__If + new A.BinaryOperationExpression(B.BinaryOperator_u15, new A.StringExpression(result0, true), value, false).toString$0(0) + "'.", value.get$span(value));
               }
               t8 += $async$self._async_evaluate$_serialize$3$quote(result, value, false);
             case 4:
@@ -66536,7 +68030,7 @@ self.util = _cliPkgRequires.util;
     _evaluateToCss$body$_EvaluateVisitor(expression, quote) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.String),
-        $async$returnValue, $async$self = this;
+        $async$returnValue, $async$self = this, t1;
       var $async$_evaluateToCss$2$quote = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -66544,8 +68038,9 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
+              t1 = expression.accept$1($async$self);
               $async$goto = 3;
-              return A._asyncAwait(expression.accept$1($async$self), $async$_evaluateToCss$2$quote);
+              return A._asyncAwait(type$.Future_Value._is(t1) ? t1 : A._Future$value(t1, type$.Value), $async$_evaluateToCss$2$quote);
             case 3:
               // returning from await.
               $async$returnValue = $async$self._async_evaluate$_serialize$3$quote($async$result, expression, quote);
@@ -66617,16 +68112,9 @@ self.util = _cliPkgRequires.util;
       var _0_0, grandparent, t1,
         $parent = this._async_evaluate$_assertInModule$2(this._async_evaluate$__parent, "__parent");
       if (through != null) {
-        for (; through.call$1($parent); $parent = grandparent) {
+        for (; through.call$1($parent); $parent = _0_0) {
           _0_0 = $parent._parent;
-          if (_0_0 != null) {
-            grandparent = _0_0;
-            t1 = true;
-          } else {
-            grandparent = null;
-            t1 = false;
-          }
-          if (!t1)
+          if (_0_0 == null)
             throw A.wrapException(A.ArgumentError$(string$.throug + node.toString$0(0) + ".", null));
         }
         if ($parent.get$hasFollowingSibling()) {
@@ -66751,8 +68239,13 @@ self.util = _cliPkgRequires.util;
       return A._asyncStartSync($async$_async_evaluate$_withStackFrame$1$3, $async$completer);
     },
     _async_evaluate$_withoutSlash$2(value, nodeForSpan) {
-      if (value instanceof A.SassNumber && value.asSlash != null && true)
-        this._async_evaluate$_warn$3(string$.Using__i + A.S(new A._EvaluateVisitor__withoutSlash_recommendation0().call$1(value)) + string$.x0a_Morex20, nodeForSpan.get$span(nodeForSpan), B.Deprecation_xHK);
+      var t1;
+      if (value instanceof A.SassNumber)
+        t1 = value.asSlash != null;
+      else
+        t1 = false;
+      if (t1)
+        this._async_evaluate$_warn$3(string$.Using__i + A.S(new A._EvaluateVisitor__withoutSlash_recommendation0().call$1(value)) + string$.x0a_Morex20, nodeForSpan.get$span(nodeForSpan), B.Deprecation_oJv);
       return value.withoutSlash$0();
     },
     _async_evaluate$_stackFrame$2(member, span) {
@@ -66855,8 +68348,9 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               $async$handler = 4;
+              t1 = callback.call$0();
               $async$goto = 7;
-              return A._asyncAwait(callback.call$0(), $async$_addExceptionSpanAsync$1$3$addStackFrame);
+              return A._asyncAwait($T._eval$1("Future<0>")._is(t1) ? t1 : A._Future$value(t1, $T), $async$_addExceptionSpanAsync$1$3$addStackFrame);
             case 7:
               // returning from await.
               t1 = $async$result;
@@ -66917,8 +68411,9 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               $async$handler = 4;
+              t1 = callback.call$0();
               $async$goto = 7;
-              return A._asyncAwait(callback.call$0(), $async$_async_evaluate$_addExceptionTrace$1$1);
+              return A._asyncAwait($T._eval$1("Future<0>")._is(t1) ? t1 : A._Future$value(t1, $T), $async$_async_evaluate$_addExceptionTrace$1$1);
             case 7:
               // returning from await.
               t1 = $async$result;
@@ -67043,7 +68538,7 @@ self.util = _cliPkgRequires.util;
       t2 = A.stringReplaceAllUnchecked(variable._string$_text, "_", "-");
       return t1.globalVariableExists$2$namespace(t2, module == null ? null : module._string$_text) ? B.SassBoolean_true : B.SassBoolean_false;
     },
-    $signature: 23
+    $signature: 20
   };
   A._EvaluateVisitor_closure13.prototype = {
     call$1($arguments) {
@@ -67051,7 +68546,7 @@ self.util = _cliPkgRequires.util;
         t1 = this.$this._async_evaluate$_environment;
       return t1.getVariable$1(A.stringReplaceAllUnchecked(variable._string$_text, "_", "-")) != null ? B.SassBoolean_true : B.SassBoolean_false;
     },
-    $signature: 23
+    $signature: 20
   };
   A._EvaluateVisitor_closure14.prototype = {
     call$1($arguments) {
@@ -67066,7 +68561,7 @@ self.util = _cliPkgRequires.util;
       t4 = A.stringReplaceAllUnchecked(t3, "_", "-");
       return t2.getFunction$2$namespace(t4, module == null ? null : module._string$_text) != null || t1._async_evaluate$_builtInFunctions.containsKey$1(t3) ? B.SassBoolean_true : B.SassBoolean_false;
     },
-    $signature: 23
+    $signature: 20
   };
   A._EvaluateVisitor_closure15.prototype = {
     call$1($arguments) {
@@ -67079,7 +68574,7 @@ self.util = _cliPkgRequires.util;
       t2 = A.stringReplaceAllUnchecked(variable._string$_text, "_", "-");
       return t1.getMixin$2$namespace(t2, module == null ? null : module._string$_text) != null ? B.SassBoolean_true : B.SassBoolean_false;
     },
-    $signature: 23
+    $signature: 20
   };
   A._EvaluateVisitor_closure16.prototype = {
     call$1($arguments) {
@@ -67088,11 +68583,11 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException(A.SassScriptException$(string$.conten, null));
       return t1._async_environment$_content != null ? B.SassBoolean_true : B.SassBoolean_false;
     },
-    $signature: 23
+    $signature: 20
   };
   A._EvaluateVisitor_closure17.prototype = {
     call$1($arguments) {
-      var t2, t3, t4, $name, value,
+      var t2, t3, t4,
         t1 = J.$index$asx($arguments, 0).assertString$1("module")._string$_text,
         module = this.$this._async_evaluate$_environment._async_environment$_modules.$index(0, t1);
       if (module == null)
@@ -67101,18 +68596,15 @@ self.util = _cliPkgRequires.util;
       t2 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1);
       for (t3 = A.MapExtensions_get_pairs(module.get$variables(), type$.String, t1), t3 = t3.get$iterator(t3); t3.moveNext$0();) {
         t4 = t3.get$current(t3);
-        $name = t4._0;
-        value = t4._1;
-        value = value;
-        t2.$indexSet(0, new A.SassString($name, true), value);
+        t2.$indexSet(0, new A.SassString(t4._0, true), t4._1);
       }
       return new A.SassMap(A.ConstantMap_ConstantMap$from(t2, t1, t1));
     },
-    $signature: 40
+    $signature: 33
   };
   A._EvaluateVisitor_closure18.prototype = {
     call$1($arguments) {
-      var t2, t3, t4, $name, value,
+      var t2, t3, t4,
         t1 = J.$index$asx($arguments, 0).assertString$1("module")._string$_text,
         module = this.$this._async_evaluate$_environment._async_environment$_modules.$index(0, t1);
       if (module == null)
@@ -67121,18 +68613,15 @@ self.util = _cliPkgRequires.util;
       t2 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1);
       for (t3 = A.MapExtensions_get_pairs(module.get$functions(module), type$.String, type$.AsyncCallable), t3 = t3.get$iterator(t3); t3.moveNext$0();) {
         t4 = t3.get$current(t3);
-        $name = t4._0;
-        value = t4._1;
-        value = value;
-        t2.$indexSet(0, new A.SassString($name, true), new A.SassFunction(value));
+        t2.$indexSet(0, new A.SassString(t4._0, true), new A.SassFunction(t4._1));
       }
       return new A.SassMap(A.ConstantMap_ConstantMap$from(t2, t1, t1));
     },
-    $signature: 40
+    $signature: 33
   };
   A._EvaluateVisitor_closure19.prototype = {
     call$1($arguments) {
-      var t2, t3, t4, $name, value,
+      var t2, t3, t4,
         t1 = J.$index$asx($arguments, 0).assertString$1("module")._string$_text,
         module = this.$this._async_evaluate$_environment._async_environment$_modules.$index(0, t1);
       if (module == null)
@@ -67141,14 +68630,11 @@ self.util = _cliPkgRequires.util;
       t2 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1);
       for (t3 = A.MapExtensions_get_pairs(module.get$mixins(), type$.String, type$.AsyncCallable), t3 = t3.get$iterator(t3); t3.moveNext$0();) {
         t4 = t3.get$current(t3);
-        $name = t4._0;
-        value = t4._1;
-        value = value;
-        t2.$indexSet(0, new A.SassString($name, true), new A.SassMixin(value));
+        t2.$indexSet(0, new A.SassString(t4._0, true), new A.SassMixin(t4._1));
       }
       return new A.SassMap(A.ConstantMap_ConstantMap$from(t2, t1, t1));
     },
-    $signature: 40
+    $signature: 33
   };
   A._EvaluateVisitor_closure20.prototype = {
     call$1($arguments) {
@@ -67171,7 +68657,7 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException("Function not found: " + $name.toString$0(0));
       return new A.SassFunction(callable);
     },
-    $signature: 222
+    $signature: 163
   };
   A._EvaluateVisitor__closure6.prototype = {
     call$0() {
@@ -67185,7 +68671,7 @@ self.util = _cliPkgRequires.util;
         return local;
       return t1._async_evaluate$_builtInFunctions.$index(0, normalizedName);
     },
-    $signature: 97
+    $signature: 86
   };
   A._EvaluateVisitor_closure21.prototype = {
     call$1($arguments) {
@@ -67202,7 +68688,7 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException("Mixin not found: " + $name.toString$0(0));
       return new A.SassMixin(callable);
     },
-    $signature: 224
+    $signature: 164
   };
   A._EvaluateVisitor__closure5.prototype = {
     call$0() {
@@ -67211,7 +68697,7 @@ self.util = _cliPkgRequires.util;
         t3 = this.module;
       return t1.getMixin$2$namespace(t2, t3 == null ? null : t3._string$_text);
     },
-    $signature: 97
+    $signature: 86
   };
   A._EvaluateVisitor_closure22.prototype = {
     call$1($arguments) {
@@ -67220,7 +68706,7 @@ self.util = _cliPkgRequires.util;
     $call$body$_EvaluateVisitor_closure1($arguments) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Value),
-        $async$returnValue, $async$self = this, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, $name, value, invocation, callableNode, t1, $function, args;
+        $async$returnValue, $async$self = this, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, invocation, callableNode, t1, $function, args;
       var $async$call$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -67248,10 +68734,7 @@ self.util = _cliPkgRequires.util;
                 t10 = A.LinkedHashMap_LinkedHashMap$_empty(t9, t9);
                 for (args._wereKeywordsAccessed = true, t8 = A.MapExtensions_get_pairs(t8, t4, t9), t8 = t8.get$iterator(t8); t8.moveNext$0();) {
                   t11 = t8.get$current(t8);
-                  $name = t11._0;
-                  value = t11._1;
-                  value = value;
-                  t10.$indexSet(0, new A.SassString($name, false), value);
+                  t10.$indexSet(0, new A.SassString(t11._0, false), t11._1);
                 }
                 t2 = new A.ValueExpression(new A.SassMap(A.ConstantMap_ConstantMap$from(t10, t9, t9)), t2.get$span(t2));
               }
@@ -67260,11 +68743,13 @@ self.util = _cliPkgRequires.util;
               break;
             case 3:
               // then
-              t2 = $function.toString$0(0);
-              A.EvaluationContext_current().warn$2(0, string$.Passina + t2 + "))", B.Deprecation_qVK);
+              A.warnForDeprecation(string$.Passina + $function.toString$0(0) + "))", B.Deprecation_gkc);
               callableNode = t1._async_evaluate$_callableNode;
+              t2 = $function._string$_text;
+              t3 = callableNode.get$span(callableNode);
+              t1 = t1.visitFunctionExpression$1(new A.FunctionExpression(null, A.stringReplaceAllUnchecked(t2, "_", "-"), t2, invocation, t3));
               $async$goto = 5;
-              return A._asyncAwait(t1.visitFunctionExpression$1(new A.FunctionExpression(null, $function._string$_text, invocation, callableNode.get$span(callableNode))), $async$call$1);
+              return A._asyncAwait(type$.Future_Value._is(t1) ? t1 : A._Future$value(t1, type$.Value), $async$call$1);
             case 5:
               // returning from await.
               $async$returnValue = $async$result;
@@ -67292,7 +68777,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$1, $async$completer);
     },
-    $signature: 159
+    $signature: 257
   };
   A._EvaluateVisitor_closure23.prototype = {
     call$1($arguments) {
@@ -67334,7 +68819,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$1, $async$completer);
     },
-    $signature: 226
+    $signature: 165
   };
   A._EvaluateVisitor__closure3.prototype = {
     call$2(variable, value) {
@@ -67345,14 +68830,14 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException("The variable $" + $name + " was configured twice.");
       t1.$indexSet(0, $name, new A.ConfiguredValue(value, this.span, this.callableNode));
     },
-    $signature: 106
+    $signature: 90
   };
   A._EvaluateVisitor__closure4.prototype = {
     call$2(module, _) {
       var t1 = this.$this;
       return t1._async_evaluate$_combineCss$2$clone(module, true).accept$1(t1);
     },
-    $signature: 438
+    $signature: 352
   };
   A._EvaluateVisitor_closure24.prototype = {
     call$1($arguments) {
@@ -67389,13 +68874,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$1, $async$completer);
     },
-    $signature: 226
+    $signature: 165
   };
   A._EvaluateVisitor_run_closure0.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Record_2_Set_Uri_loadedUrls_and_CssStylesheet_stylesheet),
-        $async$returnValue, $async$self = this, module, url, t1, t2, _0_0;
+        $async$returnValue, $async$self = this, module, t1, t2, _0_0, url;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -67403,16 +68888,12 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              url = null;
               t1 = $async$self.node;
               t2 = t1.span;
               _0_0 = t2.get$sourceUrl(t2);
+              url = null;
               if (_0_0 != null) {
                 url = _0_0;
-                t2 = true;
-              } else
-                t2 = false;
-              if (t2) {
                 t2 = $async$self.$this;
                 t2._async_evaluate$_activeModules.$indexSet(0, url, null);
                 t2._async_evaluate$_loadedUrls.add$1(0, url);
@@ -67434,13 +68915,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 442
+    $signature: 383
   };
   A._EvaluateVisitor_run__closure0.prototype = {
     call$0() {
       return this.$this._async_evaluate$_execute$2(this.importer, this.node);
     },
-    $signature: 443
+    $signature: 351
   };
   A._EvaluateVisitor__loadModule_closure1.prototype = {
     call$0() {
@@ -67478,13 +68959,18 @@ self.util = _cliPkgRequires.util;
               stylesheet = _1_0._0;
               importer = _1_0._1;
               isDependency = _1_0._2;
-              isDependency = isDependency;
               t4 = stylesheet.span;
               canonicalUrl = t4.get$sourceUrl(t4);
               if (canonicalUrl != null) {
                 t4 = t2._async_evaluate$_activeModules;
                 if (t4.containsKey$1(canonicalUrl)) {
-                  message = $async$self.namesInErrors ? "Module loop: " + $.$get$context().prettyUri$1(canonicalUrl) + " is already being loaded." : string$.Modulel;
+                  if ($async$self.namesInErrors) {
+                    t1 = canonicalUrl;
+                    t3 = $.$get$context();
+                    t1.toString;
+                    message = "Module loop: " + t3.prettyUri$1(t1) + " is already being loaded.";
+                  } else
+                    message = string$.Modulel;
                   t1 = A.NullableExtension_andThen(t4.$index(0, canonicalUrl), new A._EvaluateVisitor__loadModule__closure1(t2, message));
                   throw A.wrapException(t1 == null ? t2._async_evaluate$_exception$1(message) : t1);
                 } else
@@ -67531,13 +69017,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor__loadModule__closure1.prototype = {
     call$1(previousLoad) {
       return this.$this._async_evaluate$_multiSpanException$3(this.message, "new load", A.LinkedHashMap_LinkedHashMap$_literal([previousLoad.get$span(previousLoad), "original load"], type$.FileSpan, type$.String));
     },
-    $signature: 81
+    $signature: 91
   };
   A._EvaluateVisitor__loadModule__closure2.prototype = {
     call$0() {
@@ -67590,8 +69076,8 @@ self.util = _cliPkgRequires.util;
             case 2:
               // returning from await.
               t3 = t1._async_evaluate$_outOfOrderImports == null ? t5 : new A.CssStylesheet(new A.UnmodifiableListView(t1._async_evaluate$_addOutOfOrderImports$0(), type$.UnmodifiableListView_CssNode), t4);
-              $async$self.css._value = t3;
-              $async$self.preModuleComments._value = t1._async_evaluate$_preModuleComments;
+              $async$self.css.__late_helper$_value = t3;
+              $async$self.preModuleComments.__late_helper$_value = t1._async_evaluate$_preModuleComments;
               t1._async_evaluate$_importer = oldImporter;
               t1._async_evaluate$__stylesheet = oldStylesheet;
               t1._async_evaluate$__root = oldRoot;
@@ -67613,23 +69099,23 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor__combineCss_closure1.prototype = {
     call$1(module) {
       return module.get$transitivelyContainsCss();
     },
-    $signature: 146
+    $signature: 123
   };
   A._EvaluateVisitor__combineCss_closure2.prototype = {
     call$1(target) {
       return !this.selectors.contains$1(0, target);
     },
-    $signature: 16
+    $signature: 13
   };
   A._EvaluateVisitor__combineCss_visitModule0.prototype = {
     call$1(module) {
-      var t1, t2, t3, t4, _i, upstream, _1_0, comments, t5, statements, index, _this = this;
+      var t1, t2, t3, t4, _i, upstream, _1_0, statements, index, _this = this;
       if (!_this.seen.add$1(0, module))
         return;
       if (_this.clone)
@@ -67638,15 +69124,8 @@ self.util = _cliPkgRequires.util;
         upstream = t1[_i];
         if (upstream.get$transitivelyContainsCss()) {
           _1_0 = module.get$preModuleComments().$index(0, upstream);
-          if (_1_0 != null) {
-            comments = _1_0;
-            t5 = true;
-          } else {
-            comments = null;
-            t5 = false;
-          }
-          if (t5)
-            B.JSArray_methods.addAll$1(t3.length === 0 ? t4 : t3, comments);
+          if (_1_0 != null)
+            B.JSArray_methods.addAll$1(t3.length === 0 ? t4 : t3, _1_0);
           _this.call$1(upstream);
         }
       }
@@ -67658,19 +69137,19 @@ self.util = _cliPkgRequires.util;
       B.JSArray_methods.addAll$1(t4, t1.getRange$2(statements, 0, index));
       B.JSArray_methods.addAll$1(t3, t1.getRange$2(statements, index, t1.get$length(statements)));
     },
-    $signature: 449
+    $signature: 344
   };
   A._EvaluateVisitor__extendModules_closure1.prototype = {
     call$1(target) {
       return !this.originalSelectors.contains$1(0, target);
     },
-    $signature: 16
+    $signature: 13
   };
   A._EvaluateVisitor__extendModules_closure2.prototype = {
     call$0() {
       return A._setArrayType([], type$.JSArray_ExtensionStore);
     },
-    $signature: 229
+    $signature: 167
   };
   A._EvaluateVisitor_visitAtRootRule_closure1.prototype = {
     call$0() {
@@ -67710,7 +69189,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitAtRootRule_closure2.prototype = {
     call$0() {
@@ -67750,7 +69229,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 30
+    $signature: 25
   };
   A._EvaluateVisitor__scopeForAtRoot_closure5.prototype = {
     call$1(callback) {
@@ -67778,7 +69257,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$1, $async$completer);
     },
-    $signature: 41
+    $signature: 38
   };
   A._EvaluateVisitor__scopeForAtRoot_closure6.prototype = {
     call$1(callback) {
@@ -67806,19 +69285,19 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$1, $async$completer);
     },
-    $signature: 41
+    $signature: 38
   };
   A._EvaluateVisitor__scopeForAtRoot_closure7.prototype = {
     call$1(callback) {
       return this.$this._async_evaluate$_withMediaQueries$1$3(null, null, new A._EvaluateVisitor__scopeForAtRoot__closure0(this.innerScope, callback), type$.Null);
     },
-    $signature: 41
+    $signature: 38
   };
   A._EvaluateVisitor__scopeForAtRoot__closure0.prototype = {
     call$0() {
       return this.innerScope.call$1(this.callback);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor__scopeForAtRoot_closure8.prototype = {
     call$1(callback) {
@@ -67846,13 +69325,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$1, $async$completer);
     },
-    $signature: 41
+    $signature: 38
   };
   A._EvaluateVisitor__scopeForAtRoot_closure9.prototype = {
     call$1($parent) {
       return $parent instanceof A.ModifiableCssAtRule;
     },
-    $signature: 237
+    $signature: 169
   };
   A._EvaluateVisitor__scopeForAtRoot_closure10.prototype = {
     call$1(callback) {
@@ -67880,7 +69359,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$1, $async$completer);
     },
-    $signature: 41
+    $signature: 38
   };
   A._EvaluateVisitor_visitContentRule_closure0.prototype = {
     call$0() {
@@ -67925,7 +69404,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitDeclaration_closure0.prototype = {
     call$0() {
@@ -67965,7 +69444,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitEachRule_closure2.prototype = {
     call$1(value) {
@@ -67973,13 +69452,13 @@ self.util = _cliPkgRequires.util;
         t2 = this.nodeWithSpan;
       return t1._async_evaluate$_environment.setLocalVariable$3(this._box_0.variable, t1._async_evaluate$_withoutSlash$2(value, t2), t2);
     },
-    $signature: 63
+    $signature: 54
   };
   A._EvaluateVisitor_visitEachRule_closure3.prototype = {
     call$1(value) {
       return this.$this._async_evaluate$_setMultipleVariables$3(this._box_0.variables, value, this.nodeWithSpan);
     },
-    $signature: 63
+    $signature: 54
   };
   A._EvaluateVisitor_visitEachRule_closure4.prototype = {
     call$0() {
@@ -67987,7 +69466,7 @@ self.util = _cliPkgRequires.util;
         t1 = _this.$this;
       return t1._async_evaluate$_handleReturn$2(_this.list.get$asList(), new A._EvaluateVisitor_visitEachRule__closure0(t1, _this.setVariables, _this.node));
     },
-    $signature: 70
+    $signature: 66
   };
   A._EvaluateVisitor_visitEachRule__closure0.prototype = {
     call$1(element) {
@@ -67996,19 +69475,19 @@ self.util = _cliPkgRequires.util;
       t1 = this.$this;
       return t1._async_evaluate$_handleReturn$2(this.node.children, new A._EvaluateVisitor_visitEachRule___closure0(t1));
     },
-    $signature: 468
+    $signature: 338
   };
   A._EvaluateVisitor_visitEachRule___closure0.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 114
+    $signature: 84
   };
   A._EvaluateVisitor_visitAtRule_closure2.prototype = {
     call$1(value) {
       return this.$this._async_evaluate$_interpolationToValue$3$trim$warnForColor(value, true, true);
     },
-    $signature: 472
+    $signature: 335
   };
   A._EvaluateVisitor_visitAtRule_closure3.prototype = {
     call$0() {
@@ -68054,7 +69533,7 @@ self.util = _cliPkgRequires.util;
             case 4:
               // else
               $async$goto = 9;
-              return A._asyncAwait(t1._async_evaluate$_withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$(styleRule._style_rule$_selector, styleRule.span, styleRule.originalSelector), new A._EvaluateVisitor_visitAtRule__closure0(t1, $async$self.children), false, type$.ModifiableCssStyleRule, type$.Null), $async$call$0);
+              return A._asyncAwait(t1._async_evaluate$_withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$(styleRule._style_rule$_selector, styleRule.span, false, styleRule.originalSelector), new A._EvaluateVisitor_visitAtRule__closure0(t1, $async$self.children), false, type$.ModifiableCssStyleRule, type$.Null), $async$call$0);
             case 9:
               // returning from await.
             case 3:
@@ -68065,7 +69544,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitAtRule__closure0.prototype = {
     call$0() {
@@ -68105,13 +69584,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitAtRule_closure4.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
+    $signature: 7
   };
   A._EvaluateVisitor_visitForRule_closure4.prototype = {
     call$0() {
@@ -68140,7 +69619,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 248
+    $signature: 172
   };
   A._EvaluateVisitor_visitForRule_closure5.prototype = {
     call$0() {
@@ -68169,26 +69648,26 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 248
+    $signature: 172
   };
   A._EvaluateVisitor_visitForRule_closure6.prototype = {
     call$0() {
       return this.fromNumber.assertInt$0();
     },
-    $signature: 3
+    $signature: 10
   };
   A._EvaluateVisitor_visitForRule_closure7.prototype = {
     call$0() {
       var t1 = this.fromNumber;
       return this.toNumber.coerce$2(t1.get$numeratorUnits(t1), t1.get$denominatorUnits(t1)).assertInt$0();
     },
-    $signature: 3
+    $signature: 10
   };
   A._EvaluateVisitor_visitForRule_closure8.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value),
-        $async$returnValue, $async$self = this, i, t3, t4, t5, t6, t7, t8, _0_0, result, t1, t2, nodeWithSpan;
+        $async$returnValue, $async$self = this, i, t3, t4, t5, t6, t7, t8, _0_0, t1, t2, nodeWithSpan;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -68216,14 +69695,7 @@ self.util = _cliPkgRequires.util;
               // returning from await.
               _0_0 = $async$result;
               if (_0_0 != null) {
-                result = _0_0;
-                t7 = true;
-              } else {
-                result = null;
-                t7 = false;
-              }
-              if (t7) {
-                $async$returnValue = result;
+                $async$returnValue = _0_0;
                 // goto return
                 $async$goto = 1;
                 break;
@@ -68247,13 +69719,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 70
+    $signature: 66
   };
   A._EvaluateVisitor_visitForRule__closure0.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 114
+    $signature: 84
   };
   A._EvaluateVisitor_visitForwardRule_closure1.prototype = {
     call$2(module, firstLoad) {
@@ -68261,7 +69733,7 @@ self.util = _cliPkgRequires.util;
         this.$this._async_evaluate$_registerCommentsForModule$1(module);
       this.$this._async_evaluate$_environment.forwardModule$2(module, this.node);
     },
-    $signature: 129
+    $signature: 119
   };
   A._EvaluateVisitor_visitForwardRule_closure2.prototype = {
     call$2(module, firstLoad) {
@@ -68269,33 +69741,33 @@ self.util = _cliPkgRequires.util;
         this.$this._async_evaluate$_registerCommentsForModule$1(module);
       this.$this._async_evaluate$_environment.forwardModule$2(module, this.node);
     },
-    $signature: 129
+    $signature: 119
   };
   A._EvaluateVisitor__registerCommentsForModule_closure0.prototype = {
     call$0() {
       return A._setArrayType([], type$.JSArray_CssComment);
     },
-    $signature: 260
+    $signature: 173
   };
   A._EvaluateVisitor_visitIfRule_closure0.prototype = {
     call$1(clause) {
       var t1 = this.$this;
       return t1._async_evaluate$_environment.scope$1$3$semiGlobal$when(new A._EvaluateVisitor_visitIfRule__closure0(t1, clause), true, clause.hasDeclarations, type$.nullable_Value);
     },
-    $signature: 480
+    $signature: 327
   };
   A._EvaluateVisitor_visitIfRule__closure0.prototype = {
     call$0() {
       var t1 = this.$this;
       return t1._async_evaluate$_handleReturn$2(this.clause.children, new A._EvaluateVisitor_visitIfRule___closure0(t1));
     },
-    $signature: 70
+    $signature: 66
   };
   A._EvaluateVisitor_visitIfRule___closure0.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 114
+    $signature: 84
   };
   A._EvaluateVisitor__visitDynamicImport_closure0.prototype = {
     call$0() {
@@ -68304,7 +69776,7 @@ self.util = _cliPkgRequires.util;
     $call$body$_EvaluateVisitor__visitDynamicImport_closure() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.void),
-        $async$returnValue, $async$self = this, t1, t2, _0_0, stylesheet, t3, isDependency, t4, t5, url, t6, oldImporter, oldInDependency, loadsUserDefinedModules, children, t7, t8, t9, t10, environment, module, visitor, _box_0;
+        $async$returnValue, $async$self = this, t1, t2, _0_0, stylesheet, importer, isDependency, t3, url, oldImporter, oldInDependency, loadsUserDefinedModules, children, t4, t5, t6, t7, t8, t9, t10, environment, module, visitor, _box_0;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -68322,38 +69794,32 @@ self.util = _cliPkgRequires.util;
               // returning from await.
               _0_0 = $async$result;
               stylesheet = _box_0.stylesheet = _0_0._0;
-              t3 = _box_0.importer = _0_0._1;
+              importer = _0_0._1;
+              _box_0.importer = importer;
               isDependency = _0_0._2;
               _box_0.isDependency = isDependency;
-              t4 = isDependency;
-              t5 = stylesheet.span;
-              url = t5.get$sourceUrl(t5);
+              t3 = stylesheet.span;
+              url = t3.get$sourceUrl(t3);
               if (url != null) {
-                t5 = t1._async_evaluate$_activeModules;
-                if (t5.containsKey$1(url)) {
-                  t2 = A.NullableExtension_andThen(t5.$index(0, url), new A._EvaluateVisitor__visitDynamicImport__closure3(t1));
+                t3 = t1._async_evaluate$_activeModules;
+                if (t3.containsKey$1(url)) {
+                  t2 = A.NullableExtension_andThen(t3.$index(0, url), new A._EvaluateVisitor__visitDynamicImport__closure3(t1));
                   throw A.wrapException(t2 == null ? t1._async_evaluate$_exception$1("This file is already being loaded.") : t2);
                 }
-                t5.$indexSet(0, url, t2);
+                t3.$indexSet(0, url, t2);
               }
               t2 = stylesheet._uses;
-              t5 = type$.UnmodifiableListView_UseRule;
-              t6 = new A.UnmodifiableListView(t2, t5);
-              if (t6.get$length(t6) === 0) {
-                t6 = new A.UnmodifiableListView(stylesheet._forwards, type$.UnmodifiableListView_ForwardRule);
-                t6 = t6.get$length(t6) === 0;
-              } else
-                t6 = false;
-              $async$goto = t6 ? 4 : 5;
+              t3 = type$.UnmodifiableListView_UseRule;
+              $async$goto = new A.UnmodifiableListView(t2, t3).get$length(0) === 0 && new A.UnmodifiableListView(stylesheet._forwards, type$.UnmodifiableListView_ForwardRule).get$length(0) === 0 ? 4 : 5;
               break;
             case 4:
               // then
               oldImporter = t1._async_evaluate$_importer;
               t2 = t1._async_evaluate$_assertInModule$2(t1._async_evaluate$__stylesheet, "_stylesheet");
               oldInDependency = t1._async_evaluate$_inDependency;
-              t1._async_evaluate$_importer = t3;
+              t1._async_evaluate$_importer = importer;
               t1._async_evaluate$__stylesheet = stylesheet;
-              t1._async_evaluate$_inDependency = t4;
+              t1._async_evaluate$_inDependency = isDependency;
               $async$goto = 6;
               return A._asyncAwait(t1.visitStylesheet$1(stylesheet), $async$call$0);
             case 6:
@@ -68367,7 +69833,7 @@ self.util = _cliPkgRequires.util;
               break;
             case 5:
               // join
-              t2 = new A.UnmodifiableListView(t2, t5);
+              t2 = new A.UnmodifiableListView(t2, t3);
               if (!t2.any$1(t2, new A._EvaluateVisitor__visitDynamicImport__closure4())) {
                 t2 = new A.UnmodifiableListView(stylesheet._forwards, type$.UnmodifiableListView_ForwardRule);
                 loadsUserDefinedModules = t2.any$1(t2, new A._EvaluateVisitor__visitDynamicImport__closure5());
@@ -68421,25 +69887,25 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 30
+    $signature: 25
   };
   A._EvaluateVisitor__visitDynamicImport__closure3.prototype = {
     call$1(previousLoad) {
       return this.$this._async_evaluate$_multiSpanException$3("This file is already being loaded.", "new load", A.LinkedHashMap_LinkedHashMap$_literal([previousLoad.get$span(previousLoad), "original load"], type$.FileSpan, type$.String));
     },
-    $signature: 81
+    $signature: 91
   };
   A._EvaluateVisitor__visitDynamicImport__closure4.prototype = {
     call$1(rule) {
       return rule.url.get$scheme() !== "sass";
     },
-    $signature: 275
+    $signature: 174
   };
   A._EvaluateVisitor__visitDynamicImport__closure5.prototype = {
     call$1(rule) {
       return rule.url.get$scheme() !== "sass";
     },
-    $signature: 283
+    $signature: 175
   };
   A._EvaluateVisitor__visitDynamicImport__closure6.prototype = {
     call$0() {
@@ -68483,7 +69949,7 @@ self.util = _cliPkgRequires.util;
             case 2:
               // returning from await.
               t6 = t8 ? t1._async_evaluate$_addOutOfOrderImports$0() : A._setArrayType([], type$.JSArray_ModifiableCssNode);
-              $async$self.children._value = t6;
+              $async$self.children.__late_helper$_value = t6;
               t1._async_evaluate$_importer = oldImporter;
               t1._async_evaluate$__stylesheet = t2;
               if (t8) {
@@ -68500,9 +69966,9 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
-  A._EvaluateVisitor__applyMixin_closure3.prototype = {
+  A._EvaluateVisitor__applyMixin_closure1.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.void),
@@ -68525,7 +69991,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 30
+    $signature: 25
   };
   A._EvaluateVisitor__applyMixin__closure2.prototype = {
     call$0() {
@@ -68549,18 +70015,9 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 30
+    $signature: 25
   };
   A._EvaluateVisitor__applyMixin_closure2.prototype = {
-    call$0() {
-      var t1 = this._1_0;
-      if (t1 == null)
-        t1 = type$.AsyncCallable._as(t1);
-      return type$.UserDefinedCallable_AsyncEnvironment._as(t1).declaration;
-    },
-    $signature: 143
-  };
-  A._EvaluateVisitor__applyMixin_closure4.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Null),
@@ -68583,7 +70040,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor__applyMixin__closure1.prototype = {
     call$0() {
@@ -68608,7 +70065,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 30
+    $signature: 25
   };
   A._EvaluateVisitor__applyMixin___closure0.prototype = {
     call$0() {
@@ -68648,39 +70105,39 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 30
+    $signature: 25
   };
   A._EvaluateVisitor__applyMixin____closure0.prototype = {
     call$0() {
       return this.statement.accept$1(this.$this);
     },
-    $signature: 70
+    $signature: 66
   };
   A._EvaluateVisitor_visitIncludeRule_closure2.prototype = {
     call$0() {
       var t1 = this.node;
       return this.$this._async_evaluate$_environment.getMixin$2$namespace(t1.name, t1.namespace);
     },
-    $signature: 97
+    $signature: 86
   };
   A._EvaluateVisitor_visitIncludeRule_closure3.prototype = {
     call$1($content) {
       var t1 = this.$this;
       return new A.UserDefinedCallable($content, t1._async_evaluate$_environment.closure$0(), t1._async_evaluate$_inDependency, type$.UserDefinedCallable_AsyncEnvironment);
     },
-    $signature: 494
+    $signature: 326
   };
   A._EvaluateVisitor_visitIncludeRule_closure4.prototype = {
     call$0() {
       return this.node.get$spanWithoutContent();
     },
-    $signature: 33
+    $signature: 27
   };
   A._EvaluateVisitor_visitMediaRule_closure2.prototype = {
     call$1(mediaQueries) {
       return this.$this._async_evaluate$_mergeMediaQueries$2(mediaQueries, this.queries);
     },
-    $signature: 83
+    $signature: 89
   };
   A._EvaluateVisitor_visitMediaRule_closure3.prototype = {
     call$0() {
@@ -68708,13 +70165,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitMediaRule__closure0.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Null),
-        $async$self = this, styleRule, t2, t3, _i, t1, _0_0;
+        $async$self = this, t2, t3, _i, t1, _0_0;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -68724,19 +70181,12 @@ self.util = _cliPkgRequires.util;
               // Function start
               t1 = $async$self.$this;
               _0_0 = t1._async_evaluate$_atRootExcludingStyleRule ? null : t1._async_evaluate$_styleRuleIgnoringAtRoot;
-              if (_0_0 != null) {
-                styleRule = _0_0;
-                t2 = true;
-              } else {
-                styleRule = null;
-                t2 = false;
-              }
-              $async$goto = t2 ? 2 : 4;
+              $async$goto = _0_0 != null ? 2 : 4;
               break;
             case 2:
               // then
               $async$goto = 5;
-              return A._asyncAwait(t1._async_evaluate$_withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$(styleRule._style_rule$_selector, styleRule.span, styleRule.originalSelector), new A._EvaluateVisitor_visitMediaRule___closure0(t1, $async$self.node), false, type$.ModifiableCssStyleRule, type$.Null), $async$call$0);
+              return A._asyncAwait(t1._async_evaluate$_withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$(_0_0._style_rule$_selector, _0_0.span, false, _0_0.originalSelector), new A._EvaluateVisitor_visitMediaRule___closure0(t1, $async$self.node), false, type$.ModifiableCssStyleRule, type$.Null), $async$call$0);
             case 5:
               // returning from await.
               // goto join
@@ -68772,7 +70222,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitMediaRule___closure0.prototype = {
     call$0() {
@@ -68812,7 +70262,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitMediaRule_closure4.prototype = {
     call$1(node) {
@@ -68824,9 +70274,9 @@ self.util = _cliPkgRequires.util;
         t1 = true;
       return t1;
     },
-    $signature: 9
+    $signature: 7
   };
-  A._EvaluateVisitor_visitStyleRule_closure4.prototype = {
+  A._EvaluateVisitor_visitStyleRule_closure3.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Null),
@@ -68864,13 +70314,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
-  A._EvaluateVisitor_visitStyleRule_closure5.prototype = {
+  A._EvaluateVisitor_visitStyleRule_closure4.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
+    $signature: 7
   };
   A._EvaluateVisitor_visitStyleRule_closure6.prototype = {
     call$0() {
@@ -68895,7 +70345,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitStyleRule__closure0.prototype = {
     call$0() {
@@ -68935,25 +70385,25 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
-  A._EvaluateVisitor_visitStyleRule_closure7.prototype = {
+  A._EvaluateVisitor_visitStyleRule_closure5.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
+    $signature: 7
   };
-  A._EvaluateVisitor_visitStyleRule_closure8.prototype = {
+  A._EvaluateVisitor__warnForBogusCombinators_closure0.prototype = {
     call$1(child) {
       return child instanceof A.ModifiableCssComment;
     },
-    $signature: 124
+    $signature: 7
   };
   A._EvaluateVisitor_visitSupportsRule_closure1.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Null),
-        $async$self = this, styleRule, t2, t3, _i, t1, _0_0;
+        $async$self = this, t2, t3, _i, t1, _0_0;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -68963,19 +70413,12 @@ self.util = _cliPkgRequires.util;
               // Function start
               t1 = $async$self.$this;
               _0_0 = t1._async_evaluate$_atRootExcludingStyleRule ? null : t1._async_evaluate$_styleRuleIgnoringAtRoot;
-              if (_0_0 != null) {
-                styleRule = _0_0;
-                t2 = true;
-              } else {
-                styleRule = null;
-                t2 = false;
-              }
-              $async$goto = t2 ? 2 : 4;
+              $async$goto = _0_0 != null ? 2 : 4;
               break;
             case 2:
               // then
               $async$goto = 5;
-              return A._asyncAwait(t1._async_evaluate$_withParent$2$2(A.ModifiableCssStyleRule$(styleRule._style_rule$_selector, styleRule.span, styleRule.originalSelector), new A._EvaluateVisitor_visitSupportsRule__closure0(t1, $async$self.node), type$.ModifiableCssStyleRule, type$.Null), $async$call$0);
+              return A._asyncAwait(t1._async_evaluate$_withParent$2$2(A.ModifiableCssStyleRule$(_0_0._style_rule$_selector, _0_0.span, false, _0_0.originalSelector), new A._EvaluateVisitor_visitSupportsRule__closure0(t1, $async$self.node), type$.ModifiableCssStyleRule, type$.Null), $async$call$0);
             case 5:
               // returning from await.
               // goto join
@@ -69011,7 +70454,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitSupportsRule__closure0.prototype = {
     call$0() {
@@ -69051,13 +70494,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitSupportsRule_closure2.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
+    $signature: 7
   };
   A._EvaluateVisitor__visitSupportsCondition_closure0.prototype = {
     call$0() {
@@ -69097,7 +70540,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 288
+    $signature: 176
   };
   A._EvaluateVisitor_visitVariableDeclaration_closure2.prototype = {
     call$0() {
@@ -69105,14 +70548,14 @@ self.util = _cliPkgRequires.util;
         t2 = this._box_0.override;
       t1.setVariable$4$global(this.node.name, t2.value, t2.assignmentNode, true);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitVariableDeclaration_closure3.prototype = {
     call$0() {
       var t1 = this.node;
       return this.$this._async_evaluate$_environment.getVariable$2$namespace(t1.name, t1.namespace);
     },
-    $signature: 44
+    $signature: 40
   };
   A._EvaluateVisitor_visitVariableDeclaration_closure4.prototype = {
     call$0() {
@@ -69120,11 +70563,11 @@ self.util = _cliPkgRequires.util;
         t2 = this.node;
       t1._async_evaluate$_environment.setVariable$5$global$namespace(t2.name, this.value, t1._async_evaluate$_expressionNode$1(t2.expression), t2.isGlobal, t2.namespace);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitUseRule_closure0.prototype = {
     call$2(module, firstLoad) {
-      var t1, t2, t3, _0_0, $name, t4, t5, span;
+      var t1, t2, t3, _0_0, t4, t5, span;
       if (firstLoad)
         this.$this._async_evaluate$_registerCommentsForModule$1(module);
       t1 = this.$this._async_evaluate$_environment;
@@ -69134,15 +70577,8 @@ self.util = _cliPkgRequires.util;
         t1._async_environment$_globalModules.$indexSet(0, module, t2);
         t1._async_environment$_allModules.push(module);
         _0_0 = A.IterableExtension_firstWhereOrNull(J.get$keys$z(B.JSArray_methods.get$first(t1._async_environment$_variables)), module.get$variables().get$containsKey());
-        if (_0_0 != null) {
-          $name = _0_0;
-          t1 = true;
-        } else {
-          $name = null;
-          t1 = false;
-        }
-        if (t1)
-          A.throwExpression(A.SassScriptException$(string$.This_ma + A.S($name) + '".', null));
+        if (_0_0 != null)
+          A.throwExpression(A.SassScriptException$(string$.This_ma + _0_0 + '".', null));
       } else {
         t4 = t1._async_environment$_modules;
         if (t4.containsKey$1(t3)) {
@@ -69158,19 +70594,19 @@ self.util = _cliPkgRequires.util;
         t1._async_environment$_allModules.push(module);
       }
     },
-    $signature: 129
+    $signature: 119
   };
   A._EvaluateVisitor_visitWarnRule_closure0.prototype = {
     call$0() {
       return this.node.expression.accept$1(this.$this);
     },
-    $signature: 67
+    $signature: 68
   };
   A._EvaluateVisitor_visitWhileRule_closure0.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value),
-        $async$returnValue, $async$self = this, t1, t2, t3, _0_0, result, t4;
+        $async$returnValue, $async$self = this, t1, t2, t3, _0_0;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -69196,14 +70632,7 @@ self.util = _cliPkgRequires.util;
               // returning from await.
               _0_0 = $async$result;
               if (_0_0 != null) {
-                result = _0_0;
-                t4 = true;
-              } else {
-                result = null;
-                t4 = false;
-              }
-              if (t4) {
-                $async$returnValue = result;
+                $async$returnValue = _0_0;
                 // goto return
                 $async$goto = 1;
                 break;
@@ -69224,19 +70653,19 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 70
+    $signature: 66
   };
   A._EvaluateVisitor_visitWhileRule__closure0.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 114
+    $signature: 84
   };
   A._EvaluateVisitor_visitBinaryOperationExpression_closure0.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Value),
-        $async$returnValue, $async$self = this, t1, t2, left, $async$temp1, $async$temp2;
+        $async$returnValue, $async$self = this, t3, t1, t2, left, $async$temp1, $async$temp2;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -69254,59 +70683,59 @@ self.util = _cliPkgRequires.util;
             case 4:
               // switch
               switch (t1.operator) {
-                case B.BinaryOperator_2jN:
+                case B.BinaryOperator_wdM:
                   // goto case
                   $async$goto = 6;
                   break;
-                case B.BinaryOperator_M6L:
+                case B.BinaryOperator_qNM:
                   // goto case
                   $async$goto = 7;
                   break;
-                case B.BinaryOperator_SNp:
+                case B.BinaryOperator_eDt:
                   // goto case
                   $async$goto = 8;
                   break;
-                case B.BinaryOperator_ql5:
+                case B.BinaryOperator_g8k:
                   // goto case
                   $async$goto = 9;
                   break;
-                case B.BinaryOperator_ViB:
+                case B.BinaryOperator_icU:
                   // goto case
                   $async$goto = 10;
                   break;
-                case B.BinaryOperator_cIH:
+                case B.BinaryOperator_bEa:
                   // goto case
                   $async$goto = 11;
                   break;
-                case B.BinaryOperator_7Tg:
+                case B.BinaryOperator_oEm:
                   // goto case
                   $async$goto = 12;
                   break;
-                case B.BinaryOperator_U8c:
+                case B.BinaryOperator_miq:
                   // goto case
                   $async$goto = 13;
                   break;
-                case B.BinaryOperator_kpg:
+                case B.BinaryOperator_SPQ:
                   // goto case
                   $async$goto = 14;
                   break;
-                case B.BinaryOperator_anB:
+                case B.BinaryOperator_u15:
                   // goto case
                   $async$goto = 15;
                   break;
-                case B.BinaryOperator_olz:
+                case B.BinaryOperator_SjO:
                   // goto case
                   $async$goto = 16;
                   break;
-                case B.BinaryOperator_qN2:
+                case B.BinaryOperator_2No:
                   // goto case
                   $async$goto = 17;
                   break;
-                case B.BinaryOperator_t8B:
+                case B.BinaryOperator_U77:
                   // goto case
                   $async$goto = 18;
                   break;
-                case B.BinaryOperator_OTG:
+                case B.BinaryOperator_KNx:
                   // goto case
                   $async$goto = 19;
                   break;
@@ -69318,8 +70747,9 @@ self.util = _cliPkgRequires.util;
               break;
             case 6:
               // case
+              t1 = t1.right.accept$1(t2);
               $async$goto = 21;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value._is(t1) ? t1 : A._Future$value(t1, type$.Value), $async$call$0);
             case 21:
               // returning from await.
               t1 = $async$result;
@@ -69333,19 +70763,20 @@ self.util = _cliPkgRequires.util;
               break;
             case 22:
               // then
-              $async$result = left;
+              t1 = left;
               // goto join
               $async$goto = 23;
               break;
             case 24:
               // else
+              t1 = t1.right.accept$1(t2);
               $async$goto = 25;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value._is(t1) ? t1 : A._Future$value(t1, type$.Value), $async$call$0);
             case 25:
               // returning from await.
+              t1 = $async$result;
             case 23:
               // join
-              t1 = $async$result;
               // goto after switch
               $async$goto = 5;
               break;
@@ -69355,19 +70786,20 @@ self.util = _cliPkgRequires.util;
               break;
             case 26:
               // then
+              t1 = t1.right.accept$1(t2);
               $async$goto = 29;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value._is(t1) ? t1 : A._Future$value(t1, type$.Value), $async$call$0);
             case 29:
               // returning from await.
+              t1 = $async$result;
               // goto join
               $async$goto = 27;
               break;
             case 28:
               // else
-              $async$result = left;
+              t1 = left;
             case 27:
               // join
-              t1 = $async$result;
               // goto after switch
               $async$goto = 5;
               break;
@@ -69395,9 +70827,10 @@ self.util = _cliPkgRequires.util;
               break;
             case 11:
               // case
+              t1 = t1.right.accept$1(t2);
               $async$temp1 = left;
               $async$goto = 32;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value._is(t1) ? t1 : A._Future$value(t1, type$.Value), $async$call$0);
             case 32:
               // returning from await.
               t1 = $async$temp1.greaterThan$1($async$result);
@@ -69406,9 +70839,10 @@ self.util = _cliPkgRequires.util;
               break;
             case 12:
               // case
+              t1 = t1.right.accept$1(t2);
               $async$temp1 = left;
               $async$goto = 33;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value._is(t1) ? t1 : A._Future$value(t1, type$.Value), $async$call$0);
             case 33:
               // returning from await.
               t1 = $async$temp1.greaterThanOrEquals$1($async$result);
@@ -69417,9 +70851,10 @@ self.util = _cliPkgRequires.util;
               break;
             case 13:
               // case
+              t1 = t1.right.accept$1(t2);
               $async$temp1 = left;
               $async$goto = 34;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value._is(t1) ? t1 : A._Future$value(t1, type$.Value), $async$call$0);
             case 34:
               // returning from await.
               t1 = $async$temp1.lessThan$1($async$result);
@@ -69428,9 +70863,10 @@ self.util = _cliPkgRequires.util;
               break;
             case 14:
               // case
+              t1 = t1.right.accept$1(t2);
               $async$temp1 = left;
               $async$goto = 35;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value._is(t1) ? t1 : A._Future$value(t1, type$.Value), $async$call$0);
             case 35:
               // returning from await.
               t1 = $async$temp1.lessThanOrEquals$1($async$result);
@@ -69439,9 +70875,10 @@ self.util = _cliPkgRequires.util;
               break;
             case 15:
               // case
+              t1 = t1.right.accept$1(t2);
               $async$temp1 = left;
               $async$goto = 36;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value._is(t1) ? t1 : A._Future$value(t1, type$.Value), $async$call$0);
             case 36:
               // returning from await.
               t1 = $async$temp1.plus$1($async$result);
@@ -69450,9 +70887,10 @@ self.util = _cliPkgRequires.util;
               break;
             case 16:
               // case
+              t1 = t1.right.accept$1(t2);
               $async$temp1 = left;
               $async$goto = 37;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value._is(t1) ? t1 : A._Future$value(t1, type$.Value), $async$call$0);
             case 37:
               // returning from await.
               t1 = $async$temp1.minus$1($async$result);
@@ -69461,9 +70899,10 @@ self.util = _cliPkgRequires.util;
               break;
             case 17:
               // case
+              t1 = t1.right.accept$1(t2);
               $async$temp1 = left;
               $async$goto = 38;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value._is(t1) ? t1 : A._Future$value(t1, type$.Value), $async$call$0);
             case 38:
               // returning from await.
               t1 = $async$temp1.times$1($async$result);
@@ -69472,10 +70911,11 @@ self.util = _cliPkgRequires.util;
               break;
             case 18:
               // case
+              t3 = t1.right.accept$1(t2);
               $async$temp1 = t2;
               $async$temp2 = left;
               $async$goto = 39;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value._is(t3) ? t3 : A._Future$value(t3, type$.Value), $async$call$0);
             case 39:
               // returning from await.
               t1 = $async$temp1._async_evaluate$_slash$3($async$temp2, $async$result, t1);
@@ -69484,9 +70924,10 @@ self.util = _cliPkgRequires.util;
               break;
             case 19:
               // case
+              t1 = t1.right.accept$1(t2);
               $async$temp1 = left;
               $async$goto = 40;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value._is(t1) ? t1 : A._Future$value(t1, type$.Value), $async$call$0);
             case 40:
               // returning from await.
               t1 = $async$temp1.modulo$1($async$result);
@@ -69509,41 +70950,14 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 67
-  };
-  A._EvaluateVisitor__slash_closure1.prototype = {
-    call$0() {
-      return this._1_0._0;
-    },
-    $signature: 25
-  };
-  A._EvaluateVisitor__slash_closure2.prototype = {
-    call$0() {
-      return this._1_0._1;
-    },
-    $signature: 25
+    $signature: 68
   };
   A._EvaluateVisitor__slash_recommendation0.prototype = {
     call$1(expression) {
-      var left, right, t1, _null = null;
+      var t1;
       $label0$0: {
-        if (expression instanceof A.BinaryOperationExpression)
-          if (B.BinaryOperator_t8B === expression.operator) {
-            left = expression.left;
-            right = expression.right;
-            t1 = true;
-          } else {
-            right = _null;
-            left = right;
-            t1 = false;
-          }
-        else {
-          right = _null;
-          left = right;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = "math.div(" + A.S(this.call$1(left)) + ", " + A.S(this.call$1(right)) + ")";
+        if (expression instanceof A.BinaryOperationExpression && B.BinaryOperator_U77 === expression.operator) {
+          t1 = "math.div(" + A.S(this.call$1(expression.left)) + ", " + A.S(this.call$1(expression.right)) + ")";
           break $label0$0;
         }
         if (expression instanceof A.ParenthesizedExpression) {
@@ -69555,26 +70969,26 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 132
+    $signature: 111
   };
   A._EvaluateVisitor_visitVariableExpression_closure0.prototype = {
     call$0() {
       var t1 = this.node;
       return this.$this._async_evaluate$_environment.getVariable$2$namespace(t1.name, t1.namespace);
     },
-    $signature: 44
+    $signature: 40
   };
   A._EvaluateVisitor_visitUnaryOperationExpression_closure0.prototype = {
     call$0() {
       var t1, _this = this;
       switch (_this.node.operator) {
-        case B.UnaryOperator_gg4:
+        case B.UnaryOperator_cLp:
           t1 = _this.operand.unaryPlus$0();
           break;
-        case B.UnaryOperator_TLI:
+        case B.UnaryOperator_AiQ:
           t1 = _this.operand.unaryMinus$0();
           break;
-        case B.UnaryOperator_Ix1:
+        case B.UnaryOperator_SJr:
           t1 = new A.SassString("/" + A.serializeValue(_this.operand, false, true), false);
           break;
         case B.UnaryOperator_not_not_not:
@@ -69585,34 +70999,33 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 25
+    $signature: 34
   };
   A._EvaluateVisitor_visitListExpression_closure0.prototype = {
     call$1(expression) {
       return expression.accept$1(this.$this);
     },
-    $signature: 518
+    $signature: 316
   };
   A._EvaluateVisitor_visitFunctionExpression_closure2.prototype = {
     call$0() {
-      var t1 = this.$this._async_evaluate$_environment,
-        t2 = this.node;
-      return t1.getFunction$2$namespace(A.stringReplaceAllUnchecked(t2.originalName, "_", "-"), t2.namespace);
+      var t1 = this.node;
+      return this.$this._async_evaluate$_environment.getFunction$2$namespace(t1.name, t1.namespace);
     },
-    $signature: 97
+    $signature: 86
   };
   A._EvaluateVisitor_visitFunctionExpression_closure3.prototype = {
     call$1(argument) {
       return argument.accept$1(new A._IsCalculationSafeVisitor());
     },
-    $signature: 126
+    $signature: 113
   };
   A._EvaluateVisitor_visitFunctionExpression_closure4.prototype = {
     call$0() {
       var t1 = this.node;
       return this.$this._async_evaluate$_runFunctionCallable$3(t1.$arguments, this._box_0.$function, t1);
     },
-    $signature: 67
+    $signature: 68
   };
   A._EvaluateVisitor__checkCalculationArguments_check0.prototype = {
     call$1(maxArgs) {
@@ -69626,7 +71039,7 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return this.call$1(null);
     },
-    $signature: 86
+    $signature: 96
   };
   A._EvaluateVisitor__visitCalculationExpression_closure0.prototype = {
     call$0() {
@@ -69665,20 +71078,14 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 151
-  };
-  A._EvaluateVisitor__checkAdjacentCalculationValues_closure0.prototype = {
-    call$0() {
-      return type$.UnaryOperationExpression._as(this._0_0).operator;
-    },
-    $signature: 137
+    $signature: 179
   };
   A._EvaluateVisitor_visitInterpolatedFunctionExpression_closure0.prototype = {
     call$0() {
       var t1 = this.node;
       return this.$this._async_evaluate$_runFunctionCallable$3(t1.$arguments, this.$function, t1);
     },
-    $signature: 67
+    $signature: 68
   };
   A._EvaluateVisitor__runUserDefinedCallable_closure0.prototype = {
     call$0() {
@@ -69774,7 +71181,7 @@ self.util = _cliPkgRequires.util;
                 rest = J.get$length$asx(t2[2]) > t5 ? J.sublist$1$ax(t2[2], t5) : B.List_empty8;
                 t5 = t2[0];
                 t6 = t2[4];
-                argumentList = A.SassArgumentList$(rest, t5, t6 === B.ListSeparator_undecided_null_undecided ? B.ListSeparator_rXA : t6);
+                argumentList = A.SassArgumentList$(rest, t5, t6 === B.ListSeparator_undecided_null_undecided ? B.ListSeparator_ECn : t6);
                 t1._async_evaluate$_environment.setLocalVariable$3(restArgument, argumentList, t4);
               } else
                 argumentList = null;
@@ -69817,7 +71224,7 @@ self.util = _cliPkgRequires.util;
     call$1($name) {
       return "$" + $name;
     },
-    $signature: 7
+    $signature: 5
   };
   A._EvaluateVisitor__runFunctionCallable_closure0.prototype = {
     call$0() {
@@ -69866,7 +71273,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 67
+    $signature: 68
   };
   A._EvaluateVisitor__runBuiltInCallable_closure2.prototype = {
     call$0() {
@@ -69878,25 +71285,25 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return this._box_0.callback.call$1(this.evaluated._values[2]);
     },
-    $signature: 529
+    $signature: 314
   };
   A._EvaluateVisitor__runBuiltInCallable_closure4.prototype = {
     call$1($name) {
       return "$" + $name;
     },
-    $signature: 7
+    $signature: 5
   };
   A._EvaluateVisitor__evaluateArguments_closure3.prototype = {
     call$1(value) {
       return value;
     },
-    $signature: 43
+    $signature: 39
   };
   A._EvaluateVisitor__evaluateArguments_closure4.prototype = {
     call$1(value) {
       return this.$this._async_evaluate$_withoutSlash$2(value, this.restNodeForSpan);
     },
-    $signature: 43
+    $signature: 39
   };
   A._EvaluateVisitor__evaluateArguments_closure5.prototype = {
     call$2(key, value) {
@@ -69905,27 +71312,27 @@ self.util = _cliPkgRequires.util;
       _this.named.$indexSet(0, key, _this.$this._async_evaluate$_withoutSlash$2(value, t1));
       _this.namedNodes.$indexSet(0, key, t1);
     },
-    $signature: 87
+    $signature: 98
   };
   A._EvaluateVisitor__evaluateArguments_closure6.prototype = {
     call$1(value) {
       return value;
     },
-    $signature: 43
+    $signature: 39
   };
   A._EvaluateVisitor__evaluateMacroArguments_closure3.prototype = {
     call$1(value) {
       var t1 = this.restArgs;
       return new A.ValueExpression(value, t1.get$span(t1));
     },
-    $signature: 65
+    $signature: 58
   };
   A._EvaluateVisitor__evaluateMacroArguments_closure4.prototype = {
     call$1(value) {
       var t1 = this.restArgs;
       return new A.ValueExpression(this.$this._async_evaluate$_withoutSlash$2(value, this.restNodeForSpan), t1.get$span(t1));
     },
-    $signature: 65
+    $signature: 58
   };
   A._EvaluateVisitor__evaluateMacroArguments_closure5.prototype = {
     call$2(key, value) {
@@ -69933,14 +71340,14 @@ self.util = _cliPkgRequires.util;
         t1 = _this.restArgs;
       _this.named.$indexSet(0, key, new A.ValueExpression(_this.$this._async_evaluate$_withoutSlash$2(value, _this.restNodeForSpan), t1.get$span(t1)));
     },
-    $signature: 87
+    $signature: 98
   };
   A._EvaluateVisitor__evaluateMacroArguments_closure6.prototype = {
     call$1(value) {
       var t1 = this.keywordRestArgs;
       return new A.ValueExpression(this.$this._async_evaluate$_withoutSlash$2(value, this.keywordRestNodeForSpan), t1.get$span(t1));
     },
-    $signature: 65
+    $signature: 58
   };
   A._EvaluateVisitor__addRestMap_closure0.prototype = {
     call$2(key, value) {
@@ -69953,7 +71360,7 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException(t1._async_evaluate$_exception$2(string$.Variab_ + key.toString$0(0) + " is not a string in " + _this.map.toString$0(0) + ".", t2.get$span(t2)));
       }
     },
-    $signature: 106
+    $signature: 90
   };
   A._EvaluateVisitor__verifyArguments_closure0.prototype = {
     call$0() {
@@ -69973,7 +71380,7 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              t1 = $async$self.node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = $async$self.$this, t3 = A._instanceType(t1)._precomputed1;
+              t1 = $async$self.node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = $async$self.$this, t2 = t2._eval$1("ListBase.E");
             case 2:
               // for condition
               if (!t1.moveNext$0()) {
@@ -69983,7 +71390,7 @@ self.util = _cliPkgRequires.util;
               }
               t4 = t1.__internal$_current;
               $async$goto = 4;
-              return A._asyncAwait((t4 == null ? t3._as(t4) : t4).accept$1(t2), $async$call$0);
+              return A._asyncAwait((t4 == null ? t2._as(t4) : t4).accept$1(t3), $async$call$0);
             case 4:
               // returning from await.
               // goto for condition
@@ -69997,13 +71404,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitCssAtRule_closure2.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
+    $signature: 7
   };
   A._EvaluateVisitor_visitCssKeyframeBlock_closure1.prototype = {
     call$0() {
@@ -70017,7 +71424,7 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              t1 = $async$self.node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = $async$self.$this, t3 = A._instanceType(t1)._precomputed1;
+              t1 = $async$self.node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = $async$self.$this, t2 = t2._eval$1("ListBase.E");
             case 2:
               // for condition
               if (!t1.moveNext$0()) {
@@ -70027,7 +71434,7 @@ self.util = _cliPkgRequires.util;
               }
               t4 = t1.__internal$_current;
               $async$goto = 4;
-              return A._asyncAwait((t4 == null ? t3._as(t4) : t4).accept$1(t2), $async$call$0);
+              return A._asyncAwait((t4 == null ? t2._as(t4) : t4).accept$1(t3), $async$call$0);
             case 4:
               // returning from await.
               // goto for condition
@@ -70041,19 +71448,19 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitCssKeyframeBlock_closure2.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
+    $signature: 7
   };
   A._EvaluateVisitor_visitCssMediaRule_closure2.prototype = {
     call$1(mediaQueries) {
       return this.$this._async_evaluate$_mergeMediaQueries$2(mediaQueries, this.node.queries);
     },
-    $signature: 83
+    $signature: 89
   };
   A._EvaluateVisitor_visitCssMediaRule_closure3.prototype = {
     call$0() {
@@ -70081,13 +71488,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitCssMediaRule__closure0.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Null),
-        $async$self = this, styleRule, t2, t3, t4, t1, _0_0;
+        $async$self = this, t2, t3, t4, t1, _0_0;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -70097,19 +71504,12 @@ self.util = _cliPkgRequires.util;
               // Function start
               t1 = $async$self.$this;
               _0_0 = t1._async_evaluate$_atRootExcludingStyleRule ? null : t1._async_evaluate$_styleRuleIgnoringAtRoot;
-              if (_0_0 != null) {
-                styleRule = _0_0;
-                t2 = true;
-              } else {
-                styleRule = null;
-                t2 = false;
-              }
-              $async$goto = t2 ? 2 : 4;
+              $async$goto = _0_0 != null ? 2 : 4;
               break;
             case 2:
               // then
               $async$goto = 5;
-              return A._asyncAwait(t1._async_evaluate$_withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$(styleRule._style_rule$_selector, styleRule.span, styleRule.originalSelector), new A._EvaluateVisitor_visitCssMediaRule___closure0(t1, $async$self.node), false, type$.ModifiableCssStyleRule, type$.Null), $async$call$0);
+              return A._asyncAwait(t1._async_evaluate$_withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$(_0_0._style_rule$_selector, _0_0.span, false, _0_0.originalSelector), new A._EvaluateVisitor_visitCssMediaRule___closure0(t1, $async$self.node), false, type$.ModifiableCssStyleRule, type$.Null), $async$call$0);
             case 5:
               // returning from await.
               // goto join
@@ -70117,7 +71517,7 @@ self.util = _cliPkgRequires.util;
               break;
             case 4:
               // else
-              t2 = $async$self.node.children, t2 = new A.ListIterator(t2, t2.get$length(t2)), t3 = A._instanceType(t2)._precomputed1;
+              t2 = $async$self.node.children, t3 = t2.$ti, t2 = new A.ListIterator(t2, t2.get$length(0), t3._eval$1("ListIterator<ListBase.E>")), t3 = t3._eval$1("ListBase.E");
             case 6:
               // for condition
               if (!t2.moveNext$0()) {
@@ -70143,7 +71543,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitCssMediaRule___closure0.prototype = {
     call$0() {
@@ -70157,7 +71557,7 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              t1 = $async$self.node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = $async$self.$this, t3 = A._instanceType(t1)._precomputed1;
+              t1 = $async$self.node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = $async$self.$this, t2 = t2._eval$1("ListBase.E");
             case 2:
               // for condition
               if (!t1.moveNext$0()) {
@@ -70167,7 +71567,7 @@ self.util = _cliPkgRequires.util;
               }
               t4 = t1.__internal$_current;
               $async$goto = 4;
-              return A._asyncAwait((t4 == null ? t3._as(t4) : t4).accept$1(t2), $async$call$0);
+              return A._asyncAwait((t4 == null ? t2._as(t4) : t4).accept$1(t3), $async$call$0);
             case 4:
               // returning from await.
               // goto for condition
@@ -70181,7 +71581,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitCssMediaRule_closure4.prototype = {
     call$1(node) {
@@ -70193,7 +71593,7 @@ self.util = _cliPkgRequires.util;
         t1 = true;
       return t1;
     },
-    $signature: 9
+    $signature: 7
   };
   A._EvaluateVisitor_visitCssStyleRule_closure2.prototype = {
     call$0() {
@@ -70218,7 +71618,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitCssStyleRule__closure0.prototype = {
     call$0() {
@@ -70232,7 +71632,7 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              t1 = $async$self.node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = $async$self.$this, t3 = A._instanceType(t1)._precomputed1;
+              t1 = $async$self.node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = $async$self.$this, t2 = t2._eval$1("ListBase.E");
             case 2:
               // for condition
               if (!t1.moveNext$0()) {
@@ -70242,7 +71642,7 @@ self.util = _cliPkgRequires.util;
               }
               t4 = t1.__internal$_current;
               $async$goto = 4;
-              return A._asyncAwait((t4 == null ? t3._as(t4) : t4).accept$1(t2), $async$call$0);
+              return A._asyncAwait((t4 == null ? t2._as(t4) : t4).accept$1(t3), $async$call$0);
             case 4:
               // returning from await.
               // goto for condition
@@ -70256,25 +71656,19 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
-  A._EvaluateVisitor_visitCssStyleRule_closure3.prototype = {
+  A._EvaluateVisitor_visitCssStyleRule_closure1.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
-  };
-  A._EvaluateVisitor_visitCssStyleRule_closure4.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_0._collection$_source);
-    },
-    $signature: 3
+    $signature: 7
   };
   A._EvaluateVisitor_visitCssSupportsRule_closure1.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Null),
-        $async$self = this, styleRule, t2, t3, t4, t1, _0_0;
+        $async$self = this, t2, t3, t4, t1, _0_0;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -70284,19 +71678,12 @@ self.util = _cliPkgRequires.util;
               // Function start
               t1 = $async$self.$this;
               _0_0 = t1._async_evaluate$_atRootExcludingStyleRule ? null : t1._async_evaluate$_styleRuleIgnoringAtRoot;
-              if (_0_0 != null) {
-                styleRule = _0_0;
-                t2 = true;
-              } else {
-                styleRule = null;
-                t2 = false;
-              }
-              $async$goto = t2 ? 2 : 4;
+              $async$goto = _0_0 != null ? 2 : 4;
               break;
             case 2:
               // then
               $async$goto = 5;
-              return A._asyncAwait(t1._async_evaluate$_withParent$2$2(A.ModifiableCssStyleRule$(styleRule._style_rule$_selector, styleRule.span, styleRule.originalSelector), new A._EvaluateVisitor_visitCssSupportsRule__closure0(t1, $async$self.node), type$.ModifiableCssStyleRule, type$.Null), $async$call$0);
+              return A._asyncAwait(t1._async_evaluate$_withParent$2$2(A.ModifiableCssStyleRule$(_0_0._style_rule$_selector, _0_0.span, false, _0_0.originalSelector), new A._EvaluateVisitor_visitCssSupportsRule__closure0(t1, $async$self.node), type$.ModifiableCssStyleRule, type$.Null), $async$call$0);
             case 5:
               // returning from await.
               // goto join
@@ -70304,7 +71691,7 @@ self.util = _cliPkgRequires.util;
               break;
             case 4:
               // else
-              t2 = $async$self.node.children, t2 = new A.ListIterator(t2, t2.get$length(t2)), t3 = A._instanceType(t2)._precomputed1;
+              t2 = $async$self.node.children, t3 = t2.$ti, t2 = new A.ListIterator(t2, t2.get$length(0), t3._eval$1("ListIterator<ListBase.E>")), t3 = t3._eval$1("ListBase.E");
             case 6:
               // for condition
               if (!t2.moveNext$0()) {
@@ -70330,7 +71717,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitCssSupportsRule__closure0.prototype = {
     call$0() {
@@ -70344,7 +71731,7 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              t1 = $async$self.node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = $async$self.$this, t3 = A._instanceType(t1)._precomputed1;
+              t1 = $async$self.node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = $async$self.$this, t2 = t2._eval$1("ListBase.E");
             case 2:
               // for condition
               if (!t1.moveNext$0()) {
@@ -70354,7 +71741,7 @@ self.util = _cliPkgRequires.util;
               }
               t4 = t1.__internal$_current;
               $async$goto = 4;
-              return A._asyncAwait((t4 == null ? t3._as(t4) : t4).accept$1(t2), $async$call$0);
+              return A._asyncAwait((t4 == null ? t2._as(t4) : t4).accept$1(t3), $async$call$0);
             case 4:
               // returning from await.
               // goto for condition
@@ -70368,32 +71755,32 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitCssSupportsRule_closure2.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
+    $signature: 7
   };
   A._EvaluateVisitor__performInterpolationHelper_closure0.prototype = {
     call$1(targetLocations) {
       return A.InterpolationMap$(this.interpolation, targetLocations);
     },
-    $signature: 154
+    $signature: 181
   };
   A._EvaluateVisitor__serialize_closure0.prototype = {
     call$0() {
       return A.serializeValue(this.value, false, this.quote);
     },
-    $signature: 22
+    $signature: 26
   };
   A._EvaluateVisitor__expressionNode_closure0.prototype = {
     call$0() {
       var t1 = this.expression;
       return this.$this._async_evaluate$_environment.getVariableNode$2$namespace(t1.name, t1.namespace);
     },
-    $signature: 155
+    $signature: 182
   };
   A._EvaluateVisitor__withoutSlash_recommendation0.prototype = {
     call$1(number) {
@@ -70404,13 +71791,6 @@ self.util = _cliPkgRequires.util;
           t1 = type$.SassNumber;
           before = t1._as(_1_0._0);
           after = t1._as(_1_0._1);
-          t1 = true;
-        } else {
-          before = null;
-          after = null;
-          t1 = false;
-        }
-        if (t1) {
           t1 = "math.div(" + A.S(this.call$1(before)) + ", " + A.S(this.call$1(after)) + ")";
           break $label0$0;
         }
@@ -70419,7 +71799,7 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 156
+    $signature: 183
   };
   A._EvaluateVisitor__stackFrame_closure0.prototype = {
     call$1(url) {
@@ -70427,7 +71807,7 @@ self.util = _cliPkgRequires.util;
       t1 = t1 == null ? null : t1.humanize$1(url);
       return t1 == null ? url : t1;
     },
-    $signature: 48
+    $signature: 43
   };
   A._ImportedCssVisitor0.prototype = {
     visitCssAtRule$1(node) {
@@ -70465,7 +71845,7 @@ self.util = _cliPkgRequires.util;
     },
     visitCssStylesheet$1(node) {
       var t1, t2, t3;
-      for (t1 = node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t2 = t2._eval$1("ListBase.E"); t1.moveNext$0();) {
         t3 = t1.__internal$_current;
         (t3 == null ? t2._as(t3) : t3).accept$1(this);
       }
@@ -70478,7 +71858,7 @@ self.util = _cliPkgRequires.util;
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
+    $signature: 7
   };
   A._ImportedCssVisitor_visitCssMediaRule_closure0.prototype = {
     call$1(node) {
@@ -70489,33 +71869,25 @@ self.util = _cliPkgRequires.util;
         t1 = true;
       return t1;
     },
-    $signature: 9
+    $signature: 7
   };
   A._ImportedCssVisitor_visitCssStyleRule_closure0.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
+    $signature: 7
   };
   A._ImportedCssVisitor_visitCssSupportsRule_closure0.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
+    $signature: 7
   };
   A._EvaluationContext0.prototype = {
     get$currentCallableSpan() {
-      var callableNode, t1,
-        _0_0 = this._async_evaluate$_visitor._async_evaluate$_callableNode;
-      if (_0_0 != null) {
-        callableNode = _0_0;
-        t1 = true;
-      } else {
-        callableNode = null;
-        t1 = false;
-      }
-      if (t1)
-        return callableNode.get$span(callableNode);
+      var _0_0 = this._async_evaluate$_visitor._async_evaluate$_callableNode;
+      if (_0_0 != null)
+        return _0_0.get$span(_0_0);
       throw A.wrapException(A.StateError$(string$.No_Sasc));
     },
     warn$2(_, message, deprecation) {
@@ -70551,17 +71923,9 @@ self.util = _cliPkgRequires.util;
       return this._visitChildren$2(A.ModifiableCssMediaRule$(node.queries, node.span), node);
     },
     visitCssStyleRule$1(node) {
-      var newSelector, t1,
-        _0_0 = this._oldToNewSelectors.$index(0, node._style_rule$_selector._box$_inner.value);
-      if (_0_0 != null) {
-        newSelector = _0_0;
-        t1 = true;
-      } else {
-        newSelector = null;
-        t1 = false;
-      }
-      if (t1)
-        return this._visitChildren$2(A.ModifiableCssStyleRule$(newSelector, node.span, node.originalSelector), node);
+      var _0_0 = this._oldToNewSelectors.$index(0, node._style_rule$_selector._box$_inner.value);
+      if (_0_0 != null)
+        return this._visitChildren$2(A.ModifiableCssStyleRule$(_0_0, node.span, false, node.originalSelector), node);
       else
         throw A.wrapException(A.StateError$(string$.The_Ex));
     },
@@ -70662,15 +72026,11 @@ self.util = _cliPkgRequires.util;
       return this._withFakeStylesheet$1$3(importer, nodeWithSpan, callback, type$.dynamic);
     },
     _loadModule$7$baseUrl$configuration$namesInErrors(url, stackFrame, nodeWithSpan, callback, baseUrl, configuration, namesInErrors) {
-      var _0_0, t2, _this = this, t1 = {};
+      var t2, _this = this, t1 = {},
+        _0_0 = _this._builtInModules.$index(0, url);
       t1.builtInModule = null;
-      _0_0 = _this._builtInModules.$index(0, url);
       if (_0_0 != null) {
         t1.builtInModule = _0_0;
-        t2 = true;
-      } else
-        t2 = false;
-      if (t2) {
         if (configuration instanceof A.ExplicitConfiguration) {
           t1 = namesInErrors ? "Built-in module " + url.toString$0(0) + " can't be configured." : "Built-in modules can't be configured.";
           t2 = configuration.nodeWithSpan;
@@ -70688,19 +72048,12 @@ self.util = _cliPkgRequires.util;
       return this._loadModule$7$baseUrl$configuration$namesInErrors(url, stackFrame, nodeWithSpan, callback, null, null, false);
     },
     _execute$5$configuration$namesInErrors$nodeWithSpan(importer, stylesheet, configuration, namesInErrors, nodeWithSpan) {
-      var _0_0, alreadyLoaded, t2, currentConfiguration, t3, message, existingSpan, configurationSpan, environment, css, preModuleComments, extensionStore, module, _this = this,
+      var _0_0, currentConfiguration, t2, t3, message, existingSpan, configurationSpan, environment, css, preModuleComments, extensionStore, module, _this = this,
         t1 = stylesheet.span,
         url = t1.get$sourceUrl(t1);
       t1 = _this._modules;
       _0_0 = t1.$index(0, url);
       if (_0_0 != null) {
-        alreadyLoaded = _0_0;
-        t2 = true;
-      } else {
-        alreadyLoaded = null;
-        t2 = false;
-      }
-      if (t2) {
         t1 = configuration == null;
         currentConfiguration = t1 ? _this._configuration : configuration;
         t2 = _this._moduleConfigurations.$index(0, url);
@@ -70708,7 +72061,12 @@ self.util = _cliPkgRequires.util;
         t2 = t3 == null ? t2 : t3;
         t3 = currentConfiguration.__originalConfiguration;
         if (t2 !== (t3 == null ? currentConfiguration : t3) && currentConfiguration instanceof A.ExplicitConfiguration) {
-          message = namesInErrors ? $.$get$context().prettyUri$1(url) + string$.x20was_a : string$.This_mw;
+          if (namesInErrors) {
+            t2 = $.$get$context();
+            url.toString;
+            message = t2.prettyUri$1(url) + string$.x20was_a;
+          } else
+            message = string$.This_mw;
           t2 = _this._moduleNodes.$index(0, url);
           existingSpan = t2 == null ? null : t2.get$span(t2);
           if (t1) {
@@ -70721,9 +72079,9 @@ self.util = _cliPkgRequires.util;
             t1.$indexSet(0, existingSpan, "original load");
           if (configurationSpan != null)
             t1.$indexSet(0, configurationSpan, "configuration");
-          throw A.wrapException(t1.get$isEmpty(t1) ? _this._evaluate$_exception$1(message) : _this._multiSpanException$3(message, "new load", t1));
+          throw A.wrapException(t1.get$isEmpty(0) ? _this._evaluate$_exception$1(message) : _this._multiSpanException$3(message, "new load", t1));
         }
-        return alreadyLoaded;
+        return _0_0;
       }
       environment = A.Environment$();
       css = A._Cell$();
@@ -70753,8 +72111,7 @@ self.util = _cliPkgRequires.util;
           t1 = _this._assertInModule$2(_this.__root, _s5_).children;
           break $label0$0;
         }
-        t1 = _this._assertInModule$2(_this.__root, _s5_);
-        t1 = t1.children;
+        t1 = _this._assertInModule$2(_this.__root, _s5_).children;
         t1 = A.List_List$of(A.SubListIterable$(t1, 0, A.checkNotNullable(_this._assertInModule$2(_this.__endOfImports, _s13_), "count", type$.int), t1.$ti._eval$1("ListBase.E")), true, type$.ModifiableCssNode);
         B.JSArray_methods.addAll$1(t1, _0_0);
         t2 = _this._assertInModule$2(_this.__root, _s5_).children;
@@ -70764,19 +72121,12 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     _combineCss$2$clone(root, clone) {
-      var selectors, _0_0, unsatisfiedExtension, t1, imports, css, sorted, t2;
+      var selectors, _0_0, t1, imports, css, sorted, t2;
       if (!B.JSArray_methods.any$1(root.get$upstream(), new A._EvaluateVisitor__combineCss_closure())) {
         selectors = root.get$extensionStore().get$simpleSelectors();
         _0_0 = A.IterableExtension_get_firstOrNull(root.get$extensionStore().extensionsWhereTarget$1(new A._EvaluateVisitor__combineCss_closure0(selectors)));
-        if (_0_0 != null) {
-          unsatisfiedExtension = _0_0;
-          t1 = true;
-        } else {
-          unsatisfiedExtension = null;
-          t1 = false;
-        }
-        if (t1)
-          this._throwForUnsatisfiedExtension$1(unsatisfiedExtension);
+        if (_0_0 != null)
+          this._throwForUnsatisfiedExtension$1(_0_0);
         return root.get$css(root);
       }
       t1 = type$.JSArray_CssNode;
@@ -70795,10 +72145,10 @@ self.util = _cliPkgRequires.util;
       return this._combineCss$2$clone(root, false);
     },
     _extendModules$1(sortedModules) {
-      var t1, t2, t3, originalSelectors, $self, t4, t5, _i, upstream, _0_0, url, t6,
+      var t1, t2, t3, originalSelectors, $self, t4, t5, _i, upstream, _0_0,
         downstreamExtensionStores = A.LinkedHashMap_LinkedHashMap$_empty(type$.Uri, type$.List_ExtensionStore),
         unsatisfiedExtensions = new A._LinkedIdentityHashSet(type$._LinkedIdentityHashSet_Extension);
-      for (t1 = A._ListQueueIterator$(sortedModules), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = A._ListQueueIterator$(sortedModules, sortedModules.$ti._precomputed1), t2 = t1.$ti._precomputed1; t1.moveNext$0();) {
         t3 = t1._collection$_current;
         if (t3 == null)
           t3 = t2._as(t3);
@@ -70814,20 +72164,13 @@ self.util = _cliPkgRequires.util;
         for (t4 = t3.get$upstream(), t5 = t4.length, _i = 0; _i < t4.length; t4.length === t5 || (0, A.throwConcurrentModificationError)(t4), ++_i) {
           upstream = t4[_i];
           _0_0 = upstream.get$url(upstream);
-          if (_0_0 != null) {
-            url = _0_0;
-            t6 = true;
-          } else {
-            url = null;
-            t6 = false;
-          }
-          if (t6)
-            J.add$1$ax(downstreamExtensionStores.putIfAbsent$2(url, new A._EvaluateVisitor__extendModules_closure0()), t3.get$extensionStore());
+          if (_0_0 != null)
+            J.add$1$ax(downstreamExtensionStores.putIfAbsent$2(_0_0, new A._EvaluateVisitor__extendModules_closure0()), t3.get$extensionStore());
         }
         unsatisfiedExtensions.removeAll$1(t3.get$extensionStore().extensionsWhereTarget$1(originalSelectors.get$contains(originalSelectors)));
       }
       if (unsatisfiedExtensions._collection$_length !== 0)
-        this._throwForUnsatisfiedExtension$1(unsatisfiedExtensions.get$first(unsatisfiedExtensions));
+        this._throwForUnsatisfiedExtension$1(unsatisfiedExtensions.get$first(0));
     },
     _throwForUnsatisfiedExtension$1(extension) {
       throw A.wrapException(A.SassException$(string$.The_ta + extension.target.toString$0(0) + ' !optional" to avoid this error.', extension.span, null));
@@ -70854,52 +72197,27 @@ self.util = _cliPkgRequires.util;
       return null;
     },
     visitAtRootRule$1(node) {
-      var unparsedQuery, t1, _1_0, query, $parent, included, _2_0, grandparent, t2, root, first, rest, innerCopy, outerCopy, _i, copy, _this = this, _null = null,
+      var t1, _2_0, root, first, rest, innerCopy, outerCopy, _i, copy, _this = this,
         _s8_ = "__parent",
-        _0_0 = node.query;
-      if (_0_0 != null) {
-        unparsedQuery = _0_0;
-        t1 = true;
-      } else {
-        unparsedQuery = _null;
-        t1 = false;
-      }
-      if (t1) {
-        _1_0 = _this._performInterpolationWithMap$2$warnForColor(unparsedQuery, true);
-        query = A.AtRootQueryParser$(_1_0._0, _this._evaluate$_logger, _null).parse$0();
-      } else
-        query = B.AtRootQuery_UsS;
-      $parent = _this._assertInModule$2(_this.__parent, _s8_);
-      included = A._setArrayType([], type$.JSArray_ModifiableCssParentNode);
-      for (t1 = type$.CssStylesheet; !t1._is($parent); $parent = grandparent) {
+        _0_0 = node.query,
+        query = _0_0 != null ? A.AtRootQueryParser$(_this._performInterpolationWithMap$2$warnForColor(_0_0, true)._0, _this._evaluate$_logger, null).parse$0() : B.AtRootQuery_n2q,
+        $parent = _this._assertInModule$2(_this.__parent, _s8_),
+        included = A._setArrayType([], type$.JSArray_ModifiableCssParentNode);
+      for (t1 = type$.CssStylesheet; !t1._is($parent); $parent = _2_0) {
         if (!query.excludes$1($parent))
           included.push($parent);
         _2_0 = $parent._parent;
-        if (_2_0 != null) {
-          grandparent = _2_0;
-          t2 = true;
-        } else {
-          grandparent = _null;
-          t2 = false;
-        }
-        if (!t2)
+        if (_2_0 == null)
           throw A.wrapException(A.StateError$(string$.CssNod));
       }
       root = _this._trimIncluded$1(included);
       if (root === _this._assertInModule$2(_this.__parent, _s8_)) {
         _this._environment.scope$1$2$when(new A._EvaluateVisitor_visitAtRootRule_closure(_this, node), node.hasDeclarations, type$.Null);
-        return _null;
+        return null;
       }
       if (included.length >= 1) {
         first = included[0];
         rest = B.JSArray_methods.sublist$1(included, 1);
-        t1 = true;
-      } else {
-        rest = _null;
-        first = rest;
-        t1 = false;
-      }
-      if (t1) {
         innerCopy = first.copyWithoutChildren$0();
         for (t1 = rest.length, outerCopy = innerCopy, _i = 0; _i < rest.length; rest.length === t1 || (0, A.throwConcurrentModificationError)(rest), ++_i, outerCopy = copy) {
           copy = rest[_i].copyWithoutChildren$0();
@@ -70909,38 +72227,24 @@ self.util = _cliPkgRequires.util;
       } else
         innerCopy = root;
       _this._scopeForAtRoot$4(node, innerCopy, query, included).call$1(new A._EvaluateVisitor_visitAtRootRule_closure0(_this, node));
-      return _null;
+      return null;
     },
     _trimIncluded$1(nodes) {
-      var $parent, t1, innermostContiguous, i, t2, _0_0, grandparent, t3, _1_0, root, _this = this, _null = null, _s5_ = "_root",
+      var $parent, t1, innermostContiguous, i, t2, _0_0, _1_0, root, _this = this, _null = null, _s5_ = "_root",
         _s22_ = " to be an ancestor of ";
       if (nodes.length === 0)
         return _this._assertInModule$2(_this.__root, _s5_);
       $parent = _this._assertInModule$2(_this.__parent, "__parent");
-      for (t1 = nodes.length, innermostContiguous = _null, i = 0; i < t1; ++i, $parent = grandparent) {
-        for (; t2 = nodes[i], $parent !== t2; innermostContiguous = _null, $parent = grandparent) {
+      for (t1 = nodes.length, innermostContiguous = _null, i = 0; i < t1; ++i, $parent = _1_0) {
+        for (; t2 = nodes[i], $parent !== t2; innermostContiguous = _null, $parent = _0_0) {
           _0_0 = $parent._parent;
-          if (_0_0 != null) {
-            grandparent = _0_0;
-            t3 = true;
-          } else {
-            grandparent = _null;
-            t3 = false;
-          }
-          if (!t3)
+          if (_0_0 == null)
             throw A.wrapException(A.ArgumentError$("Expected " + t2.toString$0(0) + _s22_ + _this.toString$0(0) + ".", _null));
         }
         if (innermostContiguous == null)
           innermostContiguous = i;
         _1_0 = $parent._parent;
-        if (_1_0 != null) {
-          grandparent = _1_0;
-          t3 = true;
-        } else {
-          grandparent = _null;
-          t3 = false;
-        }
-        if (!t3)
+        if (_1_0 == null)
           throw A.wrapException(A.ArgumentError$("Expected " + t2.toString$0(0) + _s22_ + _this.toString$0(0) + ".", _null));
       }
       if ($parent !== _this._assertInModule$2(_this.__root, _s5_))
@@ -70979,54 +72283,46 @@ self.util = _cliPkgRequires.util;
       return null;
     },
     visitDeclaration$1(node) {
-      var t2, $name, _0_0, declarationName, t3, _1_0, expression, value, t4, t5, _2_0, oldDeclarationName, _this = this, _null = null, t1 = {};
+      var t2, _0_0, t3, $name, _1_0, _2_0, value, t4, t5, _3_0, oldDeclarationName, _this = this, _null = null,
+        _s8_ = "__parent",
+        t1 = {};
       if ((_this._atRootExcludingStyleRule ? _null : _this._styleRuleIgnoringAtRoot) == null && !_this._inUnknownAtRule && !_this._inKeyframes)
         throw A.wrapException(_this._evaluate$_exception$2(string$.Declarm, node.span));
       if (_this._declarationName != null && B.JSString_methods.startsWith$1(node.name.get$initialPlain(), "--"))
         throw A.wrapException(_this._evaluate$_exception$2(string$.Declarw, node.span));
+      t2 = _this._assertInModule$2(_this.__parent, _s8_)._parent.children;
+      _0_0 = t2.get$last(t2);
+      t2 = _this._assertInModule$2(_this.__parent, _s8_);
+      if (t2 !== _0_0) {
+        t2 = type$.SourceSpan;
+        t3 = type$.String;
+        _this._warn$3(string$.Sassx27s, new A.MultiSpan(node.span, "declaration", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([_0_0.get$span(_0_0), "nested rule"], t2, t3), t2, t3)), B.Deprecation_gf0);
+      }
       t2 = node.name;
       $name = _this._interpolationToValue$2$warnForColor(t2, true);
-      _0_0 = _this._declarationName;
-      if (_0_0 != null) {
-        declarationName = _0_0;
-        t3 = true;
-      } else {
-        declarationName = _null;
-        t3 = false;
-      }
-      if (t3)
-        $name = new A.CssValue(A.S(declarationName) + "-" + A.S($name.value), $name.span, type$.CssValue_String);
-      _1_0 = node.value;
-      if (_1_0 != null) {
-        expression = _1_0;
-        t3 = true;
-      } else {
-        expression = _null;
-        t3 = false;
-      }
-      if (t3) {
-        value = expression.accept$1(_this);
+      _1_0 = _this._declarationName;
+      if (_1_0 != null)
+        $name = new A.CssValue(_1_0 + "-" + A.S($name.value), $name.span, type$.CssValue_String);
+      _2_0 = node.value;
+      if (_2_0 != null) {
+        value = _2_0.accept$1(_this);
         if (!value.get$isBlank() || value.get$asList().length === 0) {
-          t3 = _this._assertInModule$2(_this.__parent, "__parent");
-          t4 = expression.get$span(expression);
+          t3 = _this._assertInModule$2(_this.__parent, _s8_);
+          t4 = _2_0.get$span(_2_0);
           t2 = B.JSString_methods.startsWith$1(t2.get$initialPlain(), "--");
           if (_this._sourceMap) {
-            t5 = A.NullableExtension_andThen(_1_0, _this.get$_expressionNode());
+            t5 = A.NullableExtension_andThen(_2_0, _this.get$_expressionNode());
             t5 = t5 == null ? _null : J.get$span$z(t5);
           } else
             t5 = _null;
           t3.addChild$1(A.ModifiableCssDeclaration$($name, new A.CssValue(value, t4, type$.CssValue_Value), node.span, t2, t5));
         } else if (J.startsWith$1$s($name.value, "--"))
-          throw A.wrapException(_this._evaluate$_exception$2("Custom property values may not be empty.", expression.get$span(expression)));
+          throw A.wrapException(_this._evaluate$_exception$2("Custom property values may not be empty.", _2_0.get$span(_2_0)));
       }
+      _3_0 = node.children;
       t1.children = null;
-      _2_0 = node.children;
-      if (_2_0 != null) {
-        t1.children = _2_0;
-        t2 = true;
-      } else
-        t2 = false;
-      if (t2) {
+      if (_3_0 != null) {
+        t1.children = _3_0;
         oldDeclarationName = _this._declarationName;
         _this._declarationName = $name.value;
         _this._environment.scope$1$2$when(new A._EvaluateVisitor_visitDeclaration_closure(t1, _this), node.hasDeclarations, type$.Null);
@@ -71035,7 +72331,7 @@ self.util = _cliPkgRequires.util;
       return _null;
     },
     visitEachRule$1(node) {
-      var t2, _this = this, _box_0 = {},
+      var _this = this, _box_0 = {},
         t1 = node.list,
         list = t1.accept$1(_this),
         nodeWithSpan = _this._expressionNode$1(t1),
@@ -71044,17 +72340,12 @@ self.util = _cliPkgRequires.util;
         _box_0.variable = null;
         if (_0_0.length === 1) {
           _box_0.variable = _0_0[0];
-          t1 = true;
-        } else
-          t1 = false;
-        if (t1) {
           t1 = new A._EvaluateVisitor_visitEachRule_closure(_box_0, _this, nodeWithSpan);
           break $label0$0;
         }
-        t1 = _box_0.variables = null;
+        _box_0.variables = null;
         _box_0.variables = _0_0;
-        t2 = new A._EvaluateVisitor_visitEachRule_closure0(_box_0, _this, nodeWithSpan);
-        t1 = t2;
+        t1 = new A._EvaluateVisitor_visitEachRule_closure0(_box_0, _this, nodeWithSpan);
         break $label0$0;
       }
       return _this._environment.scope$1$2$semiGlobal(new A._EvaluateVisitor_visitEachRule_closure1(_this, list, t1, node), true, type$.nullable_Value);
@@ -71085,10 +72376,10 @@ self.util = _cliPkgRequires.util;
         complex.accept$1(visitor);
         t6 = B.JSString_methods.trim$0(visitor._serialize$_buffer.toString$0(0));
         t7 = complex.accept$1(B.C__IsUselessVisitor) ? "can't" : "shouldn't";
-        _this._warn$3('The selector "' + t6 + '" is invalid CSS and ' + t7 + string$.x20be_an, new A.MultiSpan(A.SpanExtensions_trimRight(complex.span), "invalid selector", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([t3, "@extend rule"], t4, t5), t4, t5)), B.Deprecation_vrR);
+        _this._warn$3('The selector "' + t6 + '" is invalid CSS and ' + t7 + string$.x20be_an, new A.MultiSpan(A.SpanExtensions_trimRight(complex.span), "invalid selector", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([t3, "@extend rule"], t4, t5), t4, t5)), B.Deprecation_ido);
       }
       _0_0 = _this._performInterpolationWithMap$2$warnForColor(node.selector, true);
-      for (t1 = A.SelectorList_SelectorList$parse(A.trimAscii(_0_0._0, true), false, true, _0_0._1, _this._evaluate$_logger).components, t2 = t1.length, t3 = styleRule._style_rule$_selector._box$_inner, _i = 0; _i < t2; ++_i) {
+      for (t1 = A.SelectorList_SelectorList$parse(A.trimAscii(_0_0._0, true), false, _0_0._1, _this._evaluate$_logger, false).components, t2 = t1.length, t3 = styleRule._style_rule$_selector._box$_inner, _i = 0; _i < t2; ++_i) {
         complex = t1[_i];
         compound = complex.get$singleCompound();
         if (compound == null)
@@ -71182,12 +72473,12 @@ self.util = _cliPkgRequires.util;
           t4 = variable.name;
           oldValue = t1.get$isEmpty(t1) ? _null : t1.remove$1(0, t4);
           if (oldValue != null)
-            t5 = true;
+            t5 = !oldValue.value.$eq(0, B.C__SassNull);
           else {
             oldValue = _null;
             t5 = false;
           }
-          if (t5 && !oldValue.value.$eq(0, B.C__SassNull)) {
+          if (t5) {
             newValues.$indexSet(0, t4, oldValue);
             continue;
           }
@@ -71206,8 +72497,7 @@ self.util = _cliPkgRequires.util;
         t1 = _this.__root;
       if (t1 == null)
         return;
-      t1 = _this._assertInModule$2(t1, _s5_).children;
-      if (t1.get$length(t1) === 0 || !module.get$transitivelyContainsCss())
+      if (_this._assertInModule$2(t1, _s5_).children.get$length(0) === 0 || !module.get$transitivelyContainsCss())
         return;
       t1 = _this._preModuleComments;
       if (t1 == null)
@@ -71304,76 +72594,44 @@ self.util = _cliPkgRequires.util;
       return this._withStackFrame$3("@import", $import, new A._EvaluateVisitor__visitDynamicImport_closure(this, $import));
     },
     _loadStylesheet$4$baseUrl$forImport(url, span, baseUrl, forImport) {
-      var importCache, _0_0, importer, canonicalUrl, originalUrl, _1_0, isDependency, stylesheet, _2_0, result, _3_0, error, stackTrace, error0, stackTrace0, message, t1, t2, t3, t4, exception, message0, _this = this,
-        _s11_ = "_stylesheet";
+      var _0_0, importCache, _1_0, importer, canonicalUrl, originalUrl, isDependency, _2_0, stylesheet, error, stackTrace, error0, stackTrace0, message, t1, t2, t3, t4, exception, message0, _this = this;
       baseUrl = baseUrl;
       try {
         _this._importSpan = span;
-        importCache = null;
         _0_0 = _this._evaluate$_importCache;
+        importCache = null;
         if (_0_0 != null) {
           importCache = _0_0;
-          t1 = true;
-        } else
-          t1 = false;
-        if (t1) {
           if (baseUrl == null) {
-            t1 = _this._assertInModule$2(_this.__stylesheet, _s11_).span;
+            t1 = _this._assertInModule$2(_this.__stylesheet, "_stylesheet").span;
             baseUrl = t1.get$sourceUrl(t1);
           }
+          _1_0 = J.canonicalize$4$baseImporter$baseUrl$forImport$x(importCache, A.Uri_parse(url), _this._importer, baseUrl, forImport);
           importer = null;
           canonicalUrl = null;
           originalUrl = null;
-          _1_0 = J.canonicalize$4$baseImporter$baseUrl$forImport$x(importCache, A.Uri_parse(url), _this._importer, baseUrl, forImport);
           if (type$.Record_3_nullable_Object_and_nullable_Object_and_nullable_Object_originalUrl._is(_1_0)) {
             importer = _1_0._0;
             canonicalUrl = _1_0._1;
             originalUrl = _1_0._2;
-            t1 = true;
-          } else
-            t1 = false;
-          if (t1) {
             _this._loadedUrls.add$1(0, canonicalUrl);
             isDependency = _this._inDependency || !J.$eq$(importer, _this._importer);
-            stylesheet = null;
             t1 = importCache;
             t2 = importer;
             t3 = canonicalUrl;
             t4 = originalUrl;
             _2_0 = t1.importCanonical$4$originalUrl$quiet(t2, t3, t4, _this._quietDeps && isDependency);
+            stylesheet = null;
             if (_2_0 != null) {
               stylesheet = _2_0;
-              t1 = true;
-            } else
-              t1 = false;
-            if (t1) {
               t1 = stylesheet;
               t2 = importer;
               return new A._Record_3_importer_isDependency(t1, t2, isDependency);
             }
           }
-        } else {
-          result = null;
-          t1 = baseUrl;
-          if (t1 == null) {
-            t1 = _this._assertInModule$2(_this.__stylesheet, _s11_).span;
-            t1 = t1.get$sourceUrl(t1);
-          }
-          _3_0 = _this._importLikeNode$3(url, t1, forImport);
-          if (_3_0 != null) {
-            result = _3_0;
-            t1 = true;
-          } else
-            t1 = false;
-          if (t1) {
-            t1 = result._0.span;
-            t2 = _this._loadedUrls;
-            A.NullableExtension_andThen(t1.get$sourceUrl(t1), t2.get$add(t2));
-            t2 = result;
-            return t2;
-          }
         }
-        if (B.JSString_methods.startsWith$1(url, "package:") && true)
+        t1 = B.JSString_methods.startsWith$1(url, "package:");
+        if (t1)
           throw A.wrapException(string$.x22packa);
         else
           throw A.wrapException("Can't find stylesheet to import.");
@@ -71407,22 +72665,11 @@ self.util = _cliPkgRequires.util;
     _loadStylesheet$3$forImport(url, span, forImport) {
       return this._loadStylesheet$4$baseUrl$forImport(url, span, null, forImport);
     },
-    _importLikeNode$3(originalUrl, previous, forImport) {
-      var t1, t2, _this = this,
-        result = _this._nodeImporter.loadRelative$3(originalUrl, previous, forImport),
-        isDependency = _this._inDependency,
-        url = result._1;
-      url = url;
-      t1 = J.startsWith$1$s(url, "file") ? A.Syntax_forPath(url) : B.Syntax_SCSS_scss;
-      t2 = _this._quietDeps && isDependency ? $.$get$Logger_quiet() : _this._evaluate$_logger;
-      return new A._Record_3_importer_isDependency(A.Stylesheet_Stylesheet$parse(result._0, t1, t2, url), null, isDependency);
-    },
     _applyMixin$5(mixin, contentCallable, $arguments, nodeWithSpan, nodeWithSpanWithoutContent) {
-      var _1_8, t1, _0_0, _this = this,
+      var t1, _0_0, _1_8, t2, _this = this,
         _s37_ = "Mixin doesn't accept a content block.",
         _s10_ = "invocation";
       $label0$0: {
-        _1_8 = A._InitializedCell$(new A._EvaluateVisitor__applyMixin_closure(mixin));
         if (mixin == null)
           throw A.wrapException(_this._evaluate$_exception$2("Undefined mixin.", nodeWithSpan.get$span(nodeWithSpan)));
         t1 = mixin instanceof A.BuiltInCallable;
@@ -71432,22 +72679,33 @@ self.util = _cliPkgRequires.util;
           throw A.wrapException(A.MultiSpanSassRuntimeException$(_s37_, nodeWithSpanWithoutContent.get$span(nodeWithSpanWithoutContent), _s10_, A.LinkedHashMap_LinkedHashMap$_literal([_0_0._0.get$spanWithName(), "declaration"], type$.FileSpan, type$.String), _this._evaluate$_stackTrace$1(nodeWithSpanWithoutContent.get$span(nodeWithSpanWithoutContent)), null));
         }
         if (t1) {
-          _this._environment.withContent$2(contentCallable, new A._EvaluateVisitor__applyMixin_closure0(_this, $arguments, mixin, nodeWithSpanWithoutContent));
+          _this._environment.withContent$2(contentCallable, new A._EvaluateVisitor__applyMixin_closure(_this, $arguments, mixin, nodeWithSpanWithoutContent));
           break $label0$0;
         }
         t1 = type$.UserDefinedCallable_Environment._is(mixin);
-        if (t1 && _1_8._readFinal$0() instanceof A.MixinRule && !_1_8._readFinal$0().get$hasContent() && contentCallable != null)
+        if (t1) {
+          _1_8 = mixin.declaration;
+          if (_1_8 instanceof A.MixinRule)
+            t2 = !type$.MixinRule._as(_1_8).get$hasContent() && contentCallable != null;
+          else
+            t2 = false;
+        } else
+          t2 = false;
+        if (t2)
           throw A.wrapException(A.MultiSpanSassRuntimeException$(_s37_, nodeWithSpanWithoutContent.get$span(nodeWithSpanWithoutContent), _s10_, A.LinkedHashMap_LinkedHashMap$_literal([mixin.declaration.$arguments.get$spanWithName(), "declaration"], type$.FileSpan, type$.String), _this._evaluate$_stackTrace$1(nodeWithSpanWithoutContent.get$span(nodeWithSpanWithoutContent)), null));
         if (t1) {
-          _this._runUserDefinedCallable$1$4($arguments, mixin, nodeWithSpanWithoutContent, new A._EvaluateVisitor__applyMixin_closure1(_this, contentCallable, mixin, nodeWithSpanWithoutContent), type$.Null);
+          _this._runUserDefinedCallable$1$4($arguments, mixin, nodeWithSpanWithoutContent, new A._EvaluateVisitor__applyMixin_closure0(_this, contentCallable, mixin, nodeWithSpanWithoutContent), type$.Null);
           break $label0$0;
         }
         throw A.wrapException(A.UnsupportedError$("Unknown callable type " + mixin.toString$0(0) + "."));
       }
     },
     visitIncludeRule$1(node) {
-      var _this = this;
-      _this._applyMixin$5(_this._addExceptionSpan$2(node, new A._EvaluateVisitor_visitIncludeRule_closure(_this, node)), A.NullableExtension_andThen(node.content, new A._EvaluateVisitor_visitIncludeRule_closure0(_this)), node.$arguments, node, new A._FakeAstNode(new A._EvaluateVisitor_visitIncludeRule_closure1(node)));
+      var _this = this,
+        mixin = _this._addExceptionSpan$2(node, new A._EvaluateVisitor_visitIncludeRule_closure(_this, node));
+      if (B.JSString_methods.startsWith$1(node.originalName, "--") && mixin instanceof A.UserDefinedCallable && !B.JSString_methods.startsWith$1(mixin.declaration.originalName, "--"))
+        _this._warn$3(string$.Sassx20_m, node.get$nameSpan(), B.Deprecation_HJ0);
+      _this._applyMixin$5(mixin, A.NullableExtension_andThen(node.content, new A._EvaluateVisitor_visitIncludeRule_closure0(_this)), node.$arguments, node, new A._FakeAstNode(new A._EvaluateVisitor_visitIncludeRule_closure1(node)));
       return null;
     },
     visitMixinRule$1(node) {
@@ -71500,26 +72758,23 @@ self.util = _cliPkgRequires.util;
       return null;
     },
     _mergeMediaQueries$2(queries1, queries2) {
-      var t1, t2, t3, t4, _0_0, result, t5,
+      var t1, t2, t3, t4, _0_0, t5, result,
         queries = A._setArrayType([], type$.JSArray_CssMediaQuery);
       for (t1 = J.get$iterator$ax(queries1), t2 = J.getInterceptor$ax(queries2); t1.moveNext$0();) {
         t3 = t1.get$current(t1);
-        for (t4 = t2.get$iterator(queries2); t4.moveNext$0();) {
-          _0_0 = t3.merge$1(t4.get$current(t4));
-          if (B._SingletonCssMediaQueryMergeResult_0 === _0_0)
-            continue;
-          if (B._SingletonCssMediaQueryMergeResult_1 === _0_0)
-            return null;
-          if (_0_0 instanceof A.MediaQuerySuccessfulMergeResult) {
-            result = _0_0;
-            t5 = true;
-          } else {
-            result = null;
-            t5 = false;
+        for (t4 = t2.get$iterator(queries2); t4.moveNext$0();)
+          $label0$1: {
+            _0_0 = t3.merge$1(t4.get$current(t4));
+            if (B._SingletonCssMediaQueryMergeResult_0 === _0_0)
+              continue;
+            if (B._SingletonCssMediaQueryMergeResult_1 === _0_0)
+              return null;
+            t5 = _0_0 instanceof A.MediaQuerySuccessfulMergeResult;
+            result = t5 ? _0_0 : null;
+            if (t5)
+              queries.push(result.query);
+            break $label0$1;
           }
-          if (t5)
-            queries.push(result.query);
-        }
       }
       return queries;
     },
@@ -71531,11 +72786,13 @@ self.util = _cliPkgRequires.util;
       return null;
     },
     visitStyleRule$1(node) {
-      var t1, _0_0, selectorText, selectorMap, t2, parsedSelector, rule, oldAtRootExcludingStyleRule, t3, t4, t5, _i, complex, visitor, t6, t7, t8, t9, _this = this, _null = null,
-        _s11_ = "_stylesheet",
-        _s8_ = "__parent";
+      var t1, _0_0, selectorText, selectorMap, parsedSelector, nest, t2, _i, _1_0, first, t3, rule, oldAtRootExcludingStyleRule, _this = this, _null = null,
+        _s8_ = "__parent",
+        _s11_ = "_stylesheet";
       if (_this._declarationName != null)
-        throw A.wrapException(_this._evaluate$_exception$2(string$.Style_, node.span));
+        throw A.wrapException(_this._evaluate$_exception$2(string$.Style_n, node.span));
+      else if (_this._inKeyframes && _this._assertInModule$2(_this.__parent, _s8_) instanceof A.ModifiableCssKeyframeBlock)
+        throw A.wrapException(_this._evaluate$_exception$2(string$.Style_k, node.span));
       t1 = node.selector;
       _0_0 = _this._performInterpolationWithMap$2$warnForColor(t1, true);
       selectorText = _0_0._0;
@@ -71544,50 +72801,75 @@ self.util = _cliPkgRequires.util;
         _this._withParent$2$4$scopeWhen$through(A.ModifiableCssKeyframeBlock$(new A.CssValue(A.List_List$unmodifiable(A.KeyframeSelectorParser$(selectorText, selectorMap, _this._evaluate$_logger).parse$0(), type$.String), t1.span, type$.CssValue_List_String), node.span), new A._EvaluateVisitor_visitStyleRule_closure(_this, node), node.hasDeclarations, new A._EvaluateVisitor_visitStyleRule_closure0(), type$.ModifiableCssKeyframeBlock, type$.Null);
         return _null;
       }
-      t1 = A.SelectorList_SelectorList$parse(selectorText, !_this._assertInModule$2(_this.__stylesheet, _s11_).plainCss, !_this._assertInModule$2(_this.__stylesheet, _s11_).plainCss, selectorMap, _this._evaluate$_logger);
-      t2 = _this._styleRuleIgnoringAtRoot;
-      t2 = t2 == null ? _null : t2.originalSelector;
-      parsedSelector = t1.resolveParentSelectors$2$implicitParent(t2, !_this._atRootExcludingStyleRule);
-      rule = A.ModifiableCssStyleRule$(_this._assertInModule$2(_this.__extensionStore, "_extensionStore").addSelector$2(parsedSelector, _this._mediaQueries), node.span, parsedSelector);
+      parsedSelector = A.SelectorList_SelectorList$parse(selectorText, true, selectorMap, _this._evaluate$_logger, _this._assertInModule$2(_this.__stylesheet, _s11_).plainCss);
+      t1 = _this._atRootExcludingStyleRule ? _null : _this._styleRuleIgnoringAtRoot;
+      t1 = t1 == null ? _null : t1.fromPlainCss;
+      nest = t1 !== true;
+      if (nest) {
+        if (_this._assertInModule$2(_this.__stylesheet, _s11_).plainCss)
+          for (t1 = parsedSelector.components, t2 = t1.length, _i = 0; _i < t2; ++_i) {
+            _1_0 = t1[_i].leadingCombinators;
+            if (_1_0.length >= 1) {
+              first = _1_0[0];
+              t3 = _this._assertInModule$2(_this.__stylesheet, _s11_);
+              t3 = t3.plainCss;
+            } else {
+              first = _null;
+              t3 = false;
+            }
+            if (t3)
+              throw A.wrapException(_this._evaluate$_exception$2(string$.Top_lel, first.span));
+          }
+        t1 = _this._styleRuleIgnoringAtRoot;
+        t1 = t1 == null ? _null : t1.originalSelector;
+        parsedSelector = parsedSelector.nestWithin$3$implicitParent$preserveParentSelectors(t1, !_this._atRootExcludingStyleRule, _this._assertInModule$2(_this.__stylesheet, _s11_).plainCss);
+      }
+      rule = A.ModifiableCssStyleRule$(_this._assertInModule$2(_this.__extensionStore, "_extensionStore").addSelector$2(parsedSelector, _this._mediaQueries), node.span, _this._assertInModule$2(_this.__stylesheet, _s11_).plainCss, parsedSelector);
       oldAtRootExcludingStyleRule = _this._atRootExcludingStyleRule;
-      _this._atRootExcludingStyleRule = false;
-      _this._withParent$2$4$scopeWhen$through(rule, new A._EvaluateVisitor_visitStyleRule_closure1(_this, rule, node), node.hasDeclarations, new A._EvaluateVisitor_visitStyleRule_closure2(), type$.ModifiableCssStyleRule, type$.Null);
+      t1 = _this._atRootExcludingStyleRule = false;
+      t2 = nest ? new A._EvaluateVisitor_visitStyleRule_closure1() : _null;
+      _this._withParent$2$4$scopeWhen$through(rule, new A._EvaluateVisitor_visitStyleRule_closure2(_this, rule, node), node.hasDeclarations, t2, type$.ModifiableCssStyleRule, type$.Null);
       _this._atRootExcludingStyleRule = oldAtRootExcludingStyleRule;
+      _this._warnForBogusCombinators$1(rule);
+      if ((_this._atRootExcludingStyleRule ? _null : _this._styleRuleIgnoringAtRoot) == null) {
+        t1 = _this._assertInModule$2(_this.__parent, _s8_).children;
+        t1 = !t1.get$isEmpty(t1);
+      }
+      if (t1) {
+        t1 = _this._assertInModule$2(_this.__parent, _s8_).children;
+        t1.get$last(t1).isGroupEnd = true;
+      }
+      return _null;
+    },
+    _warnForBogusCombinators$1(rule) {
+      var t1, t2, t3, t4, t5, _i, complex, visitor, t6, t7, t8, t9, _this = this, _null = null;
       if (!rule.accept$1(B._IsInvisibleVisitor_false_false))
-        for (t1 = parsedSelector.components, t2 = t1.length, t3 = type$.SourceSpan, t4 = type$.String, t5 = rule.children, _i = 0; _i < t2; ++_i) {
+        for (t1 = rule._style_rule$_selector._box$_inner.value.components, t2 = t1.length, t3 = type$.SourceSpan, t4 = type$.String, t5 = rule.children, _i = 0; _i < t2; ++_i) {
           complex = t1[_i];
           if (!complex.accept$1(B._IsBogusVisitor_true))
             continue;
           if (complex.accept$1(B.C__IsUselessVisitor)) {
             visitor = A._SerializeVisitor$(_null, true, _null, true, false, _null, true);
             complex.accept$1(visitor);
-            _this._warn$3('The selector "' + B.JSString_methods.trim$0(visitor._serialize$_buffer.toString$0(0)) + string$.x22x20is_ix20, A.SpanExtensions_trimRight(complex.span), B.Deprecation_vrR);
+            _this._warn$3('The selector "' + B.JSString_methods.trim$0(visitor._serialize$_buffer.toString$0(0)) + string$.x22x20is_ix20, A.SpanExtensions_trimRight(complex.span), B.Deprecation_ido);
           } else if (complex.leadingCombinators.length !== 0) {
-            visitor = A._SerializeVisitor$(_null, true, _null, true, false, _null, true);
-            complex.accept$1(visitor);
-            _this._warn$3('The selector "' + B.JSString_methods.trim$0(visitor._serialize$_buffer.toString$0(0)) + string$.x22x20is_ix0a, A.SpanExtensions_trimRight(complex.span), B.Deprecation_vrR);
+            if (!_this._assertInModule$2(_this.__stylesheet, "_stylesheet").plainCss) {
+              visitor = A._SerializeVisitor$(_null, true, _null, true, false, _null, true);
+              complex.accept$1(visitor);
+              _this._warn$3('The selector "' + B.JSString_methods.trim$0(visitor._serialize$_buffer.toString$0(0)) + string$.x22x20is_ix0a, A.SpanExtensions_trimRight(complex.span), B.Deprecation_ido);
+            }
           } else {
             visitor = A._SerializeVisitor$(_null, true, _null, true, false, _null, true);
             complex.accept$1(visitor);
             t6 = B.JSString_methods.trim$0(visitor._serialize$_buffer.toString$0(0));
             t7 = complex.accept$1(B._IsBogusVisitor_false) ? string$.x20It_wi : "";
             t8 = A.SpanExtensions_trimRight(complex.span);
-            if (t5.get$length(t5) === 0)
+            if (t5.get$length(0) === 0)
               A.throwExpression(A.IterableElementError_noElement());
             t9 = J.get$span$z(t5.$index(0, 0));
-            _this._warn$3('The selector "' + t6 + string$.x22x20is_o + t7 + string$.x0aThis_, new A.MultiSpan(t8, "invalid selector", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([t9, "this is not a style rule" + (t5.every$1(t5, new A._EvaluateVisitor_visitStyleRule_closure3()) ? "\n(try converting to a //-style comment)" : "")], t3, t4), t3, t4)), B.Deprecation_vrR);
+            _this._warn$3('The selector "' + t6 + string$.x22x20is_o + t7 + string$.x0aThis_, new A.MultiSpan(t8, "invalid selector", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([t9, "this is not a style rule" + (t5.every$1(t5, new A._EvaluateVisitor__warnForBogusCombinators_closure()) ? "\n(try converting to a //-style comment)" : "")], t3, t4), t3, t4)), B.Deprecation_ido);
           }
         }
-      if ((_this._atRootExcludingStyleRule ? _null : _this._styleRuleIgnoringAtRoot) == null) {
-        t1 = _this._assertInModule$2(_this.__parent, _s8_).children;
-        t1 = !t1.get$isEmpty(t1);
-      } else
-        t1 = false;
-      if (t1) {
-        t1 = _this._assertInModule$2(_this.__parent, _s8_).children;
-        t1.get$last(t1).isGroupEnd = true;
-      }
-      return _null;
     },
     visitSupportsRule$1(node) {
       var t1, _this = this;
@@ -71598,78 +72880,37 @@ self.util = _cliPkgRequires.util;
       return null;
     },
     _visitSupportsCondition$1(condition) {
-      var operation, t1, t2, negation, interpolation, $function, anything, _this = this, _null = null, _box_0 = {};
+      var t1, _this = this, _box_0 = {};
       $label0$0: {
         if (condition instanceof A.SupportsOperation) {
-          operation = condition;
-          t1 = true;
-        } else {
-          operation = _null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = operation.left;
-          t2 = operation.operator;
-          t2 = _this._parenthesize$2(t1, t2) + " " + t2 + " " + _this._parenthesize$2(operation.right, t2);
-          t1 = t2;
+          t1 = condition.operator;
+          t1 = _this._parenthesize$2(condition.left, t1) + " " + t1 + " " + _this._parenthesize$2(condition.right, t1);
           break $label0$0;
         }
         if (condition instanceof A.SupportsNegation) {
-          negation = condition;
-          t1 = true;
-        } else {
-          negation = _null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = "not " + _this._parenthesize$1(negation.condition);
+          t1 = "not " + _this._parenthesize$1(condition.condition);
           break $label0$0;
         }
         if (condition instanceof A.SupportsInterpolation) {
-          interpolation = condition;
-          t1 = true;
-        } else {
-          interpolation = _null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = interpolation.expression;
+          t1 = condition.expression;
           t1 = _this._evaluate$_serialize$3$quote(t1.accept$1(_this), t1, false);
           break $label0$0;
         }
         _box_0.declaration = null;
         if (condition instanceof A.SupportsDeclaration) {
           _box_0.declaration = condition;
-          t1 = true;
-        } else
-          t1 = false;
-        if (t1) {
           t1 = _this._withSupportsDeclaration$1(new A._EvaluateVisitor__visitSupportsCondition_closure(_box_0, _this));
           break $label0$0;
         }
         if (condition instanceof A.SupportsFunction) {
-          $function = condition;
-          t1 = true;
-        } else {
-          $function = _null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = _this._performInterpolation$1($function.name) + "(" + _this._performInterpolation$1($function.$arguments) + ")";
+          t1 = _this._performInterpolation$1(condition.name) + "(" + _this._performInterpolation$1(condition.$arguments) + ")";
           break $label0$0;
         }
         if (condition instanceof A.SupportsAnything) {
-          anything = condition;
-          t1 = true;
-        } else {
-          anything = _null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = "(" + _this._performInterpolation$1(anything.contents) + ")";
+          t1 = "(" + _this._performInterpolation$1(condition.contents) + ")";
           break $label0$0;
         }
-        t1 = A.throwExpression(A.ArgumentError$("Unknown supports condition type " + A.getRuntimeTypeOfDartObject(condition).toString$0(0) + ".", _null));
+        t1 = A.throwExpression(A.ArgumentError$("Unknown supports condition type " + A.getRuntimeTypeOfDartObject(condition).toString$0(0) + ".", null));
       }
       return t1;
     },
@@ -71704,21 +72945,18 @@ self.util = _cliPkgRequires.util;
       return this._parenthesize$2(condition, null);
     },
     visitVariableDeclaration$1(node) {
-      var t2, t3, value, _this = this, _null = null, t1 = {};
+      var t2, value, _this = this, _null = null, t1 = {};
       if (node.isGuarded) {
         if (node.namespace == null && _this._environment._variables.length === 1) {
-          t1.override = null;
           t2 = _this._configuration._configuration$_values;
           t2 = t2.get$isEmpty(t2) ? _null : t2.remove$1(0, node.name);
+          t1.override = null;
           if (t2 != null) {
             t1.override = t2;
-            t3 = t2;
-            t2 = true;
-          } else {
-            t3 = _null;
+            t2 = !t2.value.$eq(0, B.C__SassNull);
+          } else
             t2 = false;
-          }
-          if (t2 && !t3.value.$eq(0, B.C__SassNull)) {
+          if (t2) {
             _this._addExceptionSpan$2(node, new A._EvaluateVisitor_visitVariableDeclaration_closure(t1, _this, node));
             return _null;
           }
@@ -71729,7 +72967,7 @@ self.util = _cliPkgRequires.util;
       }
       if (node.isGlobal && !_this._environment.globalVariableExists$1(node.name)) {
         t1 = _this._environment._variables.length === 1 ? string$.As_of_S : string$.As_of_R + A.declarationName(node.span) + ": null` at the stylesheet root.";
-        _this._warn$3(t1, node.span, B.Deprecation_hzy);
+        _this._warn$3(t1, node.span, B.Deprecation_2nU);
       }
       t1 = node.expression;
       _this._addExceptionSpan$2(node, new A._EvaluateVisitor_visitVariableDeclaration_closure1(_this, node, _this._withoutSlash$2(t1.accept$1(_this), t1)));
@@ -71768,7 +73006,7 @@ self.util = _cliPkgRequires.util;
       var t1, _this = this;
       if (_this._assertInModule$2(_this.__stylesheet, "_stylesheet").plainCss) {
         t1 = node.operator;
-        t1 = t1 !== B.BinaryOperator_2jN && t1 !== B.BinaryOperator_t8B;
+        t1 = t1 !== B.BinaryOperator_wdM && t1 !== B.BinaryOperator_U77;
       } else
         t1 = false;
       if (t1)
@@ -71776,43 +73014,48 @@ self.util = _cliPkgRequires.util;
       return _this._addExceptionSpan$2(node, new A._EvaluateVisitor_visitBinaryOperationExpression_closure(_this, node));
     },
     _slash$3(left, right, node) {
-      var t1, _null = null,
+      var t1, right0, _1_2, _1_1, _null = null,
         result = left.dividedBy$1(right),
-        _1_0 = new A._Record_2(left, right),
-        _1_1 = A._InitializedCell$(new A._EvaluateVisitor__slash_closure(_1_0)),
-        _1_2 = A._InitializedCell$(new A._EvaluateVisitor__slash_closure0(_1_0));
-      if (_1_1._readFinal$0() instanceof A.SassNumber) {
-        left = _1_1._readFinal$0();
-        if (_1_2._readFinal$0() instanceof A.SassNumber) {
-          right = _1_2._readFinal$0();
+        _1_2_isSet = left instanceof A.SassNumber;
+      if (_1_2_isSet) {
+        t1 = type$.SassNumber;
+        t1._as(left);
+        if (right instanceof A.SassNumber) {
+          t1._as(right);
           t1 = node.allowsSlash && this._operandAllowsSlash$1(node.left) && this._operandAllowsSlash$1(node.right);
+          right0 = right;
+          _1_2 = right0;
         } else {
-          right = _null;
+          right0 = _null;
+          _1_2 = right;
           t1 = false;
         }
+        _1_1 = left;
       } else {
-        right = _null;
-        left = right;
+        right0 = _null;
+        _1_2 = right0;
+        _1_1 = left;
+        left = _1_2;
         t1 = false;
       }
       if (t1)
-        return type$.SassNumber._as(result).withSlash$2(left, right);
-      if (_1_1._readFinal$0() instanceof A.SassNumber && _1_2._readFinal$0() instanceof A.SassNumber) {
-        this._warn$3(string$.Using__o + A.S(new A._EvaluateVisitor__slash_recommendation().call$1(node)) + " or " + A.expressionToCalc(node).toString$0(0) + string$.x0a_Morex20, node.get$span(node), B.Deprecation_xHK);
+        return type$.SassNumber._as(result).withSlash$2(left, right0);
+      if (_1_1 instanceof A.SassNumber)
+        t1 = (_1_2_isSet ? _1_2 : right) instanceof A.SassNumber;
+      else
+        t1 = false;
+      if (t1) {
+        this._warn$3(string$.Using__o + A.S(new A._EvaluateVisitor__slash_recommendation().call$1(node)) + " or " + A.expressionToCalc(node).toString$0(0) + string$.x0a_Morex20, node.get$span(0), B.Deprecation_oJv);
         return result;
       }
       return result;
     },
     _operandAllowsSlash$1(node) {
-      var t1, t2;
+      var t1;
       if (node instanceof A.FunctionExpression)
         if (node.namespace == null) {
-          t1 = node.originalName;
-          if (B.Set_WfnXb.contains$1(0, A.stringReplaceAllUnchecked(t1, "_", "-").toLowerCase())) {
-            t2 = this._environment;
-            t1 = t2.getFunction$1(A.stringReplaceAllUnchecked(t1, "_", "-")) == null;
-          } else
-            t1 = false;
+          t1 = node.name;
+          t1 = B.Set_yHF81.contains$1(0, t1.toLowerCase()) && this._environment.getFunction$1(t1) == null;
         } else
           t1 = false;
       else
@@ -71912,8 +73155,8 @@ self.util = _cliPkgRequires.util;
       if ($function == null) {
         if (node.namespace != null)
           throw A.wrapException(_this._evaluate$_exception$2("Undefined function.", node.span));
-        t2 = node.originalName;
-        _0_0 = A.stringReplaceAllUnchecked(t2, "_", "-").toLowerCase();
+        t2 = node.name;
+        _0_0 = t2.toLowerCase();
         if ("min" === _0_0 || "max" === _0_0 || "round" === _0_0 || "abs" === _0_0) {
           t3 = node.$arguments;
           t4 = t3.named;
@@ -71924,14 +73167,12 @@ self.util = _cliPkgRequires.util;
           return _this._visitCalculation$2$inLegacySassFunction(node, true);
         if ("calc" === _0_0 || "clamp" === _0_0 || "hypot" === _0_0 || "sin" === _0_0 || "cos" === _0_0 || "tan" === _0_0 || "asin" === _0_0 || "acos" === _0_0 || "atan" === _0_0 || "sqrt" === _0_0 || "exp" === _0_0 || "sign" === _0_0 || "mod" === _0_0 || "rem" === _0_0 || "atan2" === _0_0 || "pow" === _0_0 || "log" === _0_0)
           return _this._visitCalculation$1(node);
-        if (_this._assertInModule$2(_this.__stylesheet, _s11_).plainCss)
-          $function = null;
-        else {
-          t3 = _this._builtInFunctions.$index(0, A.stringReplaceAllUnchecked(t2, "_", "-"));
-          $function = t3;
-        }
-        t1.$function = $function == null ? new A.PlainCssCallable(t2) : $function;
-      }
+        $function = _this._assertInModule$2(_this.__stylesheet, _s11_).plainCss ? null : _this._builtInFunctions.$index(0, t2);
+        t2 = t1.$function = $function == null ? new A.PlainCssCallable(node.originalName) : $function;
+      } else
+        t2 = $function;
+      if (B.JSString_methods.startsWith$1(node.originalName, "--") && t2 instanceof A.UserDefinedCallable && !B.JSString_methods.startsWith$1(t2.declaration.originalName, "--"))
+        _this._warn$3(string$.Sassx20_ff, node.get$nameSpan(), B.Deprecation_HJ0);
       oldInFunction = _this._inFunction;
       _this._inFunction = true;
       result = _this._addErrorSpan$2(node, new A._EvaluateVisitor_visitFunctionExpression_closure1(t1, _this, node));
@@ -71952,12 +73193,13 @@ self.util = _cliPkgRequires.util;
         t3.push(_this._visitCalculationExpression$2$inLegacySassFunction(t2[_i], inLegacySassFunction));
       $arguments = t3;
       if (_this._inSupportsDeclaration)
-        return new A.SassCalculation(A.stringReplaceAllUnchecked(node.originalName, "_", "-"), A.List_List$unmodifiable($arguments, type$.Object));
+        return new A.SassCalculation(node.name, A.List_List$unmodifiable($arguments, type$.Object));
       oldCallableNode = _this._callableNode;
       _this._callableNode = node;
       try {
         t1 = null;
-        _0_0 = A.stringReplaceAllUnchecked(node.originalName, "_", "-").toLowerCase();
+        t3 = node.name;
+        _0_0 = t3.toLowerCase();
         $label0$0: {
           if ("calc" === _0_0) {
             t1 = A.SassCalculation_calc(J.$index$asx($arguments, 0));
@@ -72043,7 +73285,7 @@ self.util = _cliPkgRequires.util;
             t1 = A.SassCalculation_clamp(J.$index$asx($arguments, 0), A.ListExtensions_elementAtOrNull($arguments, 1), A.ListExtensions_elementAtOrNull($arguments, 2));
             break $label0$0;
           }
-          t3 = A.UnsupportedError$('Unknown calculation name "' + node.get$name(node) + '".');
+          t3 = A.UnsupportedError$('Unknown calculation name "' + t3 + '".');
           t1 = A.throwExpression(t3);
         }
         t1 = t1;
@@ -72066,10 +73308,11 @@ self.util = _cliPkgRequires.util;
       return this._visitCalculation$2$inLegacySassFunction(node, false);
     },
     _checkCalculationArguments$1(node) {
-      var _0_0,
+      var t1, _0_0,
         check = new A._EvaluateVisitor__checkCalculationArguments_check(this, node);
       $label0$0: {
-        _0_0 = A.stringReplaceAllUnchecked(node.originalName, "_", "-").toLowerCase();
+        t1 = node.name;
+        _0_0 = t1.toLowerCase();
         if ("calc" === _0_0 || "sqrt" === _0_0 || "sin" === _0_0 || "cos" === _0_0 || "tan" === _0_0 || "asin" === _0_0 || "acos" === _0_0 || "atan" === _0_0 || "abs" === _0_0 || "exp" === _0_0 || "sign" === _0_0) {
           check.call$1(1);
           break $label0$0;
@@ -72086,7 +73329,7 @@ self.util = _cliPkgRequires.util;
           check.call$1(3);
           break $label0$0;
         }
-        throw A.wrapException(A.UnsupportedError$('Unknown calculation name "' + node.get$name(node) + '".'));
+        throw A.wrapException(A.UnsupportedError$('Unknown calculation name "' + t1 + '".'));
       }
     },
     _verifyCompatibleNumbers$2(args, nodesWithSpans) {
@@ -72118,14 +73361,9 @@ self.util = _cliPkgRequires.util;
       }
     },
     _visitCalculationExpression$2$inLegacySassFunction(node, inLegacySassFunction) {
-      var inner, t1, result, t2, _0_0, _1_0, t3, _i, i, _this = this, _null = null, _box_0 = {};
-      if (node instanceof A.ParenthesizedExpression) {
-        inner = node.expression;
-        t1 = true;
-      } else {
-        inner = _null;
-        t1 = false;
-      }
+      var result, t2, _0_0, _1_0, t3, _i, i, _this = this, _null = null, _box_0 = {},
+        t1 = node instanceof A.ParenthesizedExpression,
+        inner = t1 ? node.expression : _null;
       if (t1) {
         result = _this._visitCalculationExpression$2$inLegacySassFunction(inner, inLegacySassFunction);
         return result instanceof A.SassString ? new A.SassString("(" + result._string$_text + ")", false) : result;
@@ -72161,13 +73399,12 @@ self.util = _cliPkgRequires.util;
         return t1;
       }
       _box_0.right = _box_0.left = _box_0.operator = null;
-      if (node instanceof A.BinaryOperationExpression) {
+      t1 = node instanceof A.BinaryOperationExpression;
+      if (t1) {
         _box_0.operator = node.operator;
         _box_0.left = node.left;
         _box_0.right = node.right;
-        t1 = true;
-      } else
-        t1 = false;
+      }
       if (t1) {
         _this._checkWhitespaceAroundCalculationOperator$1(node);
         return _this._addExceptionSpan$2(node, new A._EvaluateVisitor__visitCalculationExpression_closure(_box_0, _this, node, inLegacySassFunction));
@@ -72176,25 +73413,11 @@ self.util = _cliPkgRequires.util;
         _1_0 = node.accept$1(_this);
         $label1$1: {
           if (_1_0 instanceof A.SassNumber) {
-            result = _1_0;
-            t1 = true;
-          } else {
-            result = _null;
-            t1 = false;
-          }
-          if (t1) {
-            t1 = result;
+            t1 = _1_0;
             break $label1$1;
           }
           if (_1_0 instanceof A.SassCalculation) {
-            result = _1_0;
-            t1 = true;
-          } else {
-            result = _null;
-            t1 = false;
-          }
-          if (t1) {
-            t1 = result;
+            t1 = _1_0;
             break $label1$1;
           }
           if (_1_0 instanceof A.SassString) {
@@ -72212,7 +73435,7 @@ self.util = _cliPkgRequires.util;
         }
         return t1;
       }
-      if (node instanceof A.ListExpression && !node.hasBrackets && B.ListSeparator_EVt === node.separator && node.contents.length >= 2) {
+      if (node instanceof A.ListExpression && !node.hasBrackets && B.ListSeparator_nbm === node.separator && node.contents.length >= 2) {
         t1 = A._setArrayType([], type$.JSArray_Object);
         for (t2 = node.contents, t3 = t2.length, _i = 0; _i < t3; ++_i)
           t1.push(_this._visitCalculationExpression$2$inLegacySassFunction(t2[_i], inLegacySassFunction));
@@ -72229,7 +73452,7 @@ self.util = _cliPkgRequires.util;
     _checkWhitespaceAroundCalculationOperator$1(node) {
       var t2, t3, t4, textBetweenOperands, first, last,
         t1 = node.operator;
-      if (t1 !== B.BinaryOperator_anB && t1 !== B.BinaryOperator_olz)
+      if (t1 !== B.BinaryOperator_u15 && t1 !== B.BinaryOperator_SjO)
         return;
       t1 = node.left;
       t2 = t1.get$span(t1);
@@ -72261,20 +73484,20 @@ self.util = _cliPkgRequires.util;
     _binaryOperatorToCalculationOperator$2(operator, node) {
       var t1;
       $label0$0: {
-        if (B.BinaryOperator_anB === operator) {
-          t1 = B.CalculationOperator_IyK;
+        if (B.BinaryOperator_u15 === operator) {
+          t1 = B.CalculationOperator_g2q;
           break $label0$0;
         }
-        if (B.BinaryOperator_olz === operator) {
-          t1 = B.CalculationOperator_2bx;
+        if (B.BinaryOperator_SjO === operator) {
+          t1 = B.CalculationOperator_CxF;
           break $label0$0;
         }
-        if (B.BinaryOperator_qN2 === operator) {
-          t1 = B.CalculationOperator_jFr;
+        if (B.BinaryOperator_2No === operator) {
+          t1 = B.CalculationOperator_171;
           break $label0$0;
         }
-        if (B.BinaryOperator_t8B === operator) {
-          t1 = B.CalculationOperator_OvN;
+        if (B.BinaryOperator_U77 === operator) {
+          t1 = B.CalculationOperator_Qf1;
           break $label0$0;
         }
         t1 = A.throwExpression(this._evaluate$_exception$2(string$.This_o, node.get$operatorSpan()));
@@ -72292,10 +73515,13 @@ self.util = _cliPkgRequires.util;
         t1 = node.contents;
         previousNode = t1[t2];
         currentNode = t1[i];
-        _0_2 = A._InitializedCell$(new A._EvaluateVisitor__checkAdjacentCalculationValues_closure(currentNode));
-        if (currentNode instanceof A.UnaryOperationExpression)
-          t1 = B.UnaryOperator_TLI === _0_2._readFinal$0() || B.UnaryOperator_gg4 === _0_2._readFinal$0();
-        else
+        if (currentNode instanceof A.UnaryOperationExpression) {
+          _0_2 = currentNode.operator;
+          if (B.UnaryOperator_AiQ !== _0_2)
+            t1 = B.UnaryOperator_cLp === _0_2;
+          else
+            t1 = true;
+        } else
           t1 = false;
         if (!t1)
           t1 = currentNode instanceof A.NumberExpression && currentNode.value < 0;
@@ -72329,7 +73555,7 @@ self.util = _cliPkgRequires.util;
       return result;
     },
     _runFunctionCallable$3($arguments, callable, nodeWithSpan) {
-      var buffer, first, argument, restArg, rest, error, t1, t2, _i, t3, exception, _this = this;
+      var buffer, first, argument, restArg, rest, error, t1, t2, _i, t3, t4, exception, _this = this;
       if (callable instanceof A.BuiltInCallable)
         return _this._withoutSlash$2(_this._runBuiltInCallable$3($arguments, callable, nodeWithSpan), nodeWithSpan);
       else if (type$.UserDefinedCallable_Environment._is(callable))
@@ -72347,15 +73573,19 @@ self.util = _cliPkgRequires.util;
               first = false;
             else
               buffer._contents += ", ";
-            t3 = argument;
-            buffer._contents += _this._evaluate$_serialize$3$quote(t3.accept$1(_this), t3, true);
+            t3 = buffer;
+            t4 = argument;
+            t4 = _this._evaluate$_serialize$3$quote(t4.accept$1(_this), t4, true);
+            t3._contents += t4;
           }
           restArg = $arguments.rest;
           if (restArg != null) {
             rest = restArg.accept$1(_this);
             if (!first)
               buffer._contents += ", ";
-            buffer._contents += _this._evaluate$_serialize$2(rest, restArg);
+            t1 = buffer;
+            t2 = _this._evaluate$_serialize$2(rest, restArg);
+            t1._contents += t2;
           }
         } catch (exception) {
           t1 = A.unwrapException(exception);
@@ -72367,9 +73597,11 @@ self.util = _cliPkgRequires.util;
           } else
             throw exception;
         }
-        buffer._contents += A.Primitives_stringFromCharCode(41);
-        t1 = buffer._contents;
-        return new A.SassString(t1.charCodeAt(0) == 0 ? t1 : t1, false);
+        t1 = buffer;
+        t2 = A.Primitives_stringFromCharCode(41);
+        t1._contents += t2;
+        t2 = buffer._contents;
+        return new A.SassString(t2.charCodeAt(0) == 0 ? t2 : t2, false);
       } else
         throw A.wrapException(A.ArgumentError$("Unknown callable type " + J.get$runtimeType$(callable).toString$0(0) + ".", null));
     },
@@ -72402,7 +73634,7 @@ self.util = _cliPkgRequires.util;
         } else
           rest = B.List_empty8;
         t1 = evaluated._values[0];
-        argumentList = A.SassArgumentList$(rest, t1, evaluated._values[4] === B.ListSeparator_undecided_null_undecided ? B.ListSeparator_rXA : evaluated._values[4]);
+        argumentList = A.SassArgumentList$(rest, t1, evaluated._values[4] === B.ListSeparator_undecided_null_undecided ? B.ListSeparator_ECn : evaluated._values[4]);
         evaluated._values[2].push(argumentList);
       } else
         argumentList = null;
@@ -72433,11 +73665,7 @@ self.util = _cliPkgRequires.util;
         return result;
       if (argumentList._wereKeywordsAccessed)
         return result;
-      t1 = evaluated._values[0];
-      t1 = t1.get$keys(t1);
-      t1 = A.pluralize("argument", t1.get$length(t1), null);
-      t2 = evaluated._values[0];
-      throw A.wrapException(A.MultiSpanSassRuntimeException$("No " + t1 + " named " + A.toSentence(t2.get$keys(t2).map$1$1(0, new A._EvaluateVisitor__runBuiltInCallable_closure1(), type$.Object), "or") + ".", nodeWithSpan.get$span(nodeWithSpan), "invocation", A.LinkedHashMap_LinkedHashMap$_literal([_box_0.overload.get$spanWithName(), "declaration"], type$.FileSpan, type$.String), _this._evaluate$_stackTrace$1(nodeWithSpan.get$span(nodeWithSpan)), null));
+      throw A.wrapException(A.MultiSpanSassRuntimeException$("No " + A.pluralize("argument", evaluated._values[0].get$keys(0).get$length(0), null) + " named " + A.toSentence(evaluated._values[0].get$keys(0).map$1$1(0, new A._EvaluateVisitor__runBuiltInCallable_closure1(), type$.Object), "or") + ".", nodeWithSpan.get$span(nodeWithSpan), "invocation", A.LinkedHashMap_LinkedHashMap$_literal([_box_0.overload.get$spanWithName(), "declaration"], type$.FileSpan, type$.String), _this._evaluate$_stackTrace$1(nodeWithSpan.get$span(nodeWithSpan)), null));
     },
     _evaluateArguments$1($arguments) {
       var t1, t2, _i, expression, nodeForSpan, named, namedNodes, t3, t4, $name, value, restArgs, rest, restNodeForSpan, t5, separator, keywordRestArgs, keywordRest, keywordRestNodeForSpan, _this = this,
@@ -72566,12 +73794,6 @@ self.util = _cliPkgRequires.util;
             $label1$1: {
               if (_0_0 instanceof A.SassString) {
                 text = _0_0._string$_text;
-                t5 = true;
-              } else {
-                text = null;
-                t5 = false;
-              }
-              if (t5) {
                 t5 = text;
                 break $label1$1;
               }
@@ -72664,27 +73886,38 @@ self.util = _cliPkgRequires.util;
       _this._withParent$2$4$scopeWhen$through(A.ModifiableCssMediaRule$(t1, node.span), new A._EvaluateVisitor_visitCssMediaRule_closure0(_this, mergedQueries, node, mergedSources), false, new A._EvaluateVisitor_visitCssMediaRule_closure1(mergedSources), type$.ModifiableCssMediaRule, type$.Null);
     },
     visitCssStyleRule$1(node) {
-      var t1, styleRule, t2, t3, t4, originalSelector, rule, oldAtRootExcludingStyleRule, _0_0, _0_1, lastChild, _this = this;
+      var t1, styleRule, t2, nest, t3, originalSelector, rule, oldAtRootExcludingStyleRule, _0_1, lastChild, _this = this, _null = null,
+        _s8_ = "__parent";
       if (_this._declarationName != null)
-        throw A.wrapException(_this._evaluate$_exception$2(string$.Style_, node.span));
+        throw A.wrapException(_this._evaluate$_exception$2(string$.Style_n, node.span));
+      else if (_this._inKeyframes && _this._assertInModule$2(_this.__parent, _s8_) instanceof A.ModifiableCssKeyframeBlock)
+        throw A.wrapException(_this._evaluate$_exception$2(string$.Style_k, node.span));
       t1 = _this._atRootExcludingStyleRule;
-      styleRule = t1 ? null : _this._styleRuleIgnoringAtRoot;
-      t2 = node._style_rule$_selector._box$_inner.value;
-      t3 = styleRule == null;
-      t4 = t3 ? null : styleRule.originalSelector;
-      originalSelector = t2.resolveParentSelectors$2$implicitParent(t4, !t1);
-      rule = A.ModifiableCssStyleRule$(_this._assertInModule$2(_this.__extensionStore, "_extensionStore").addSelector$2(originalSelector, _this._mediaQueries), node.span, originalSelector);
+      styleRule = t1 ? _null : _this._styleRuleIgnoringAtRoot;
+      t2 = t1 ? _null : _this._styleRuleIgnoringAtRoot;
+      t2 = t2 == null ? _null : t2.fromPlainCss;
+      nest = t2 !== true;
+      t2 = node._style_rule$_selector._box$_inner;
+      if (nest) {
+        t2 = t2.value;
+        t3 = styleRule == null ? _null : styleRule.originalSelector;
+        originalSelector = t2.nestWithin$3$implicitParent$preserveParentSelectors(t3, !t1, node.fromPlainCss);
+      } else
+        originalSelector = t2.value;
+      rule = A.ModifiableCssStyleRule$(_this._assertInModule$2(_this.__extensionStore, "_extensionStore").addSelector$2(originalSelector, _this._mediaQueries), node.span, node.fromPlainCss, originalSelector);
       oldAtRootExcludingStyleRule = _this._atRootExcludingStyleRule;
       _this._atRootExcludingStyleRule = false;
-      _this._withParent$2$4$scopeWhen$through(rule, new A._EvaluateVisitor_visitCssStyleRule_closure(_this, rule, node), false, new A._EvaluateVisitor_visitCssStyleRule_closure0(), type$.ModifiableCssStyleRule, type$.Null);
+      t1 = nest ? new A._EvaluateVisitor_visitCssStyleRule_closure() : _null;
+      _this._withParent$2$4$scopeWhen$through(rule, new A._EvaluateVisitor_visitCssStyleRule_closure0(_this, rule, node), false, t1, type$.ModifiableCssStyleRule, type$.Null);
       _this._atRootExcludingStyleRule = oldAtRootExcludingStyleRule;
-      _0_0 = _this._assertInModule$2(_this.__parent, "__parent").children;
-      _0_1 = A._InitializedCell$(new A._EvaluateVisitor_visitCssStyleRule_closure1(_0_0));
-      if (_0_1._readFinal$0() >= 1) {
-        lastChild = J.elementAt$1$ax(_0_0._collection$_source, _0_1._readFinal$0() - 1);
-        t1 = t3;
+      t1 = _this._assertInModule$2(_this.__parent, _s8_).children._collection$_source;
+      t2 = J.getInterceptor$asx(t1);
+      _0_1 = t2.get$length(t1);
+      if (_0_1 >= 1) {
+        lastChild = t2.elementAt$1(t1, _0_1 - 1);
+        t1 = styleRule == null;
       } else {
-        lastChild = null;
+        lastChild = _null;
         t1 = false;
       }
       if (t1)
@@ -72702,18 +73935,11 @@ self.util = _cliPkgRequires.util;
       _this._withParent$2$4$scopeWhen$through(A.ModifiableCssSupportsRule$(node.condition, node.span), new A._EvaluateVisitor_visitCssSupportsRule_closure(_this, node), false, new A._EvaluateVisitor_visitCssSupportsRule_closure0(), type$.ModifiableCssSupportsRule, type$.Null);
     },
     _handleReturn$1$2(list, callback) {
-      var t1, _i, _0_0, result, t2;
+      var t1, _i, _0_0;
       for (t1 = list.length, _i = 0; _i < list.length; list.length === t1 || (0, A.throwConcurrentModificationError)(list), ++_i) {
         _0_0 = callback.call$1(list[_i]);
-        if (_0_0 != null) {
-          result = _0_0;
-          t2 = true;
-        } else {
-          result = null;
-          t2 = false;
-        }
-        if (t2)
-          return result;
+        if (_0_0 != null)
+          return _0_0;
       }
       return null;
     },
@@ -72743,8 +73969,7 @@ self.util = _cliPkgRequires.util;
       return this._interpolationToValue$3$trim$warnForColor(interpolation, false, warnForColor);
     },
     _performInterpolation$2$warnForColor(interpolation, warnForColor) {
-      var _0_0 = this._performInterpolationHelper$3$sourceMap$warnForColor(interpolation, false, warnForColor);
-      return _0_0._0;
+      return this._performInterpolationHelper$3$sourceMap$warnForColor(interpolation, false, warnForColor)._0;
     },
     _performInterpolation$1(interpolation) {
       return this._performInterpolation$2$warnForColor(interpolation, false);
@@ -72779,7 +74004,7 @@ self.util = _cliPkgRequires.util;
           result0 = new A.Interpolation(result0, t6);
           result0.Interpolation$2(t9, t6);
           t9 = $.$get$namesByColor();
-          _this._warn$2(string$.You_pr + A.S(t9.$index(0, result)) + string$.x20in_in + result.toString$0(0) + string$.x2c_whicw + A.S(t9.$index(0, result)) + string$.x22x29__If + new A.BinaryOperationExpression(B.BinaryOperator_anB, new A.StringExpression(result0, true), value, false).toString$0(0) + "'.", value.get$span(value));
+          _this._warn$2(string$.You_pr + A.S(t9.$index(0, result)) + string$.x20in_in + result.toString$0(0) + string$.x2c_whicw + A.S(t9.$index(0, result)) + string$.x22x29__If + new A.BinaryOperationExpression(B.BinaryOperator_u15, new A.StringExpression(result0, true), value, false).toString$0(0) + "'.", value.get$span(value));
         }
         t8 += _this._evaluate$_serialize$3$quote(result, value, false);
       }
@@ -72819,16 +74044,9 @@ self.util = _cliPkgRequires.util;
       var _0_0, grandparent, t1,
         $parent = this._assertInModule$2(this.__parent, "__parent");
       if (through != null) {
-        for (; through.call$1($parent); $parent = grandparent) {
+        for (; through.call$1($parent); $parent = _0_0) {
           _0_0 = $parent._parent;
-          if (_0_0 != null) {
-            grandparent = _0_0;
-            t1 = true;
-          } else {
-            grandparent = null;
-            t1 = false;
-          }
-          if (!t1)
+          if (_0_0 == null)
             throw A.wrapException(A.ArgumentError$(string$.throug + node.toString$0(0) + ".", null));
         }
         if ($parent.get$hasFollowingSibling()) {
@@ -72887,8 +74105,13 @@ self.util = _cliPkgRequires.util;
       return this._withStackFrame$1$3(member, nodeWithSpan, callback, type$.dynamic);
     },
     _withoutSlash$2(value, nodeForSpan) {
-      if (value instanceof A.SassNumber && value.asSlash != null && true)
-        this._warn$3(string$.Using__i + A.S(new A._EvaluateVisitor__withoutSlash_recommendation().call$1(value)) + string$.x0a_Morex20, nodeForSpan.get$span(nodeForSpan), B.Deprecation_xHK);
+      var t1;
+      if (value instanceof A.SassNumber)
+        t1 = value.asSlash != null;
+      else
+        t1 = false;
+      if (t1)
+        this._warn$3(string$.Using__i + A.S(new A._EvaluateVisitor__withoutSlash_recommendation().call$1(value)) + string$.x0a_Morex20, nodeForSpan.get$span(nodeForSpan), B.Deprecation_oJv);
       return value.withoutSlash$0();
     },
     _stackFrame$2(member, span) {
@@ -73030,7 +74253,7 @@ self.util = _cliPkgRequires.util;
       t2 = A.stringReplaceAllUnchecked(variable._string$_text, "_", "-");
       return t1.globalVariableExists$2$namespace(t2, module == null ? null : module._string$_text) ? B.SassBoolean_true : B.SassBoolean_false;
     },
-    $signature: 23
+    $signature: 20
   };
   A._EvaluateVisitor_closure0.prototype = {
     call$1($arguments) {
@@ -73038,7 +74261,7 @@ self.util = _cliPkgRequires.util;
         t1 = this.$this._environment;
       return t1.getVariable$1(A.stringReplaceAllUnchecked(variable._string$_text, "_", "-")) != null ? B.SassBoolean_true : B.SassBoolean_false;
     },
-    $signature: 23
+    $signature: 20
   };
   A._EvaluateVisitor_closure1.prototype = {
     call$1($arguments) {
@@ -73053,7 +74276,7 @@ self.util = _cliPkgRequires.util;
       t4 = A.stringReplaceAllUnchecked(t3, "_", "-");
       return t2.getFunction$2$namespace(t4, module == null ? null : module._string$_text) != null || t1._builtInFunctions.containsKey$1(t3) ? B.SassBoolean_true : B.SassBoolean_false;
     },
-    $signature: 23
+    $signature: 20
   };
   A._EvaluateVisitor_closure2.prototype = {
     call$1($arguments) {
@@ -73066,7 +74289,7 @@ self.util = _cliPkgRequires.util;
       t2 = A.stringReplaceAllUnchecked(variable._string$_text, "_", "-");
       return t1.getMixin$2$namespace(t2, module == null ? null : module._string$_text) != null ? B.SassBoolean_true : B.SassBoolean_false;
     },
-    $signature: 23
+    $signature: 20
   };
   A._EvaluateVisitor_closure3.prototype = {
     call$1($arguments) {
@@ -73075,11 +74298,11 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException(A.SassScriptException$(string$.conten, null));
       return t1._content != null ? B.SassBoolean_true : B.SassBoolean_false;
     },
-    $signature: 23
+    $signature: 20
   };
   A._EvaluateVisitor_closure4.prototype = {
     call$1($arguments) {
-      var t2, t3, t4, $name, value,
+      var t2, t3, t4,
         t1 = J.$index$asx($arguments, 0).assertString$1("module")._string$_text,
         module = this.$this._environment._environment$_modules.$index(0, t1);
       if (module == null)
@@ -73088,18 +74311,15 @@ self.util = _cliPkgRequires.util;
       t2 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1);
       for (t3 = A.MapExtensions_get_pairs(module.get$variables(), type$.String, t1), t3 = t3.get$iterator(t3); t3.moveNext$0();) {
         t4 = t3.get$current(t3);
-        $name = t4._0;
-        value = t4._1;
-        value = value;
-        t2.$indexSet(0, new A.SassString($name, true), value);
+        t2.$indexSet(0, new A.SassString(t4._0, true), t4._1);
       }
       return new A.SassMap(A.ConstantMap_ConstantMap$from(t2, t1, t1));
     },
-    $signature: 40
+    $signature: 33
   };
   A._EvaluateVisitor_closure5.prototype = {
     call$1($arguments) {
-      var t2, t3, t4, $name, value,
+      var t2, t3, t4,
         t1 = J.$index$asx($arguments, 0).assertString$1("module")._string$_text,
         module = this.$this._environment._environment$_modules.$index(0, t1);
       if (module == null)
@@ -73108,18 +74328,15 @@ self.util = _cliPkgRequires.util;
       t2 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1);
       for (t3 = A.MapExtensions_get_pairs(module.get$functions(module), type$.String, type$.Callable), t3 = t3.get$iterator(t3); t3.moveNext$0();) {
         t4 = t3.get$current(t3);
-        $name = t4._0;
-        value = t4._1;
-        value = value;
-        t2.$indexSet(0, new A.SassString($name, true), new A.SassFunction(value));
+        t2.$indexSet(0, new A.SassString(t4._0, true), new A.SassFunction(t4._1));
       }
       return new A.SassMap(A.ConstantMap_ConstantMap$from(t2, t1, t1));
     },
-    $signature: 40
+    $signature: 33
   };
   A._EvaluateVisitor_closure6.prototype = {
     call$1($arguments) {
-      var t2, t3, t4, $name, value,
+      var t2, t3, t4,
         t1 = J.$index$asx($arguments, 0).assertString$1("module")._string$_text,
         module = this.$this._environment._environment$_modules.$index(0, t1);
       if (module == null)
@@ -73128,14 +74345,11 @@ self.util = _cliPkgRequires.util;
       t2 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1);
       for (t3 = A.MapExtensions_get_pairs(module.get$mixins(), type$.String, type$.Callable), t3 = t3.get$iterator(t3); t3.moveNext$0();) {
         t4 = t3.get$current(t3);
-        $name = t4._0;
-        value = t4._1;
-        value = value;
-        t2.$indexSet(0, new A.SassString($name, true), new A.SassMixin(value));
+        t2.$indexSet(0, new A.SassString(t4._0, true), new A.SassMixin(t4._1));
       }
       return new A.SassMap(A.ConstantMap_ConstantMap$from(t2, t1, t1));
     },
-    $signature: 40
+    $signature: 33
   };
   A._EvaluateVisitor_closure7.prototype = {
     call$1($arguments) {
@@ -73158,7 +74372,7 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException("Function not found: " + $name.toString$0(0));
       return new A.SassFunction(callable);
     },
-    $signature: 222
+    $signature: 163
   };
   A._EvaluateVisitor__closure2.prototype = {
     call$0() {
@@ -73172,7 +74386,7 @@ self.util = _cliPkgRequires.util;
         return local;
       return t1._builtInFunctions.$index(0, normalizedName);
     },
-    $signature: 89
+    $signature: 102
   };
   A._EvaluateVisitor_closure8.prototype = {
     call$1($arguments) {
@@ -73189,7 +74403,7 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException("Mixin not found: " + $name.toString$0(0));
       return new A.SassMixin(callable);
     },
-    $signature: 224
+    $signature: 164
   };
   A._EvaluateVisitor__closure1.prototype = {
     call$0() {
@@ -73198,11 +74412,11 @@ self.util = _cliPkgRequires.util;
         t3 = this.module;
       return t1.getMixin$2$namespace(t2, t3 == null ? null : t3._string$_text);
     },
-    $signature: 89
+    $signature: 102
   };
   A._EvaluateVisitor_closure9.prototype = {
     call$1($arguments) {
-      var t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, $name, value, invocation, callableNode, callable, _null = null,
+      var t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, invocation, callableNode, callable,
         t1 = J.getInterceptor$asx($arguments),
         $function = t1.$index($arguments, 0),
         args = type$.SassArgumentList._as(t1.$index($arguments, 1));
@@ -73217,25 +74431,23 @@ self.util = _cliPkgRequires.util;
       args._wereKeywordsAccessed = true;
       t8 = args._keywords;
       if (t8.get$isEmpty(t8))
-        t2 = _null;
+        t2 = null;
       else {
         t9 = type$.Value;
         t10 = A.LinkedHashMap_LinkedHashMap$_empty(t9, t9);
         for (args._wereKeywordsAccessed = true, t8 = A.MapExtensions_get_pairs(t8, t4, t9), t8 = t8.get$iterator(t8); t8.moveNext$0();) {
           t11 = t8.get$current(t8);
-          $name = t11._0;
-          value = t11._1;
-          value = value;
-          t10.$indexSet(0, new A.SassString($name, false), value);
+          t10.$indexSet(0, new A.SassString(t11._0, false), t11._1);
         }
         t2 = new A.ValueExpression(new A.SassMap(A.ConstantMap_ConstantMap$from(t10, t9, t9)), t2.get$span(t2));
       }
       invocation = new A.ArgumentInvocation(A.List_List$unmodifiable(t3, t5), A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_empty(t4, t5), t4, t5), new A.ValueExpression(args, t7), t2, t6);
       if ($function instanceof A.SassString) {
-        t2 = $function.toString$0(0);
-        A.EvaluationContext_current().warn$2(0, string$.Passina + t2 + "))", B.Deprecation_qVK);
+        A.warnForDeprecation(string$.Passina + $function.toString$0(0) + "))", B.Deprecation_gkc);
         callableNode = t1._callableNode;
-        return t1.visitFunctionExpression$1(new A.FunctionExpression(_null, $function._string$_text, invocation, callableNode.get$span(callableNode)));
+        t2 = $function._string$_text;
+        t3 = callableNode.get$span(callableNode);
+        return t1.visitFunctionExpression$1(new A.FunctionExpression(null, A.stringReplaceAllUnchecked(t2, "_", "-"), t2, invocation, t3));
       }
       callable = $function.assertFunction$1("function").callable;
       if (type$.Callable._is(callable)) {
@@ -73243,7 +74455,7 @@ self.util = _cliPkgRequires.util;
         t2.toString;
         return t1._runFunctionCallable$3(invocation, callable, t2);
       } else
-        throw A.wrapException(A.SassScriptException$("The function " + callable.get$name(callable) + string$.x20is_as, _null));
+        throw A.wrapException(A.SassScriptException$("The function " + callable.get$name(callable) + string$.x20is_as, null));
     },
     $signature: 6
   };
@@ -73267,7 +74479,7 @@ self.util = _cliPkgRequires.util;
       t1._loadModule$7$baseUrl$configuration$namesInErrors(url, "load-css()", t2, new A._EvaluateVisitor__closure0(t1), t3.get$sourceUrl(t3), configuration, true);
       t1._assertConfigurationIsEmpty$2$nameInError(configuration, true);
     },
-    $signature: 158
+    $signature: 184
   };
   A._EvaluateVisitor__closure.prototype = {
     call$2(variable, value) {
@@ -73278,14 +74490,14 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException("The variable $" + $name + " was configured twice.");
       t1.$indexSet(0, $name, new A.ConfiguredValue(value, this.span, this.callableNode));
     },
-    $signature: 106
+    $signature: 90
   };
   A._EvaluateVisitor__closure0.prototype = {
     call$2(module, _) {
       var t1 = this.$this;
       return t1._combineCss$2$clone(module, true).accept$1(t1);
     },
-    $signature: 90
+    $signature: 77
   };
   A._EvaluateVisitor_closure11.prototype = {
     call$1($arguments) {
@@ -73307,20 +74519,17 @@ self.util = _cliPkgRequires.util;
       else
         throw A.wrapException(A.SassScriptException$("The mixin " + callable.get$name(callable) + string$.x20is_as, null));
     },
-    $signature: 158
+    $signature: 184
   };
   A._EvaluateVisitor_run_closure.prototype = {
     call$0() {
-      var module, _this = this, url = null,
+      var module, _this = this,
         t1 = _this.node,
         t2 = t1.span,
-        _0_0 = t2.get$sourceUrl(t2);
+        _0_0 = t2.get$sourceUrl(t2),
+        url = null;
       if (_0_0 != null) {
         url = _0_0;
-        t2 = true;
-      } else
-        t2 = false;
-      if (t2) {
         t2 = _this.$this;
         t2._activeModules.$indexSet(0, url, null);
         t2._loadedUrls.add$1(0, url);
@@ -73329,13 +74538,13 @@ self.util = _cliPkgRequires.util;
       module = t2._addExceptionTrace$1(new A._EvaluateVisitor_run__closure(t2, _this.importer, t1));
       return new A._Record_2_loadedUrls_stylesheet(t2._loadedUrls, t2._combineCss$1(module));
     },
-    $signature: 550
+    $signature: 305
   };
   A._EvaluateVisitor_run__closure.prototype = {
     call$0() {
       return this.$this._execute$2(this.importer, this.node);
     },
-    $signature: 552
+    $signature: 298
   };
   A._EvaluateVisitor_runExpression_closure.prototype = {
     call$0() {
@@ -73343,20 +74552,20 @@ self.util = _cliPkgRequires.util;
         t2 = this.expression;
       return t1._withFakeStylesheet$3(this.importer, t2, new A._EvaluateVisitor_runExpression__closure(t1, t2));
     },
-    $signature: 25
+    $signature: 34
   };
   A._EvaluateVisitor_runExpression__closure.prototype = {
     call$0() {
       var t1 = this.$this;
       return t1._addExceptionTrace$1(new A._EvaluateVisitor_runExpression___closure(t1, this.expression));
     },
-    $signature: 25
+    $signature: 34
   };
   A._EvaluateVisitor_runExpression___closure.prototype = {
     call$0() {
       return this.expression.accept$1(this.$this);
     },
-    $signature: 25
+    $signature: 34
   };
   A._EvaluateVisitor_runStatement_closure.prototype = {
     call$0() {
@@ -73387,20 +74596,24 @@ self.util = _cliPkgRequires.util;
   };
   A._EvaluateVisitor__loadModule_closure0.prototype = {
     call$0() {
-      var canonicalUrl, oldInDependency, isDependency, t4, message, _this = this, t1 = {}, stylesheet = null, importer = null,
+      var canonicalUrl, oldInDependency, t4, message, _this = this, t1 = {}, stylesheet = null, importer = null,
         t2 = _this.$this,
         t3 = _this.nodeWithSpan,
         _1_0 = t2._loadStylesheet$3$baseUrl(_this.url.toString$0(0), t3.get$span(t3), _this.baseUrl);
       stylesheet = _1_0._0;
       importer = _1_0._1;
-      isDependency = _1_0._2;
-      isDependency = isDependency;
       t4 = stylesheet.span;
       canonicalUrl = t4.get$sourceUrl(t4);
       if (canonicalUrl != null) {
         t4 = t2._activeModules;
         if (t4.containsKey$1(canonicalUrl)) {
-          message = _this.namesInErrors ? "Module loop: " + $.$get$context().prettyUri$1(canonicalUrl) + " is already being loaded." : string$.Modulel;
+          if (_this.namesInErrors) {
+            t1 = canonicalUrl;
+            t3 = $.$get$context();
+            t1.toString;
+            message = "Module loop: " + t3.prettyUri$1(t1) + " is already being loaded.";
+          } else
+            message = string$.Modulel;
           t1 = A.NullableExtension_andThen(t4.$index(0, canonicalUrl), new A._EvaluateVisitor__loadModule__closure(t2, message));
           throw A.wrapException(t1 == null ? t2._evaluate$_exception$1(message) : t1);
         } else
@@ -73408,7 +74621,7 @@ self.util = _cliPkgRequires.util;
       }
       t4 = t2._modules.containsKey$1(canonicalUrl);
       oldInDependency = t2._inDependency;
-      t2._inDependency = isDependency;
+      t2._inDependency = _1_0._2;
       t1.module = null;
       try {
         t1.module = t2._execute$5$configuration$namesInErrors$nodeWithSpan(importer, stylesheet, _this.configuration, _this.namesInErrors, t3);
@@ -73418,13 +74631,13 @@ self.util = _cliPkgRequires.util;
       }
       t2._addExceptionSpan$3$addStackFrame(t3, new A._EvaluateVisitor__loadModule__closure0(t1, _this.callback, !t4), false);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor__loadModule__closure.prototype = {
     call$1(previousLoad) {
       return this.$this._multiSpanException$3(this.message, "new load", A.LinkedHashMap_LinkedHashMap$_literal([previousLoad.get$span(previousLoad), "original load"], type$.FileSpan, type$.String));
     },
-    $signature: 81
+    $signature: 91
   };
   A._EvaluateVisitor__loadModule__closure0.prototype = {
     call$0() {
@@ -73465,8 +74678,8 @@ self.util = _cliPkgRequires.util;
         t1._configuration = t6;
       t1.visitStylesheet$1(t3);
       t3 = t1._outOfOrderImports == null ? t5 : new A.CssStylesheet(new A.UnmodifiableListView(t1._addOutOfOrderImports$0(), type$.UnmodifiableListView_CssNode), t4);
-      _this.css._value = t3;
-      _this.preModuleComments._value = t1._preModuleComments;
+      _this.css.__late_helper$_value = t3;
+      _this.preModuleComments.__late_helper$_value = t1._preModuleComments;
       t1._importer = oldImporter;
       t1.__stylesheet = oldStylesheet;
       t1.__root = oldRoot;
@@ -73483,23 +74696,23 @@ self.util = _cliPkgRequires.util;
       t1._inKeyframes = oldInKeyframes;
       t1._configuration = oldConfiguration;
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor__combineCss_closure.prototype = {
     call$1(module) {
       return module.get$transitivelyContainsCss();
     },
-    $signature: 134
+    $signature: 117
   };
   A._EvaluateVisitor__combineCss_closure0.prototype = {
     call$1(target) {
       return !this.selectors.contains$1(0, target);
     },
-    $signature: 16
+    $signature: 13
   };
   A._EvaluateVisitor__combineCss_visitModule.prototype = {
     call$1(module) {
-      var t1, t2, t3, t4, _i, upstream, _1_0, comments, t5, statements, index, _this = this;
+      var t1, t2, t3, t4, _i, upstream, _1_0, statements, index, _this = this;
       if (!_this.seen.add$1(0, module))
         return;
       if (_this.clone)
@@ -73508,15 +74721,8 @@ self.util = _cliPkgRequires.util;
         upstream = t1[_i];
         if (upstream.get$transitivelyContainsCss()) {
           _1_0 = module.get$preModuleComments().$index(0, upstream);
-          if (_1_0 != null) {
-            comments = _1_0;
-            t5 = true;
-          } else {
-            comments = null;
-            t5 = false;
-          }
-          if (t5)
-            B.JSArray_methods.addAll$1(t3.length === 0 ? t4 : t3, comments);
+          if (_1_0 != null)
+            B.JSArray_methods.addAll$1(t3.length === 0 ? t4 : t3, _1_0);
           _this.call$1(upstream);
         }
       }
@@ -73528,19 +74734,19 @@ self.util = _cliPkgRequires.util;
       B.JSArray_methods.addAll$1(t4, t1.getRange$2(statements, 0, index));
       B.JSArray_methods.addAll$1(t3, t1.getRange$2(statements, index, t1.get$length(statements)));
     },
-    $signature: 559
+    $signature: 292
   };
   A._EvaluateVisitor__extendModules_closure.prototype = {
     call$1(target) {
       return !this.originalSelectors.contains$1(0, target);
     },
-    $signature: 16
+    $signature: 13
   };
   A._EvaluateVisitor__extendModules_closure0.prototype = {
     call$0() {
       return A._setArrayType([], type$.JSArray_ExtensionStore);
     },
-    $signature: 229
+    $signature: 167
   };
   A._EvaluateVisitor_visitAtRootRule_closure.prototype = {
     call$0() {
@@ -73548,7 +74754,7 @@ self.util = _cliPkgRequires.util;
       for (t1 = this.node.children, t2 = t1.length, t3 = this.$this, _i = 0; _i < t2; ++_i)
         t1[_i].accept$1(t3);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitAtRootRule_closure0.prototype = {
     call$0() {
@@ -73566,7 +74772,7 @@ self.util = _cliPkgRequires.util;
       t1._environment.scope$1$2$when(callback, this.node.hasDeclarations, type$.void);
       t1.__parent = t2;
     },
-    $signature: 39
+    $signature: 32
   };
   A._EvaluateVisitor__scopeForAtRoot_closure0.prototype = {
     call$1(callback) {
@@ -73576,19 +74782,19 @@ self.util = _cliPkgRequires.util;
       this.innerScope.call$1(callback);
       t1._atRootExcludingStyleRule = oldAtRootExcludingStyleRule;
     },
-    $signature: 39
+    $signature: 32
   };
   A._EvaluateVisitor__scopeForAtRoot_closure1.prototype = {
     call$1(callback) {
       return this.$this._withMediaQueries$3(null, null, new A._EvaluateVisitor__scopeForAtRoot__closure(this.innerScope, callback));
     },
-    $signature: 39
+    $signature: 32
   };
   A._EvaluateVisitor__scopeForAtRoot__closure.prototype = {
     call$0() {
       return this.innerScope.call$1(this.callback);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor__scopeForAtRoot_closure2.prototype = {
     call$1(callback) {
@@ -73598,13 +74804,13 @@ self.util = _cliPkgRequires.util;
       this.innerScope.call$1(callback);
       t1._inKeyframes = wasInKeyframes;
     },
-    $signature: 39
+    $signature: 32
   };
   A._EvaluateVisitor__scopeForAtRoot_closure3.prototype = {
     call$1($parent) {
       return $parent instanceof A.ModifiableCssAtRule;
     },
-    $signature: 237
+    $signature: 169
   };
   A._EvaluateVisitor__scopeForAtRoot_closure4.prototype = {
     call$1(callback) {
@@ -73614,7 +74820,7 @@ self.util = _cliPkgRequires.util;
       this.innerScope.call$1(callback);
       t1._inUnknownAtRule = wasInUnknownAtRule;
     },
-    $signature: 39
+    $signature: 32
   };
   A._EvaluateVisitor_visitContentRule_closure.prototype = {
     call$0() {
@@ -73623,7 +74829,7 @@ self.util = _cliPkgRequires.util;
         t1[_i].accept$1(t3);
       return null;
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitDeclaration_closure.prototype = {
     call$0() {
@@ -73631,7 +74837,7 @@ self.util = _cliPkgRequires.util;
       for (t1 = this._box_0.children, t2 = t1.length, t3 = this.$this, _i = 0; _i < t2; ++_i)
         t1[_i].accept$1(t3);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitEachRule_closure.prototype = {
     call$1(value) {
@@ -73639,13 +74845,13 @@ self.util = _cliPkgRequires.util;
         t2 = this.nodeWithSpan;
       return t1._environment.setLocalVariable$3(this._box_0.variable, t1._withoutSlash$2(value, t2), t2);
     },
-    $signature: 63
+    $signature: 54
   };
   A._EvaluateVisitor_visitEachRule_closure0.prototype = {
     call$1(value) {
       return this.$this._setMultipleVariables$3(this._box_0.variables, value, this.nodeWithSpan);
     },
-    $signature: 63
+    $signature: 54
   };
   A._EvaluateVisitor_visitEachRule_closure1.prototype = {
     call$0() {
@@ -73653,7 +74859,7 @@ self.util = _cliPkgRequires.util;
         t1 = _this.$this;
       return t1._handleReturn$2(_this.list.get$asList(), new A._EvaluateVisitor_visitEachRule__closure(t1, _this.setVariables, _this.node));
     },
-    $signature: 44
+    $signature: 40
   };
   A._EvaluateVisitor_visitEachRule__closure.prototype = {
     call$1(element) {
@@ -73662,19 +74868,19 @@ self.util = _cliPkgRequires.util;
       t1 = this.$this;
       return t1._handleReturn$2(this.node.children, new A._EvaluateVisitor_visitEachRule___closure(t1));
     },
-    $signature: 561
+    $signature: 291
   };
   A._EvaluateVisitor_visitEachRule___closure.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 91
+    $signature: 78
   };
   A._EvaluateVisitor_visitAtRule_closure.prototype = {
     call$1(value) {
       return this.$this._interpolationToValue$3$trim$warnForColor(value, true, true);
     },
-    $signature: 574
+    $signature: 286
   };
   A._EvaluateVisitor_visitAtRule_closure0.prototype = {
     call$0() {
@@ -73685,9 +74891,9 @@ self.util = _cliPkgRequires.util;
         for (t2 = _this.children, t3 = t2.length, _i = 0; _i < t3; ++_i)
           t2[_i].accept$1(t1);
       else
-        t1._withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$(styleRule._style_rule$_selector, styleRule.span, styleRule.originalSelector), new A._EvaluateVisitor_visitAtRule__closure(t1, _this.children), false, type$.ModifiableCssStyleRule, type$.Null);
+        t1._withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$(styleRule._style_rule$_selector, styleRule.span, false, styleRule.originalSelector), new A._EvaluateVisitor_visitAtRule__closure(t1, _this.children), false, type$.ModifiableCssStyleRule, type$.Null);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitAtRule__closure.prototype = {
     call$0() {
@@ -73695,42 +74901,42 @@ self.util = _cliPkgRequires.util;
       for (t1 = this.children, t2 = t1.length, t3 = this.$this, _i = 0; _i < t2; ++_i)
         t1[_i].accept$1(t3);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitAtRule_closure1.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
+    $signature: 7
   };
   A._EvaluateVisitor_visitForRule_closure.prototype = {
     call$0() {
       return this.node.from.accept$1(this.$this).assertNumber$0();
     },
-    $signature: 161
+    $signature: 186
   };
   A._EvaluateVisitor_visitForRule_closure0.prototype = {
     call$0() {
       return this.node.to.accept$1(this.$this).assertNumber$0();
     },
-    $signature: 161
+    $signature: 186
   };
   A._EvaluateVisitor_visitForRule_closure1.prototype = {
     call$0() {
       return this.fromNumber.assertInt$0();
     },
-    $signature: 3
+    $signature: 10
   };
   A._EvaluateVisitor_visitForRule_closure2.prototype = {
     call$0() {
       var t1 = this.fromNumber;
       return this.toNumber.coerce$2(t1.get$numeratorUnits(t1), t1.get$denominatorUnits(t1)).assertInt$0();
     },
-    $signature: 3
+    $signature: 10
   };
   A._EvaluateVisitor_visitForRule_closure3.prototype = {
     call$0() {
-      var i, t3, t4, t5, t6, t7, t8, _0_0, result, _this = this,
+      var i, t3, t4, t5, t6, t7, t8, _0_0, _this = this,
         t1 = _this.$this,
         t2 = _this.node,
         nodeWithSpan = t1._expressionNode$1(t2.from);
@@ -73739,25 +74945,18 @@ self.util = _cliPkgRequires.util;
         t8 = t6.get$numeratorUnits(t6);
         t7.setLocalVariable$3(t5, A.SassNumber_SassNumber$withUnits(i, t6.get$denominatorUnits(t6), t8), nodeWithSpan);
         _0_0 = t1._handleReturn$2(t2, new A._EvaluateVisitor_visitForRule__closure(t1));
-        if (_0_0 != null) {
-          result = _0_0;
-          t7 = true;
-        } else {
-          result = null;
-          t7 = false;
-        }
-        if (t7)
-          return result;
+        if (_0_0 != null)
+          return _0_0;
       }
       return null;
     },
-    $signature: 44
+    $signature: 40
   };
   A._EvaluateVisitor_visitForRule__closure.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 91
+    $signature: 78
   };
   A._EvaluateVisitor_visitForwardRule_closure.prototype = {
     call$2(module, firstLoad) {
@@ -73765,7 +74964,7 @@ self.util = _cliPkgRequires.util;
         this.$this._registerCommentsForModule$1(module);
       this.$this._environment.forwardModule$2(module, this.node);
     },
-    $signature: 90
+    $signature: 77
   };
   A._EvaluateVisitor_visitForwardRule_closure0.prototype = {
     call$2(module, firstLoad) {
@@ -73773,71 +74972,65 @@ self.util = _cliPkgRequires.util;
         this.$this._registerCommentsForModule$1(module);
       this.$this._environment.forwardModule$2(module, this.node);
     },
-    $signature: 90
+    $signature: 77
   };
   A._EvaluateVisitor__registerCommentsForModule_closure.prototype = {
     call$0() {
       return A._setArrayType([], type$.JSArray_CssComment);
     },
-    $signature: 260
+    $signature: 173
   };
   A._EvaluateVisitor_visitIfRule_closure.prototype = {
     call$1(clause) {
       var t1 = this.$this;
       return t1._environment.scope$1$3$semiGlobal$when(new A._EvaluateVisitor_visitIfRule__closure(t1, clause), true, clause.hasDeclarations, type$.nullable_Value);
     },
-    $signature: 583
+    $signature: 270
   };
   A._EvaluateVisitor_visitIfRule__closure.prototype = {
     call$0() {
       var t1 = this.$this;
       return t1._handleReturn$2(this.clause.children, new A._EvaluateVisitor_visitIfRule___closure(t1));
     },
-    $signature: 44
+    $signature: 40
   };
   A._EvaluateVisitor_visitIfRule___closure.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 91
+    $signature: 78
   };
   A._EvaluateVisitor__visitDynamicImport_closure.prototype = {
     call$0() {
-      var t1, t2, _0_0, stylesheet, t3, isDependency, t4, t5, url, t6, oldImporter, oldInDependency, loadsUserDefinedModules, children, t7, t8, t9, t10, environment, module, visitor, _null = null, _box_0 = {};
+      var t1, t2, _0_0, stylesheet, importer, isDependency, t3, url, oldImporter, oldInDependency, loadsUserDefinedModules, children, t4, t5, t6, t7, t8, t9, t10, environment, module, visitor, _box_0 = {};
       _box_0.isDependency = _box_0.importer = _box_0.stylesheet = null;
       t1 = this.$this;
       t2 = this.$import;
       _0_0 = t1._loadStylesheet$3$forImport(t2.urlString, t2.span, true);
       stylesheet = _box_0.stylesheet = _0_0._0;
-      t3 = _box_0.importer = _0_0._1;
+      importer = _0_0._1;
+      _box_0.importer = importer;
       isDependency = _0_0._2;
       _box_0.isDependency = isDependency;
-      t4 = isDependency;
-      t5 = stylesheet.span;
-      url = t5.get$sourceUrl(t5);
+      t3 = stylesheet.span;
+      url = t3.get$sourceUrl(t3);
       if (url != null) {
-        t5 = t1._activeModules;
-        if (t5.containsKey$1(url)) {
-          t2 = A.NullableExtension_andThen(t5.$index(0, url), new A._EvaluateVisitor__visitDynamicImport__closure(t1));
+        t3 = t1._activeModules;
+        if (t3.containsKey$1(url)) {
+          t2 = A.NullableExtension_andThen(t3.$index(0, url), new A._EvaluateVisitor__visitDynamicImport__closure(t1));
           throw A.wrapException(t2 == null ? t1._evaluate$_exception$1("This file is already being loaded.") : t2);
         }
-        t5.$indexSet(0, url, t2);
+        t3.$indexSet(0, url, t2);
       }
       t2 = stylesheet._uses;
-      t5 = type$.UnmodifiableListView_UseRule;
-      t6 = new A.UnmodifiableListView(t2, t5);
-      if (t6.get$length(t6) === 0) {
-        t6 = new A.UnmodifiableListView(stylesheet._forwards, type$.UnmodifiableListView_ForwardRule);
-        t6 = t6.get$length(t6) === 0;
-      } else
-        t6 = false;
-      if (t6) {
+      t3 = type$.UnmodifiableListView_UseRule;
+      if (new A.UnmodifiableListView(t2, t3).get$length(0) === 0 && new A.UnmodifiableListView(stylesheet._forwards, type$.UnmodifiableListView_ForwardRule).get$length(0) === 0) {
         oldImporter = t1._importer;
         t2 = t1._assertInModule$2(t1.__stylesheet, "_stylesheet");
         oldInDependency = t1._inDependency;
-        t1._importer = t3;
+        t1._importer = importer;
         t1.__stylesheet = stylesheet;
-        t1._inDependency = t4;
+        t1._inDependency = isDependency;
         t1.visitStylesheet$1(stylesheet);
         t1._importer = oldImporter;
         t1.__stylesheet = t2;
@@ -73845,7 +75038,7 @@ self.util = _cliPkgRequires.util;
         t1._activeModules.remove$1(0, url);
         return;
       }
-      t2 = new A.UnmodifiableListView(t2, t5);
+      t2 = new A.UnmodifiableListView(t2, t3);
       if (!t2.any$1(t2, new A._EvaluateVisitor__visitDynamicImport__closure0())) {
         t2 = new A.UnmodifiableListView(stylesheet._forwards, type$.UnmodifiableListView_ForwardRule);
         loadsUserDefinedModules = t2.any$1(t2, new A._EvaluateVisitor__visitDynamicImport__closure1());
@@ -73865,7 +75058,7 @@ self.util = _cliPkgRequires.util;
       t9 = A._setArrayType(t9.slice(0), A._arrayInstanceType(t9));
       t10 = t2._mixins;
       t10 = A._setArrayType(t10.slice(0), A._arrayInstanceType(t10));
-      environment = A.Environment$_(A.LinkedHashMap_LinkedHashMap$_empty(t3, t4), A.LinkedHashMap_LinkedHashMap$_empty(t3, t5), A.LinkedHashMap_LinkedHashMap$_empty(t4, t5), t2._importedModules, _null, _null, t6, t7, t8, t9, t10, t2._content);
+      environment = A.Environment$_(A.LinkedHashMap_LinkedHashMap$_empty(t3, t4), A.LinkedHashMap_LinkedHashMap$_empty(t3, t5), A.LinkedHashMap_LinkedHashMap$_empty(t4, t5), t2._importedModules, null, null, t6, t7, t8, t9, t10, t2._content);
       t1._withEnvironment$2(environment, new A._EvaluateVisitor__visitDynamicImport__closure2(_box_0, t1, loadsUserDefinedModules, environment, children));
       module = environment.toDummyModule$0();
       t1._environment.importForwards$1(module);
@@ -73884,19 +75077,19 @@ self.util = _cliPkgRequires.util;
     call$1(previousLoad) {
       return this.$this._multiSpanException$3("This file is already being loaded.", "new load", A.LinkedHashMap_LinkedHashMap$_literal([previousLoad.get$span(previousLoad), "original load"], type$.FileSpan, type$.String));
     },
-    $signature: 81
+    $signature: 91
   };
   A._EvaluateVisitor__visitDynamicImport__closure0.prototype = {
     call$1(rule) {
       return rule.url.get$scheme() !== "sass";
     },
-    $signature: 275
+    $signature: 174
   };
   A._EvaluateVisitor__visitDynamicImport__closure1.prototype = {
     call$1(rule) {
       return rule.url.get$scheme() !== "sass";
     },
-    $signature: 283
+    $signature: 175
   };
   A._EvaluateVisitor__visitDynamicImport__closure2.prototype = {
     call$0() {
@@ -73928,7 +75121,7 @@ self.util = _cliPkgRequires.util;
         t1._configuration = _this.environment.toImplicitConfiguration$0();
       t1.visitStylesheet$1(t6.stylesheet);
       t6 = t8 ? t1._addOutOfOrderImports$0() : A._setArrayType([], type$.JSArray_ModifiableCssNode);
-      _this.children._value = t6;
+      _this.children.__late_helper$_value = t6;
       t1._importer = oldImporter;
       t1.__stylesheet = t2;
       if (t8) {
@@ -73940,9 +75133,9 @@ self.util = _cliPkgRequires.util;
       t1._configuration = oldConfiguration;
       t1._inDependency = oldInDependency;
     },
-    $signature: 2
+    $signature: 1
   };
-  A._EvaluateVisitor__applyMixin_closure0.prototype = {
+  A._EvaluateVisitor__applyMixin_closure.prototype = {
     call$0() {
       var _this = this,
         t1 = _this.$this;
@@ -73957,22 +75150,13 @@ self.util = _cliPkgRequires.util;
     },
     $signature: 0
   };
-  A._EvaluateVisitor__applyMixin_closure.prototype = {
-    call$0() {
-      var t1 = this._1_0;
-      if (t1 == null)
-        t1 = type$.Callable._as(t1);
-      return type$.UserDefinedCallable_Environment._as(t1).declaration;
-    },
-    $signature: 143
-  };
-  A._EvaluateVisitor__applyMixin_closure1.prototype = {
+  A._EvaluateVisitor__applyMixin_closure0.prototype = {
     call$0() {
       var _this = this,
         t1 = _this.$this;
       t1._environment.withContent$2(_this.contentCallable, new A._EvaluateVisitor__applyMixin__closure(t1, _this.mixin, _this.nodeWithSpanWithoutContent));
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor__applyMixin__closure.prototype = {
     call$0() {
@@ -73993,33 +75177,33 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return this.statement.accept$1(this.$this);
     },
-    $signature: 44
+    $signature: 40
   };
   A._EvaluateVisitor_visitIncludeRule_closure.prototype = {
     call$0() {
       var t1 = this.node;
       return this.$this._environment.getMixin$2$namespace(t1.name, t1.namespace);
     },
-    $signature: 89
+    $signature: 102
   };
   A._EvaluateVisitor_visitIncludeRule_closure0.prototype = {
     call$1($content) {
       var t1 = this.$this;
       return new A.UserDefinedCallable($content, t1._environment.closure$0(), t1._inDependency, type$.UserDefinedCallable_Environment);
     },
-    $signature: 590
+    $signature: 269
   };
   A._EvaluateVisitor_visitIncludeRule_closure1.prototype = {
     call$0() {
       return this.node.get$spanWithoutContent();
     },
-    $signature: 33
+    $signature: 27
   };
   A._EvaluateVisitor_visitMediaRule_closure.prototype = {
     call$1(mediaQueries) {
       return this.$this._mergeMediaQueries$2(mediaQueries, this.queries);
     },
-    $signature: 83
+    $signature: 89
   };
   A._EvaluateVisitor_visitMediaRule_closure0.prototype = {
     call$0() {
@@ -74030,27 +75214,20 @@ self.util = _cliPkgRequires.util;
         t2 = _this.queries;
       t1._withMediaQueries$3(t2, _this.mergedSources, new A._EvaluateVisitor_visitMediaRule__closure(t1, _this.node));
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitMediaRule__closure.prototype = {
     call$0() {
-      var styleRule, t2, t3, _i,
+      var t2, t3, _i,
         t1 = this.$this,
         _0_0 = t1._atRootExcludingStyleRule ? null : t1._styleRuleIgnoringAtRoot;
-      if (_0_0 != null) {
-        styleRule = _0_0;
-        t2 = true;
-      } else {
-        styleRule = null;
-        t2 = false;
-      }
-      if (t2)
-        t1._withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$(styleRule._style_rule$_selector, styleRule.span, styleRule.originalSelector), new A._EvaluateVisitor_visitMediaRule___closure(t1, this.node), false, type$.ModifiableCssStyleRule, type$.Null);
+      if (_0_0 != null)
+        t1._withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$(_0_0._style_rule$_selector, _0_0.span, false, _0_0.originalSelector), new A._EvaluateVisitor_visitMediaRule___closure(t1, this.node), false, type$.ModifiableCssStyleRule, type$.Null);
       else
         for (t2 = this.node.children, t3 = t2.length, _i = 0; _i < t3; ++_i)
           t2[_i].accept$1(t1);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitMediaRule___closure.prototype = {
     call$0() {
@@ -74058,7 +75235,7 @@ self.util = _cliPkgRequires.util;
       for (t1 = this.node.children, t2 = t1.length, t3 = this.$this, _i = 0; _i < t2; ++_i)
         t1[_i].accept$1(t3);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitMediaRule_closure1.prototype = {
     call$1(node) {
@@ -74070,7 +75247,7 @@ self.util = _cliPkgRequires.util;
         t1 = true;
       return t1;
     },
-    $signature: 9
+    $signature: 7
   };
   A._EvaluateVisitor_visitStyleRule_closure.prototype = {
     call$0() {
@@ -74078,20 +75255,20 @@ self.util = _cliPkgRequires.util;
       for (t1 = this.node.children, t2 = t1.length, t3 = this.$this, _i = 0; _i < t2; ++_i)
         t1[_i].accept$1(t3);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitStyleRule_closure0.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
+    $signature: 7
   };
-  A._EvaluateVisitor_visitStyleRule_closure1.prototype = {
+  A._EvaluateVisitor_visitStyleRule_closure2.prototype = {
     call$0() {
       var t1 = this.$this;
       t1._withStyleRule$2(this.rule, new A._EvaluateVisitor_visitStyleRule__closure(t1, this.node));
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitStyleRule__closure.prototype = {
     call$0() {
@@ -74099,39 +75276,32 @@ self.util = _cliPkgRequires.util;
       for (t1 = this.node.children, t2 = t1.length, t3 = this.$this, _i = 0; _i < t2; ++_i)
         t1[_i].accept$1(t3);
     },
-    $signature: 2
+    $signature: 1
   };
-  A._EvaluateVisitor_visitStyleRule_closure2.prototype = {
+  A._EvaluateVisitor_visitStyleRule_closure1.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
+    $signature: 7
   };
-  A._EvaluateVisitor_visitStyleRule_closure3.prototype = {
+  A._EvaluateVisitor__warnForBogusCombinators_closure.prototype = {
     call$1(child) {
       return child instanceof A.ModifiableCssComment;
     },
-    $signature: 124
+    $signature: 7
   };
   A._EvaluateVisitor_visitSupportsRule_closure.prototype = {
     call$0() {
-      var styleRule, t2, t3, _i,
+      var t2, t3, _i,
         t1 = this.$this,
         _0_0 = t1._atRootExcludingStyleRule ? null : t1._styleRuleIgnoringAtRoot;
-      if (_0_0 != null) {
-        styleRule = _0_0;
-        t2 = true;
-      } else {
-        styleRule = null;
-        t2 = false;
-      }
-      if (t2)
-        t1._withParent$2$2(A.ModifiableCssStyleRule$(styleRule._style_rule$_selector, styleRule.span, styleRule.originalSelector), new A._EvaluateVisitor_visitSupportsRule__closure(t1, this.node), type$.ModifiableCssStyleRule, type$.Null);
+      if (_0_0 != null)
+        t1._withParent$2$2(A.ModifiableCssStyleRule$(_0_0._style_rule$_selector, _0_0.span, false, _0_0.originalSelector), new A._EvaluateVisitor_visitSupportsRule__closure(t1, this.node), type$.ModifiableCssStyleRule, type$.Null);
       else
         for (t2 = this.node.children, t3 = t2.length, _i = 0; _i < t3; ++_i)
           t2[_i].accept$1(t1);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitSupportsRule__closure.prototype = {
     call$0() {
@@ -74139,13 +75309,13 @@ self.util = _cliPkgRequires.util;
       for (t1 = this.node.children, t2 = t1.length, t3 = this.$this, _i = 0; _i < t2; ++_i)
         t1[_i].accept$1(t3);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitSupportsRule_closure0.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
+    $signature: 7
   };
   A._EvaluateVisitor__visitSupportsCondition_closure.prototype = {
     call$0() {
@@ -74158,7 +75328,7 @@ self.util = _cliPkgRequires.util;
       t2 = t2.declaration.value;
       return "(" + t3 + ":" + t4 + t1._evaluate$_serialize$3$quote(t2.accept$1(t1), t2, true) + ")";
     },
-    $signature: 22
+    $signature: 26
   };
   A._EvaluateVisitor_visitVariableDeclaration_closure.prototype = {
     call$0() {
@@ -74166,14 +75336,14 @@ self.util = _cliPkgRequires.util;
         t2 = this._box_0.override;
       t1.setVariable$4$global(this.node.name, t2.value, t2.assignmentNode, true);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitVariableDeclaration_closure0.prototype = {
     call$0() {
       var t1 = this.node;
       return this.$this._environment.getVariable$2$namespace(t1.name, t1.namespace);
     },
-    $signature: 44
+    $signature: 40
   };
   A._EvaluateVisitor_visitVariableDeclaration_closure1.prototype = {
     call$0() {
@@ -74181,11 +75351,11 @@ self.util = _cliPkgRequires.util;
         t2 = this.node;
       t1._environment.setVariable$5$global$namespace(t2.name, this.value, t1._expressionNode$1(t2.expression), t2.isGlobal, t2.namespace);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitUseRule_closure.prototype = {
     call$2(module, firstLoad) {
-      var t1, t2, t3, _0_0, $name, t4, t5, span;
+      var t1, t2, t3, _0_0, t4, t5, span;
       if (firstLoad)
         this.$this._registerCommentsForModule$1(module);
       t1 = this.$this._environment;
@@ -74195,15 +75365,8 @@ self.util = _cliPkgRequires.util;
         t1._globalModules.$indexSet(0, module, t2);
         t1._allModules.push(module);
         _0_0 = A.IterableExtension_firstWhereOrNull(J.get$keys$z(B.JSArray_methods.get$first(t1._variables)), module.get$variables().get$containsKey());
-        if (_0_0 != null) {
-          $name = _0_0;
-          t1 = true;
-        } else {
-          $name = null;
-          t1 = false;
-        }
-        if (t1)
-          A.throwExpression(A.SassScriptException$(string$.This_ma + A.S($name) + '".', null));
+        if (_0_0 != null)
+          A.throwExpression(A.SassScriptException$(string$.This_ma + _0_0 + '".', null));
       } else {
         t4 = t1._environment$_modules;
         if (t4.containsKey$1(t3)) {
@@ -74219,38 +75382,31 @@ self.util = _cliPkgRequires.util;
         t1._allModules.push(module);
       }
     },
-    $signature: 90
+    $signature: 77
   };
   A._EvaluateVisitor_visitWarnRule_closure.prototype = {
     call$0() {
       return this.node.expression.accept$1(this.$this);
     },
-    $signature: 25
+    $signature: 34
   };
   A._EvaluateVisitor_visitWhileRule_closure.prototype = {
     call$0() {
-      var t1, t2, t3, _0_0, result, t4;
+      var t1, t2, t3, _0_0;
       for (t1 = this.node, t2 = t1.condition, t3 = this.$this, t1 = t1.children; t2.accept$1(t3).get$isTruthy();) {
         _0_0 = t3._handleReturn$2(t1, new A._EvaluateVisitor_visitWhileRule__closure(t3));
-        if (_0_0 != null) {
-          result = _0_0;
-          t4 = true;
-        } else {
-          result = null;
-          t4 = false;
-        }
-        if (t4)
-          return result;
+        if (_0_0 != null)
+          return _0_0;
       }
       return null;
     },
-    $signature: 44
+    $signature: 40
   };
   A._EvaluateVisitor_visitWhileRule__closure.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 91
+    $signature: 78
   };
   A._EvaluateVisitor_visitBinaryOperationExpression_closure.prototype = {
     call$0() {
@@ -74258,47 +75414,47 @@ self.util = _cliPkgRequires.util;
         t2 = this.$this,
         left = t1.left.accept$1(t2);
       switch (t1.operator) {
-        case B.BinaryOperator_2jN:
+        case B.BinaryOperator_wdM:
           t1 = t1.right.accept$1(t2);
           t1 = new A.SassString(A.serializeValue(left, false, true) + "=" + A.serializeValue(t1, false, true), false);
           break;
-        case B.BinaryOperator_M6L:
+        case B.BinaryOperator_qNM:
           t1 = left.get$isTruthy() ? left : t1.right.accept$1(t2);
           break;
-        case B.BinaryOperator_SNp:
+        case B.BinaryOperator_eDt:
           t1 = left.get$isTruthy() ? t1.right.accept$1(t2) : left;
           break;
-        case B.BinaryOperator_ql5:
+        case B.BinaryOperator_g8k:
           t1 = left.$eq(0, t1.right.accept$1(t2)) ? B.SassBoolean_true : B.SassBoolean_false;
           break;
-        case B.BinaryOperator_ViB:
+        case B.BinaryOperator_icU:
           t1 = !left.$eq(0, t1.right.accept$1(t2)) ? B.SassBoolean_true : B.SassBoolean_false;
           break;
-        case B.BinaryOperator_cIH:
+        case B.BinaryOperator_bEa:
           t1 = left.greaterThan$1(t1.right.accept$1(t2));
           break;
-        case B.BinaryOperator_7Tg:
+        case B.BinaryOperator_oEm:
           t1 = left.greaterThanOrEquals$1(t1.right.accept$1(t2));
           break;
-        case B.BinaryOperator_U8c:
+        case B.BinaryOperator_miq:
           t1 = left.lessThan$1(t1.right.accept$1(t2));
           break;
-        case B.BinaryOperator_kpg:
+        case B.BinaryOperator_SPQ:
           t1 = left.lessThanOrEquals$1(t1.right.accept$1(t2));
           break;
-        case B.BinaryOperator_anB:
+        case B.BinaryOperator_u15:
           t1 = left.plus$1(t1.right.accept$1(t2));
           break;
-        case B.BinaryOperator_olz:
+        case B.BinaryOperator_SjO:
           t1 = left.minus$1(t1.right.accept$1(t2));
           break;
-        case B.BinaryOperator_qN2:
+        case B.BinaryOperator_2No:
           t1 = left.times$1(t1.right.accept$1(t2));
           break;
-        case B.BinaryOperator_t8B:
+        case B.BinaryOperator_U77:
           t1 = t2._slash$3(left, t1.right.accept$1(t2), t1);
           break;
-        case B.BinaryOperator_OTG:
+        case B.BinaryOperator_KNx:
           t1 = left.modulo$1(t1.right.accept$1(t2));
           break;
         default:
@@ -74306,41 +75462,14 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 25
-  };
-  A._EvaluateVisitor__slash_closure.prototype = {
-    call$0() {
-      return this._1_0._0;
-    },
-    $signature: 25
-  };
-  A._EvaluateVisitor__slash_closure0.prototype = {
-    call$0() {
-      return this._1_0._1;
-    },
-    $signature: 25
+    $signature: 34
   };
   A._EvaluateVisitor__slash_recommendation.prototype = {
     call$1(expression) {
-      var left, right, t1, _null = null;
+      var t1;
       $label0$0: {
-        if (expression instanceof A.BinaryOperationExpression)
-          if (B.BinaryOperator_t8B === expression.operator) {
-            left = expression.left;
-            right = expression.right;
-            t1 = true;
-          } else {
-            right = _null;
-            left = right;
-            t1 = false;
-          }
-        else {
-          right = _null;
-          left = right;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = "math.div(" + A.S(this.call$1(left)) + ", " + A.S(this.call$1(right)) + ")";
+        if (expression instanceof A.BinaryOperationExpression && B.BinaryOperator_U77 === expression.operator) {
+          t1 = "math.div(" + A.S(this.call$1(expression.left)) + ", " + A.S(this.call$1(expression.right)) + ")";
           break $label0$0;
         }
         if (expression instanceof A.ParenthesizedExpression) {
@@ -74352,26 +75481,26 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 132
+    $signature: 111
   };
   A._EvaluateVisitor_visitVariableExpression_closure.prototype = {
     call$0() {
       var t1 = this.node;
       return this.$this._environment.getVariable$2$namespace(t1.name, t1.namespace);
     },
-    $signature: 44
+    $signature: 40
   };
   A._EvaluateVisitor_visitUnaryOperationExpression_closure.prototype = {
     call$0() {
       var t1, _this = this;
       switch (_this.node.operator) {
-        case B.UnaryOperator_gg4:
+        case B.UnaryOperator_cLp:
           t1 = _this.operand.unaryPlus$0();
           break;
-        case B.UnaryOperator_TLI:
+        case B.UnaryOperator_AiQ:
           t1 = _this.operand.unaryMinus$0();
           break;
-        case B.UnaryOperator_Ix1:
+        case B.UnaryOperator_SJr:
           t1 = new A.SassString("/" + A.serializeValue(_this.operand, false, true), false);
           break;
         case B.UnaryOperator_not_not_not:
@@ -74382,34 +75511,33 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 25
+    $signature: 34
   };
   A._EvaluateVisitor_visitListExpression_closure.prototype = {
     call$1(expression) {
       return expression.accept$1(this.$this);
     },
-    $signature: 611
+    $signature: 265
   };
   A._EvaluateVisitor_visitFunctionExpression_closure.prototype = {
     call$0() {
-      var t1 = this.$this._environment,
-        t2 = this.node;
-      return t1.getFunction$2$namespace(A.stringReplaceAllUnchecked(t2.originalName, "_", "-"), t2.namespace);
+      var t1 = this.node;
+      return this.$this._environment.getFunction$2$namespace(t1.name, t1.namespace);
     },
-    $signature: 89
+    $signature: 102
   };
   A._EvaluateVisitor_visitFunctionExpression_closure0.prototype = {
     call$1(argument) {
       return argument.accept$1(new A._IsCalculationSafeVisitor());
     },
-    $signature: 126
+    $signature: 113
   };
   A._EvaluateVisitor_visitFunctionExpression_closure1.prototype = {
     call$0() {
       var t1 = this.node;
       return this.$this._runFunctionCallable$3(t1.$arguments, this._box_0.$function, t1);
     },
-    $signature: 25
+    $signature: 34
   };
   A._EvaluateVisitor__checkCalculationArguments_check.prototype = {
     call$1(maxArgs) {
@@ -74423,7 +75551,7 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return this.call$1(null);
     },
-    $signature: 86
+    $signature: 96
   };
   A._EvaluateVisitor__visitCalculationExpression_closure.prototype = {
     call$0() {
@@ -74433,20 +75561,14 @@ self.util = _cliPkgRequires.util;
         t3 = _this.inLegacySassFunction;
       return A.SassCalculation_operateInternal(t1._binaryOperatorToCalculationOperator$2(t2.operator, _this.node), t1._visitCalculationExpression$2$inLegacySassFunction(t2.left, t3), t1._visitCalculationExpression$2$inLegacySassFunction(t2.right, t3), t3, !t1._inSupportsDeclaration);
     },
-    $signature: 14
-  };
-  A._EvaluateVisitor__checkAdjacentCalculationValues_closure.prototype = {
-    call$0() {
-      return type$.UnaryOperationExpression._as(this._0_0).operator;
-    },
-    $signature: 137
+    $signature: 79
   };
   A._EvaluateVisitor_visitInterpolatedFunctionExpression_closure.prototype = {
     call$0() {
       var t1 = this.node;
       return this.$this._runFunctionCallable$3(t1.$arguments, this.$function, t1);
     },
-    $signature: 25
+    $signature: 34
   };
   A._EvaluateVisitor__runUserDefinedCallable_closure.prototype = {
     call$0() {
@@ -74506,7 +75628,7 @@ self.util = _cliPkgRequires.util;
         rest = J.get$length$asx(t2[2]) > t5 ? J.sublist$1$ax(t2[2], t5) : B.List_empty8;
         t5 = t2[0];
         t6 = t2[4];
-        argumentList = A.SassArgumentList$(rest, t5, t6 === B.ListSeparator_undecided_null_undecided ? B.ListSeparator_rXA : t6);
+        argumentList = A.SassArgumentList$(rest, t5, t6 === B.ListSeparator_undecided_null_undecided ? B.ListSeparator_ECn : t6);
         t1._environment.setLocalVariable$3(restArgument, argumentList, t4);
       } else
         argumentList = null;
@@ -74520,7 +75642,7 @@ self.util = _cliPkgRequires.util;
         return result;
       argumentWord = A.pluralize("argument", t5, null);
       t2 = t2[0];
-      t5 = A.instanceType(t2)._eval$1("LinkedHashMapKeyIterable<1>");
+      t5 = A._instanceType(t2)._eval$1("LinkedHashMapKeyIterable<1>");
       throw A.wrapException(A.MultiSpanSassRuntimeException$("No " + argumentWord + " named " + A.toSentence(A.MappedIterable_MappedIterable(new A.LinkedHashMapKeyIterable(t2, t5), new A._EvaluateVisitor__runUserDefinedCallable____closure(), t5._eval$1("Iterable.E"), type$.Object), "or") + ".", t4.get$span(t4), "invocation", A.LinkedHashMap_LinkedHashMap$_literal([t3.get$spanWithName(), "declaration"], type$.FileSpan, type$.String), t1._evaluate$_stackTrace$1(t4.get$span(t4)), null));
     },
     $signature() {
@@ -74531,7 +75653,7 @@ self.util = _cliPkgRequires.util;
     call$1($name) {
       return "$" + $name;
     },
-    $signature: 7
+    $signature: 5
   };
   A._EvaluateVisitor__runFunctionCallable_closure.prototype = {
     call$0() {
@@ -74543,7 +75665,7 @@ self.util = _cliPkgRequires.util;
       }
       throw A.wrapException(t4._evaluate$_exception$2("Function finished without @return.", t1.span));
     },
-    $signature: 25
+    $signature: 34
   };
   A._EvaluateVisitor__runBuiltInCallable_closure.prototype = {
     call$0() {
@@ -74555,25 +75677,25 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return this._box_0.callback.call$1(this.evaluated._values[2]);
     },
-    $signature: 25
+    $signature: 34
   };
   A._EvaluateVisitor__runBuiltInCallable_closure1.prototype = {
     call$1($name) {
       return "$" + $name;
     },
-    $signature: 7
+    $signature: 5
   };
   A._EvaluateVisitor__evaluateArguments_closure.prototype = {
     call$1(value) {
       return value;
     },
-    $signature: 43
+    $signature: 39
   };
   A._EvaluateVisitor__evaluateArguments_closure0.prototype = {
     call$1(value) {
       return this.$this._withoutSlash$2(value, this.restNodeForSpan);
     },
-    $signature: 43
+    $signature: 39
   };
   A._EvaluateVisitor__evaluateArguments_closure1.prototype = {
     call$2(key, value) {
@@ -74582,27 +75704,27 @@ self.util = _cliPkgRequires.util;
       _this.named.$indexSet(0, key, _this.$this._withoutSlash$2(value, t1));
       _this.namedNodes.$indexSet(0, key, t1);
     },
-    $signature: 87
+    $signature: 98
   };
   A._EvaluateVisitor__evaluateArguments_closure2.prototype = {
     call$1(value) {
       return value;
     },
-    $signature: 43
+    $signature: 39
   };
   A._EvaluateVisitor__evaluateMacroArguments_closure.prototype = {
     call$1(value) {
       var t1 = this.restArgs;
       return new A.ValueExpression(value, t1.get$span(t1));
     },
-    $signature: 65
+    $signature: 58
   };
   A._EvaluateVisitor__evaluateMacroArguments_closure0.prototype = {
     call$1(value) {
       var t1 = this.restArgs;
       return new A.ValueExpression(this.$this._withoutSlash$2(value, this.restNodeForSpan), t1.get$span(t1));
     },
-    $signature: 65
+    $signature: 58
   };
   A._EvaluateVisitor__evaluateMacroArguments_closure1.prototype = {
     call$2(key, value) {
@@ -74610,14 +75732,14 @@ self.util = _cliPkgRequires.util;
         t1 = _this.restArgs;
       _this.named.$indexSet(0, key, new A.ValueExpression(_this.$this._withoutSlash$2(value, _this.restNodeForSpan), t1.get$span(t1)));
     },
-    $signature: 87
+    $signature: 98
   };
   A._EvaluateVisitor__evaluateMacroArguments_closure2.prototype = {
     call$1(value) {
       var t1 = this.keywordRestArgs;
       return new A.ValueExpression(this.$this._withoutSlash$2(value, this.keywordRestNodeForSpan), t1.get$span(t1));
     },
-    $signature: 65
+    $signature: 58
   };
   A._EvaluateVisitor__addRestMap_closure.prototype = {
     call$2(key, value) {
@@ -74630,7 +75752,7 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException(t1._evaluate$_exception$2(string$.Variab_ + key.toString$0(0) + " is not a string in " + _this.map.toString$0(0) + ".", t2.get$span(t2)));
       }
     },
-    $signature: 106
+    $signature: 90
   };
   A._EvaluateVisitor__verifyArguments_closure.prototype = {
     call$0() {
@@ -74641,40 +75763,40 @@ self.util = _cliPkgRequires.util;
   A._EvaluateVisitor_visitCssAtRule_closure.prototype = {
     call$0() {
       var t1, t2, t3, t4;
-      for (t1 = this.node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = this.$this, t3 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = this.node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = this.$this, t2 = t2._eval$1("ListBase.E"); t1.moveNext$0();) {
         t4 = t1.__internal$_current;
-        (t4 == null ? t3._as(t4) : t4).accept$1(t2);
+        (t4 == null ? t2._as(t4) : t4).accept$1(t3);
       }
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitCssAtRule_closure0.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
+    $signature: 7
   };
   A._EvaluateVisitor_visitCssKeyframeBlock_closure.prototype = {
     call$0() {
       var t1, t2, t3, t4;
-      for (t1 = this.node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = this.$this, t3 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = this.node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = this.$this, t2 = t2._eval$1("ListBase.E"); t1.moveNext$0();) {
         t4 = t1.__internal$_current;
-        (t4 == null ? t3._as(t4) : t4).accept$1(t2);
+        (t4 == null ? t2._as(t4) : t4).accept$1(t3);
       }
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitCssKeyframeBlock_closure0.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
+    $signature: 7
   };
   A._EvaluateVisitor_visitCssMediaRule_closure.prototype = {
     call$1(mediaQueries) {
       return this.$this._mergeMediaQueries$2(mediaQueries, this.node.queries);
     },
-    $signature: 83
+    $signature: 89
   };
   A._EvaluateVisitor_visitCssMediaRule_closure0.prototype = {
     call$0() {
@@ -74685,39 +75807,32 @@ self.util = _cliPkgRequires.util;
         t2 = _this.node.queries;
       t1._withMediaQueries$3(t2, _this.mergedSources, new A._EvaluateVisitor_visitCssMediaRule__closure(t1, _this.node));
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitCssMediaRule__closure.prototype = {
     call$0() {
-      var styleRule, t2, t3, t4,
+      var t2, t3, t4,
         t1 = this.$this,
         _0_0 = t1._atRootExcludingStyleRule ? null : t1._styleRuleIgnoringAtRoot;
-      if (_0_0 != null) {
-        styleRule = _0_0;
-        t2 = true;
-      } else {
-        styleRule = null;
-        t2 = false;
-      }
-      if (t2)
-        t1._withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$(styleRule._style_rule$_selector, styleRule.span, styleRule.originalSelector), new A._EvaluateVisitor_visitCssMediaRule___closure(t1, this.node), false, type$.ModifiableCssStyleRule, type$.Null);
+      if (_0_0 != null)
+        t1._withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$(_0_0._style_rule$_selector, _0_0.span, false, _0_0.originalSelector), new A._EvaluateVisitor_visitCssMediaRule___closure(t1, this.node), false, type$.ModifiableCssStyleRule, type$.Null);
       else
-        for (t2 = this.node.children, t2 = new A.ListIterator(t2, t2.get$length(t2)), t3 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
+        for (t2 = this.node.children, t3 = t2.$ti, t2 = new A.ListIterator(t2, t2.get$length(0), t3._eval$1("ListIterator<ListBase.E>")), t3 = t3._eval$1("ListBase.E"); t2.moveNext$0();) {
           t4 = t2.__internal$_current;
           (t4 == null ? t3._as(t4) : t4).accept$1(t1);
         }
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitCssMediaRule___closure.prototype = {
     call$0() {
       var t1, t2, t3, t4;
-      for (t1 = this.node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = this.$this, t3 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = this.node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = this.$this, t2 = t2._eval$1("ListBase.E"); t1.moveNext$0();) {
         t4 = t1.__internal$_current;
-        (t4 == null ? t3._as(t4) : t4).accept$1(t2);
+        (t4 == null ? t2._as(t4) : t4).accept$1(t3);
       }
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitCssMediaRule_closure1.prototype = {
     call$1(node) {
@@ -74729,93 +75844,80 @@ self.util = _cliPkgRequires.util;
         t1 = true;
       return t1;
     },
-    $signature: 9
+    $signature: 7
   };
-  A._EvaluateVisitor_visitCssStyleRule_closure.prototype = {
+  A._EvaluateVisitor_visitCssStyleRule_closure0.prototype = {
     call$0() {
       var t1 = this.$this;
       t1._withStyleRule$2(this.rule, new A._EvaluateVisitor_visitCssStyleRule__closure(t1, this.node));
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitCssStyleRule__closure.prototype = {
     call$0() {
       var t1, t2, t3, t4;
-      for (t1 = this.node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = this.$this, t3 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = this.node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = this.$this, t2 = t2._eval$1("ListBase.E"); t1.moveNext$0();) {
         t4 = t1.__internal$_current;
-        (t4 == null ? t3._as(t4) : t4).accept$1(t2);
+        (t4 == null ? t2._as(t4) : t4).accept$1(t3);
       }
     },
-    $signature: 2
+    $signature: 1
   };
-  A._EvaluateVisitor_visitCssStyleRule_closure0.prototype = {
+  A._EvaluateVisitor_visitCssStyleRule_closure.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
-  };
-  A._EvaluateVisitor_visitCssStyleRule_closure1.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_0._collection$_source);
-    },
-    $signature: 3
+    $signature: 7
   };
   A._EvaluateVisitor_visitCssSupportsRule_closure.prototype = {
     call$0() {
-      var styleRule, t2, t3, t4,
+      var t2, t3, t4,
         t1 = this.$this,
         _0_0 = t1._atRootExcludingStyleRule ? null : t1._styleRuleIgnoringAtRoot;
-      if (_0_0 != null) {
-        styleRule = _0_0;
-        t2 = true;
-      } else {
-        styleRule = null;
-        t2 = false;
-      }
-      if (t2)
-        t1._withParent$2$2(A.ModifiableCssStyleRule$(styleRule._style_rule$_selector, styleRule.span, styleRule.originalSelector), new A._EvaluateVisitor_visitCssSupportsRule__closure(t1, this.node), type$.ModifiableCssStyleRule, type$.Null);
+      if (_0_0 != null)
+        t1._withParent$2$2(A.ModifiableCssStyleRule$(_0_0._style_rule$_selector, _0_0.span, false, _0_0.originalSelector), new A._EvaluateVisitor_visitCssSupportsRule__closure(t1, this.node), type$.ModifiableCssStyleRule, type$.Null);
       else
-        for (t2 = this.node.children, t2 = new A.ListIterator(t2, t2.get$length(t2)), t3 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
+        for (t2 = this.node.children, t3 = t2.$ti, t2 = new A.ListIterator(t2, t2.get$length(0), t3._eval$1("ListIterator<ListBase.E>")), t3 = t3._eval$1("ListBase.E"); t2.moveNext$0();) {
           t4 = t2.__internal$_current;
           (t4 == null ? t3._as(t4) : t4).accept$1(t1);
         }
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitCssSupportsRule__closure.prototype = {
     call$0() {
       var t1, t2, t3, t4;
-      for (t1 = this.node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = this.$this, t3 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = this.node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = this.$this, t2 = t2._eval$1("ListBase.E"); t1.moveNext$0();) {
         t4 = t1.__internal$_current;
-        (t4 == null ? t3._as(t4) : t4).accept$1(t2);
+        (t4 == null ? t2._as(t4) : t4).accept$1(t3);
       }
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitCssSupportsRule_closure0.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
+    $signature: 7
   };
   A._EvaluateVisitor__performInterpolationHelper_closure.prototype = {
     call$1(targetLocations) {
       return A.InterpolationMap$(this.interpolation, targetLocations);
     },
-    $signature: 154
+    $signature: 181
   };
   A._EvaluateVisitor__serialize_closure.prototype = {
     call$0() {
       return A.serializeValue(this.value, false, this.quote);
     },
-    $signature: 22
+    $signature: 26
   };
   A._EvaluateVisitor__expressionNode_closure.prototype = {
     call$0() {
       var t1 = this.expression;
       return this.$this._environment.getVariableNode$2$namespace(t1.name, t1.namespace);
     },
-    $signature: 155
+    $signature: 182
   };
   A._EvaluateVisitor__withoutSlash_recommendation.prototype = {
     call$1(number) {
@@ -74826,13 +75928,6 @@ self.util = _cliPkgRequires.util;
           t1 = type$.SassNumber;
           before = t1._as(_1_0._0);
           after = t1._as(_1_0._1);
-          t1 = true;
-        } else {
-          before = null;
-          after = null;
-          t1 = false;
-        }
-        if (t1) {
           t1 = "math.div(" + A.S(this.call$1(before)) + ", " + A.S(this.call$1(after)) + ")";
           break $label0$0;
         }
@@ -74841,7 +75936,7 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 156
+    $signature: 183
   };
   A._EvaluateVisitor__stackFrame_closure.prototype = {
     call$1(url) {
@@ -74849,7 +75944,7 @@ self.util = _cliPkgRequires.util;
       t1 = t1 == null ? null : t1.humanize$1(url);
       return t1 == null ? url : t1;
     },
-    $signature: 48
+    $signature: 43
   };
   A._ImportedCssVisitor.prototype = {
     visitCssAtRule$1(node) {
@@ -74887,7 +75982,7 @@ self.util = _cliPkgRequires.util;
     },
     visitCssStylesheet$1(node) {
       var t1, t2, t3;
-      for (t1 = node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t2 = t2._eval$1("ListBase.E"); t1.moveNext$0();) {
         t3 = t1.__internal$_current;
         (t3 == null ? t2._as(t3) : t3).accept$1(this);
       }
@@ -74900,7 +75995,7 @@ self.util = _cliPkgRequires.util;
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
+    $signature: 7
   };
   A._ImportedCssVisitor_visitCssMediaRule_closure.prototype = {
     call$1(node) {
@@ -74911,33 +76006,25 @@ self.util = _cliPkgRequires.util;
         t1 = true;
       return t1;
     },
-    $signature: 9
+    $signature: 7
   };
   A._ImportedCssVisitor_visitCssStyleRule_closure.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
+    $signature: 7
   };
   A._ImportedCssVisitor_visitCssSupportsRule_closure.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule;
     },
-    $signature: 9
+    $signature: 7
   };
   A._EvaluationContext.prototype = {
     get$currentCallableSpan() {
-      var callableNode, t1,
-        _0_0 = this._visitor._callableNode;
-      if (_0_0 != null) {
-        callableNode = _0_0;
-        t1 = true;
-      } else {
-        callableNode = null;
-        t1 = false;
-      }
-      if (t1)
-        return callableNode.get$span(callableNode);
+      var _0_0 = this._visitor._callableNode;
+      if (_0_0 != null)
+        return _0_0.get$span(_0_0);
       throw A.wrapException(A.StateError$(string$.No_Sasc));
     },
     warn$2(_, message, deprecation) {
@@ -74993,47 +76080,49 @@ self.util = _cliPkgRequires.util;
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 9
+    $signature: 7
   };
   A.EveryCssVisitor_visitCssKeyframeBlock_closure.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 9
+    $signature: 7
   };
   A.EveryCssVisitor_visitCssMediaRule_closure.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 9
+    $signature: 7
   };
   A.EveryCssVisitor_visitCssStyleRule_closure.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 9
+    $signature: 7
   };
   A.EveryCssVisitor_visitCssStylesheet_closure.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 9
+    $signature: 7
   };
   A.EveryCssVisitor_visitCssSupportsRule_closure.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 9
+    $signature: 7
   };
   A._MakeExpressionCalculationSafe.prototype = {
     visitBinaryOperationExpression$1(node) {
-      var t1, t2, t3;
-      if (node.operator === B.BinaryOperator_OTG) {
+      var t1, t2, t3, t4;
+      if (node.operator === B.BinaryOperator_KNx) {
         t1 = A._setArrayType([node], type$.JSArray_Expression);
-        t2 = node.get$span(node);
+        t2 = node.get$span(0);
         t3 = type$.Expression;
-        t2 = new A.FunctionExpression("math", "max", new A.ArgumentInvocation(A.List_List$unmodifiable(t1, t3), A.ConstantMap_ConstantMap$from(B.Map_empty6, type$.String, t3), null, null, t2), node.get$span(node));
-        t1 = t2;
+        t1 = A.List_List$unmodifiable(t1, t3);
+        t3 = A.ConstantMap_ConstantMap$from(B.Map_empty6, type$.String, t3);
+        t4 = node.get$span(0);
+        t1 = new A.FunctionExpression("math", A.stringReplaceAllUnchecked("max", "_", "-"), "max", new A.ArgumentInvocation(t1, t3, null, null, t2), t4);
       } else
         t1 = this.super$ReplaceExpressionVisitor$visitBinaryOperationExpression(node);
       return t1;
@@ -75045,12 +76134,12 @@ self.util = _cliPkgRequires.util;
       var t1,
         _0_0 = node.operator;
       $label0$0: {
-        if (B.UnaryOperator_gg4 === _0_0) {
+        if (B.UnaryOperator_cLp === _0_0) {
           t1 = node.operand;
           break $label0$0;
         }
-        if (B.UnaryOperator_TLI === _0_0) {
-          t1 = new A.BinaryOperationExpression(B.BinaryOperator_qN2, new A.NumberExpression(-1, null, node.span), node.operand, false);
+        if (B.UnaryOperator_AiQ === _0_0) {
+          t1 = new A.BinaryOperationExpression(B.BinaryOperator_2No, new A.NumberExpression(-1, null, node.span), node.operand, false);
           break $label0$0;
         }
         t1 = this.super$ReplaceExpressionVisitor$visitUnaryOperationExpression(node);
@@ -75090,47 +76179,51 @@ self.util = _cliPkgRequires.util;
       }
     },
     visitIncludeRule$1(node) {
-      var url, _0_0, _0_4, _0_7, t1, exception;
+      var url, _0_0, _0_4_isSet, _0_4, t1, _0_7_isSet, _0_7, url0, exception, _null = null;
       if (node.name !== "load-css")
         return;
       if (!this._metaNamespaces.contains$1(0, node.namespace))
         return;
-      url = null;
       _0_0 = node.$arguments.positional;
-      _0_4 = A._InitializedCell$(new A._FindDependenciesVisitor_visitIncludeRule_closure(_0_0));
-      _0_7 = A._InitializedCell$(new A._FindDependenciesVisitor_visitIncludeRule_closure0(_0_4));
-      if (_0_0.length === 1)
-        if (_0_4._readFinal$0() instanceof A.StringExpression)
-          if (_0_7._readFinal$0() != null) {
-            url = _0_7._readFinal$0();
-            t1 = true;
-          } else
-            t1 = false;
-        else
+      url = null;
+      _0_4_isSet = _0_0.length === 1;
+      if (_0_4_isSet) {
+        _0_4 = _0_0[0];
+        t1 = _0_4;
+        _0_7_isSet = t1 instanceof A.StringExpression;
+        if (_0_7_isSet) {
+          type$.StringExpression._as(_0_4);
+          _0_7 = _0_4.text.get$asPlain();
+          t1 = _0_7;
+          t1 = t1 != null;
+        } else {
+          _0_7 = _null;
           t1 = false;
-      else
+        }
+      } else {
+        _0_7 = _null;
+        _0_4 = _0_7;
+        _0_7_isSet = false;
         t1 = false;
-      if (t1)
+      }
+      if (t1) {
+        if (_0_7_isSet)
+          url0 = _0_7;
+        else {
+          t1 = _0_4_isSet ? _0_4 : _0_0[0];
+          _0_7 = type$.StringExpression._as(t1).text.get$asPlain();
+          url0 = _0_7;
+        }
+        url = url0 == null ? A._asString(url0) : url0;
         try {
           this._metaLoadCss.add$1(0, A.Uri_parse(url));
         } catch (exception) {
           if (!type$.FormatException._is(A.unwrapException(exception)))
             throw exception;
         }
+      }
     }
   };
-  A._FindDependenciesVisitor_visitIncludeRule_closure.prototype = {
-    call$0() {
-      return this._0_0[0];
-    },
-    $signature: 612
-  };
-  A._FindDependenciesVisitor_visitIncludeRule_closure0.prototype = {
-    call$0() {
-      return this._0_4._readFinal$0().text.get$asPlain();
-    },
-    $signature: 32
-  };
   A.DependencyReport.prototype = {};
   A.__FindDependenciesVisitor_Object_RecursiveStatementVisitor.prototype = {};
   A.RecursiveStatementVisitor.prototype = {
@@ -75166,20 +76259,13 @@ self.util = _cliPkgRequires.util;
       return null;
     },
     visitIfRule$1(node) {
-      var t1, t2, _i, t3, t4, _i0, _0_0, lastClause;
+      var t1, t2, _i, t3, t4, _i0, _0_0;
       for (t1 = node.clauses, t2 = t1.length, _i = 0; _i < t2; ++_i)
         for (t3 = t1[_i].children, t4 = t3.length, _i0 = 0; _i0 < t4; ++_i0)
           t3[_i0].accept$1(this);
       _0_0 = node.lastClause;
-      if (_0_0 != null) {
-        lastClause = _0_0;
-        t1 = true;
-      } else {
-        lastClause = null;
-        t1 = false;
-      }
-      if (t1)
-        for (t1 = lastClause.children, t2 = t1.length, _i = 0; _i < t2; ++_i)
+      if (_0_0 != null)
+        for (t1 = _0_0.children, t2 = t1.length, _i = 0; _i < t2; ++_i)
           t1[_i].accept$1(this);
     },
     visitImportRule$1(node) {
@@ -75234,7 +76320,9 @@ self.util = _cliPkgRequires.util;
       return node;
     },
     visitFunctionExpression$1(node) {
-      return new A.FunctionExpression(node.namespace, node.originalName, this.visitArgumentInvocation$1(node.$arguments), node.span);
+      var t1 = node.originalName,
+        t2 = this.visitArgumentInvocation$1(node.$arguments);
+      return new A.FunctionExpression(node.namespace, A.stringReplaceAllUnchecked(t1, "_", "-"), t1, t2, node.span);
     },
     visitInterpolatedFunctionExpression$1(node) {
       return new A.InterpolatedFunctionExpression(this.visitInterpolation$1(node.name), this.visitArgumentInvocation$1(node.$arguments), node.span);
@@ -75285,16 +76373,14 @@ self.util = _cliPkgRequires.util;
       return node;
     },
     visitArgumentInvocation$1(invocation) {
-      var t5, t6, $name, value, _this = this,
+      var t5, t6, _this = this,
         t1 = invocation.positional,
         t2 = type$.String,
         t3 = type$.Expression,
         t4 = A.LinkedHashMap_LinkedHashMap$_empty(t2, t3);
       for (t5 = A.MapExtensions_get_pairs(invocation.named, t2, t3), t5 = t5.get$iterator(t5); t5.moveNext$0();) {
         t6 = t5.get$current(t5);
-        $name = t6._0;
-        value = t6._1;
-        t4.$indexSet(0, $name, value.accept$1(_this));
+        t4.$indexSet(0, t6._0, t6._1.accept$1(_this));
       }
       t5 = invocation.rest;
       t5 = t5 == null ? null : t5.accept$1(_this);
@@ -75324,19 +76410,19 @@ self.util = _cliPkgRequires.util;
     call$1(item) {
       return item.accept$1(this.$this);
     },
-    $signature: 162
+    $signature: 238
   };
   A.ReplaceExpressionVisitor_visitArgumentInvocation_closure.prototype = {
     call$1(expression) {
       return expression.accept$1(this.$this);
     },
-    $signature: 162
+    $signature: 238
   };
   A.ReplaceExpressionVisitor_visitInterpolation_closure.prototype = {
     call$1(node) {
       return type$.Expression._is(node) ? node.accept$1(this.$this) : node;
     },
-    $signature: 69
+    $signature: 67
   };
   A.SelectorSearchVisitor.prototype = {
     visitAttributeSelector$1(attribute) {
@@ -75393,7 +76479,7 @@ self.util = _cliPkgRequires.util;
     call$1(codeUnit) {
       return codeUnit > 127;
     },
-    $signature: 47
+    $signature: 45
   };
   A._SerializeVisitor.prototype = {
     visitCssStylesheet$1(node) {
@@ -75480,31 +76566,17 @@ self.util = _cliPkgRequires.util;
       _this._serialize$_visitChildren$1(node);
     },
     _visitMediaQuery$1(query) {
-      var modifier, t1, _1_0, type, _2_0, condition, operator, t2, _this = this,
+      var t1, _1_0, _2_0, condition, operator, t2, _this = this,
         _0_0 = query.modifier;
       if (_0_0 != null) {
-        modifier = _0_0;
-        t1 = true;
-      } else {
-        modifier = null;
-        t1 = false;
-      }
-      if (t1) {
         t1 = _this._serialize$_buffer;
-        t1.write$1(0, modifier);
+        t1.write$1(0, _0_0);
         t1.writeCharCode$1(32);
       }
       _1_0 = query.type;
       if (_1_0 != null) {
-        type = _1_0;
-        t1 = true;
-      } else {
-        type = null;
-        t1 = false;
-      }
-      if (t1) {
         t1 = _this._serialize$_buffer;
-        t1.write$1(0, type);
+        t1.write$1(0, _1_0);
         if (query.conditions.length !== 0)
           t1.write$1(0, " and ");
       }
@@ -75706,67 +76778,67 @@ self.util = _cliPkgRequires.util;
       t1.writeCharCode$1(41);
     },
     _writeCalculationValue$1(value) {
-      var _2_5, t1, _0_0, _1_0, unit, t2, operator, left, right, parenthesizeLeft, operatorWhitespace, parenthesizeRight, _this = this, _null = null;
-      $label0$0: {
-        _2_5 = A._InitializedCell$(new A._SerializeVisitor__writeCalculationValue_closure(value));
-        t1 = value instanceof A.SassNumber;
-        if (t1 && _2_5._readFinal$0() && value.get$hasComplexUnits()) {
-          if (!_this._inspect)
-            throw A.wrapException(A.SassScriptException$(A.S(value) + " isn't a valid CSS value.", _null));
-          _this._writeNumber$1(value._number$_value);
-          _this._serialize$_buffer.write$1(0, value.get$unitString());
-          break $label0$0;
+      var _2_4_isSet, _2_4, t1, _0_0, _1_0, first, rest, operator, left, right, parenthesizeLeft, operatorWhitespace, t2, parenthesizeRight, _this = this, _null = null;
+      $label1$1: {
+        _2_4_isSet = value instanceof A.SassNumber;
+        if (_2_4_isSet) {
+          _2_4 = value.get$hasComplexUnits();
+          t1 = _2_4 && !_this._inspect;
+        } else {
+          _2_4 = _null;
+          t1 = false;
         }
-        if (t1 && _2_5._readFinal$0()) {
-          $label1$1: {
+        if (t1)
+          throw A.wrapException(A.SassScriptException$(A.S(value) + " isn't a valid CSS value.", _null));
+        if (_2_4_isSet && !isFinite(value._number$_value)) {
+          $label0$0: {
             _0_0 = value._number$_value;
             if (1 / 0 === _0_0) {
               _this._serialize$_buffer.write$1(0, "infinity");
-              break $label1$1;
+              break $label0$0;
             }
             if (-1 / 0 === _0_0) {
               _this._serialize$_buffer.write$1(0, "-infinity");
-              break $label1$1;
+              break $label0$0;
             }
             if (isNaN(_0_0))
               _this._serialize$_buffer.write$1(0, "NaN");
           }
-          _1_0 = A.IterableExtension_get_firstOrNull(J.get$numeratorUnits$x(value));
-          if (_1_0 != null) {
-            unit = _1_0;
-            t1 = true;
-          } else {
-            unit = _null;
-            t1 = false;
-          }
-          if (t1) {
-            t1 = _this._style !== B.OutputStyle_1;
-            if (t1)
-              _this._serialize$_buffer.writeCharCode$1(32);
-            t2 = _this._serialize$_buffer;
-            t2.writeCharCode$1(42);
-            if (t1)
-              t2.writeCharCode$1(32);
-            t2.writeCharCode$1(49);
-            t2.write$1(0, unit);
-          }
-          break $label0$0;
+          t1 = J.getInterceptor$x(value);
+          _this._writeCalculationUnits$2(t1.get$numeratorUnits(value), t1.get$denominatorUnits(value));
+          break $label1$1;
+        }
+        if (_2_4_isSet)
+          t1 = _2_4;
+        else
+          t1 = false;
+        if (t1) {
+          _this._writeNumber$1(value._number$_value);
+          t1 = J.getInterceptor$x(value);
+          _1_0 = t1.get$numeratorUnits(value);
+          if (_1_0.length >= 1) {
+            first = _1_0[0];
+            rest = B.JSArray_methods.sublist$1(_1_0, 1);
+            _this._serialize$_buffer.write$1(0, first);
+            _this._writeCalculationUnits$2(rest, t1.get$denominatorUnits(value));
+          } else
+            _this._writeCalculationUnits$2(A._setArrayType([], type$.JSArray_String), t1.get$denominatorUnits(value));
+          break $label1$1;
         }
         if (value instanceof A.Value) {
           value.accept$1(_this);
-          break $label0$0;
+          break $label1$1;
         }
-        if (value instanceof A.CalculationOperation) {
+        t1 = value instanceof A.CalculationOperation;
+        if (t1) {
           operator = value._operator;
           left = value._left;
           right = value._right;
           right = right;
-          t1 = true;
         } else {
           right = _null;
           left = right;
           operator = left;
-          t1 = false;
         }
         if (t1) {
           parenthesizeLeft = left instanceof A.CalculationOperation && left._operator.precedence < operator.precedence;
@@ -75783,7 +76855,14 @@ self.util = _cliPkgRequires.util;
           if (operatorWhitespace)
             t1.writeCharCode$1(32);
           if (!(right instanceof A.CalculationOperation && _this._parenthesizeCalculationRhs$2(operator, right._operator)))
-            parenthesizeRight = operator === B.CalculationOperator_OvN && right instanceof A.SassNumber && !isFinite(right._number$_value) && right.get$hasUnits();
+            if (operator === B.CalculationOperator_Qf1) {
+              if (right instanceof A.SassNumber)
+                t2 = isFinite(right._number$_value) ? right.get$hasComplexUnits() : right.get$hasUnits();
+              else
+                t2 = false;
+              parenthesizeRight = t2;
+            } else
+              parenthesizeRight = false;
           else
             parenthesizeRight = true;
           if (parenthesizeRight)
@@ -75794,24 +76873,47 @@ self.util = _cliPkgRequires.util;
         }
       }
     },
+    _writeCalculationUnits$2(numeratorUnits, denominatorUnits) {
+      var t1, t2, t3, t4;
+      for (t1 = J.get$iterator$ax(numeratorUnits), t2 = this._serialize$_buffer, t3 = this._style !== B.OutputStyle_1; t1.moveNext$0();) {
+        t4 = t1.get$current(t1);
+        if (t3)
+          t2.writeCharCode$1(32);
+        t2.writeCharCode$1(42);
+        if (t3)
+          t2.writeCharCode$1(32);
+        t2.writeCharCode$1(49);
+        t2.write$1(0, t4);
+      }
+      for (t1 = J.get$iterator$ax(denominatorUnits); t1.moveNext$0();) {
+        t4 = t1.get$current(t1);
+        if (t3)
+          t2.writeCharCode$1(32);
+        t2.writeCharCode$1(47);
+        if (t3)
+          t2.writeCharCode$1(32);
+        t2.writeCharCode$1(49);
+        t2.write$1(0, t4);
+      }
+    },
     _parenthesizeCalculationRhs$2(outer, right) {
       var t1;
       $label0$0: {
-        if (B.CalculationOperator_OvN === outer) {
+        if (B.CalculationOperator_Qf1 === outer) {
           t1 = true;
           break $label0$0;
         }
-        if (B.CalculationOperator_IyK === outer) {
+        if (B.CalculationOperator_g2q === outer) {
           t1 = false;
           break $label0$0;
         }
-        t1 = right === B.CalculationOperator_IyK || right === B.CalculationOperator_2bx;
+        t1 = right === B.CalculationOperator_g2q || right === B.CalculationOperator_CxF;
         break $label0$0;
       }
       return t1;
     },
     visitColor$1(value) {
-      var hexLength, _0_0, $name, t1, _1_0, format, opaque, t2, _3_0, _this = this;
+      var hexLength, _0_0, t1, $name, _1_0, opaque, t2, _3_0, _this = this;
       if (_this._style === B.OutputStyle_1)
         if (!A.fuzzyEquals(value._alpha, 1))
           _this._writeRgb$1(value);
@@ -75819,55 +76921,48 @@ self.util = _cliPkgRequires.util;
           hexLength = _this._canUseShortHex$1(value) ? 4 : 7;
           _0_0 = $.$get$namesByColor().$index(0, value);
           if (_0_0 != null) {
+            t1 = _0_0.length <= hexLength;
             $name = _0_0;
-            t1 = true;
           } else {
             $name = null;
             t1 = false;
           }
-          if (t1 && $name.length <= hexLength)
+          if (t1)
             _this._serialize$_buffer.write$1(0, $name);
           else {
             t1 = _this._serialize$_buffer;
             if (_this._canUseShortHex$1(value)) {
               t1.writeCharCode$1(35);
-              t1.writeCharCode$1(A.hexCharFor(value.get$red(value) & 15));
-              t1.writeCharCode$1(A.hexCharFor(value.get$green(value) & 15));
-              t1.writeCharCode$1(A.hexCharFor(value.get$blue(value) & 15));
+              t1.writeCharCode$1(A.hexCharFor(value.get$red(0) & 15));
+              t1.writeCharCode$1(A.hexCharFor(value.get$green(0) & 15));
+              t1.writeCharCode$1(A.hexCharFor(value.get$blue(0) & 15));
             } else {
               t1.writeCharCode$1(35);
-              _this._writeHexComponent$1(value.get$red(value));
-              _this._writeHexComponent$1(value.get$green(value));
-              _this._writeHexComponent$1(value.get$blue(value));
+              _this._writeHexComponent$1(value.get$red(0));
+              _this._writeHexComponent$1(value.get$green(0));
+              _this._writeHexComponent$1(value.get$blue(0));
             }
           }
         }
       else {
         _1_0 = value.format;
-        if (_1_0 != null) {
-          format = _1_0;
-          t1 = true;
-        } else {
-          format = null;
-          t1 = false;
-        }
-        if (t1)
+        if (_1_0 != null)
           $label0$0: {
-            if (B._ColorFormatEnum_rgbFunction === format) {
+            if (B._ColorFormatEnum_rgbFunction === _1_0) {
               _this._writeRgb$1(value);
               break $label0$0;
             }
-            if (B._ColorFormatEnum_hslFunction === format) {
+            if (B._ColorFormatEnum_hslFunction === _1_0) {
               t1 = value._alpha;
               opaque = A.fuzzyEquals(t1, 1);
               t2 = _this._serialize$_buffer;
               t2.write$1(0, opaque ? "hsl(" : "hsla(");
-              _this._writeNumber$1(value.get$hue(value));
+              _this._writeNumber$1(value.get$hue(0));
               t2.write$1(0, ", ");
-              _this._writeNumber$1(value.get$saturation(value));
+              _this._writeNumber$1(value.get$saturation(0));
               t2.writeCharCode$1(37);
               t2.write$1(0, ", ");
-              _this._writeNumber$1(value.get$lightness(value));
+              _this._writeNumber$1(value.get$lightness(0));
               t2.writeCharCode$1(37);
               if (!opaque) {
                 t2.write$1(0, ", ");
@@ -75876,27 +76971,27 @@ self.util = _cliPkgRequires.util;
               t2.writeCharCode$1(41);
               break $label0$0;
             }
-            if (format instanceof A.SpanColorFormat) {
-              _this._serialize$_buffer.write$1(0, format._color$_span.get$text());
+            if (_1_0 instanceof A.SpanColorFormat) {
+              _this._serialize$_buffer.write$1(0, _1_0._color$_span.get$text());
               break $label0$0;
             }
           }
         else {
           _3_0 = $.$get$namesByColor().$index(0, value);
           if (_3_0 != null) {
+            t1 = !A.fuzzyEquals(value._alpha, 0);
             $name = _3_0;
-            t1 = true;
           } else {
             $name = null;
             t1 = false;
           }
-          if (t1 && !A.fuzzyEquals(value._alpha, 0))
+          if (t1)
             _this._serialize$_buffer.write$1(0, $name);
           else if (A.fuzzyEquals(value._alpha, 1)) {
             _this._serialize$_buffer.writeCharCode$1(35);
-            _this._writeHexComponent$1(value.get$red(value));
-            _this._writeHexComponent$1(value.get$green(value));
-            _this._writeHexComponent$1(value.get$blue(value));
+            _this._writeHexComponent$1(value.get$red(0));
+            _this._writeHexComponent$1(value.get$green(0));
+            _this._writeHexComponent$1(value.get$blue(0));
           } else
             _this._writeRgb$1(value);
         }
@@ -75908,12 +77003,12 @@ self.util = _cliPkgRequires.util;
         opaque = A.fuzzyEquals(t1, 1),
         t2 = this._serialize$_buffer;
       t2.write$1(0, opaque ? "rgb(" : "rgba(");
-      t2.write$1(0, value.get$red(value));
+      t2.write$1(0, value.get$red(0));
       t3 = this._style === B.OutputStyle_1;
       t2.write$1(0, t3 ? "," : ", ");
-      t2.write$1(0, value.get$green(value));
+      t2.write$1(0, value.get$green(0));
       t2.write$1(0, t3 ? "," : ", ");
-      t2.write$1(0, value.get$blue(value));
+      t2.write$1(0, value.get$blue(0));
       if (!opaque) {
         t2.write$1(0, t3 ? "," : ", ");
         this._writeNumber$1(t1);
@@ -75921,11 +77016,11 @@ self.util = _cliPkgRequires.util;
       t2.writeCharCode$1(41);
     },
     _canUseShortHex$1(color) {
-      var t1 = color.get$red(color);
+      var t1 = color.get$red(0);
       if ((t1 & 15) === B.JSInt_methods._shrOtherPositive$1(t1, 4)) {
-        t1 = color.get$green(color);
+        t1 = color.get$green(0);
         if ((t1 & 15) === B.JSInt_methods._shrOtherPositive$1(t1, 4)) {
-          t1 = color.get$blue(color);
+          t1 = color.get$blue(0);
           t1 = (t1 & 15) === B.JSInt_methods._shrOtherPositive$1(t1, 4);
         } else
           t1 = false;
@@ -75953,7 +77048,7 @@ self.util = _cliPkgRequires.util;
       if (t2)
         if (value._list$_contents.length === 1) {
           t3 = value._separator;
-          t3 = t3 === B.ListSeparator_rXA || t3 === B.ListSeparator_zg9;
+          t3 = t3 === B.ListSeparator_ECn || t3 === B.ListSeparator_cQA;
           singleton = t3;
         } else
           singleton = false;
@@ -75978,15 +77073,15 @@ self.util = _cliPkgRequires.util;
     _separatorString$1(separator) {
       var t1;
       $label0$0: {
-        if (B.ListSeparator_rXA === separator) {
+        if (B.ListSeparator_ECn === separator) {
           t1 = this._style === B.OutputStyle_1 ? "," : ", ";
           break $label0$0;
         }
-        if (B.ListSeparator_zg9 === separator) {
+        if (B.ListSeparator_cQA === separator) {
           t1 = this._style === B.OutputStyle_1 ? "/" : " / ";
           break $label0$0;
         }
-        if (B.ListSeparator_EVt === separator) {
+        if (B.ListSeparator_nbm === separator) {
           t1 = " ";
           break $label0$0;
         }
@@ -76000,13 +77095,13 @@ self.util = _cliPkgRequires.util;
       $label1$1: {
         if (value instanceof A.SassList && value._list$_contents.length > 1 && !value._hasBrackets) {
           $label0$0: {
-            if (B.ListSeparator_rXA === separator) {
-              t1 = value._separator === B.ListSeparator_rXA;
+            if (B.ListSeparator_ECn === separator) {
+              t1 = value._separator === B.ListSeparator_ECn;
               break $label0$0;
             }
-            if (B.ListSeparator_zg9 === separator) {
+            if (B.ListSeparator_cQA === separator) {
               t1 = value._separator;
-              t1 = t1 === B.ListSeparator_rXA || t1 === B.ListSeparator_zg9;
+              t1 = t1 === B.ListSeparator_ECn || t1 === B.ListSeparator_cQA;
               break $label0$0;
             }
             t1 = value._separator !== B.ListSeparator_undecided_null_undecided;
@@ -76030,7 +77125,7 @@ self.util = _cliPkgRequires.util;
       t1.writeCharCode$1(41);
     },
     _writeMapElement$1(value) {
-      var needsParens = value instanceof A.SassList && value._separator === B.ListSeparator_rXA && !value._hasBrackets;
+      var needsParens = value instanceof A.SassList && value._separator === B.ListSeparator_ECn && !value._hasBrackets;
       if (needsParens)
         this._serialize$_buffer.writeCharCode$1(40);
       value.accept$1(this);
@@ -76038,18 +77133,11 @@ self.util = _cliPkgRequires.util;
         this._serialize$_buffer.writeCharCode$1(41);
     },
     visitNumber$1(value) {
-      var before, after, t1, _1_0, first, _this = this, _null = null,
+      var before, after, t1, _1_0, _this = this,
         _0_0 = value.asSlash;
       if (type$.Record_2_nullable_Object_and_nullable_Object._is(_0_0)) {
         before = _0_0._0;
         after = _0_0._1;
-        t1 = true;
-      } else {
-        after = _null;
-        before = after;
-        t1 = false;
-      }
-      if (t1) {
         _this.visitNumber$1(before);
         _this._serialize$_buffer.writeCharCode$1(47);
         _this.visitNumber$1(after);
@@ -76060,35 +77148,22 @@ self.util = _cliPkgRequires.util;
         _this.visitCalculation$1(new A.SassCalculation("calc", A.List_List$unmodifiable(A._setArrayType([value], type$.JSArray_Object), type$.Object)));
         return;
       }
-      _this._writeNumber$1(t1);
-      if (!_this._inspect) {
-        if (value.get$hasComplexUnits())
-          throw A.wrapException(A.SassScriptException$(value.toString$0(0) + " isn't a valid CSS value.", _null));
+      if (value.get$hasComplexUnits()) {
+        if (!_this._inspect)
+          throw A.wrapException(A.SassScriptException$(value.toString$0(0) + " isn't a valid CSS value.", null));
+        _this.visitCalculation$1(new A.SassCalculation("calc", A.List_List$unmodifiable(A._setArrayType([value], type$.JSArray_Object), type$.Object)));
+      } else {
+        _this._writeNumber$1(t1);
         _1_0 = value.get$numeratorUnits(value);
-        if (_1_0.length === 1) {
-          first = _1_0[0];
-          t1 = true;
-        } else {
-          first = _null;
-          t1 = false;
-        }
-        if (t1)
-          _this._serialize$_buffer.write$1(0, first);
-      } else
-        _this._serialize$_buffer.write$1(0, value.get$unitString());
+        if (_1_0.length === 1)
+          _this._serialize$_buffer.write$1(0, _1_0[0]);
+      }
     },
     _writeNumber$1(number) {
-      var integer, t1, text, _this = this,
+      var text, _this = this,
         _0_0 = A.fuzzyAsInt(number);
       if (_0_0 != null) {
-        integer = _0_0;
-        t1 = true;
-      } else {
-        integer = null;
-        t1 = false;
-      }
-      if (t1) {
-        _this._serialize$_buffer.write$1(0, _this._removeExponent$1(J.toString$0$(integer)));
+        _this._serialize$_buffer.write$1(0, _this._removeExponent$1(B.JSInt_methods.toString$0(_0_0)));
         return;
       }
       text = _this._removeExponent$1(B.JSNumber_methods.toString$0(number));
@@ -76123,7 +77198,7 @@ self.util = _cliPkgRequires.util;
               buffer._contents = t2 + B.JSString_methods.substring$2(text, 3, i);
           } else if (i > 2)
             buffer._contents = t2 + B.JSString_methods.substring$2(text, 2, i);
-          exponent._value = A.int_parse(B.JSString_methods.substring$2(text, i + 1, t1), null);
+          exponent.__late_helper$_value = A.int_parse(B.JSString_methods.substring$2(text, i + 1, t1), null);
           break;
         }
         ++i;
@@ -76135,19 +77210,20 @@ self.util = _cliPkgRequires.util;
         t2 = buffer._contents;
         t3 = negative ? 1 : 0;
         additionalZeroes = t1 - (t2.length - 1 - t3);
-        for (t1 = t2, i = 0; i < additionalZeroes; ++i)
-          t1 = buffer._contents += A.Primitives_stringFromCharCode(48);
+        for (t1 = t2, i = 0; i < additionalZeroes; ++i) {
+          t1 = A.Primitives_stringFromCharCode(48);
+          t1 = buffer._contents += t1;
+        }
         return t1.charCodeAt(0) == 0 ? t1 : t1;
       } else {
         negative = text.charCodeAt(0) === 45;
         t1 = (negative ? "" + A.Primitives_stringFromCharCode(45) : "") + "0.";
-        t2 = exponent.__late_helper$_name;
         i = -1;
         while (true) {
-          t3 = exponent._value;
-          if (t3 === exponent)
-            A.throwExpression(A.LateError$localNI(t2));
-          if (!(i > t3))
+          t2 = exponent.__late_helper$_value;
+          if (t2 === exponent)
+            A.throwExpression(A.LateError$localNI(""));
+          if (!(i > t2))
             break;
           t1 += A.Primitives_stringFromCharCode(48);
           --i;
@@ -76230,42 +77306,42 @@ self.util = _cliPkgRequires.util;
       }
     },
     _visitQuotedString$2$forceDoubleQuote(string, forceDoubleQuote) {
-      var t1, includesSingleQuote, includesDoubleQuote, i, char, _1_2, _1_4, _0_0, newIndex, t2, quote, _this = this,
+      var t1, includesSingleQuote, includesDoubleQuote, i, char, _1_2, _1_4, _0_0, quote, _this = this,
         buffer = forceDoubleQuote ? _this._serialize$_buffer : new A.StringBuffer("");
       if (forceDoubleQuote)
         buffer.writeCharCode$1(34);
       for (t1 = string.length, includesSingleQuote = false, includesDoubleQuote = false, i = 0; i < t1; ++i) {
         char = string.charCodeAt(i);
-        _1_2 = A._InitializedCell$(new A._SerializeVisitor__visitQuotedString_closure(char));
-        _1_4 = A._InitializedCell$(new A._SerializeVisitor__visitQuotedString_closure0(char));
-        if (_1_2._readFinal$0() && forceDoubleQuote) {
+        _1_2 = 39 === char;
+        if (_1_2 && forceDoubleQuote) {
           buffer.writeCharCode$1(39);
           continue;
         }
-        if (_1_2._readFinal$0() && includesDoubleQuote) {
+        if (_1_2 && includesDoubleQuote) {
           _this._visitQuotedString$2$forceDoubleQuote(string, true);
           return;
         }
-        if (_1_2._readFinal$0()) {
+        if (_1_2) {
           buffer.writeCharCode$1(39);
           includesSingleQuote = true;
           continue;
         }
-        if (_1_4._readFinal$0() && forceDoubleQuote) {
+        _1_4 = 34 === char;
+        if (_1_4 && forceDoubleQuote) {
           buffer.writeCharCode$1(92);
           buffer.writeCharCode$1(34);
           continue;
         }
-        if (_1_4._readFinal$0() && includesSingleQuote) {
+        if (_1_4 && includesSingleQuote) {
           _this._visitQuotedString$2$forceDoubleQuote(string, true);
           return;
         }
-        if (_1_4._readFinal$0()) {
+        if (_1_4) {
           buffer.writeCharCode$1(34);
           includesDoubleQuote = true;
           continue;
         }
-        if (0 === char || 1 === char || 2 === char || 3 === char || 4 === char || 5 === char || 6 === char || 7 === char || 8 === char || 10 === char || 11 === char || 12 === char || 13 === char || 14 === char || 15 === char || 16 === char || 17 === char || 18 === char || 19 === char || 20 === char || 21 === char || 22 === char || 23 === char || 24 === char || 25 === char || 26 === char || 27 === char || 28 === char || 29 === char || 30 === char || 31 === char) {
+        if (0 === char || 1 === char || 2 === char || 3 === char || 4 === char || 5 === char || 6 === char || 7 === char || 8 === char || 10 === char || 11 === char || 12 === char || 13 === char || 14 === char || 15 === char || 16 === char || 17 === char || 18 === char || 19 === char || 20 === char || 21 === char || 22 === char || 23 === char || 24 === char || 25 === char || 26 === char || 27 === char || 28 === char || 29 === char || 30 === char || 31 === char || 127 === char) {
           _this._writeEscape$4(buffer, char, string, i);
           continue;
         }
@@ -76275,15 +77351,8 @@ self.util = _cliPkgRequires.util;
           continue;
         }
         _0_0 = _this._tryPrivateUseCharacter$4(buffer, char, string, i);
-        if (_0_0 != null) {
-          newIndex = _0_0;
-          t2 = true;
-        } else {
-          newIndex = null;
-          t2 = false;
-        }
-        if (t2)
-          i = newIndex;
+        if (_0_0 != null)
+          i = _0_0;
         else
           buffer.writeCharCode$1(char);
       }
@@ -76301,7 +77370,7 @@ self.util = _cliPkgRequires.util;
       return this._visitQuotedString$2$forceDoubleQuote(string, false);
     },
     _visitUnquotedString$1(string) {
-      var t1, t2, afterNewline, i, _1_0, _0_0, newIndex, t3;
+      var t1, t2, afterNewline, i, _1_0, _0_0;
       for (t1 = string.length, t2 = this._serialize$_buffer, afterNewline = false, i = 0; i < t1; ++i) {
         _1_0 = string.charCodeAt(i);
         if (10 === _1_0) {
@@ -76315,15 +77384,8 @@ self.util = _cliPkgRequires.util;
           continue;
         }
         _0_0 = this._tryPrivateUseCharacter$4(t2, _1_0, string, i);
-        if (_0_0 != null) {
-          newIndex = _0_0;
-          t3 = true;
-        } else {
-          newIndex = null;
-          t3 = false;
-        }
-        if (t3)
-          i = newIndex;
+        if (_0_0 != null)
+          i = _0_0;
         else
           t2.writeCharCode$1(_1_0);
         afterNewline = false;
@@ -76356,27 +77418,20 @@ self.util = _cliPkgRequires.util;
         buffer.writeCharCode$1(32);
     },
     visitAttributeSelector$1(attribute) {
-      var _0_0, value, t2,
+      var _0_0, t2,
         t1 = this._serialize$_buffer;
       t1.writeCharCode$1(91);
       t1.write$1(0, attribute.name);
       _0_0 = attribute.value;
       if (_0_0 != null) {
-        value = _0_0;
-        t2 = true;
-      } else {
-        value = null;
-        t2 = false;
-      }
-      if (t2) {
         t1.write$1(0, attribute.op);
-        if (A.Parser_isIdentifier(value) && !J.startsWith$1$s(value, "--")) {
-          t1.write$1(0, value);
+        if (A.Parser_isIdentifier(_0_0) && !B.JSString_methods.startsWith$1(_0_0, "--")) {
+          t1.write$1(0, _0_0);
           t2 = attribute.modifier;
           if (t2 != null)
             t1.writeCharCode$1(32);
         } else {
-          this._visitQuotedString$1(value);
+          this._visitQuotedString$1(_0_0);
           t2 = attribute.modifier;
           if (t2 != null)
             if (this._style !== B.OutputStyle_1)
@@ -76465,10 +77520,17 @@ self.util = _cliPkgRequires.util;
       t1.write$1(0, placeholder.name);
     },
     visitPseudoSelector$1(pseudo) {
-      var t2, t3,
-        _0_4 = A._InitializedCell$(new A._SerializeVisitor_visitPseudoSelector_closure(pseudo)),
+      var _0_4, t2, t3,
         t1 = pseudo.name;
-      if ("not" === t1 && _0_4._readFinal$0() instanceof A.SelectorList && _0_4._readFinal$0().accept$1(B._IsInvisibleVisitor_true))
+      if ("not" === t1) {
+        _0_4 = pseudo.selector;
+        if (_0_4 instanceof A.SelectorList)
+          t2 = (_0_4 == null ? type$.SelectorList._as(_0_4) : _0_4).accept$1(B._IsInvisibleVisitor_true);
+        else
+          t2 = false;
+      } else
+        t2 = false;
+      if (t2)
         return;
       t2 = this._serialize$_buffer;
       t2.writeCharCode$1(58);
@@ -76508,28 +77570,28 @@ self.util = _cliPkgRequires.util;
       var t2, t3, t4, t5, t6, t7, prePrevious, previous, t8, previous0, t9, savedIndentation, _this = this,
         t1 = _this._serialize$_buffer;
       t1.writeCharCode$1(123);
-      for (t2 = $parent.children, t2 = new A.ListIterator(t2, t2.get$length(t2)), t3 = _this._style === B.OutputStyle_1, t4 = !t3, t5 = _this.get$_requiresSemicolon(), t6 = !_this._inspect, t7 = A._instanceType(t2)._precomputed1, prePrevious = null, previous = null; t2.moveNext$0();) {
+      for (t2 = $parent.children, t3 = t2.$ti, t2 = new A.ListIterator(t2, t2.get$length(0), t3._eval$1("ListIterator<ListBase.E>")), t4 = _this._style === B.OutputStyle_1, t5 = !t4, t6 = _this.get$_requiresSemicolon(), t7 = !_this._inspect, t3 = t3._eval$1("ListBase.E"), prePrevious = null, previous = null; t2.moveNext$0();) {
         t8 = t2.__internal$_current;
-        previous0 = t8 == null ? t7._as(t8) : t8;
-        if (t6)
-          t8 = t3 ? previous0.accept$1(B._IsInvisibleVisitor_true_true) : previous0.accept$1(B._IsInvisibleVisitor_true_false);
+        previous0 = t8 == null ? t3._as(t8) : t8;
+        if (t7)
+          t8 = t4 ? previous0.accept$1(B._IsInvisibleVisitor_true_true) : previous0.accept$1(B._IsInvisibleVisitor_true_false);
         else
           t8 = false;
         if (t8)
           continue;
         t8 = previous == null;
-        t9 = t8 ? null : t5.call$1(previous);
+        t9 = t8 ? null : t6.call$1(previous);
         if (t9 == null ? false : t9)
           t1.writeCharCode$1(59);
         if (_this._isTrailingComment$2(previous0, t8 ? $parent : previous)) {
-          if (t4)
+          if (t5)
             t1.writeCharCode$1(32);
           savedIndentation = _this._indentation;
           _this._indentation = 0;
           new A._SerializeVisitor__visitChildren_closure(_this, previous0).call$0();
           _this._indentation = savedIndentation;
         } else {
-          if (t4)
+          if (t5)
             t1.write$1(0, "\n");
           ++_this._indentation;
           new A._SerializeVisitor__visitChildren_closure0(_this, previous0).call$0();
@@ -76539,10 +77601,10 @@ self.util = _cliPkgRequires.util;
         previous = previous0;
       }
       if (previous != null) {
-        if ((type$.CssParentNode._is(previous) ? previous.get$isChildless() : !(previous instanceof A.ModifiableCssComment)) && t4)
+        if ((type$.CssParentNode._is(previous) ? previous.get$isChildless() : !(previous instanceof A.ModifiableCssComment)) && t5)
           t1.writeCharCode$1(59);
         if (prePrevious == null && _this._isTrailingComment$2(previous, $parent)) {
-          if (t4)
+          if (t5)
             t1.writeCharCode$1(32);
         } else {
           _this._writeLineFeed$0();
@@ -76622,7 +77684,7 @@ self.util = _cliPkgRequires.util;
   };
   A._SerializeVisitor_visitCssComment_closure.prototype = {
     call$0() {
-      var t2, t3, _0_0, minimumIndentation, t4,
+      var t2, t3, _0_0, minimumIndentation,
         t1 = this.$this;
       if (t1._style === B.OutputStyle_1 && this.node.text.charCodeAt(2) !== 33)
         return;
@@ -76632,17 +77694,9 @@ self.util = _cliPkgRequires.util;
         return;
       _0_0 = t1._minimumIndentation$1(t3);
       if (_0_0 != null) {
-        minimumIndentation = _0_0;
-        t4 = true;
-      } else {
-        minimumIndentation = null;
-        t4 = false;
-      }
-      if (t4) {
         t2 = t2.span;
         t2 = t2.get$start(t2);
-        t2 = t2.file.getColumn$1(t2.offset);
-        minimumIndentation = Math.min(A.checkNum(minimumIndentation), t2);
+        minimumIndentation = Math.min(_0_0, t2.file.getColumn$1(t2.offset));
         t1._writeIndentation$0();
         t1._writeWithIndent$2(t3, minimumIndentation);
       } else {
@@ -76650,11 +77704,11 @@ self.util = _cliPkgRequires.util;
         t1._serialize$_buffer.write$1(0, t3);
       }
     },
-    $signature: 2
+    $signature: 1
   };
   A._SerializeVisitor_visitCssAtRule_closure.prototype = {
     call$0() {
-      var t3, _0_0, value,
+      var t3, _0_0,
         t1 = this.$this,
         t2 = t1._serialize$_buffer;
       t2.writeCharCode$1(64);
@@ -76662,18 +77716,11 @@ self.util = _cliPkgRequires.util;
       t1._serialize$_write$1(t3.name);
       _0_0 = t3.value;
       if (_0_0 != null) {
-        value = _0_0;
-        t3 = true;
-      } else {
-        value = null;
-        t3 = false;
-      }
-      if (t3) {
         t2.writeCharCode$1(32);
-        t1._serialize$_write$1(value);
+        t1._serialize$_write$1(_0_0);
       }
     },
-    $signature: 2
+    $signature: 1
   };
   A._SerializeVisitor_visitCssMediaRule_closure.prototype = {
     call$0() {
@@ -76700,11 +77747,11 @@ self.util = _cliPkgRequires.util;
       t2 = t4 ? "," : ", ";
       t1._writeBetween$3(t3, t2, t1.get$_visitMediaQuery());
     },
-    $signature: 2
+    $signature: 1
   };
   A._SerializeVisitor_visitCssImport_closure.prototype = {
     call$0() {
-      var t3, t4, _0_0, modifiers,
+      var t3, t4, _0_0,
         t1 = this.$this,
         t2 = t1._serialize$_buffer;
       t2.write$1(0, "@import");
@@ -76715,19 +77762,12 @@ self.util = _cliPkgRequires.util;
       t2.forSpan$2(t4.url.span, new A._SerializeVisitor_visitCssImport__closure(t1, t4));
       _0_0 = t4.modifiers;
       if (_0_0 != null) {
-        modifiers = _0_0;
-        t1 = true;
-      } else {
-        modifiers = null;
-        t1 = false;
-      }
-      if (t1) {
         if (t3)
           t2.writeCharCode$1(32);
-        t2.write$1(0, modifiers);
+        t2.write$1(0, _0_0);
       }
     },
-    $signature: 2
+    $signature: 1
   };
   A._SerializeVisitor_visitCssImport__closure.prototype = {
     call$0() {
@@ -76759,7 +77799,7 @@ self.util = _cliPkgRequires.util;
         t2.writeCharCode$1(32);
       t1._serialize$_write$1(this.node.condition);
     },
-    $signature: 2
+    $signature: 1
   };
   A._SerializeVisitor_visitCssDeclaration_closure.prototype = {
     call$0() {
@@ -76770,7 +77810,7 @@ self.util = _cliPkgRequires.util;
       else
         t1._writeReindentedValue$1(t2);
     },
-    $signature: 2
+    $signature: 1
   };
   A._SerializeVisitor_visitCssDeclaration_closure0.prototype = {
     call$0() {
@@ -76778,17 +77818,11 @@ self.util = _cliPkgRequires.util;
     },
     $signature: 0
   };
-  A._SerializeVisitor__writeCalculationValue_closure.prototype = {
-    call$0() {
-      return !isFinite(this._2_0._number$_value);
-    },
-    $signature: 1
-  };
   A._SerializeVisitor_visitList_closure.prototype = {
     call$1(element) {
       return !element.get$isBlank();
     },
-    $signature: 79
+    $signature: 72
   };
   A._SerializeVisitor_visitList_closure0.prototype = {
     call$1(element) {
@@ -76800,13 +77834,13 @@ self.util = _cliPkgRequires.util;
       if (needsParens)
         t1._serialize$_buffer.writeCharCode$1(41);
     },
-    $signature: 63
+    $signature: 54
   };
   A._SerializeVisitor_visitList_closure1.prototype = {
     call$1(element) {
       element.accept$1(this.$this);
     },
-    $signature: 63
+    $signature: 54
   };
   A._SerializeVisitor_visitMap_closure.prototype = {
     call$1(entry) {
@@ -76815,31 +77849,13 @@ self.util = _cliPkgRequires.util;
       t1._serialize$_buffer.write$1(0, ": ");
       t1._writeMapElement$1(entry.value);
     },
-    $signature: 647
-  };
-  A._SerializeVisitor__visitQuotedString_closure.prototype = {
-    call$0() {
-      return 39 === this._1_0;
-    },
-    $signature: 1
-  };
-  A._SerializeVisitor__visitQuotedString_closure0.prototype = {
-    call$0() {
-      return 34 === this._1_0;
-    },
-    $signature: 1
+    $signature: 273
   };
   A._SerializeVisitor_visitSelectorList_closure.prototype = {
     call$1(complex) {
       return !complex.accept$1(B._IsInvisibleVisitor_true);
     },
-    $signature: 19
-  };
-  A._SerializeVisitor_visitPseudoSelector_closure.prototype = {
-    call$0() {
-      return this._0_0.selector;
-    },
-    $signature: 75
+    $signature: 16
   };
   A._SerializeVisitor__write_closure.prototype = {
     call$0() {
@@ -77089,32 +78105,32 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return this.urls.__js_helper$_length;
     },
-    $signature: 3
+    $signature: 10
   };
   A.SingleMapping_SingleMapping$fromEntries_closure0.prototype = {
     call$0() {
       return this.sourceEntry.source.file;
     },
-    $signature: 296
+    $signature: 274
   };
   A.SingleMapping_SingleMapping$fromEntries_closure1.prototype = {
     call$1(i) {
       return this.files.$index(0, i);
     },
-    $signature: 297
+    $signature: 275
   };
   A.SingleMapping_toJson_closure.prototype = {
     call$1(file) {
       return file == null ? null : A.String_String$fromCharCodes(B.NativeUint32List_methods.sublist$2(file._decodedChars, 0, null), 0, null);
     },
-    $signature: 298
+    $signature: 276
   };
   A.SingleMapping_toJson_closure0.prototype = {
     call$2($name, value) {
       this.result.$indexSet(0, $name, value);
       return value;
     },
-    $signature: 208
+    $signature: 114
   };
   A.TargetLineEntry.prototype = {
     toString$0(_) {
@@ -77150,15 +78166,15 @@ self.util = _cliPkgRequires.util;
     span$2(_, start, end) {
       return A._FileSpan$(this, start, end == null ? this._decodedChars.length : end);
     },
-    span$1($receiver, start) {
-      return this.span$2($receiver, start, null);
+    span$1(_, start) {
+      return this.span$2(0, start, null);
     },
     getLine$1(offset) {
       var t1, _this = this;
       if (offset < 0)
         throw A.wrapException(A.RangeError$("Offset may not be negative, was " + offset + "."));
       else if (offset > _this._decodedChars.length)
-        throw A.wrapException(A.RangeError$("Offset " + offset + string$.x20must_n + _this.get$length(_this) + "."));
+        throw A.wrapException(A.RangeError$("Offset " + offset + string$.x20must_n + _this.get$length(0) + "."));
       t1 = _this._lineStarts;
       if (offset < B.JSArray_methods.get$first(t1))
         return -1;
@@ -77206,7 +78222,7 @@ self.util = _cliPkgRequires.util;
       if (offset < 0)
         throw A.wrapException(A.RangeError$("Offset may not be negative, was " + offset + "."));
       else if (offset > _this._decodedChars.length)
-        throw A.wrapException(A.RangeError$("Offset " + offset + " must be not be greater than the number of characters in the file, " + _this.get$length(_this) + "."));
+        throw A.wrapException(A.RangeError$("Offset " + offset + " must be not be greater than the number of characters in the file, " + _this.get$length(0) + "."));
       line = _this.getLine$1(offset);
       lineStart = _this._lineStarts[line];
       if (lineStart > offset)
@@ -77252,7 +78268,7 @@ self.util = _cliPkgRequires.util;
       else {
         t2 = this.file;
         if (t1 > t2._decodedChars.length)
-          throw A.wrapException(A.RangeError$("Offset " + t1 + string$.x20must_n + t2.get$length(t2) + "."));
+          throw A.wrapException(A.RangeError$("Offset " + t1 + string$.x20must_n + t2.get$length(0) + "."));
       }
     },
     pointSpan$0() {
@@ -77300,7 +78316,7 @@ self.util = _cliPkgRequires.util;
       else {
         t3 = this.file;
         if (t1 > t3._decodedChars.length)
-          throw A.wrapException(A.RangeError$("End " + t1 + string$.x20must_n + t3.get$length(t3) + "."));
+          throw A.wrapException(A.RangeError$("End " + t1 + string$.x20must_n + t3.get$length(0) + "."));
         else if (t2 < 0)
           throw A.wrapException(A.RangeError$("Start may not be negative, was " + t2 + "."));
       }
@@ -77329,7 +78345,7 @@ self.util = _cliPkgRequires.util;
       var t2, t3, _this = this,
         t1 = _this.file;
       if (!J.$eq$(t1.url, other.get$sourceUrl(other)))
-        throw A.wrapException(A.ArgumentError$('Source URLs "' + A.S(_this.get$sourceUrl(_this)) + '" and  "' + A.S(other.get$sourceUrl(other)) + "\" don't match.", null));
+        throw A.wrapException(A.ArgumentError$('Source URLs "' + A.S(_this.get$sourceUrl(0)) + '" and  "' + A.S(other.get$sourceUrl(other)) + "\" don't match.", null));
       t2 = _this._file$_start;
       t3 = _this._end;
       if (other instanceof A._FileSpan)
@@ -77365,10 +78381,10 @@ self.util = _cliPkgRequires.util;
             t3._contents += "\n";
           }
         }
-        for (t5 = line.highlights, t6 = new A.ReversedListIterable(t5, A._arrayInstanceType(t5)._eval$1("ReversedListIterable<1>")), t6 = new A.ListIterator(t6, t6.get$length(t6)), t7 = A._instanceType(t6)._precomputed1, t8 = line.number, t9 = line.text; t6.moveNext$0();) {
-          t10 = t6.__internal$_current;
+        for (t5 = line.highlights, t6 = A._arrayInstanceType(t5)._eval$1("ReversedListIterable<1>"), t7 = new A.ReversedListIterable(t5, t6), t7 = new A.ListIterator(t7, t7.get$length(0), t6._eval$1("ListIterator<ListIterable.E>")), t6 = t6._eval$1("ListIterable.E"), t8 = line.number, t9 = line.text; t7.moveNext$0();) {
+          t10 = t7.__internal$_current;
           if (t10 == null)
-            t10 = t7._as(t10);
+            t10 = t6._as(t10);
           t11 = t10.span;
           if (t11.get$start(t11).get$line() !== t11.get$end(t11).get$line() && t11.get$start(t11).get$line() === t8 && _this._isOnlyWhitespace$1(B.JSString_methods.substring$2(t9, 0, t11.get$start(t11).get$column()))) {
             index = B.JSArray_methods.indexOf$1(highlightsByColumn, _null);
@@ -77414,7 +78430,9 @@ self.util = _cliPkgRequires.util;
       else {
         _this._writeSidebar$1$end(t2.get$topLeftCorner());
         _this._colorize$2$color(new A.Highlighter__writeFileStart_closure(_this), "\x1b[34m");
-        _this._highlighter$_buffer._contents += " " + $.$get$context().prettyUri$1(url);
+        t1 = _this._highlighter$_buffer;
+        t2 = " " + $.$get$context().prettyUri$1(url);
+        t1._contents += t2;
       }
       _this._highlighter$_buffer._contents += "\n";
     },
@@ -77510,7 +78528,8 @@ self.util = _cliPkgRequires.util;
         t1 = beginning ? 0 : 1,
         tabs = this._countTabs$1(B.JSString_methods.substring$2(line.text, 0, column + t1));
       t1 = this._highlighter$_buffer;
-      t2 = t1._contents += B.JSString_methods.$mul($._glyphs.get$horizontalLine(), 1 + column + tabs * 3);
+      t2 = B.JSString_methods.$mul($._glyphs.get$horizontalLine(), 1 + column + tabs * 3);
+      t2 = t1._contents += t2;
       t1._contents = t2 + "^";
     },
     _writeArrow$2(line, column) {
@@ -77528,35 +78547,41 @@ self.util = _cliPkgRequires.util;
       _this._colorize$2$color(new A.Highlighter__writeLabel_closure(_this, lines), color);
       t1 = _this._highlighter$_buffer;
       t1._contents += "\n";
-      for (t2 = A.SubListIterable$(lines, 1, null, type$.String), t2 = new A.ListIterator(t2, t2.get$length(t2)), t3 = highlightsByColumn.length, t4 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
+      for (t2 = A.SubListIterable$(lines, 1, null, type$.String), t3 = t2.$ti, t2 = new A.ListIterator(t2, t2.get$length(0), t3._eval$1("ListIterator<ListIterable.E>")), t4 = highlightsByColumn.length, t3 = t3._eval$1("ListIterable.E"); t2.moveNext$0();) {
         t5 = t2.__internal$_current;
         if (t5 == null)
-          t5 = t4._as(t5);
+          t5 = t3._as(t5);
         _this._writeSidebar$0();
         t6 = t1._contents += " ";
-        for (_i = 0; _i < t3; ++_i) {
+        for (_i = 0; _i < t4; ++_i) {
           columnHighlight = highlightsByColumn[_i];
           if (columnHighlight == null || columnHighlight === highlight) {
             t6 += " ";
             t1._contents = t6;
-          } else
-            t6 = t1._contents += $._glyphs.get$verticalLine();
+          } else {
+            t6 = $._glyphs.get$verticalLine();
+            t6 = t1._contents += t6;
+          }
         }
-        t1._contents += B.JSString_methods.$mul(" ", underlineLength);
+        t6 = B.JSString_methods.$mul(" ", underlineLength);
+        t1._contents += t6;
         _this._colorize$2$color(new A.Highlighter__writeLabel_closure0(_this, t5), color);
         t1._contents += "\n";
       }
     },
     _writeText$1(text) {
       var t1, t2, t3, t4;
-      for (t1 = new A.CodeUnits(text), t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = this._highlighter$_buffer, t3 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = new A.CodeUnits(text), t2 = type$.CodeUnits, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = this._highlighter$_buffer, t2 = t2._eval$1("ListBase.E"); t1.moveNext$0();) {
         t4 = t1.__internal$_current;
         if (t4 == null)
-          t4 = t3._as(t4);
-        if (t4 === 9)
-          t2._contents += B.JSString_methods.$mul(" ", 4);
-        else
-          t2._contents += A.Primitives_stringFromCharCode(t4);
+          t4 = t2._as(t4);
+        if (t4 === 9) {
+          t4 = B.JSString_methods.$mul(" ", 4);
+          t3._contents += t4;
+        } else {
+          t4 = A.Primitives_stringFromCharCode(t4);
+          t3._contents += t4;
+        }
       }
     },
     _writeSidebar$3$end$line$text(end, line, text) {
@@ -77580,7 +78605,7 @@ self.util = _cliPkgRequires.util;
     },
     _countTabs$1(text) {
       var t1, t2, count, t3;
-      for (t1 = new A.CodeUnits(text), t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1, count = 0; t1.moveNext$0();) {
+      for (t1 = new A.CodeUnits(text), t2 = type$.CodeUnits, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t2 = t2._eval$1("ListBase.E"), count = 0; t1.moveNext$0();) {
         t3 = t1.__internal$_current;
         if ((t3 == null ? t2._as(t3) : t3) === 9)
           ++count;
@@ -77589,7 +78614,7 @@ self.util = _cliPkgRequires.util;
     },
     _isOnlyWhitespace$1(text) {
       var t1, t2, t3;
-      for (t1 = new A.CodeUnits(text), t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = new A.CodeUnits(text), t2 = type$.CodeUnits, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t2 = t2._eval$1("ListBase.E"); t1.moveNext$0();) {
         t3 = t1.__internal$_current;
         if (t3 == null)
           t3 = t2._as(t3);
@@ -77622,28 +78647,27 @@ self.util = _cliPkgRequires.util;
         return null;
       return A._asStringQ(t1);
     },
-    $signature: 32
+    $signature: 44
   };
   A.Highlighter$__closure.prototype = {
     call$1(line) {
       var t1 = line.highlights;
-      t1 = new A.WhereIterable(t1, new A.Highlighter$___closure(), A._arrayInstanceType(t1)._eval$1("WhereIterable<1>"));
-      return t1.get$length(t1);
+      return new A.WhereIterable(t1, new A.Highlighter$___closure(), A._arrayInstanceType(t1)._eval$1("WhereIterable<1>")).get$length(0);
     },
-    $signature: 299
+    $signature: 277
   };
   A.Highlighter$___closure.prototype = {
     call$1(highlight) {
       var t1 = highlight.span;
       return t1.get$start(t1).get$line() !== t1.get$end(t1).get$line();
     },
-    $signature: 128
+    $signature: 133
   };
   A.Highlighter$__closure0.prototype = {
     call$1(line) {
       return line.url;
     },
-    $signature: 301
+    $signature: 279
   };
   A.Highlighter__collateLines_closure.prototype = {
     call$1(highlight) {
@@ -77651,13 +78675,13 @@ self.util = _cliPkgRequires.util;
       t1 = t1.get$sourceUrl(t1);
       return t1 == null ? new A.Object() : t1;
     },
-    $signature: 302
+    $signature: 280
   };
   A.Highlighter__collateLines_closure0.prototype = {
     call$2(highlight1, highlight2) {
       return highlight1.span.compareTo$1(0, highlight2.span);
     },
-    $signature: 303
+    $signature: 281
   };
   A.Highlighter__collateLines_closure1.prototype = {
     call$1(entry) {
@@ -77670,8 +78694,7 @@ self.util = _cliPkgRequires.util;
         context = t4.get$context(t4);
         t5 = A.findLineStart(context, t4.get$text(), t4.get$start(t4).get$column());
         t5.toString;
-        t5 = B.JSString_methods.allMatches$1("\n", B.JSString_methods.substring$2(context, 0, t5));
-        linesBeforeSpan = t5.get$length(t5);
+        linesBeforeSpan = B.JSString_methods.allMatches$1("\n", B.JSString_methods.substring$2(context, 0, t5)).get$length(0);
         lineNumber = t4.get$start(t4).get$line() - linesBeforeSpan;
         for (t4 = context.split("\n"), t5 = t4.length, _i = 0; _i < t5; ++_i) {
           line = t4[_i];
@@ -77687,7 +78710,7 @@ self.util = _cliPkgRequires.util;
           A.throwExpression(A.UnsupportedError$("removeWhere"));
         B.JSArray_methods._removeWhere$2(activeHighlights, new A.Highlighter__collateLines__closure(line), true);
         oldHighlightLength = activeHighlights.length;
-        for (t3 = t1.skip$1(highlightsForFile, highlightIndex), t3 = new A.ListIterator(t3, t3.get$length(t3)), t4 = A._instanceType(t3)._precomputed1; t3.moveNext$0();) {
+        for (t3 = t1.skip$1(highlightsForFile, highlightIndex), t4 = t3.$ti, t3 = new A.ListIterator(t3, t3.get$length(0), t4._eval$1("ListIterator<ListIterable.E>")), t4 = t4._eval$1("ListIterable.E"); t3.moveNext$0();) {
           t5 = t3.__internal$_current;
           if (t5 == null)
             t5 = t4._as(t5);
@@ -77701,47 +78724,53 @@ self.util = _cliPkgRequires.util;
       }
       return lines;
     },
-    $signature: 304
+    $signature: 282
   };
   A.Highlighter__collateLines__closure.prototype = {
     call$1(highlight) {
       var t1 = highlight.span;
       return t1.get$end(t1).get$line() < this.line.number;
     },
-    $signature: 128
+    $signature: 133
   };
   A.Highlighter_highlight_closure.prototype = {
     call$1(highlight) {
       return highlight.isPrimary;
     },
-    $signature: 128
+    $signature: 133
   };
   A.Highlighter__writeFileStart_closure.prototype = {
     call$0() {
-      this.$this._highlighter$_buffer._contents += B.JSString_methods.$mul($._glyphs.get$horizontalLine(), 2) + ">";
+      var t1 = this.$this._highlighter$_buffer,
+        t2 = B.JSString_methods.$mul($._glyphs.get$horizontalLine(), 2) + ">";
+      t1._contents += t2;
       return null;
     },
     $signature: 0
   };
   A.Highlighter__writeMultilineHighlights_closure.prototype = {
     call$0() {
-      var t1 = $._glyphs;
-      t1 = this.startLine === this.line.number ? t1.get$topLeftCorner() : t1.get$bottomLeftCorner();
-      this.$this._highlighter$_buffer._contents += t1;
+      var t1 = this.$this._highlighter$_buffer,
+        t2 = $._glyphs;
+      t2 = this.startLine === this.line.number ? t2.get$topLeftCorner() : t2.get$bottomLeftCorner();
+      t1._contents += t2;
     },
-    $signature: 2
+    $signature: 1
   };
   A.Highlighter__writeMultilineHighlights_closure0.prototype = {
     call$0() {
-      var t1 = $._glyphs;
-      t1 = this.highlight == null ? t1.get$horizontalLine() : t1.get$cross();
-      this.$this._highlighter$_buffer._contents += t1;
+      var t1 = this.$this._highlighter$_buffer,
+        t2 = $._glyphs;
+      t2 = this.highlight == null ? t2.get$horizontalLine() : t2.get$cross();
+      t1._contents += t2;
     },
-    $signature: 2
+    $signature: 1
   };
   A.Highlighter__writeMultilineHighlights_closure1.prototype = {
     call$0() {
-      this.$this._highlighter$_buffer._contents += $._glyphs.get$horizontalLine();
+      var t1 = this.$this._highlighter$_buffer,
+        t2 = $._glyphs.get$horizontalLine();
+      t1._contents += t2;
       return null;
     },
     $signature: 0
@@ -77772,27 +78801,30 @@ self.util = _cliPkgRequires.util;
             t2 = false;
           t3 = _this.$this;
           if (t2) {
-            t1 = _this.highlight.label == null ? $._glyphs.glyphOrAscii$2("\u2514", "\\") : vertical;
-            t3._highlighter$_buffer._contents += t1;
+            t1 = t3._highlighter$_buffer;
+            t2 = _this.highlight.label == null ? $._glyphs.glyphOrAscii$2("\u2514", "\\") : vertical;
+            t1._contents += t2;
           } else
             t3._colorize$2$color(new A.Highlighter__writeMultilineHighlights__closure0(t3, vertical), t1.openedOnThisLineColor);
         }
       }
     },
-    $signature: 2
+    $signature: 1
   };
   A.Highlighter__writeMultilineHighlights__closure.prototype = {
     call$0() {
-      var t1 = this._box_0.openedOnThisLine ? "\u252c" : "\u250c";
-      this.$this._highlighter$_buffer._contents += $._glyphs.glyphOrAscii$2(t1, "/");
+      var t1 = this.$this._highlighter$_buffer,
+        t2 = this._box_0.openedOnThisLine ? "\u252c" : "\u250c";
+      t2 = $._glyphs.glyphOrAscii$2(t2, "/");
+      t1._contents += t2;
     },
-    $signature: 2
+    $signature: 1
   };
   A.Highlighter__writeMultilineHighlights__closure0.prototype = {
     call$0() {
       this.$this._highlighter$_buffer._contents += this.vertical;
     },
-    $signature: 2
+    $signature: 1
   };
   A.Highlighter__writeHighlightedText_closure.prototype = {
     call$0() {
@@ -77816,11 +78848,13 @@ self.util = _cliPkgRequires.util;
       tabsBefore = t1._countTabs$1(B.JSString_methods.substring$2(t5, 0, startColumn));
       tabsInside = t1._countTabs$1(B.JSString_methods.substring$2(t5, startColumn, endColumn));
       startColumn += tabsBefore * 3;
-      t2._contents += B.JSString_methods.$mul(" ", startColumn);
-      t4 = t2._contents += B.JSString_methods.$mul(t4, Math.max(endColumn + (tabsBefore + tabsInside) * 3 - startColumn, 1));
+      t5 = B.JSString_methods.$mul(" ", startColumn);
+      t2._contents += t5;
+      t4 = B.JSString_methods.$mul(t4, Math.max(endColumn + (tabsBefore + tabsInside) * 3 - startColumn, 1));
+      t4 = t2._contents += t4;
       return t4.length - t3.length;
     },
-    $signature: 3
+    $signature: 10
   };
   A.Highlighter__writeIndicator_closure0.prototype = {
     call$0() {
@@ -77835,19 +78869,22 @@ self.util = _cliPkgRequires.util;
         t1 = _this.$this,
         t2 = t1._highlighter$_buffer,
         t3 = t2._contents;
-      if (_this.coversWholeLine)
-        t2._contents += B.JSString_methods.$mul($._glyphs.get$horizontalLine(), 3);
-      else {
+      if (_this.coversWholeLine) {
+        t1 = B.JSString_methods.$mul($._glyphs.get$horizontalLine(), 3);
+        t2._contents += t1;
+      } else {
         t4 = _this.highlight.span;
         t1._writeArrow$3$beginning(_this.line, Math.max(t4.get$end(t4).get$column() - 1, 0), false);
       }
       return t2._contents.length - t3.length;
     },
-    $signature: 3
+    $signature: 10
   };
   A.Highlighter__writeLabel_closure.prototype = {
     call$0() {
-      this.$this._highlighter$_buffer._contents += " " + A.S(B.JSArray_methods.get$first(this.lines));
+      var t1 = this.$this._highlighter$_buffer,
+        t2 = " " + A.S(B.JSArray_methods.get$first(this.lines));
+      t1._contents += t2;
       return null;
     },
     $signature: 0
@@ -77866,11 +78903,14 @@ self.util = _cliPkgRequires.util;
         t3 = this._box_0.text;
       if (t3 == null)
         t3 = "";
-      t2._contents += B.JSString_methods.padRight$1(t3, t1._paddingBeforeSidebar);
+      t1 = B.JSString_methods.padRight$1(t3, t1._paddingBeforeSidebar);
+      t2._contents += t1;
       t1 = this.end;
-      t2._contents += t1 == null ? $._glyphs.get$verticalLine() : t1;
+      if (t1 == null)
+        t1 = $._glyphs.get$verticalLine();
+      t2._contents += t1;
     },
-    $signature: 2
+    $signature: 1
   };
   A._Highlight.prototype = {
     toString$0(_) {
@@ -77895,7 +78935,7 @@ self.util = _cliPkgRequires.util;
       }
       return A._Highlight__normalizeEndOfLine(A._Highlight__normalizeTrailingNewline(A._Highlight__normalizeNewlines(t1)));
     },
-    $signature: 305
+    $signature: 283
   };
   A._Line.prototype = {
     toString$0(_) {
@@ -77949,16 +78989,14 @@ self.util = _cliPkgRequires.util;
   };
   A.SourceLocationMixin.prototype = {
     distance$1(other) {
-      var _this = this;
-      if (!J.$eq$(_this.file.url, other.get$sourceUrl(other)))
-        throw A.wrapException(A.ArgumentError$('Source URLs "' + A.S(_this.get$sourceUrl(_this)) + '" and "' + A.S(other.get$sourceUrl(other)) + "\" don't match.", null));
-      return Math.abs(_this.offset - other.get$offset());
+      if (!J.$eq$(this.file.url, other.get$sourceUrl(other)))
+        throw A.wrapException(A.ArgumentError$('Source URLs "' + A.S(this.get$sourceUrl(0)) + '" and "' + A.S(other.get$sourceUrl(other)) + "\" don't match.", null));
+      return Math.abs(this.offset - other.get$offset());
     },
     compareTo$1(_, other) {
-      var _this = this;
-      if (!J.$eq$(_this.file.url, other.get$sourceUrl(other)))
-        throw A.wrapException(A.ArgumentError$('Source URLs "' + A.S(_this.get$sourceUrl(_this)) + '" and "' + A.S(other.get$sourceUrl(other)) + "\" don't match.", null));
-      return _this.offset - other.get$offset();
+      if (!J.$eq$(this.file.url, other.get$sourceUrl(other)))
+        throw A.wrapException(A.ArgumentError$('Source URLs "' + A.S(this.get$sourceUrl(0)) + '" and "' + A.S(other.get$sourceUrl(other)) + "\" don't match.", null));
+      return this.offset - other.get$offset();
     },
     $eq(_, other) {
       if (other == null)
@@ -78019,8 +79057,8 @@ self.util = _cliPkgRequires.util;
       _this.get$span(_this);
       return "Error on " + _this.get$span(_this).message$2$color(0, _this._span_exception$_message, color);
     },
-    toString$0($receiver) {
-      return this.toString$1$color($receiver, null);
+    toString$0(_) {
+      return this.toString$1$color(0, null);
     },
     $isException: 1
   };
@@ -78057,11 +79095,13 @@ self.util = _cliPkgRequires.util;
       return result === 0 ? _this.get$end(_this).compareTo$1(0, other.get$end(other)) : result;
     },
     message$2$color(_, message, color) {
-      var t2, highlight, _this = this,
+      var t2, t3, highlight, _this = this,
         t1 = "" + ("line " + (_this.get$start(_this).get$line() + 1) + ", column " + (_this.get$start(_this).get$column() + 1));
       if (_this.get$sourceUrl(_this) != null) {
         t2 = _this.get$sourceUrl(_this);
-        t2 = t1 + (" of " + $.$get$context().prettyUri$1(t2));
+        t3 = $.$get$context();
+        t2.toString;
+        t2 = t1 + (" of " + t3.prettyUri$1(t2));
         t1 = t2;
       }
       t1 += ": " + message;
@@ -78070,8 +79110,8 @@ self.util = _cliPkgRequires.util;
         t1 = t1 + "\n" + highlight;
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     },
-    message$1($receiver, message) {
-      return this.message$2$color($receiver, message, null);
+    message$1(_, message) {
+      return this.message$2$color(0, message, null);
     },
     highlight$1$color(color) {
       var _this = this;
@@ -78117,39 +79157,39 @@ self.util = _cliPkgRequires.util;
     call$1(line) {
       return line.length !== 0;
     },
-    $signature: 10
+    $signature: 4
   };
   A.Chain_toTrace_closure.prototype = {
     call$1(trace) {
       return trace.get$frames();
     },
-    $signature: 306
+    $signature: 284
   };
   A.Chain_toString_closure0.prototype = {
     call$1(trace) {
       var t1 = trace.get$frames();
       return new A.MappedListIterable(t1, new A.Chain_toString__closure0(), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,int>")).fold$2(0, 0, B.CONSTANT);
     },
-    $signature: 307
+    $signature: 285
   };
   A.Chain_toString__closure0.prototype = {
     call$1(frame) {
       return frame.get$location().length;
     },
-    $signature: 165
+    $signature: 261
   };
   A.Chain_toString_closure.prototype = {
     call$1(trace) {
       var t1 = trace.get$frames();
       return new A.MappedListIterable(t1, new A.Chain_toString__closure(this.longest), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,String>")).join$0(0);
     },
-    $signature: 309
+    $signature: 287
   };
   A.Chain_toString__closure.prototype = {
     call$1(frame) {
       return B.JSString_methods.padRight$1(frame.get$location(), this.longest) + "  " + A.S(frame.get$member()) + "\n";
     },
-    $signature: 166
+    $signature: 260
   };
   A.Frame.prototype = {
     get$isCore() {
@@ -78223,7 +79263,7 @@ self.util = _cliPkgRequires.util;
       line = t1 > 1 ? A.int_parse(lineAndColumn[1], _null) : _null;
       return new A.Frame(uri, line, t1 > 2 ? A.int_parse(lineAndColumn[2], _null) : _null, member);
     },
-    $signature: 74
+    $signature: 69
   };
   A.Frame_Frame$parseV8_closure.prototype = {
     call$0() {
@@ -78249,7 +79289,7 @@ self.util = _cliPkgRequires.util;
         return t1.call$2(t2, _s4_);
       }
     },
-    $signature: 74
+    $signature: 69
   };
   A.Frame_Frame$parseV8_closure_parseLocation.prototype = {
     call$2($location, member) {
@@ -78276,7 +79316,7 @@ self.util = _cliPkgRequires.util;
       columnMatch = t1[3];
       return new A.Frame(uri, line, columnMatch != null ? A.int_parse(columnMatch, _null) : _null, member);
     },
-    $signature: 312
+    $signature: 290
   };
   A.Frame_Frame$_parseFirefoxEval_closure.prototype = {
     call$0() {
@@ -78297,7 +79337,7 @@ self.util = _cliPkgRequires.util;
       line = A.int_parse(t1, _null);
       return new A.Frame(uri, line, _null, member.length === 0 || member === "anonymous" ? "<fn>" : member);
     },
-    $signature: 74
+    $signature: 69
   };
   A.Frame_Frame$parseFirefox_closure.prototype = {
     call$0() {
@@ -78319,8 +79359,7 @@ self.util = _cliPkgRequires.util;
       if (member != null) {
         t1 = t2[2];
         t1.toString;
-        t1 = B.JSString_methods.allMatches$1("/", t1);
-        member += B.JSArray_methods.join$0(A.List_List$filled(t1.get$length(t1), ".<fn>", false, type$.String));
+        member += B.JSArray_methods.join$0(A.List_List$filled(B.JSString_methods.allMatches$1("/", t1).get$length(0), ".<fn>", false, type$.String));
         if (member === "")
           member = "<fn>";
         member = B.JSString_methods.replaceFirst$2(member, $.$get$_initialDot(), "");
@@ -78344,7 +79383,7 @@ self.util = _cliPkgRequires.util;
       }
       return new A.Frame(uri, line, column, member);
     },
-    $signature: 74
+    $signature: 69
   };
   A.Frame_Frame$parseFriendly_closure.prototype = {
     call$0() {
@@ -78384,7 +79423,7 @@ self.util = _cliPkgRequires.util;
       }
       return new A.Frame(uri, line, column, t1[4]);
     },
-    $signature: 74
+    $signature: 69
   };
   A.LazyTrace.prototype = {
     get$_lazy_trace$_trace() {
@@ -78414,7 +79453,7 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return this.$this.get$_lazy_trace$_trace().get$terse();
     },
-    $signature: 168
+    $signature: 259
   };
   A.Trace.prototype = {
     get$terse() {
@@ -78425,7 +79464,7 @@ self.util = _cliPkgRequires.util;
       _box_0.predicate = predicate;
       _box_0.predicate = new A.Trace_foldFrames_closure(predicate);
       newFrames = A._setArrayType([], type$.JSArray_Frame);
-      for (t1 = this.frames, t1 = new A.ReversedListIterable(t1, A._arrayInstanceType(t1)._eval$1("ReversedListIterable<1>")), t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = this.frames, t2 = A._arrayInstanceType(t1)._eval$1("ReversedListIterable<1>"), t1 = new A.ReversedListIterable(t1, t2), t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListIterable.E>")), t2 = t2._eval$1("ListIterable.E"); t1.moveNext$0();) {
         t3 = t1.__internal$_current;
         if (t3 == null)
           t3 = t2._as(t3);
@@ -78454,43 +79493,43 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return A.Trace_Trace$parse(this.trace.toString$0(0));
     },
-    $signature: 168
+    $signature: 259
   };
   A.Trace__parseVM_closure.prototype = {
     call$1(line) {
       return line.length !== 0;
     },
-    $signature: 10
+    $signature: 4
   };
   A.Trace$parseV8_closure.prototype = {
     call$1(line) {
       return !B.JSString_methods.startsWith$1(line, $.$get$_v8TraceLine());
     },
-    $signature: 10
+    $signature: 4
   };
   A.Trace$parseJSCore_closure.prototype = {
     call$1(line) {
       return line !== "\tat ";
     },
-    $signature: 10
+    $signature: 4
   };
   A.Trace$parseFirefox_closure.prototype = {
     call$1(line) {
       return line.length !== 0 && line !== "[native code]";
     },
-    $signature: 10
+    $signature: 4
   };
   A.Trace$parseFriendly_closure.prototype = {
     call$1(line) {
       return !B.JSString_methods.startsWith$1(line, "=====");
     },
-    $signature: 10
+    $signature: 4
   };
   A.Trace_terse_closure.prototype = {
     call$1(_) {
       return false;
     },
-    $signature: 169
+    $signature: 258
   };
   A.Trace_foldFrames_closure.prototype = {
     call$1(frame) {
@@ -78507,7 +79546,7 @@ self.util = _cliPkgRequires.util;
         return false;
       return frame.get$line() == null;
     },
-    $signature: 169
+    $signature: 258
   };
   A.Trace_foldFrames_closure0.prototype = {
     call$1(frame) {
@@ -78518,13 +79557,13 @@ self.util = _cliPkgRequires.util;
       t2 = $.$get$_terseRegExp();
       return new A.Frame(A.Uri_parse(A.stringReplaceAllUnchecked(t1, t2, "")), null, null, frame.get$member());
     },
-    $signature: 315
+    $signature: 293
   };
   A.Trace_toString_closure0.prototype = {
     call$1(frame) {
       return frame.get$location().length;
     },
-    $signature: 165
+    $signature: 261
   };
   A.Trace_toString_closure.prototype = {
     call$1(frame) {
@@ -78532,7 +79571,7 @@ self.util = _cliPkgRequires.util;
         return frame.toString$0(0) + "\n";
       return B.JSString_methods.padRight$1(frame.get$location(), this.longest) + "  " + A.S(frame.get$member()) + "\n";
     },
-    $signature: 166
+    $signature: 260
   };
   A.UnparsedFrame.prototype = {
     toString$0(_) {
@@ -78591,7 +79630,7 @@ self.util = _cliPkgRequires.util;
     call$2(error, stackTrace) {
       this.handleError.call$3(error, stackTrace, this.controller);
     },
-    $signature: 62
+    $signature: 52
   };
   A.TransformByHandlers_transformByHandlers__closure0.prototype = {
     call$0() {
@@ -78609,7 +79648,7 @@ self.util = _cliPkgRequires.util;
         return toCancel.cancel$0();
       return null;
     },
-    $signature: 284
+    $signature: 214
   };
   A.RateLimit__debounceAggregate_closure.prototype = {
     call$2(value, sink) {
@@ -78684,6 +79723,11 @@ self.util = _cliPkgRequires.util;
       this._adjustLineAndColumn$1(character);
       return true;
     },
+    readChar$0() {
+      var character = this.super$StringScanner$readChar();
+      this._adjustLineAndColumn$1(character);
+      return character;
+    },
     _adjustLineAndColumn$1(character) {
       var t1, _this = this;
       if (character !== 10)
@@ -78763,14 +79807,14 @@ self.util = _cliPkgRequires.util;
         }
       throw A.wrapException(A.StringScannerException$(message, _this._sourceFile.span$2(0, position, position + $length), t1));
     },
-    error$1($receiver, message) {
-      return this.error$3$length$position($receiver, message, null, null);
+    error$1(_, message) {
+      return this.error$3$length$position(0, message, null, null);
     },
-    error$2$position($receiver, message, position) {
-      return this.error$3$length$position($receiver, message, null, position);
+    error$2$position(_, message, position) {
+      return this.error$3$length$position(0, message, null, position);
     },
-    error$2$length($receiver, message, $length) {
-      return this.error$3$length$position($receiver, message, $length, null);
+    error$2$length(_, message, $length) {
+      return this.error$3$length$position(0, message, $length, null);
     }
   };
   A._SpanScannerState.prototype = {};
@@ -78881,9 +79925,23 @@ self.util = _cliPkgRequires.util;
       return B.JSString_methods.substring$2(this.string, start, end);
     },
     error$3$length$position(_, message, $length, position) {
-      var t1 = this.string;
+      var match, t2, _this = this,
+        t1 = _this.string;
       A.validateErrorArgs(t1, null, position, $length);
-      throw A.wrapException(A.StringScannerException$(message, A.SourceFile$fromString(t1, this.sourceUrl).span$2(0, position, position + $length), t1));
+      match = position == null && $length == null ? _this.get$lastMatch() : null;
+      if (position == null)
+        position = match == null ? _this._string_scanner$_position : match.start;
+      if ($length == null)
+        if (match == null)
+          $length = 0;
+        else {
+          t2 = match.start;
+          $length = t2 + match.pattern.length - t2;
+        }
+      throw A.wrapException(A.StringScannerException$(message, A.SourceFile$fromString(t1, _this.sourceUrl).span$2(0, position, position + $length), t1));
+    },
+    error$1(_, message) {
+      return this.error$3$length$position(0, message, null, null);
     },
     _fail$1($name) {
       this.error$3$length$position(0, "expected " + $name + ".", 0, this._string_scanner$_position);
@@ -78997,13 +80055,13 @@ self.util = _cliPkgRequires.util;
     call$1(component) {
       return this.$this.visitCompoundSelector$1(component.selector);
     },
-    $signature: 52
+    $signature: 50
   };
   A.AnySelectorVisitor_visitCompoundSelector_closure0.prototype = {
     call$1(simple) {
       return simple.accept$1(this.$this);
     },
-    $signature: 15
+    $signature: 14
   };
   A.SupportsAnything0.prototype = {
     toString$0(_) {
@@ -79098,7 +80156,7 @@ self.util = _cliPkgRequires.util;
       if (_this.restArgument != null)
         return;
       if (positional > t2) {
-        t1 = names.get$isEmpty(names) ? "" : "positional ";
+        t1 = names.get$isEmpty(0) ? "" : "positional ";
         throw A.wrapException(A.MultiSpanSassScriptException$0("Only " + t2 + " " + t1 + A.pluralize0(_s8_, t2, null) + " allowed, but " + positional + " " + A.pluralize0("was", positional, "were") + " passed.", _s10_, A.LinkedHashMap_LinkedHashMap$_literal([_this.get$spanWithName(), "declaration"], type$.FileSpan, type$.String)));
       }
       if (namedUsed < t3.get$length(t3)) {
@@ -79177,13 +80235,13 @@ self.util = _cliPkgRequires.util;
     call$1(argument) {
       return argument.name;
     },
-    $signature: 319
+    $signature: 297
   };
   A.ArgumentDeclaration_verify_closure2.prototype = {
     call$1($name) {
       return "$" + $name;
     },
-    $signature: 7
+    $signature: 5
   };
   A.ArgumentInvocation0.prototype = {
     get$isEmpty(_) {
@@ -79196,42 +80254,26 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     toString$0(_) {
-      var t2, t3, _i, $name, value, _1_0, rest, _2_0, keywordRest, _this = this,
+      var t2, t3, _i, _1_0, _2_0, _this = this,
         t1 = A._setArrayType([], type$.JSArray_String);
       for (t2 = _this.positional, t3 = t2.length, _i = 0; _i < t3; ++_i)
         t1.push(_this._argument_invocation$_parenthesizeArgument$1(t2[_i]));
       for (t2 = A.MapExtensions_get_pairs0(_this.named, type$.String, type$.Expression_2), t2 = t2.get$iterator(t2); t2.moveNext$0();) {
         t3 = t2.get$current(t2);
-        $name = t3._0;
-        value = t3._1;
-        t1.push("$" + $name + ": " + _this._argument_invocation$_parenthesizeArgument$1(value));
+        t1.push("$" + t3._0 + ": " + _this._argument_invocation$_parenthesizeArgument$1(t3._1));
       }
       _1_0 = _this.rest;
-      if (_1_0 != null) {
-        rest = _1_0;
-        t2 = true;
-      } else {
-        rest = null;
-        t2 = false;
-      }
-      if (t2)
-        t1.push(_this._argument_invocation$_parenthesizeArgument$1(rest) + "...");
+      if (_1_0 != null)
+        t1.push(_this._argument_invocation$_parenthesizeArgument$1(_1_0) + "...");
       _2_0 = _this.keywordRest;
-      if (_2_0 != null) {
-        keywordRest = _2_0;
-        t2 = true;
-      } else {
-        keywordRest = null;
-        t2 = false;
-      }
-      if (t2)
-        t1.push(_this._argument_invocation$_parenthesizeArgument$1(keywordRest) + "...");
+      if (_2_0 != null)
+        t1.push(_this._argument_invocation$_parenthesizeArgument$1(_2_0) + "...");
       return "(" + B.JSArray_methods.join$1(t1, ", ") + ")";
     },
     _argument_invocation$_parenthesizeArgument$1(argument) {
       var t1;
       $label0$0: {
-        if (argument instanceof A.ListExpression0 && B.ListSeparator_rXA0 === argument.separator && !argument.hasBrackets && argument.contents.length >= 2) {
+        if (argument instanceof A.ListExpression0 && B.ListSeparator_ECn0 === argument.separator && !argument.hasBrackets && argument.contents.length >= 2) {
           t1 = "(" + argument.toString$0(0) + ")";
           break $label0$0;
         }
@@ -79253,7 +80295,7 @@ self.util = _cliPkgRequires.util;
       A.JSClassExtension_injectSuperclass(t1._as(A.SassArgumentList$0(A._setArrayType([], type$.JSArray_Value_2), A.LinkedHashMap_LinkedHashMap$_empty(type$.String, type$.Value_2), B.ListSeparator_undecided_null_undecided0).constructor), jsClass);
       return jsClass;
     },
-    $signature: 24
+    $signature: 15
   };
   A.argumentListClass__closure.prototype = {
     call$4($self, contents, keywords, separator) {
@@ -79272,14 +80314,14 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [","];
     },
-    $signature: 321
+    $signature: 299
   };
   A.argumentListClass__closure0.prototype = {
     call$1($self) {
       $self._argument_list$_wereKeywordsAccessed = true;
       return A.dartMapToImmutableMap($self._argument_list$_keywords);
     },
-    $signature: 322
+    $signature: 300
   };
   A.SassArgumentList0.prototype = {};
   A.JSArray1.prototype = {};
@@ -79341,7 +80383,7 @@ self.util = _cliPkgRequires.util;
     },
     load$body$JSToDartAsyncImporter(_, url) {
       var $async$goto = 0,
-        $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_ImporterResult),
+        $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_ImporterResult_2),
         $async$returnValue, $async$self = this, t1, contents, syntax, t2, result;
       var $async$load$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
@@ -79394,15 +80436,15 @@ self.util = _cliPkgRequires.util;
   };
   A.JSToDartAsyncImporter_canonicalize_closure.prototype = {
     call$0() {
-      return this.$this._async0$_canonicalize.call$2(this.url.toString$0(0), {fromImport: A.fromImport0(), containingUrl: A.NullableExtension_andThen0(A.containingUrl(), A.utils1__dartToJSUrl$closure())});
+      return this.$this._async0$_canonicalize.call$2(this.url.toString$0(0), A.canonicalizeContext0());
     },
-    $signature: 28
+    $signature: 35
   };
   A.JSToDartAsyncImporter_load_closure.prototype = {
     call$0() {
       return this.$this._load.call$1(new self.URL(this.url.toString$0(0)));
     },
-    $signature: 28
+    $signature: 35
   };
   A.AsyncBuiltInCallable0.prototype = {
     callbackFor$2(positional, names) {
@@ -79423,7 +80465,7 @@ self.util = _cliPkgRequires.util;
     $call$body$AsyncBuiltInCallable$mixin_closure0($arguments) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Value_2),
-        $async$returnValue, $async$self = this;
+        $async$returnValue, $async$self = this, t1;
       var $async$call$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -79431,8 +80473,9 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
+              t1 = $async$self.callback.call$1($arguments);
               $async$goto = 3;
-              return A._asyncAwait($async$self.callback.call$1($arguments), $async$call$1);
+              return A._asyncAwait(t1 instanceof A._Future ? t1 : A._Future$value(t1, type$.void), $async$call$1);
             case 3:
               // returning from await.
               $async$returnValue = B.C__SassNull0;
@@ -79446,13 +80489,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$1, $async$completer);
     },
-    $signature: 99
+    $signature: 88
   };
   A._compileStylesheet_closure2.prototype = {
     call$1(url) {
       return url === "" ? A.Uri_Uri$dataFromString(A.String_String$fromCharCodes(B.NativeUint32List_methods.sublist$2(this.stylesheet.span.file._decodedChars, 0, null), 0, null), B.C_Utf8Codec, null).get$_text() : this.importCache.sourceMapUrl$1(0, A.Uri_parse(url)).toString$0(0);
     },
-    $signature: 7
+    $signature: 5
   };
   A.AsyncEnvironment0.prototype = {
     closure$0() {
@@ -79475,7 +80518,7 @@ self.util = _cliPkgRequires.util;
       if (forwardedModules == null)
         forwardedModules = _this._async_environment0$_forwardedModules = A.LinkedHashMap_LinkedHashMap$_empty(type$.Module_AsyncCallable_2, type$.AstNode_2);
       view = A.ForwardedModuleView_ifNecessary0(module, rule, type$.AsyncCallable_2);
-      for (t1 = A.LinkedHashMapKeyIterator$(forwardedModules, forwardedModules._modifications); t1.moveNext$0();) {
+      for (t1 = A.LinkedHashMapKeyIterator$(forwardedModules, forwardedModules.__js_helper$_modifications); t1.moveNext$0();) {
         t2 = t1.__js_helper$_current;
         _this._async_environment0$_assertNoConflicts$5(view.get$variables(), t2.get$variables(), view, t2, "variable");
         _this._async_environment0$_assertNoConflicts$5(view.get$functions(view), t2.get$functions(t2), view, t2, "function");
@@ -79497,7 +80540,6 @@ self.util = _cliPkgRequires.util;
         t4 = t2.get$current(t2);
         $name = t4._0;
         small = t4._1;
-        small = small;
         large = larger.$index(0, $name);
         if (large == null)
           continue;
@@ -79540,17 +80582,17 @@ self.util = _cliPkgRequires.util;
         forwardedModules = _this._async_environment0$_forwardedModules = A.LinkedHashMap_LinkedHashMap$_empty(type$.Module_AsyncCallable_2, type$.AstNode_2);
       t1 = type$.String;
       t2 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
-      for (t3 = A.LinkedHashMapKeyIterator$(forwarded, forwarded._modifications); t3.moveNext$0();)
+      for (t3 = A.LinkedHashMapKeyIterator$(forwarded, forwarded.__js_helper$_modifications); t3.moveNext$0();)
         for (t4 = t3.__js_helper$_current.get$variables(), t4 = J.get$iterator$ax(t4.get$keys(t4)); t4.moveNext$0();)
           t2.add$1(0, t4.get$current(t4));
       t3 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
-      for (t4 = A.LinkedHashMapKeyIterator$(forwarded, forwarded._modifications); t4.moveNext$0();) {
+      for (t4 = A.LinkedHashMapKeyIterator$(forwarded, forwarded.__js_helper$_modifications); t4.moveNext$0();) {
         t5 = t4.__js_helper$_current;
         for (t5 = t5.get$functions(t5), t5 = J.get$iterator$ax(t5.get$keys(t5)); t5.moveNext$0();)
           t3.add$1(0, t5.get$current(t5));
       }
       t1 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
-      for (t4 = A.LinkedHashMapKeyIterator$(forwarded, forwarded._modifications); t4.moveNext$0();)
+      for (t4 = A.LinkedHashMapKeyIterator$(forwarded, forwarded.__js_helper$_modifications); t4.moveNext$0();)
         for (t5 = t4.__js_helper$_current.get$mixins(), t5 = J.get$iterator$ax(t5.get$keys(t5)); t5.moveNext$0();)
           t1.add$1(0, t5.get$current(t5));
       t4 = _this._async_environment0$_variables;
@@ -79623,7 +80665,7 @@ self.util = _cliPkgRequires.util;
           t5 = t6;
         B.JSArray_methods.addAll$1(B.JSArray_methods.get$last(t5), new A.LinkedHashMapKeyIterable(forwarded, A._instanceType(forwarded)._eval$1("LinkedHashMapKeyIterable<1>")));
       }
-      for (t2 = A._LinkedHashSetIterator$(t2, t2._collection$_modifications), t5 = _this._async_environment0$_variableIndices, t6 = _this._async_environment0$_variableNodes, t7 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
+      for (t2 = A._LinkedHashSetIterator$(t2, t2._modifications, t2.$ti._precomputed1), t5 = _this._async_environment0$_variableIndices, t6 = _this._async_environment0$_variableNodes, t7 = t2.$ti._precomputed1; t2.moveNext$0();) {
         t8 = t2._collection$_current;
         if (t8 == null)
           t8 = t7._as(t8);
@@ -79631,14 +80673,14 @@ self.util = _cliPkgRequires.util;
         J.remove$1$z(B.JSArray_methods.get$last(t4), t8);
         J.remove$1$z(B.JSArray_methods.get$last(t6), t8);
       }
-      for (t2 = A._LinkedHashSetIterator$(t3, t3._collection$_modifications), t3 = _this._async_environment0$_functionIndices, t4 = _this._async_environment0$_functions, t5 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
+      for (t2 = A._LinkedHashSetIterator$(t3, t3._modifications, t3.$ti._precomputed1), t3 = _this._async_environment0$_functionIndices, t4 = _this._async_environment0$_functions, t5 = t2.$ti._precomputed1; t2.moveNext$0();) {
         t6 = t2._collection$_current;
         if (t6 == null)
           t6 = t5._as(t6);
         t3.remove$1(0, t6);
         J.remove$1$z(B.JSArray_methods.get$last(t4), t6);
       }
-      for (t1 = A._LinkedHashSetIterator$(t1, t1._collection$_modifications), t2 = _this._async_environment0$_mixinIndices, t3 = _this._async_environment0$_mixins, t4 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = A._LinkedHashSetIterator$(t1, t1._modifications, t1.$ti._precomputed1), t2 = _this._async_environment0$_mixinIndices, t3 = _this._async_environment0$_mixins, t4 = t1.$ti._precomputed1; t1.moveNext$0();) {
         t5 = t1._collection$_current;
         if (t5 == null)
           t5 = t4._as(t5);
@@ -79647,7 +80689,7 @@ self.util = _cliPkgRequires.util;
       }
     },
     getVariable$2$namespace($name, namespace) {
-      var t1, _0_0, index, t2, _1_0, _this = this;
+      var t1, _0_0, _1_0, _this = this;
       if (namespace != null)
         return _this._async_environment0$_getModule$1(namespace).get$variables().$index(0, $name);
       if (_this._async_environment0$_lastVariableName === $name) {
@@ -79659,31 +80701,17 @@ self.util = _cliPkgRequires.util;
       t1 = _this._async_environment0$_variableIndices;
       _0_0 = t1.$index(0, $name);
       if (_0_0 != null) {
-        index = _0_0;
-        t2 = true;
-      } else {
-        index = null;
-        t2 = false;
-      }
-      if (t2) {
         _this._async_environment0$_lastVariableName = $name;
-        _this._async_environment0$_lastVariableIndex = index;
-        t1 = J.$index$asx(_this._async_environment0$_variables[index], $name);
+        _this._async_environment0$_lastVariableIndex = _0_0;
+        t1 = J.$index$asx(_this._async_environment0$_variables[_0_0], $name);
         return t1 == null ? _this._async_environment0$_getVariableFromGlobalModule$1($name) : t1;
       } else {
         _1_0 = _this._async_environment0$_variableIndex$1($name);
         if (_1_0 != null) {
-          index = _1_0;
-          t2 = true;
-        } else {
-          index = null;
-          t2 = false;
-        }
-        if (t2) {
           _this._async_environment0$_lastVariableName = $name;
-          _this._async_environment0$_lastVariableIndex = index;
-          t1.$indexSet(0, $name, index);
-          t1 = J.$index$asx(_this._async_environment0$_variables[index], $name);
+          _this._async_environment0$_lastVariableIndex = _1_0;
+          t1.$indexSet(0, $name, _1_0);
+          t1 = J.$index$asx(_this._async_environment0$_variables[_1_0], $name);
           return t1 == null ? _this._async_environment0$_getVariableFromGlobalModule$1($name) : t1;
         } else
           return _this._async_environment0$_getVariableFromGlobalModule$1($name);
@@ -79696,7 +80724,7 @@ self.util = _cliPkgRequires.util;
       return this._async_environment0$_fromOneModule$3($name, "variable", new A.AsyncEnvironment__getVariableFromGlobalModule_closure0($name));
     },
     getVariableNode$2$namespace($name, namespace) {
-      var t1, _0_0, index, t2, _1_0, _this = this;
+      var t1, _0_0, _1_0, _this = this;
       if (namespace != null)
         return _this._async_environment0$_getModule$1(namespace).get$variableNodes().$index(0, $name);
       if (_this._async_environment0$_lastVariableName === $name) {
@@ -79708,50 +80736,29 @@ self.util = _cliPkgRequires.util;
       t1 = _this._async_environment0$_variableIndices;
       _0_0 = t1.$index(0, $name);
       if (_0_0 != null) {
-        index = _0_0;
-        t2 = true;
-      } else {
-        index = null;
-        t2 = false;
-      }
-      if (t2) {
         _this._async_environment0$_lastVariableName = $name;
-        _this._async_environment0$_lastVariableIndex = index;
-        t1 = J.$index$asx(_this._async_environment0$_variableNodes[index], $name);
+        _this._async_environment0$_lastVariableIndex = _0_0;
+        t1 = J.$index$asx(_this._async_environment0$_variableNodes[_0_0], $name);
         return t1 == null ? _this._async_environment0$_getVariableNodeFromGlobalModule$1($name) : t1;
       } else {
         _1_0 = _this._async_environment0$_variableIndex$1($name);
         if (_1_0 != null) {
-          index = _1_0;
-          t2 = true;
-        } else {
-          index = null;
-          t2 = false;
-        }
-        if (t2) {
           _this._async_environment0$_lastVariableName = $name;
-          _this._async_environment0$_lastVariableIndex = index;
-          t1.$indexSet(0, $name, index);
-          t1 = J.$index$asx(_this._async_environment0$_variableNodes[index], $name);
+          _this._async_environment0$_lastVariableIndex = _1_0;
+          t1.$indexSet(0, $name, _1_0);
+          t1 = J.$index$asx(_this._async_environment0$_variableNodes[_1_0], $name);
           return t1 == null ? _this._async_environment0$_getVariableNodeFromGlobalModule$1($name) : t1;
         } else
           return _this._async_environment0$_getVariableNodeFromGlobalModule$1($name);
       }
     },
     _async_environment0$_getVariableNodeFromGlobalModule$1($name) {
-      var t1, t2, _0_0, value;
+      var t1, t2, _0_0;
       for (t1 = this._async_environment0$_importedModules, t2 = this._async_environment0$_globalModules, t2 = new A.LinkedHashMapKeyIterable(t1, A._instanceType(t1)._eval$1("LinkedHashMapKeyIterable<1>")).followedBy$1(0, new A.LinkedHashMapKeyIterable(t2, A._instanceType(t2)._eval$1("LinkedHashMapKeyIterable<1>"))), t2 = new A.FollowedByIterator(J.get$iterator$ax(t2.__internal$_first), t2._second); t2.moveNext$0();) {
         t1 = t2._currentIterator;
         _0_0 = t1.get$current(t1).get$variableNodes().$index(0, $name);
-        if (_0_0 != null) {
-          value = _0_0;
-          t1 = true;
-        } else {
-          value = null;
-          t1 = false;
-        }
-        if (t1)
-          return value;
+        if (_0_0 != null)
+          return _0_0;
       }
       return null;
     },
@@ -79794,9 +80801,9 @@ self.util = _cliPkgRequires.util;
       }
       nestedForwardedModules = _this._async_environment0$_nestedForwardedModules;
       if (nestedForwardedModules != null && !_this._async_environment0$_variableIndices.containsKey$1($name) && _this._async_environment0$_variableIndex$1($name) == null)
-        for (t1 = new A.ReversedListIterable(nestedForwardedModules, A.instanceType(nestedForwardedModules)._eval$1("ReversedListIterable<1>")), t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
-          t3 = t1.__internal$_current;
-          for (t3 = J.get$reversed$ax(t3 == null ? t2._as(t3) : t3), t3 = new A.ListIterator(t3, t3.get$length(t3)), t4 = A._instanceType(t3)._precomputed1; t3.moveNext$0();) {
+        for (t1 = A._arrayInstanceType(nestedForwardedModules)._eval$1("ReversedListIterable<1>"), t2 = new A.ReversedListIterable(nestedForwardedModules, t1), t2 = new A.ListIterator(t2, t2.get$length(0), t1._eval$1("ListIterator<ListIterable.E>")), t1 = t1._eval$1("ListIterable.E"); t2.moveNext$0();) {
+          t3 = t2.__internal$_current;
+          for (t3 = J.get$reversed$ax(t3 == null ? t1._as(t3) : t3), t4 = t3.$ti, t3 = new A.ListIterator(t3, t3.get$length(0), t4._eval$1("ListIterator<ListIterable.E>")), t4 = t4._eval$1("ListIterable.E"); t3.moveNext$0();) {
             t5 = t3.__internal$_current;
             if (t5 == null)
               t5 = t4._as(t5);
@@ -79835,7 +80842,7 @@ self.util = _cliPkgRequires.util;
       J.$indexSet$ax(_this._async_environment0$_variableNodes[index], $name, nodeWithSpan);
     },
     getFunction$2$namespace($name, namespace) {
-      var t1, _0_0, index, t2, _1_0, _this = this;
+      var t1, _0_0, _1_0, _this = this;
       if (namespace != null) {
         t1 = _this._async_environment0$_getModule$1(namespace);
         return t1.get$functions(t1).$index(0, $name);
@@ -79843,27 +80850,13 @@ self.util = _cliPkgRequires.util;
       t1 = _this._async_environment0$_functionIndices;
       _0_0 = t1.$index(0, $name);
       if (_0_0 != null) {
-        index = _0_0;
-        t2 = true;
-      } else {
-        index = null;
-        t2 = false;
-      }
-      if (t2) {
-        t1 = J.$index$asx(_this._async_environment0$_functions[index], $name);
+        t1 = J.$index$asx(_this._async_environment0$_functions[_0_0], $name);
         return t1 == null ? _this._async_environment0$_getFunctionFromGlobalModule$1($name) : t1;
       } else {
         _1_0 = _this._async_environment0$_functionIndex$1($name);
         if (_1_0 != null) {
-          index = _1_0;
-          t2 = true;
-        } else {
-          index = null;
-          t2 = false;
-        }
-        if (t2) {
-          t1.$indexSet(0, $name, index);
-          t1 = J.$index$asx(_this._async_environment0$_functions[index], $name);
+          t1.$indexSet(0, $name, _1_0);
+          t1 = J.$index$asx(_this._async_environment0$_functions[_1_0], $name);
           return t1 == null ? _this._async_environment0$_getFunctionFromGlobalModule$1($name) : t1;
         } else
           return _this._async_environment0$_getFunctionFromGlobalModule$1($name);
@@ -79883,33 +80876,19 @@ self.util = _cliPkgRequires.util;
       return null;
     },
     getMixin$2$namespace($name, namespace) {
-      var t1, _0_0, index, t2, _1_0, _this = this;
+      var t1, _0_0, _1_0, _this = this;
       if (namespace != null)
         return _this._async_environment0$_getModule$1(namespace).get$mixins().$index(0, $name);
       t1 = _this._async_environment0$_mixinIndices;
       _0_0 = t1.$index(0, $name);
       if (_0_0 != null) {
-        index = _0_0;
-        t2 = true;
-      } else {
-        index = null;
-        t2 = false;
-      }
-      if (t2) {
-        t1 = J.$index$asx(_this._async_environment0$_mixins[index], $name);
+        t1 = J.$index$asx(_this._async_environment0$_mixins[_0_0], $name);
         return t1 == null ? _this._async_environment0$_getMixinFromGlobalModule$1($name) : t1;
       } else {
         _1_0 = _this._async_environment0$_mixinIndex$1($name);
         if (_1_0 != null) {
-          index = _1_0;
-          t2 = true;
-        } else {
-          index = null;
-          t2 = false;
-        }
-        if (t2) {
-          t1.$indexSet(0, $name, index);
-          t1 = J.$index$asx(_this._async_environment0$_mixins[index], $name);
+          t1.$indexSet(0, $name, _1_0);
+          t1 = J.$index$asx(_this._async_environment0$_mixins[_1_0], $name);
           return t1 == null ? _this._async_environment0$_getMixinFromGlobalModule$1($name) : t1;
         } else
           return _this._async_environment0$_getMixinFromGlobalModule$1($name);
@@ -80129,59 +81108,30 @@ self.util = _cliPkgRequires.util;
       return A._EnvironmentModule__EnvironmentModule2(this, new A.CssStylesheet0(new A.UnmodifiableListView(B.List_empty16, type$.UnmodifiableListView_CssNode_2), A.SourceFile$decoded(B.List_empty4, "<dummy module>").span$1(0, 0)), B.Map_empty15, B.C_EmptyExtensionStore0, A.NullableExtension_andThen0(this._async_environment0$_forwardedModules, new A.AsyncEnvironment_toDummyModule_closure0()));
     },
     _async_environment0$_getModule$1(namespace) {
-      var module, t1,
-        _0_0 = this._async_environment0$_modules.$index(0, namespace);
-      if (_0_0 != null) {
-        module = _0_0;
-        t1 = true;
-      } else {
-        module = null;
-        t1 = false;
-      }
-      if (t1)
-        return module;
+      var _0_0 = this._async_environment0$_modules.$index(0, namespace);
+      if (_0_0 != null)
+        return _0_0;
       throw A.wrapException(A.SassScriptException$0('There is no module with the namespace "' + namespace + '".', null));
     },
     _async_environment0$_fromOneModule$1$3($name, type, callback) {
-      var nestedForwardedModules, t1, t2, t3, t4, t5, _1_0, value, _2_0, identity, valueInModule, identityFromModule, module, node, _null = null,
+      var t1, t2, t3, t4, t5, _1_0, _2_0, value, identity, valueInModule, identityFromModule, module, node,
         _0_0 = this._async_environment0$_nestedForwardedModules;
-      if (_0_0 != null) {
-        nestedForwardedModules = _0_0;
-        t1 = true;
-      } else {
-        nestedForwardedModules = _null;
-        t1 = false;
-      }
-      if (t1)
-        for (t1 = new A.ReversedListIterable(nestedForwardedModules, A.instanceType(nestedForwardedModules)._eval$1("ReversedListIterable<1>")), t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
-          t3 = t1.__internal$_current;
-          for (t3 = J.get$reversed$ax(t3 == null ? t2._as(t3) : t3), t3 = new A.ListIterator(t3, t3.get$length(t3)), t4 = A._instanceType(t3)._precomputed1; t3.moveNext$0();) {
+      if (_0_0 != null)
+        for (t1 = A._arrayInstanceType(_0_0)._eval$1("ReversedListIterable<1>"), t2 = new A.ReversedListIterable(_0_0, t1), t2 = new A.ListIterator(t2, t2.get$length(0), t1._eval$1("ListIterator<ListIterable.E>")), t1 = t1._eval$1("ListIterable.E"); t2.moveNext$0();) {
+          t3 = t2.__internal$_current;
+          for (t3 = J.get$reversed$ax(t3 == null ? t1._as(t3) : t3), t4 = t3.$ti, t3 = new A.ListIterator(t3, t3.get$length(0), t4._eval$1("ListIterator<ListIterable.E>")), t4 = t4._eval$1("ListIterable.E"); t3.moveNext$0();) {
             t5 = t3.__internal$_current;
             _1_0 = callback.call$1(t5 == null ? t4._as(t5) : t5);
-            if (_1_0 != null) {
-              value = _1_0;
-              t5 = true;
-            } else {
-              value = _null;
-              t5 = false;
-            }
-            if (t5)
-              return value;
+            if (_1_0 != null)
+              return _1_0;
           }
         }
-      for (t1 = this._async_environment0$_importedModules, t1 = A.LinkedHashMapKeyIterator$(t1, t1._modifications); t1.moveNext$0();) {
+      for (t1 = this._async_environment0$_importedModules, t1 = A.LinkedHashMapKeyIterator$(t1, t1.__js_helper$_modifications); t1.moveNext$0();) {
         _2_0 = callback.call$1(t1.__js_helper$_current);
-        if (_2_0 != null) {
-          value = _2_0;
-          t2 = true;
-        } else {
-          value = _null;
-          t2 = false;
-        }
-        if (t2)
-          return value;
+        if (_2_0 != null)
+          return _2_0;
       }
-      for (t1 = this._async_environment0$_globalModules, t2 = A.LinkedHashMapKeyIterator$(t1, t1._modifications), t3 = type$.AsyncCallable_2, identity = _null, value = identity; t2.moveNext$0();) {
+      for (t1 = this._async_environment0$_globalModules, t2 = A.LinkedHashMapKeyIterator$(t1, t1.__js_helper$_modifications), t3 = type$.AsyncCallable_2, value = null, identity = null; t2.moveNext$0();) {
         t4 = t2.__js_helper$_current;
         valueInModule = callback.call$1(t4);
         if (valueInModule == null)
@@ -80213,7 +81163,7 @@ self.util = _cliPkgRequires.util;
     call$1(module) {
       return module.get$variables().$index(0, this.name);
     },
-    $signature: 324
+    $signature: 303
   };
   A.AsyncEnvironment_setVariable_closure2.prototype = {
     call$0() {
@@ -80221,13 +81171,13 @@ self.util = _cliPkgRequires.util;
       t1._async_environment0$_lastVariableName = this.name;
       return t1._async_environment0$_lastVariableIndex = 0;
     },
-    $signature: 3
+    $signature: 10
   };
   A.AsyncEnvironment_setVariable_closure3.prototype = {
     call$1(module) {
       return module.get$variables().containsKey$1(this.name) ? module : null;
     },
-    $signature: 325
+    $signature: 304
   };
   A.AsyncEnvironment_setVariable_closure4.prototype = {
     call$0() {
@@ -80235,31 +81185,31 @@ self.util = _cliPkgRequires.util;
         t2 = t1._async_environment0$_variableIndex$1(this.name);
       return t2 == null ? t1._async_environment0$_variables.length - 1 : t2;
     },
-    $signature: 3
+    $signature: 10
   };
   A.AsyncEnvironment__getFunctionFromGlobalModule_closure0.prototype = {
     call$1(module) {
       return module.get$functions(module).$index(0, this.name);
     },
-    $signature: 175
+    $signature: 256
   };
   A.AsyncEnvironment__getMixinFromGlobalModule_closure0.prototype = {
     call$1(module) {
       return module.get$mixins().$index(0, this.name);
     },
-    $signature: 175
+    $signature: 256
   };
   A.AsyncEnvironment_toModule_closure0.prototype = {
     call$1(modules) {
       return new A.MapKeySet(modules, type$.MapKeySet_Module_AsyncCallable_2);
     },
-    $signature: 176
+    $signature: 253
   };
   A.AsyncEnvironment_toDummyModule_closure0.prototype = {
     call$1(modules) {
       return new A.MapKeySet(modules, type$.MapKeySet_Module_AsyncCallable_2);
     },
-    $signature: 176
+    $signature: 253
   };
   A._EnvironmentModule2.prototype = {
     get$url(_) {
@@ -80267,17 +81217,10 @@ self.util = _cliPkgRequires.util;
       return t1.get$span(t1).file.url;
     },
     setVariable$3($name, value, nodeWithSpan) {
-      var module, t1, t2,
+      var t1, t2,
         _0_0 = this._async_environment0$_modulesByVariable.$index(0, $name);
       if (_0_0 != null) {
-        module = _0_0;
-        t1 = true;
-      } else {
-        module = null;
-        t1 = false;
-      }
-      if (t1) {
-        module.setVariable$3($name, value, nodeWithSpan);
+        _0_0.setVariable$3($name, value, nodeWithSpan);
         return;
       }
       t1 = this._async_environment0$_environment;
@@ -80300,12 +81243,15 @@ self.util = _cliPkgRequires.util;
       return A._EnvironmentModule$_2(_this._async_environment0$_environment, _0_0._0, _this.preModuleComments, _0_0._1, _this._async_environment0$_modulesByVariable, _this.variables, _this.variableNodes, _this.functions, _this.mixins, true, _this.transitivelyContainsExtensions);
     },
     toString$0(_) {
-      var t1 = this.css;
+      var t2,
+        t1 = this.css;
       if (t1.get$span(t1).file.url == null)
         t1 = "<unknown url>";
       else {
-        t1 = t1.get$span(t1);
-        t1 = $.$get$context().prettyUri$1(t1.file.url);
+        t1 = t1.get$span(t1).file.url;
+        t2 = $.$get$context();
+        t1.toString;
+        t1 = t2.prettyUri$1(t1);
       }
       return t1;
     },
@@ -80345,37 +81291,37 @@ self.util = _cliPkgRequires.util;
     call$1(module) {
       return module.get$variables();
     },
-    $signature: 328
+    $signature: 307
   };
   A._EnvironmentModule__EnvironmentModule_closure18.prototype = {
     call$1(module) {
       return module.get$variableNodes();
     },
-    $signature: 329
+    $signature: 308
   };
   A._EnvironmentModule__EnvironmentModule_closure19.prototype = {
     call$1(module) {
       return module.get$functions(module);
     },
-    $signature: 177
+    $signature: 252
   };
   A._EnvironmentModule__EnvironmentModule_closure20.prototype = {
     call$1(module) {
       return module.get$mixins();
     },
-    $signature: 177
+    $signature: 252
   };
   A._EnvironmentModule__EnvironmentModule_closure21.prototype = {
     call$1(module) {
       return module.get$transitivelyContainsCss();
     },
-    $signature: 123
+    $signature: 112
   };
   A._EnvironmentModule__EnvironmentModule_closure22.prototype = {
     call$1(module) {
       return module.get$transitivelyContainsExtensions();
     },
-    $signature: 123
+    $signature: 112
   };
   A._EvaluateVisitor2.prototype = {
     _EvaluateVisitor$6$functions$importCache$logger$nodeImporter$quietDeps$sourceMap2(functions, importCache, logger, nodeImporter, quietDeps, sourceMap) {
@@ -80385,7 +81331,7 @@ self.util = _cliPkgRequires.util;
         _s7_ = "$module",
         t1 = type$.JSArray_AsyncBuiltInCallable_2,
         metaFunctions = A._setArrayType([A.BuiltInCallable$function0("global-variable-exists", _s20_, new A._EvaluateVisitor_closure38(_this), _s9_), A.BuiltInCallable$function0("variable-exists", "$name", new A._EvaluateVisitor_closure39(_this), _s9_), A.BuiltInCallable$function0("function-exists", _s20_, new A._EvaluateVisitor_closure40(_this), _s9_), A.BuiltInCallable$function0("mixin-exists", _s20_, new A._EvaluateVisitor_closure41(_this), _s9_), A.BuiltInCallable$function0("content-exists", "", new A._EvaluateVisitor_closure42(_this), _s9_), A.BuiltInCallable$function0("module-variables", _s7_, new A._EvaluateVisitor_closure43(_this), _s9_), A.BuiltInCallable$function0("module-functions", _s7_, new A._EvaluateVisitor_closure44(_this), _s9_), A.BuiltInCallable$function0("module-mixins", _s7_, new A._EvaluateVisitor_closure45(_this), _s9_), A.BuiltInCallable$function0("get-function", "$name, $css: false, $module: null", new A._EvaluateVisitor_closure46(_this), _s9_), A.BuiltInCallable$function0("get-mixin", _s20_, new A._EvaluateVisitor_closure47(_this), _s9_), new A.AsyncBuiltInCallable0("call", A.ScssParser$0("@function call($function, $args...) {", null, _s9_).parseArgumentDeclaration$0(), new A._EvaluateVisitor_closure48(_this), false)], t1),
-        metaMixins = A._setArrayType([A.AsyncBuiltInCallable$mixin0("load-css", "$url, $with: null", new A._EvaluateVisitor_closure49(_this), _s9_), A.BuiltInCallable$mixin0("apply", "$mixin, $args...", new A._EvaluateVisitor_closure50(_this), true, _s9_)], t1);
+        metaMixins = A._setArrayType([A.AsyncBuiltInCallable$mixin0("load-css", "$url, $with: null", new A._EvaluateVisitor_closure49(_this), false, _s9_), A.AsyncBuiltInCallable$mixin0("apply", "$mixin, $args...", new A._EvaluateVisitor_closure50(_this), true, _s9_)], t1);
       t1 = type$.AsyncBuiltInCallable_2;
       t2 = A.List_List$of($.$get$global6(), true, t1);
       B.JSArray_methods.addAll$1(t2, $.$get$local0());
@@ -80423,8 +81369,9 @@ self.util = _cliPkgRequires.util;
               // Function start
               $async$handler = 4;
               t1 = type$.nullable_Object;
+              t1 = A.runZoned(new A._EvaluateVisitor_run_closure2($async$self, node, importer), A.LinkedHashMap_LinkedHashMap$_literal([B.Symbol__evaluationContext, new A._EvaluationContext2($async$self, node)], t1, t1), type$.FutureOr_Record_2_Set_Uri_loadedUrls_and_CssStylesheet_stylesheet_2);
               $async$goto = 7;
-              return A._asyncAwait(A.runZoned(new A._EvaluateVisitor_run_closure2($async$self, node, importer), A.LinkedHashMap_LinkedHashMap$_literal([B.Symbol__evaluationContext, new A._EvaluationContext2($async$self, node)], t1, t1), type$.FutureOr_Record_2_Set_Uri_loadedUrls_and_CssStylesheet_stylesheet_2), $async$run$2);
+              return A._asyncAwait(type$.Future_Record_2_Set_Uri_loadedUrls_and_CssStylesheet_stylesheet_2._is(t1) ? t1 : A._Future$value(t1, type$.Record_2_Set_Uri_loadedUrls_and_CssStylesheet_stylesheet_2), $async$run$2);
             case 7:
               // returning from await.
               t1 = $async$result;
@@ -80487,7 +81434,7 @@ self.util = _cliPkgRequires.util;
     _loadModule$body$_EvaluateVisitor0(url, stackFrame, nodeWithSpan, callback, baseUrl, configuration, namesInErrors) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.void),
-        $async$returnValue, $async$self = this, _0_0, t2, t1;
+        $async$returnValue, $async$self = this, t2, t1, _0_0;
       var $async$_async_evaluate0$_loadModule$7$baseUrl$configuration$namesInErrors = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -80496,17 +81443,13 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               t1 = {};
-              t1.builtInModule = null;
               _0_0 = $async$self._async_evaluate0$_builtInModules.$index(0, url);
-              if (_0_0 != null) {
-                t1.builtInModule = _0_0;
-                t2 = true;
-              } else
-                t2 = false;
-              $async$goto = t2 ? 3 : 4;
+              t1.builtInModule = null;
+              $async$goto = _0_0 != null ? 3 : 4;
               break;
             case 3:
               // then
+              t1.builtInModule = _0_0;
               if (configuration instanceof A.ExplicitConfiguration0) {
                 t1 = namesInErrors ? "Built-in module " + url.toString$0(0) + " can't be configured." : "Built-in modules can't be configured.";
                 t2 = configuration.nodeWithSpan;
@@ -80541,7 +81484,7 @@ self.util = _cliPkgRequires.util;
     _execute$body$_EvaluateVisitor0(importer, stylesheet, configuration, namesInErrors, nodeWithSpan) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Module_AsyncCallable_2),
-        $async$returnValue, $async$self = this, alreadyLoaded, t2, currentConfiguration, t3, message, existingSpan, configurationSpan, environment, css, preModuleComments, extensionStore, module, url, t1, _0_0;
+        $async$returnValue, $async$self = this, currentConfiguration, t2, t3, message, existingSpan, configurationSpan, environment, css, preModuleComments, extensionStore, module, url, t1, _0_0;
       var $async$_async_evaluate0$_execute$5$configuration$namesInErrors$nodeWithSpan = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -80553,13 +81496,6 @@ self.util = _cliPkgRequires.util;
               t1 = $async$self._async_evaluate0$_modules;
               _0_0 = t1.$index(0, url);
               if (_0_0 != null) {
-                alreadyLoaded = _0_0;
-                t2 = true;
-              } else {
-                alreadyLoaded = null;
-                t2 = false;
-              }
-              if (t2) {
                 t1 = configuration == null;
                 currentConfiguration = t1 ? $async$self._async_evaluate0$_configuration : configuration;
                 t2 = $async$self._async_evaluate0$_moduleConfigurations.$index(0, url);
@@ -80567,7 +81503,12 @@ self.util = _cliPkgRequires.util;
                 t2 = t3 == null ? t2 : t3;
                 t3 = currentConfiguration._configuration0$__originalConfiguration;
                 if (t2 !== (t3 == null ? currentConfiguration : t3) && currentConfiguration instanceof A.ExplicitConfiguration0) {
-                  message = namesInErrors ? $.$get$context().prettyUri$1(url) + string$.x20was_a : string$.This_mw;
+                  if (namesInErrors) {
+                    t2 = $.$get$context();
+                    url.toString;
+                    message = t2.prettyUri$1(url) + string$.x20was_a;
+                  } else
+                    message = string$.This_mw;
                   t2 = $async$self._async_evaluate0$_moduleNodes.$index(0, url);
                   existingSpan = t2 == null ? null : t2.get$span(t2);
                   if (t1) {
@@ -80580,9 +81521,9 @@ self.util = _cliPkgRequires.util;
                     t1.$indexSet(0, existingSpan, "original load");
                   if (configurationSpan != null)
                     t1.$indexSet(0, configurationSpan, "configuration");
-                  throw A.wrapException(t1.get$isEmpty(t1) ? $async$self._async_evaluate0$_exception$1(message) : $async$self._async_evaluate0$_multiSpanException$3(message, "new load", t1));
+                  throw A.wrapException(t1.get$isEmpty(0) ? $async$self._async_evaluate0$_exception$1(message) : $async$self._async_evaluate0$_multiSpanException$3(message, "new load", t1));
                 }
-                $async$returnValue = alreadyLoaded;
+                $async$returnValue = _0_0;
                 // goto return
                 $async$goto = 1;
                 break;
@@ -80624,8 +81565,7 @@ self.util = _cliPkgRequires.util;
           t1 = _this._async_evaluate0$_assertInModule$2(_this._async_evaluate0$__root, _s5_).children;
           break $label0$0;
         }
-        t1 = _this._async_evaluate0$_assertInModule$2(_this._async_evaluate0$__root, _s5_);
-        t1 = t1.children;
+        t1 = _this._async_evaluate0$_assertInModule$2(_this._async_evaluate0$__root, _s5_).children;
         t1 = A.List_List$of(A.SubListIterable$(t1, 0, A.checkNotNullable(_this._async_evaluate0$_assertInModule$2(_this._async_evaluate0$__endOfImports, _s13_), "count", type$.int), t1.$ti._eval$1("ListBase.E")), true, type$.ModifiableCssNode_2);
         B.JSArray_methods.addAll$1(t1, _0_0);
         t2 = _this._async_evaluate0$_assertInModule$2(_this._async_evaluate0$__root, _s5_).children;
@@ -80635,19 +81575,12 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     _async_evaluate0$_combineCss$2$clone(root, clone) {
-      var selectors, _0_0, unsatisfiedExtension, t1, imports, css, sorted, t2;
+      var selectors, _0_0, t1, imports, css, sorted, t2;
       if (!B.JSArray_methods.any$1(root.get$upstream(), new A._EvaluateVisitor__combineCss_closure5())) {
         selectors = root.get$extensionStore().get$simpleSelectors();
         _0_0 = A.IterableExtension_get_firstOrNull(root.get$extensionStore().extensionsWhereTarget$1(new A._EvaluateVisitor__combineCss_closure6(selectors)));
-        if (_0_0 != null) {
-          unsatisfiedExtension = _0_0;
-          t1 = true;
-        } else {
-          unsatisfiedExtension = null;
-          t1 = false;
-        }
-        if (t1)
-          this._async_evaluate0$_throwForUnsatisfiedExtension$1(unsatisfiedExtension);
+        if (_0_0 != null)
+          this._async_evaluate0$_throwForUnsatisfiedExtension$1(_0_0);
         return root.get$css(root);
       }
       t1 = type$.JSArray_CssNode_2;
@@ -80666,10 +81599,10 @@ self.util = _cliPkgRequires.util;
       return this._async_evaluate0$_combineCss$2$clone(root, false);
     },
     _async_evaluate0$_extendModules$1(sortedModules) {
-      var t1, t2, t3, originalSelectors, $self, t4, t5, _i, upstream, _0_0, url, t6,
+      var t1, t2, t3, originalSelectors, $self, t4, t5, _i, upstream, _0_0,
         downstreamExtensionStores = A.LinkedHashMap_LinkedHashMap$_empty(type$.Uri, type$.List_ExtensionStore_2),
         unsatisfiedExtensions = new A._LinkedIdentityHashSet(type$._LinkedIdentityHashSet_Extension_2);
-      for (t1 = A._ListQueueIterator$(sortedModules), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = A._ListQueueIterator$(sortedModules, sortedModules.$ti._precomputed1), t2 = t1.$ti._precomputed1; t1.moveNext$0();) {
         t3 = t1._collection$_current;
         if (t3 == null)
           t3 = t2._as(t3);
@@ -80685,20 +81618,13 @@ self.util = _cliPkgRequires.util;
         for (t4 = t3.get$upstream(), t5 = t4.length, _i = 0; _i < t4.length; t4.length === t5 || (0, A.throwConcurrentModificationError)(t4), ++_i) {
           upstream = t4[_i];
           _0_0 = upstream.get$url(upstream);
-          if (_0_0 != null) {
-            url = _0_0;
-            t6 = true;
-          } else {
-            url = null;
-            t6 = false;
-          }
-          if (t6)
-            J.add$1$ax(downstreamExtensionStores.putIfAbsent$2(url, new A._EvaluateVisitor__extendModules_closure6()), t3.get$extensionStore());
+          if (_0_0 != null)
+            J.add$1$ax(downstreamExtensionStores.putIfAbsent$2(_0_0, new A._EvaluateVisitor__extendModules_closure6()), t3.get$extensionStore());
         }
         unsatisfiedExtensions.removeAll$1(t3.get$extensionStore().extensionsWhereTarget$1(originalSelectors.get$contains(originalSelectors)));
       }
       if (unsatisfiedExtensions._collection$_length !== 0)
-        this._async_evaluate0$_throwForUnsatisfiedExtension$1(unsatisfiedExtensions.get$first(unsatisfiedExtensions));
+        this._async_evaluate0$_throwForUnsatisfiedExtension$1(unsatisfiedExtensions.get$first(0));
     },
     _async_evaluate0$_throwForUnsatisfiedExtension$1(extension) {
       throw A.wrapException(A.SassException$0(string$.The_ta + extension.target.toString$0(0) + ' !optional" to avoid this error.', extension.span, null));
@@ -80769,7 +81695,7 @@ self.util = _cliPkgRequires.util;
     visitAtRootRule$body$_EvaluateVisitor0(node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value_2),
-        $async$returnValue, $async$self = this, unparsedQuery, t1, _1_0, resolved, query, $parent, included, _2_0, grandparent, t2, root, first, rest, innerCopy, outerCopy, _i, copy, _0_0;
+        $async$returnValue, $async$self = this, _1_0, resolved, query, $parent, included, t1, _2_0, root, first, rest, innerCopy, outerCopy, _i, copy, _0_0;
       var $async$visitAtRootRule$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -80778,19 +81704,12 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               _0_0 = node.query;
-              if (_0_0 != null) {
-                unparsedQuery = _0_0;
-                t1 = true;
-              } else {
-                unparsedQuery = null;
-                t1 = false;
-              }
-              $async$goto = t1 ? 3 : 5;
+              $async$goto = _0_0 != null ? 3 : 5;
               break;
             case 3:
               // then
               $async$goto = 6;
-              return A._asyncAwait($async$self._async_evaluate0$_performInterpolationWithMap$2$warnForColor(unparsedQuery, true), $async$visitAtRootRule$1);
+              return A._asyncAwait($async$self._async_evaluate0$_performInterpolationWithMap$2$warnForColor(_0_0, true), $async$visitAtRootRule$1);
             case 6:
               // returning from await.
               _1_0 = $async$result;
@@ -80802,23 +81721,16 @@ self.util = _cliPkgRequires.util;
               break;
             case 5:
               // else
-              query = B.AtRootQuery_UsS0;
+              query = B.AtRootQuery_n2q0;
             case 4:
               // join
               $parent = $async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__parent, "__parent");
               included = A._setArrayType([], type$.JSArray_ModifiableCssParentNode_2);
-              for (t1 = type$.CssStylesheet_2; !t1._is($parent); $parent = grandparent) {
+              for (t1 = type$.CssStylesheet_2; !t1._is($parent); $parent = _2_0) {
                 if (!query.excludes$1($parent))
                   included.push($parent);
                 _2_0 = $parent._node$_parent;
-                if (_2_0 != null) {
-                  grandparent = _2_0;
-                  t2 = true;
-                } else {
-                  grandparent = null;
-                  t2 = false;
-                }
-                if (!t2)
+                if (_2_0 == null)
                   throw A.wrapException(A.StateError$(string$.CssNod));
               }
               root = $async$self._async_evaluate0$_trimIncluded$1(included);
@@ -80839,13 +81751,6 @@ self.util = _cliPkgRequires.util;
               if (included.length >= 1) {
                 first = included[0];
                 rest = B.JSArray_methods.sublist$1(included, 1);
-                t1 = true;
-              } else {
-                first = null;
-                rest = null;
-                t1 = false;
-              }
-              if (t1) {
                 innerCopy = first.copyWithoutChildren$0();
                 for (t1 = rest.length, outerCopy = innerCopy, _i = 0; _i < rest.length; rest.length === t1 || (0, A.throwConcurrentModificationError)(rest), ++_i, outerCopy = copy) {
                   copy = rest[_i].copyWithoutChildren$0();
@@ -80870,35 +81775,21 @@ self.util = _cliPkgRequires.util;
       return A._asyncStartSync($async$visitAtRootRule$1, $async$completer);
     },
     _async_evaluate0$_trimIncluded$1(nodes) {
-      var $parent, t1, innermostContiguous, i, t2, _0_0, grandparent, t3, _1_0, root, _this = this, _null = null, _s5_ = "_root",
+      var $parent, t1, innermostContiguous, i, t2, _0_0, _1_0, root, _this = this, _null = null, _s5_ = "_root",
         _s22_ = " to be an ancestor of ";
       if (nodes.length === 0)
         return _this._async_evaluate0$_assertInModule$2(_this._async_evaluate0$__root, _s5_);
       $parent = _this._async_evaluate0$_assertInModule$2(_this._async_evaluate0$__parent, "__parent");
-      for (t1 = nodes.length, innermostContiguous = _null, i = 0; i < t1; ++i, $parent = grandparent) {
-        for (; t2 = nodes[i], $parent !== t2; innermostContiguous = _null, $parent = grandparent) {
+      for (t1 = nodes.length, innermostContiguous = _null, i = 0; i < t1; ++i, $parent = _1_0) {
+        for (; t2 = nodes[i], $parent !== t2; innermostContiguous = _null, $parent = _0_0) {
           _0_0 = $parent._node$_parent;
-          if (_0_0 != null) {
-            grandparent = _0_0;
-            t3 = true;
-          } else {
-            grandparent = _null;
-            t3 = false;
-          }
-          if (!t3)
+          if (_0_0 == null)
             throw A.wrapException(A.ArgumentError$("Expected " + t2.toString$0(0) + _s22_ + _this.toString$0(0) + ".", _null));
         }
         if (innermostContiguous == null)
           innermostContiguous = i;
         _1_0 = $parent._node$_parent;
-        if (_1_0 != null) {
-          grandparent = _1_0;
-          t3 = true;
-        } else {
-          grandparent = _null;
-          t3 = false;
-        }
-        if (!t3)
+        if (_1_0 == null)
           throw A.wrapException(A.ArgumentError$("Expected " + t2.toString$0(0) + _s22_ + _this.toString$0(0) + ".", _null));
       }
       if ($parent !== _this._async_evaluate0$_assertInModule$2(_this._async_evaluate0$__root, _s5_))
@@ -80997,7 +81888,7 @@ self.util = _cliPkgRequires.util;
     visitDeclaration$body$_EvaluateVisitor0(node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value_2),
-        $async$returnValue, $async$self = this, t2, $name, _0_0, declarationName, t3, _1_0, expression, value, t4, t5, _2_0, oldDeclarationName, t1;
+        $async$returnValue, $async$self = this, t2, _0_0, t3, $name, _1_0, _2_0, value, t4, t5, _3_0, oldDeclarationName, t1;
       var $async$visitDeclaration$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -81010,64 +81901,54 @@ self.util = _cliPkgRequires.util;
                 throw A.wrapException($async$self._async_evaluate0$_exception$2(string$.Declarm, node.span));
               if ($async$self._async_evaluate0$_declarationName != null && B.JSString_methods.startsWith$1(node.name.get$initialPlain(), "--"))
                 throw A.wrapException($async$self._async_evaluate0$_exception$2(string$.Declarw, node.span));
+              t2 = $async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__parent, "__parent")._node$_parent.children;
+              _0_0 = t2.get$last(t2);
+              t2 = $async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__parent, "__parent");
+              if (t2 !== _0_0) {
+                t2 = type$.SourceSpan;
+                t3 = type$.String;
+                $async$self._async_evaluate0$_warn$3(string$.Sassx27s, new A.MultiSpan0(node.span, "declaration", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([_0_0.get$span(_0_0), "nested rule"], t2, t3), t2, t3)), B.Deprecation_FGJ);
+              }
               t2 = node.name;
               $async$goto = 3;
               return A._asyncAwait($async$self._async_evaluate0$_interpolationToValue$2$warnForColor(t2, true), $async$visitDeclaration$1);
             case 3:
               // returning from await.
               $name = $async$result;
-              _0_0 = $async$self._async_evaluate0$_declarationName;
-              if (_0_0 != null) {
-                declarationName = _0_0;
-                t3 = true;
-              } else {
-                declarationName = null;
-                t3 = false;
-              }
-              if (t3)
-                $name = new A.CssValue0(A.S(declarationName) + "-" + A.S($name.value), $name.span, type$.CssValue_String_2);
-              _1_0 = node.value;
-              if (_1_0 != null) {
-                expression = _1_0;
-                t3 = true;
-              } else {
-                expression = null;
-                t3 = false;
-              }
-              $async$goto = t3 ? 4 : 5;
+              _1_0 = $async$self._async_evaluate0$_declarationName;
+              if (_1_0 != null)
+                $name = new A.CssValue0(_1_0 + "-" + A.S($name.value), $name.span, type$.CssValue_String_2);
+              _2_0 = node.value;
+              $async$goto = _2_0 != null ? 4 : 5;
               break;
             case 4:
               // then
               $async$goto = 6;
-              return A._asyncAwait(expression.accept$1($async$self), $async$visitDeclaration$1);
+              return A._asyncAwait(_2_0.accept$1($async$self), $async$visitDeclaration$1);
             case 6:
               // returning from await.
               value = $async$result;
               if (!value.get$isBlank() || value.get$asList().length === 0) {
                 t3 = $async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__parent, "__parent");
-                t4 = expression.get$span(expression);
+                t4 = _2_0.get$span(_2_0);
                 t2 = B.JSString_methods.startsWith$1(t2.get$initialPlain(), "--");
                 if ($async$self._async_evaluate0$_sourceMap) {
-                  t5 = A.NullableExtension_andThen0(_1_0, $async$self.get$_async_evaluate0$_expressionNode());
+                  t5 = A.NullableExtension_andThen0(_2_0, $async$self.get$_async_evaluate0$_expressionNode());
                   t5 = t5 == null ? null : J.get$span$z(t5);
                 } else
                   t5 = null;
                 t3.addChild$1(A.ModifiableCssDeclaration$0($name, new A.CssValue0(value, t4, type$.CssValue_Value_2), node.span, t2, t5));
               } else if (J.startsWith$1$s($name.value, "--"))
-                throw A.wrapException($async$self._async_evaluate0$_exception$2("Custom property values may not be empty.", expression.get$span(expression)));
+                throw A.wrapException($async$self._async_evaluate0$_exception$2("Custom property values may not be empty.", _2_0.get$span(_2_0)));
             case 5:
               // join
+              _3_0 = node.children;
               t1.children = null;
-              _2_0 = node.children;
-              if (_2_0 != null) {
-                t1.children = _2_0;
-                t2 = true;
-              } else
-                t2 = false;
-              $async$goto = t2 ? 7 : 8;
+              $async$goto = _3_0 != null ? 7 : 8;
               break;
             case 7:
               // then
+              t1.children = _3_0;
               oldDeclarationName = $async$self._async_evaluate0$_declarationName;
               $async$self._async_evaluate0$_declarationName = $name.value;
               $async$goto = 9;
@@ -81094,7 +81975,7 @@ self.util = _cliPkgRequires.util;
     visitEachRule$body$_EvaluateVisitor0(node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value_2),
-        $async$returnValue, $async$self = this, t2, _box_0, t1, list, nodeWithSpan, _0_0;
+        $async$returnValue, $async$self = this, _box_0, t1, list, nodeWithSpan, _0_0;
       var $async$visitEachRule$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -81115,17 +81996,12 @@ self.util = _cliPkgRequires.util;
                 _box_0.variable = null;
                 if (_0_0.length === 1) {
                   _box_0.variable = _0_0[0];
-                  t1 = true;
-                } else
-                  t1 = false;
-                if (t1) {
                   t1 = new A._EvaluateVisitor_visitEachRule_closure8(_box_0, $async$self, nodeWithSpan);
                   break $label0$0;
                 }
-                t1 = _box_0.variables = null;
+                _box_0.variables = null;
                 _box_0.variables = _0_0;
-                t2 = new A._EvaluateVisitor_visitEachRule_closure9(_box_0, $async$self, nodeWithSpan);
-                t1 = t2;
+                t1 = new A._EvaluateVisitor_visitEachRule_closure9(_box_0, $async$self, nodeWithSpan);
                 break $label0$0;
               }
               $async$returnValue = $async$self._async_evaluate0$_environment.scope$1$2$semiGlobal(new A._EvaluateVisitor_visitEachRule_closure10($async$self, list, t1, node), true, type$.nullable_Value_2);
@@ -81201,7 +82077,7 @@ self.util = _cliPkgRequires.util;
                 complex.accept$1(visitor);
                 t6 = B.JSString_methods.trim$0(visitor._serialize0$_buffer.toString$0(0));
                 t7 = complex.accept$1(B.C__IsUselessVisitor0) ? "can't" : "shouldn't";
-                $async$self._async_evaluate0$_warn$3('The selector "' + t6 + '" is invalid CSS and ' + t7 + string$.x20be_an, new A.MultiSpan0(A.SpanExtensions_trimRight0(complex.span), "invalid selector", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([t3, "@extend rule"], t4, t5), t4, t5)), B.Deprecation_XV6);
+                $async$self._async_evaluate0$_warn$3('The selector "' + t6 + '" is invalid CSS and ' + t7 + string$.x20be_an, new A.MultiSpan0(A.SpanExtensions_trimRight0(complex.span), "invalid selector", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([t3, "@extend rule"], t4, t5), t4, t5)), B.Deprecation_5pG);
               }
               $async$goto = 3;
               return A._asyncAwait($async$self._async_evaluate0$_performInterpolationWithMap$2$warnForColor(node.selector, true), $async$visitExtendRule$1);
@@ -81210,7 +82086,7 @@ self.util = _cliPkgRequires.util;
               _0_0 = $async$result;
               targetText = _0_0._0;
               targetMap = _0_0._1;
-              for (t1 = A.SelectorList_SelectorList$parse0(A.trimAscii0(targetText, true), false, true, targetMap, $async$self._async_evaluate0$_logger).components, t2 = t1.length, t3 = styleRule._style_rule0$_selector._box0$_inner, _i = 0; _i < t2; ++_i) {
+              for (t1 = A.SelectorList_SelectorList$parse0(A.trimAscii0(targetText, true), false, targetMap, $async$self._async_evaluate0$_logger, false).components, t2 = t1.length, t3 = styleRule._style_rule0$_selector._box0$_inner, _i = 0; _i < t2; ++_i) {
                 complex = t1[_i];
                 compound = complex.get$singleCompound();
                 if (compound == null)
@@ -81238,7 +82114,7 @@ self.util = _cliPkgRequires.util;
     visitAtRule$body$_EvaluateVisitor0(node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value_2),
-        $async$returnValue, $async$self = this, $name, value, children, wasInKeyframes, wasInUnknownAtRule;
+        $async$returnValue, $async$self = this, $name, t1, value, children, wasInKeyframes, wasInUnknownAtRule;
       var $async$visitAtRule$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -81253,8 +82129,9 @@ self.util = _cliPkgRequires.util;
             case 3:
               // returning from await.
               $name = $async$result;
+              t1 = A.NullableExtension_andThen0(node.value, new A._EvaluateVisitor_visitAtRule_closure8($async$self));
               $async$goto = 4;
-              return A._asyncAwait(A.NullableExtension_andThen0(node.value, new A._EvaluateVisitor_visitAtRule_closure8($async$self)), $async$visitAtRule$1);
+              return A._asyncAwait(type$.Future_nullable_CssValue_String_2._is(t1) ? t1 : A._Future$value(t1, type$.nullable_CssValue_String_2), $async$visitAtRule$1);
             case 4:
               // returning from await.
               value = $async$result;
@@ -81417,7 +82294,7 @@ self.util = _cliPkgRequires.util;
     _addForwardConfiguration$body$_EvaluateVisitor0(configuration, node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Configuration_2),
-        $async$returnValue, $async$self = this, t2, t3, _i, variable, t4, oldValue, t5, variableNodeWithSpan, t1, newValues, $async$temp1, $async$temp2, $async$temp3;
+        $async$returnValue, $async$self = this, t2, t3, t4, t5, _i, variable, t6, oldValue, t7, variableNodeWithSpan, t8, t1, newValues, $async$temp1, $async$temp2, $async$temp3;
       var $async$_async_evaluate0$_addForwardConfiguration$2 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -81427,7 +82304,7 @@ self.util = _cliPkgRequires.util;
               // Function start
               t1 = configuration._configuration0$_values;
               newValues = A.LinkedHashMap_LinkedHashMap$of(new A.UnmodifiableMapView(t1, type$.UnmodifiableMapView_String_ConfiguredValue_2), type$.String, type$.ConfiguredValue_2);
-              t2 = node.configuration, t3 = t2.length, _i = 0;
+              t2 = node.configuration, t3 = t2.length, t4 = type$._Future_Value_2, t5 = type$.Future_Value_2, _i = 0;
             case 3:
               // for condition
               if (!(_i < t3)) {
@@ -81437,28 +82314,36 @@ self.util = _cliPkgRequires.util;
               }
               variable = t2[_i];
               if (variable.isGuarded) {
-                t4 = variable.name;
-                oldValue = t1.get$isEmpty(t1) ? null : t1.remove$1(0, t4);
+                t6 = variable.name;
+                oldValue = t1.get$isEmpty(t1) ? null : t1.remove$1(0, t6);
                 if (oldValue != null)
-                  t5 = true;
+                  t7 = !oldValue.value.$eq(0, B.C__SassNull0);
                 else {
                   oldValue = null;
-                  t5 = false;
+                  t7 = false;
                 }
-                if (t5 && !oldValue.value.$eq(0, B.C__SassNull0)) {
-                  newValues.$indexSet(0, t4, oldValue);
+                if (t7) {
+                  newValues.$indexSet(0, t6, oldValue);
                   // goto for update
                   $async$goto = 4;
                   break;
                 }
               }
-              t4 = variable.expression;
-              variableNodeWithSpan = $async$self._async_evaluate0$_expressionNode$1(t4);
+              t6 = variable.expression;
+              variableNodeWithSpan = $async$self._async_evaluate0$_expressionNode$1(t6);
+              t7 = variable.name;
+              t6 = t6.accept$1($async$self);
+              if (!t5._is(t6)) {
+                t8 = new A._Future($.Zone__current, t4);
+                t8._state = 8;
+                t8._resultOrListeners = t6;
+                t6 = t8;
+              }
               $async$temp1 = newValues;
-              $async$temp2 = variable.name;
+              $async$temp2 = t7;
               $async$temp3 = A;
               $async$goto = 6;
-              return A._asyncAwait(t4.accept$1($async$self), $async$_async_evaluate0$_addForwardConfiguration$2);
+              return A._asyncAwait(t6, $async$_async_evaluate0$_addForwardConfiguration$2);
             case 6:
               // returning from await.
               $async$temp1.$indexSet(0, $async$temp2, new $async$temp3.ConfiguredValue0($async$self._async_evaluate0$_withoutSlash$2($async$result, variableNodeWithSpan), variable.span, variableNodeWithSpan));
@@ -81493,8 +82378,7 @@ self.util = _cliPkgRequires.util;
         t1 = _this._async_evaluate0$__root;
       if (t1 == null)
         return;
-      t1 = _this._async_evaluate0$_assertInModule$2(t1, _s5_).children;
-      if (t1.get$length(t1) === 0 || !module.get$transitivelyContainsCss())
+      if (_this._async_evaluate0$_assertInModule$2(t1, _s5_).children.get$length(0) === 0 || !module.get$transitivelyContainsCss())
         return;
       t1 = _this._async_evaluate0$_preModuleComments;
       if (t1 == null)
@@ -81606,8 +82490,9 @@ self.util = _cliPkgRequires.util;
               break;
             case 5:
               // after for
+              t1 = A.NullableExtension_andThen0(clause, new A._EvaluateVisitor_visitIfRule_closure2($async$self));
               $async$goto = 7;
-              return A._asyncAwait(A.NullableExtension_andThen0(clause, new A._EvaluateVisitor_visitIfRule_closure2($async$self)), $async$visitIfRule$1);
+              return A._asyncAwait(type$.Future_nullable_Value_2._is(t1) ? t1 : A._Future$value(t1, type$.nullable_Value_2), $async$visitIfRule$1);
             case 7:
               // returning from await.
               $async$returnValue = $async$result;
@@ -81697,7 +82582,7 @@ self.util = _cliPkgRequires.util;
     _loadStylesheet$body$_EvaluateVisitor0(url, span, baseUrl, forImport) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Record_3_Stylesheet_and_nullable_AsyncImporter_importer_and_bool_isDependency_2),
-        $async$returnValue, $async$handler = 2, $async$currentError, $async$next = [], $async$self = this, importCache, _0_0, importer, canonicalUrl, originalUrl, _1_0, isDependency, stylesheet, _2_0, result, _3_0, error, stackTrace, error0, stackTrace0, message, t1, t2, t3, t4, exception, message0, $async$exception;
+        $async$returnValue, $async$handler = 2, $async$currentError, $async$next = [], $async$self = this, _0_0, importCache, _1_0, importer, canonicalUrl, originalUrl, isDependency, _2_0, stylesheet, _3_0, result, error, stackTrace, error0, stackTrace0, message, t1, t2, t3, t4, exception, message0, $async$exception;
       var $async$_async_evaluate0$_loadStylesheet$4$baseUrl$forImport = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1) {
           $async$currentError = $async$result;
@@ -81710,56 +82595,44 @@ self.util = _cliPkgRequires.util;
               baseUrl = baseUrl;
               $async$handler = 4;
               $async$self._async_evaluate0$_importSpan = span;
-              importCache = null;
               _0_0 = $async$self._async_evaluate0$_importCache;
-              if (_0_0 != null) {
-                importCache = _0_0;
-                t1 = true;
-              } else
-                t1 = false;
-              $async$goto = t1 ? 7 : 9;
+              importCache = null;
+              $async$goto = _0_0 != null ? 7 : 8;
               break;
             case 7:
               // then
+              importCache = _0_0;
               if (baseUrl == null)
                 baseUrl = $async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__stylesheet, "_stylesheet").span.file.url;
+              $async$goto = 9;
+              return A._asyncAwait(J.canonicalize$4$baseImporter$baseUrl$forImport$x(importCache, A.Uri_parse(url), $async$self._async_evaluate0$_importer, baseUrl, forImport), $async$_async_evaluate0$_loadStylesheet$4$baseUrl$forImport);
+            case 9:
+              // returning from await.
+              _1_0 = $async$result;
               importer = null;
               canonicalUrl = null;
               originalUrl = null;
-              $async$goto = 10;
-              return A._asyncAwait(J.canonicalize$4$baseImporter$baseUrl$forImport$x(importCache, A.Uri_parse(url), $async$self._async_evaluate0$_importer, baseUrl, forImport), $async$_async_evaluate0$_loadStylesheet$4$baseUrl$forImport);
-            case 10:
-              // returning from await.
-              _1_0 = $async$result;
-              if (type$.Record_3_nullable_Object_and_nullable_Object_and_nullable_Object_originalUrl._is(_1_0)) {
-                importer = _1_0._0;
-                canonicalUrl = _1_0._1;
-                originalUrl = _1_0._2;
-                t1 = true;
-              } else
-                t1 = false;
-              $async$goto = t1 ? 11 : 12;
+              $async$goto = type$.Record_3_nullable_Object_and_nullable_Object_and_nullable_Object_originalUrl._is(_1_0) ? 10 : 11;
               break;
-            case 11:
+            case 10:
               // then
+              importer = _1_0._0;
+              canonicalUrl = _1_0._1;
+              originalUrl = _1_0._2;
               $async$self._async_evaluate0$_loadedUrls.add$1(0, canonicalUrl);
               isDependency = $async$self._async_evaluate0$_inDependency || !J.$eq$(importer, $async$self._async_evaluate0$_importer);
-              stylesheet = null;
               t1 = importCache;
               t2 = importer;
               t3 = canonicalUrl;
               t4 = originalUrl;
-              $async$goto = 13;
+              $async$goto = 12;
               return A._asyncAwait(t1.importCanonical$4$originalUrl$quiet(t2, t3, t4, $async$self._async_evaluate0$_quietDeps && isDependency), $async$_async_evaluate0$_loadStylesheet$4$baseUrl$forImport);
-            case 13:
+            case 12:
               // returning from await.
               _2_0 = $async$result;
+              stylesheet = null;
               if (_2_0 != null) {
                 stylesheet = _2_0;
-                t1 = true;
-              } else
-                t1 = false;
-              if (t1) {
                 t1 = stylesheet;
                 t2 = importer;
                 $async$returnValue = new A._Record_3_importer_isDependency(t1, t2, isDependency);
@@ -81768,26 +82641,23 @@ self.util = _cliPkgRequires.util;
                 $async$goto = 5;
                 break;
               }
-            case 12:
+            case 11:
               // join
-              // goto join
-              $async$goto = 8;
+            case 8:
+              // join
+              $async$goto = $async$self._async_evaluate0$_nodeImporter != null ? 13 : 14;
               break;
-            case 9:
-              // else
-              result = null;
+            case 13:
+              // then
               t1 = baseUrl;
-              $async$goto = 14;
+              $async$goto = 15;
               return A._asyncAwait($async$self._async_evaluate0$_importLikeNode$3(url, t1 == null ? $async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__stylesheet, "_stylesheet").span.file.url : t1, forImport), $async$_async_evaluate0$_loadStylesheet$4$baseUrl$forImport);
-            case 14:
+            case 15:
               // returning from await.
               _3_0 = $async$result;
+              result = null;
               if (_3_0 != null) {
                 result = _3_0;
-                t1 = true;
-              } else
-                t1 = false;
-              if (t1) {
                 t1 = $async$self._async_evaluate0$_loadedUrls;
                 A.NullableExtension_andThen0(result._0.span.file.url, t1.get$add(t1));
                 t1 = result;
@@ -81797,9 +82667,10 @@ self.util = _cliPkgRequires.util;
                 $async$goto = 5;
                 break;
               }
-            case 8:
+            case 14:
               // join
-              if (B.JSString_methods.startsWith$1(url, "package:") && true)
+              t1 = B.JSString_methods.startsWith$1(url, "package:");
+              if (t1)
                 throw A.wrapException(string$.x22packa);
               else
                 throw A.wrapException("Can't find stylesheet to import.");
@@ -81857,11 +82728,11 @@ self.util = _cliPkgRequires.util;
       return A._asyncStartSync($async$_async_evaluate0$_loadStylesheet$4$baseUrl$forImport, $async$completer);
     },
     _async_evaluate0$_importLikeNode$3(originalUrl, previous, forImport) {
-      return this._importLikeNode$body$_EvaluateVisitor0(originalUrl, previous, forImport);
+      return this._importLikeNode$body$_EvaluateVisitor(originalUrl, previous, forImport);
     },
-    _importLikeNode$body$_EvaluateVisitor0(originalUrl, previous, forImport) {
+    _importLikeNode$body$_EvaluateVisitor(originalUrl, previous, forImport) {
       var $async$goto = 0,
-        $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Record_3_Stylesheet_and_nullable_AsyncImporter_importer_and_bool_isDependency_2),
+        $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Record_3_Stylesheet_and_nullable_AsyncImporter_importer_and_bool_isDependency),
         $async$returnValue, $async$self = this, isDependency, url, t2, t1, result;
       var $async$_async_evaluate0$_importLikeNode$3 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
@@ -81897,7 +82768,7 @@ self.util = _cliPkgRequires.util;
             case 4:
               // join
               url = result._1;
-              t1 = J.startsWith$1$s(url, "file") ? A.Syntax_forPath0(url) : B.Syntax_SCSS_scss0;
+              t1 = B.JSString_methods.startsWith$1(url, "file") ? A.Syntax_forPath0(url) : B.Syntax_SCSS_scss0;
               t2 = $async$self._async_evaluate0$_quietDeps && isDependency ? $.$get$Logger_quiet0() : $async$self._async_evaluate0$_logger;
               $async$returnValue = new A._Record_3_importer_isDependency(A.Stylesheet_Stylesheet$parse0(result._0, t1, t2, url), null, isDependency);
               // goto return
@@ -81916,7 +82787,7 @@ self.util = _cliPkgRequires.util;
     _visitStaticImport$body$_EvaluateVisitor0($import) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.void),
-        $async$self = this, t1, node, $async$temp1, $async$temp2;
+        $async$self = this, t1, t2, node, $async$temp1, $async$temp2;
       var $async$_async_evaluate0$_visitStaticImport$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -81924,14 +82795,16 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              $async$temp1 = A;
               $async$goto = 2;
               return A._asyncAwait($async$self._async_evaluate0$_interpolationToValue$1($import.url), $async$_async_evaluate0$_visitStaticImport$1);
             case 2:
               // returning from await.
-              $async$temp2 = $async$result;
+              t1 = $async$result;
+              t2 = A.NullableExtension_andThen0($import.modifiers, $async$self.get$_async_evaluate0$_interpolationToValue());
+              $async$temp1 = A;
+              $async$temp2 = t1;
               $async$goto = 3;
-              return A._asyncAwait(A.NullableExtension_andThen0($import.modifiers, $async$self.get$_async_evaluate0$_interpolationToValue()), $async$_async_evaluate0$_visitStaticImport$1);
+              return A._asyncAwait(type$.Future_nullable_CssValue_String_2._is(t2) ? t2 : A._Future$value(t2, type$.nullable_CssValue_String_2), $async$_async_evaluate0$_visitStaticImport$1);
             case 3:
               // returning from await.
               node = new $async$temp1.ModifiableCssImport0($async$temp2, $async$result, $import.span);
@@ -81956,7 +82829,7 @@ self.util = _cliPkgRequires.util;
     _applyMixin$body$_EvaluateVisitor0(mixin, contentCallable, $arguments, nodeWithSpan, nodeWithSpanWithoutContent) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.void),
-        $async$self = this, _1_8, t1, _0_0;
+        $async$self = this, t1, _0_0, _1_8, t2;
       var $async$_async_evaluate0$_applyMixin$5 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -81964,7 +82837,6 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              _1_8 = A._InitializedCell$(new A._EvaluateVisitor__applyMixin_closure8(mixin));
               if (mixin == null)
                 throw A.wrapException($async$self._async_evaluate0$_exception$2("Undefined mixin.", nodeWithSpan.get$span(nodeWithSpan)));
               t1 = type$.AsyncBuiltInCallable_2._is(mixin);
@@ -81986,7 +82858,7 @@ self.util = _cliPkgRequires.util;
             case 6:
               // then
               $async$goto = 8;
-              return A._asyncAwait($async$self._async_evaluate0$_environment.withContent$2(contentCallable, new A._EvaluateVisitor__applyMixin_closure9($async$self, $arguments, mixin, nodeWithSpanWithoutContent)), $async$_async_evaluate0$_applyMixin$5);
+              return A._asyncAwait($async$self._async_evaluate0$_environment.withContent$2(contentCallable, new A._EvaluateVisitor__applyMixin_closure5($async$self, $arguments, mixin, nodeWithSpanWithoutContent)), $async$_async_evaluate0$_applyMixin$5);
             case 8:
               // returning from await.
               // goto break $label0$0
@@ -81995,14 +82867,22 @@ self.util = _cliPkgRequires.util;
             case 7:
               // join
               t1 = type$.UserDefinedCallable_AsyncEnvironment_2._is(mixin);
-              if (t1 && _1_8._readFinal$0() instanceof A.MixinRule0 && !_1_8._readFinal$0().get$hasContent() && contentCallable != null)
+              if (t1) {
+                _1_8 = mixin.declaration;
+                if (_1_8 instanceof A.MixinRule0)
+                  t2 = !type$.MixinRule_2._as(_1_8).get$hasContent() && contentCallable != null;
+                else
+                  t2 = false;
+              } else
+                t2 = false;
+              if (t2)
                 throw A.wrapException(A.MultiSpanSassRuntimeException$0("Mixin doesn't accept a content block.", nodeWithSpanWithoutContent.get$span(nodeWithSpanWithoutContent), "invocation", A.LinkedHashMap_LinkedHashMap$_literal([mixin.declaration.$arguments.get$spanWithName(), "declaration"], type$.FileSpan, type$.String), $async$self._async_evaluate0$_stackTrace$1(nodeWithSpanWithoutContent.get$span(nodeWithSpanWithoutContent)), null));
               $async$goto = t1 ? 9 : 10;
               break;
             case 9:
               // then
               $async$goto = 11;
-              return A._asyncAwait($async$self._async_evaluate0$_runUserDefinedCallable$1$4($arguments, mixin, nodeWithSpanWithoutContent, new A._EvaluateVisitor__applyMixin_closure10($async$self, contentCallable, mixin, nodeWithSpanWithoutContent), type$.Null), $async$_async_evaluate0$_applyMixin$5);
+              return A._asyncAwait($async$self._async_evaluate0$_runUserDefinedCallable$1$4($arguments, mixin, nodeWithSpanWithoutContent, new A._EvaluateVisitor__applyMixin_closure6($async$self, contentCallable, mixin, nodeWithSpanWithoutContent), type$.Null), $async$_async_evaluate0$_applyMixin$5);
             case 11:
               // returning from await.
               // goto break $label0$0
@@ -82025,7 +82905,7 @@ self.util = _cliPkgRequires.util;
     visitIncludeRule$body$_EvaluateVisitor0(node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value_2),
-        $async$returnValue, $async$self = this;
+        $async$returnValue, $async$self = this, mixin;
       var $async$visitIncludeRule$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -82033,8 +82913,11 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
+              mixin = $async$self._async_evaluate0$_addExceptionSpan$2(node, new A._EvaluateVisitor_visitIncludeRule_closure8($async$self, node));
+              if (B.JSString_methods.startsWith$1(node.originalName, "--") && mixin instanceof A.UserDefinedCallable0 && !B.JSString_methods.startsWith$1(mixin.declaration.originalName, "--"))
+                $async$self._async_evaluate0$_warn$3(string$.Sassx20_m, node.get$nameSpan(), B.Deprecation_qBS);
               $async$goto = 3;
-              return A._asyncAwait($async$self._async_evaluate0$_applyMixin$5($async$self._async_evaluate0$_addExceptionSpan$2(node, new A._EvaluateVisitor_visitIncludeRule_closure8($async$self, node)), A.NullableExtension_andThen0(node.content, new A._EvaluateVisitor_visitIncludeRule_closure9($async$self)), node.$arguments, node, new A._FakeAstNode0(new A._EvaluateVisitor_visitIncludeRule_closure10(node))), $async$visitIncludeRule$1);
+              return A._asyncAwait($async$self._async_evaluate0$_applyMixin$5(mixin, A.NullableExtension_andThen0(node.content, new A._EvaluateVisitor_visitIncludeRule_closure9($async$self)), node.$arguments, node, new A._FakeAstNode0(new A._EvaluateVisitor_visitIncludeRule_closure10(node))), $async$visitIncludeRule$1);
             case 3:
               // returning from await.
               $async$returnValue = null;
@@ -82185,7 +83068,7 @@ self.util = _cliPkgRequires.util;
     _visitMediaQueries$body$_EvaluateVisitor0(interpolation) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.List_CssMediaQuery_2),
-        $async$returnValue, $async$self = this, _0_0, resolved, map;
+        $async$returnValue, $async$self = this, _0_0;
       var $async$_async_evaluate0$_visitMediaQueries$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -82198,9 +83081,7 @@ self.util = _cliPkgRequires.util;
             case 3:
               // returning from await.
               _0_0 = $async$result;
-              resolved = _0_0._0;
-              map = _0_0._1;
-              $async$returnValue = A.CssMediaQuery_parseList0(resolved, map, $async$self._async_evaluate0$_logger);
+              $async$returnValue = A.CssMediaQuery_parseList0(_0_0._0, _0_0._1, $async$self._async_evaluate0$_logger);
               // goto return
               $async$goto = 1;
               break;
@@ -82212,26 +83093,23 @@ self.util = _cliPkgRequires.util;
       return A._asyncStartSync($async$_async_evaluate0$_visitMediaQueries$1, $async$completer);
     },
     _async_evaluate0$_mergeMediaQueries$2(queries1, queries2) {
-      var t1, t2, t3, t4, _0_0, result, t5,
+      var t1, t2, t3, t4, _0_0, t5, result,
         queries = A._setArrayType([], type$.JSArray_CssMediaQuery_2);
       for (t1 = J.get$iterator$ax(queries1), t2 = J.getInterceptor$ax(queries2); t1.moveNext$0();) {
         t3 = t1.get$current(t1);
-        for (t4 = t2.get$iterator(queries2); t4.moveNext$0();) {
-          _0_0 = t3.merge$1(t4.get$current(t4));
-          if (B._SingletonCssMediaQueryMergeResult_00 === _0_0)
-            continue;
-          if (B._SingletonCssMediaQueryMergeResult_10 === _0_0)
-            return null;
-          if (_0_0 instanceof A.MediaQuerySuccessfulMergeResult0) {
-            result = _0_0;
-            t5 = true;
-          } else {
-            result = null;
-            t5 = false;
+        for (t4 = t2.get$iterator(queries2); t4.moveNext$0();)
+          $label0$1: {
+            _0_0 = t3.merge$1(t4.get$current(t4));
+            if (B._SingletonCssMediaQueryMergeResult_00 === _0_0)
+              continue;
+            if (B._SingletonCssMediaQueryMergeResult_10 === _0_0)
+              return null;
+            t5 = _0_0 instanceof A.MediaQuerySuccessfulMergeResult0;
+            result = t5 ? _0_0 : null;
+            if (t5)
+              queries.push(result.query);
+            break $label0$1;
           }
-          if (t5)
-            queries.push(result.query);
-        }
       }
       return queries;
     },
@@ -82241,7 +83119,7 @@ self.util = _cliPkgRequires.util;
     visitReturnRule$body$_EvaluateVisitor0(node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Value_2),
-        $async$returnValue, $async$self = this, t1;
+        $async$returnValue, $async$self = this, t1, t2;
       var $async$visitReturnRule$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -82250,8 +83128,9 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               t1 = node.expression;
+              t2 = t1.accept$1($async$self);
               $async$goto = 3;
-              return A._asyncAwait(t1.accept$1($async$self), $async$visitReturnRule$1);
+              return A._asyncAwait(type$.Future_Value_2._is(t2) ? t2 : A._Future$value(t2, type$.Value_2), $async$visitReturnRule$1);
             case 3:
               // returning from await.
               $async$returnValue = $async$self._async_evaluate0$_withoutSlash$2($async$result, t1);
@@ -82296,7 +83175,7 @@ self.util = _cliPkgRequires.util;
     visitStyleRule$body$_EvaluateVisitor0(node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value_2),
-        $async$returnValue, $async$self = this, t1, _0_0, selectorText, selectorMap, t2, parsedSelector, rule, oldAtRootExcludingStyleRule, t3, t4, t5, _i, complex, visitor, t6, t7, t8, t9;
+        $async$returnValue, $async$self = this, t1, _0_0, selectorText, selectorMap, parsedSelector, nest, t2, _i, _1_0, first, t3, rule, oldAtRootExcludingStyleRule;
       var $async$visitStyleRule$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -82305,7 +83184,9 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               if ($async$self._async_evaluate0$_declarationName != null)
-                throw A.wrapException($async$self._async_evaluate0$_exception$2(string$.Style_, node.span));
+                throw A.wrapException($async$self._async_evaluate0$_exception$2(string$.Style_n, node.span));
+              else if ($async$self._async_evaluate0$_inKeyframes && $async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__parent, "__parent") instanceof A.ModifiableCssKeyframeBlock0)
+                throw A.wrapException($async$self._async_evaluate0$_exception$2(string$.Style_k, node.span));
               t1 = node.selector;
               $async$goto = 3;
               return A._asyncAwait($async$self._async_evaluate0$_performInterpolationWithMap$2$warnForColor(t1, true), $async$visitStyleRule$1);
@@ -82319,7 +83200,7 @@ self.util = _cliPkgRequires.util;
             case 4:
               // then
               $async$goto = 6;
-              return A._asyncAwait($async$self._async_evaluate0$_withParent$2$4$scopeWhen$through(A.ModifiableCssKeyframeBlock$0(new A.CssValue0(A.List_List$unmodifiable(A.KeyframeSelectorParser$0(selectorText, selectorMap, $async$self._async_evaluate0$_logger).parse$0(), type$.String), t1.span, type$.CssValue_List_String_2), node.span), new A._EvaluateVisitor_visitStyleRule_closure14($async$self, node), node.hasDeclarations, new A._EvaluateVisitor_visitStyleRule_closure15(), type$.ModifiableCssKeyframeBlock_2, type$.Null), $async$visitStyleRule$1);
+              return A._asyncAwait($async$self._async_evaluate0$_withParent$2$4$scopeWhen$through(A.ModifiableCssKeyframeBlock$0(new A.CssValue0(A.List_List$unmodifiable(A.KeyframeSelectorParser$0(selectorText, selectorMap, $async$self._async_evaluate0$_logger).parse$0(), type$.String), t1.span, type$.CssValue_List_String_2), node.span), new A._EvaluateVisitor_visitStyleRule_closure11($async$self, node), node.hasDeclarations, new A._EvaluateVisitor_visitStyleRule_closure12(), type$.ModifiableCssKeyframeBlock_2, type$.Null), $async$visitStyleRule$1);
             case 6:
               // returning from await.
               $async$returnValue = null;
@@ -82328,48 +83209,43 @@ self.util = _cliPkgRequires.util;
               break;
             case 5:
               // join
-              t1 = A.SelectorList_SelectorList$parse0(selectorText, !$async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__stylesheet, "_stylesheet").plainCss, !$async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__stylesheet, "_stylesheet").plainCss, selectorMap, $async$self._async_evaluate0$_logger);
-              t2 = $async$self._async_evaluate0$_styleRuleIgnoringAtRoot;
-              t2 = t2 == null ? null : t2.originalSelector;
-              parsedSelector = t1.resolveParentSelectors$2$implicitParent(t2, !$async$self._async_evaluate0$_atRootExcludingStyleRule);
-              rule = A.ModifiableCssStyleRule$0($async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__extensionStore, "_extensionStore").addSelector$2(parsedSelector, $async$self._async_evaluate0$_mediaQueries), node.span, parsedSelector);
+              parsedSelector = A.SelectorList_SelectorList$parse0(selectorText, true, selectorMap, $async$self._async_evaluate0$_logger, $async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__stylesheet, "_stylesheet").plainCss);
+              t1 = $async$self._async_evaluate0$_atRootExcludingStyleRule ? null : $async$self._async_evaluate0$_styleRuleIgnoringAtRoot;
+              t1 = t1 == null ? null : t1.fromPlainCss;
+              nest = t1 !== true;
+              if (nest) {
+                if ($async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__stylesheet, "_stylesheet").plainCss)
+                  for (t1 = parsedSelector.components, t2 = t1.length, _i = 0; _i < t2; ++_i) {
+                    _1_0 = t1[_i].leadingCombinators;
+                    if (_1_0.length >= 1) {
+                      first = _1_0[0];
+                      t3 = $async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__stylesheet, "_stylesheet");
+                      t3 = t3.plainCss;
+                    } else {
+                      first = null;
+                      t3 = false;
+                    }
+                    if (t3)
+                      throw A.wrapException($async$self._async_evaluate0$_exception$2(string$.Top_lel, first.span));
+                  }
+                t1 = $async$self._async_evaluate0$_styleRuleIgnoringAtRoot;
+                t1 = t1 == null ? null : t1.originalSelector;
+                parsedSelector = parsedSelector.nestWithin$3$implicitParent$preserveParentSelectors(t1, !$async$self._async_evaluate0$_atRootExcludingStyleRule, $async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__stylesheet, "_stylesheet").plainCss);
+              }
+              rule = A.ModifiableCssStyleRule$0($async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__extensionStore, "_extensionStore").addSelector$2(parsedSelector, $async$self._async_evaluate0$_mediaQueries), node.span, $async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__stylesheet, "_stylesheet").plainCss, parsedSelector);
               oldAtRootExcludingStyleRule = $async$self._async_evaluate0$_atRootExcludingStyleRule;
-              $async$self._async_evaluate0$_atRootExcludingStyleRule = false;
+              t1 = $async$self._async_evaluate0$_atRootExcludingStyleRule = false;
+              t2 = nest ? new A._EvaluateVisitor_visitStyleRule_closure13() : null;
               $async$goto = 7;
-              return A._asyncAwait($async$self._async_evaluate0$_withParent$2$4$scopeWhen$through(rule, new A._EvaluateVisitor_visitStyleRule_closure16($async$self, rule, node), node.hasDeclarations, new A._EvaluateVisitor_visitStyleRule_closure17(), type$.ModifiableCssStyleRule_2, type$.Null), $async$visitStyleRule$1);
+              return A._asyncAwait($async$self._async_evaluate0$_withParent$2$4$scopeWhen$through(rule, new A._EvaluateVisitor_visitStyleRule_closure14($async$self, rule, node), node.hasDeclarations, t2, type$.ModifiableCssStyleRule_2, type$.Null), $async$visitStyleRule$1);
             case 7:
               // returning from await.
               $async$self._async_evaluate0$_atRootExcludingStyleRule = oldAtRootExcludingStyleRule;
-              if (!rule.accept$1(B._IsInvisibleVisitor_false_false0))
-                for (t1 = parsedSelector.components, t2 = t1.length, t3 = type$.SourceSpan, t4 = type$.String, t5 = rule.children, _i = 0; _i < t2; ++_i) {
-                  complex = t1[_i];
-                  if (!complex.accept$1(B._IsBogusVisitor_true0))
-                    continue;
-                  if (complex.accept$1(B.C__IsUselessVisitor0)) {
-                    visitor = A._SerializeVisitor$0(null, true, null, true, false, null, true);
-                    complex.accept$1(visitor);
-                    $async$self._async_evaluate0$_warn$3('The selector "' + B.JSString_methods.trim$0(visitor._serialize0$_buffer.toString$0(0)) + string$.x22x20is_ix20, A.SpanExtensions_trimRight0(complex.span), B.Deprecation_XV6);
-                  } else if (complex.leadingCombinators.length !== 0) {
-                    visitor = A._SerializeVisitor$0(null, true, null, true, false, null, true);
-                    complex.accept$1(visitor);
-                    $async$self._async_evaluate0$_warn$3('The selector "' + B.JSString_methods.trim$0(visitor._serialize0$_buffer.toString$0(0)) + string$.x22x20is_ix0a, A.SpanExtensions_trimRight0(complex.span), B.Deprecation_XV6);
-                  } else {
-                    visitor = A._SerializeVisitor$0(null, true, null, true, false, null, true);
-                    complex.accept$1(visitor);
-                    t6 = B.JSString_methods.trim$0(visitor._serialize0$_buffer.toString$0(0));
-                    t7 = complex.accept$1(B._IsBogusVisitor_false0) ? string$.x20It_wi : "";
-                    t8 = A.SpanExtensions_trimRight0(complex.span);
-                    if (t5.get$length(t5) === 0)
-                      A.throwExpression(A.IterableElementError_noElement());
-                    t9 = J.get$span$z(t5.$index(0, 0));
-                    $async$self._async_evaluate0$_warn$3('The selector "' + t6 + string$.x22x20is_o + t7 + string$.x0aThis_, new A.MultiSpan0(t8, "invalid selector", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([t9, "this is not a style rule" + (t5.every$1(t5, new A._EvaluateVisitor_visitStyleRule_closure18()) ? "\n(try converting to a //-style comment)" : "")], t3, t4), t3, t4)), B.Deprecation_XV6);
-                  }
-                }
+              $async$self._async_evaluate0$_warnForBogusCombinators$1(rule);
               if (($async$self._async_evaluate0$_atRootExcludingStyleRule ? null : $async$self._async_evaluate0$_styleRuleIgnoringAtRoot) == null) {
                 t1 = $async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__parent, "__parent").children;
                 t1 = !t1.get$isEmpty(t1);
-              } else
-                t1 = false;
+              }
               if (t1) {
                 t1 = $async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__parent, "__parent").children;
                 t1.get$last(t1).isGroupEnd = true;
@@ -82385,6 +83261,36 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$visitStyleRule$1, $async$completer);
     },
+    _async_evaluate0$_warnForBogusCombinators$1(rule) {
+      var t1, t2, t3, t4, t5, _i, complex, visitor, t6, t7, t8, t9, _this = this, _null = null;
+      if (!rule.accept$1(B._IsInvisibleVisitor_false_false0))
+        for (t1 = rule._style_rule0$_selector._box0$_inner.value.components, t2 = t1.length, t3 = type$.SourceSpan, t4 = type$.String, t5 = rule.children, _i = 0; _i < t2; ++_i) {
+          complex = t1[_i];
+          if (!complex.accept$1(B._IsBogusVisitor_true0))
+            continue;
+          if (complex.accept$1(B.C__IsUselessVisitor0)) {
+            visitor = A._SerializeVisitor$0(_null, true, _null, true, false, _null, true);
+            complex.accept$1(visitor);
+            _this._async_evaluate0$_warn$3('The selector "' + B.JSString_methods.trim$0(visitor._serialize0$_buffer.toString$0(0)) + string$.x22x20is_ix20, A.SpanExtensions_trimRight0(complex.span), B.Deprecation_5pG);
+          } else if (complex.leadingCombinators.length !== 0) {
+            if (!_this._async_evaluate0$_assertInModule$2(_this._async_evaluate0$__stylesheet, "_stylesheet").plainCss) {
+              visitor = A._SerializeVisitor$0(_null, true, _null, true, false, _null, true);
+              complex.accept$1(visitor);
+              _this._async_evaluate0$_warn$3('The selector "' + B.JSString_methods.trim$0(visitor._serialize0$_buffer.toString$0(0)) + string$.x22x20is_ix0a, A.SpanExtensions_trimRight0(complex.span), B.Deprecation_5pG);
+            }
+          } else {
+            visitor = A._SerializeVisitor$0(_null, true, _null, true, false, _null, true);
+            complex.accept$1(visitor);
+            t6 = B.JSString_methods.trim$0(visitor._serialize0$_buffer.toString$0(0));
+            t7 = complex.accept$1(B._IsBogusVisitor_false0) ? string$.x20It_wi : "";
+            t8 = A.SpanExtensions_trimRight0(complex.span);
+            if (t5.get$length(0) === 0)
+              A.throwExpression(A.IterableElementError_noElement());
+            t9 = J.get$span$z(t5.$index(0, 0));
+            _this._async_evaluate0$_warn$3('The selector "' + t6 + string$.x22x20is_o + t7 + string$.x0aThis_, new A.MultiSpan0(t8, "invalid selector", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([t9, "this is not a style rule" + (t5.every$1(t5, new A._EvaluateVisitor__warnForBogusCombinators_closure2()) ? "\n(try converting to a //-style comment)" : "")], t3, t4), t3, t4)), B.Deprecation_5pG);
+          }
+        }
+    },
     visitSupportsRule$1(node) {
       return this.visitSupportsRule$body$_EvaluateVisitor0(node);
     },
@@ -82429,7 +83335,7 @@ self.util = _cliPkgRequires.util;
     _visitSupportsCondition$body$_EvaluateVisitor0(condition) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.String),
-        $async$returnValue, $async$self = this, operation, t1, t2, negation, interpolation, $function, anything, _box_0, $async$temp1, $async$temp2;
+        $async$returnValue, $async$self = this, t1, _box_0, $async$temp1, $async$temp2;
       var $async$_async_evaluate0$_visitSupportsCondition$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -82438,51 +83344,35 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               _box_0 = {};
-              if (condition instanceof A.SupportsOperation0) {
-                operation = condition;
-                t1 = true;
-              } else {
-                operation = null;
-                t1 = false;
-              }
-              $async$goto = t1 ? 4 : 5;
+              $async$goto = condition instanceof A.SupportsOperation0 ? 4 : 5;
               break;
             case 4:
               // then
-              t1 = operation.left;
-              t2 = operation.operator;
+              t1 = condition.operator;
               $async$temp1 = A;
               $async$goto = 6;
-              return A._asyncAwait($async$self._async_evaluate0$_parenthesize$2(t1, t2), $async$_async_evaluate0$_visitSupportsCondition$1);
+              return A._asyncAwait($async$self._async_evaluate0$_parenthesize$2(condition.left, t1), $async$_async_evaluate0$_visitSupportsCondition$1);
             case 6:
               // returning from await.
-              $async$temp1 = $async$temp1.S($async$result) + " " + t2 + " ";
+              $async$temp1 = $async$temp1.S($async$result) + " " + t1 + " ";
               $async$temp2 = A;
               $async$goto = 7;
-              return A._asyncAwait($async$self._async_evaluate0$_parenthesize$2(operation.right, t2), $async$_async_evaluate0$_visitSupportsCondition$1);
+              return A._asyncAwait($async$self._async_evaluate0$_parenthesize$2(condition.right, t1), $async$_async_evaluate0$_visitSupportsCondition$1);
             case 7:
               // returning from await.
-              t2 = $async$temp1 + $async$temp2.S($async$result);
-              t1 = t2;
+              t1 = $async$temp1 + $async$temp2.S($async$result);
               // goto break $label0$0
               $async$goto = 3;
               break;
             case 5:
               // join
-              if (condition instanceof A.SupportsNegation0) {
-                negation = condition;
-                t1 = true;
-              } else {
-                negation = null;
-                t1 = false;
-              }
-              $async$goto = t1 ? 8 : 9;
+              $async$goto = condition instanceof A.SupportsNegation0 ? 8 : 9;
               break;
             case 8:
               // then
               $async$temp1 = A;
               $async$goto = 10;
-              return A._asyncAwait($async$self._async_evaluate0$_parenthesize$1(negation.condition), $async$_async_evaluate0$_visitSupportsCondition$1);
+              return A._asyncAwait($async$self._async_evaluate0$_parenthesize$1(condition.condition), $async$_async_evaluate0$_visitSupportsCondition$1);
             case 10:
               // returning from await.
               t1 = "not " + $async$temp1.S($async$result);
@@ -82491,19 +83381,12 @@ self.util = _cliPkgRequires.util;
               break;
             case 9:
               // join
-              if (condition instanceof A.SupportsInterpolation0) {
-                interpolation = condition;
-                t1 = true;
-              } else {
-                interpolation = null;
-                t1 = false;
-              }
-              $async$goto = t1 ? 11 : 12;
+              $async$goto = condition instanceof A.SupportsInterpolation0 ? 11 : 12;
               break;
             case 11:
               // then
               $async$goto = 13;
-              return A._asyncAwait($async$self._async_evaluate0$_evaluateToCss$2$quote(interpolation.expression, false), $async$_async_evaluate0$_visitSupportsCondition$1);
+              return A._asyncAwait($async$self._async_evaluate0$_evaluateToCss$2$quote(condition.expression, false), $async$_async_evaluate0$_visitSupportsCondition$1);
             case 13:
               // returning from await.
               t1 = $async$result;
@@ -82513,15 +83396,11 @@ self.util = _cliPkgRequires.util;
             case 12:
               // join
               _box_0.declaration = null;
-              if (condition instanceof A.SupportsDeclaration0) {
-                _box_0.declaration = condition;
-                t1 = true;
-              } else
-                t1 = false;
-              $async$goto = t1 ? 14 : 15;
+              $async$goto = condition instanceof A.SupportsDeclaration0 ? 14 : 15;
               break;
             case 14:
               // then
+              _box_0.declaration = condition;
               $async$goto = 16;
               return A._asyncAwait($async$self._async_evaluate0$_withSupportsDeclaration$1$1(new A._EvaluateVisitor__visitSupportsCondition_closure2(_box_0, $async$self), type$.String), $async$_async_evaluate0$_visitSupportsCondition$1);
             case 16:
@@ -82532,26 +83411,19 @@ self.util = _cliPkgRequires.util;
               break;
             case 15:
               // join
-              if (condition instanceof A.SupportsFunction0) {
-                $function = condition;
-                t1 = true;
-              } else {
-                $function = null;
-                t1 = false;
-              }
-              $async$goto = t1 ? 17 : 18;
+              $async$goto = condition instanceof A.SupportsFunction0 ? 17 : 18;
               break;
             case 17:
               // then
               $async$temp1 = A;
               $async$goto = 19;
-              return A._asyncAwait($async$self._async_evaluate0$_performInterpolation$1($function.name), $async$_async_evaluate0$_visitSupportsCondition$1);
+              return A._asyncAwait($async$self._async_evaluate0$_performInterpolation$1(condition.name), $async$_async_evaluate0$_visitSupportsCondition$1);
             case 19:
               // returning from await.
               $async$temp1 = $async$temp1.S($async$result) + "(";
               $async$temp2 = A;
               $async$goto = 20;
-              return A._asyncAwait($async$self._async_evaluate0$_performInterpolation$1($function.$arguments), $async$_async_evaluate0$_visitSupportsCondition$1);
+              return A._asyncAwait($async$self._async_evaluate0$_performInterpolation$1(condition.$arguments), $async$_async_evaluate0$_visitSupportsCondition$1);
             case 20:
               // returning from await.
               t1 = $async$temp1 + $async$temp2.S($async$result) + ")";
@@ -82560,20 +83432,13 @@ self.util = _cliPkgRequires.util;
               break;
             case 18:
               // join
-              if (condition instanceof A.SupportsAnything0) {
-                anything = condition;
-                t1 = true;
-              } else {
-                anything = null;
-                t1 = false;
-              }
-              $async$goto = t1 ? 21 : 22;
+              $async$goto = condition instanceof A.SupportsAnything0 ? 21 : 22;
               break;
             case 21:
               // then
               $async$temp1 = A;
               $async$goto = 23;
-              return A._asyncAwait($async$self._async_evaluate0$_performInterpolation$1(anything.contents), $async$_async_evaluate0$_visitSupportsCondition$1);
+              return A._asyncAwait($async$self._async_evaluate0$_performInterpolation$1(condition.contents), $async$_async_evaluate0$_visitSupportsCondition$1);
             case 23:
               // returning from await.
               t1 = "(" + $async$temp1.S($async$result) + ")";
@@ -82615,8 +83480,9 @@ self.util = _cliPkgRequires.util;
               oldInSupportsDeclaration = $async$self._async_evaluate0$_inSupportsDeclaration;
               $async$self._async_evaluate0$_inSupportsDeclaration = true;
               $async$handler = 3;
+              t1 = callback.call$0();
               $async$goto = 6;
-              return A._asyncAwait(callback.call$0(), $async$_async_evaluate0$_withSupportsDeclaration$1$1);
+              return A._asyncAwait($T._eval$1("Future<0>")._is(t1) ? t1 : A._Future$value(t1, $T), $async$_async_evaluate0$_withSupportsDeclaration$1$1);
             case 6:
               // returning from await.
               t1 = $async$result;
@@ -82711,7 +83577,7 @@ self.util = _cliPkgRequires.util;
     visitVariableDeclaration$body$_EvaluateVisitor0(node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value_2),
-        $async$returnValue, $async$self = this, t2, t3, value, t1, $async$temp1, $async$temp2, $async$temp3;
+        $async$returnValue, $async$self = this, t2, value, t1, $async$temp1, $async$temp2, $async$temp3;
       var $async$visitVariableDeclaration$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -82722,18 +83588,15 @@ self.util = _cliPkgRequires.util;
               t1 = {};
               if (node.isGuarded) {
                 if (node.namespace == null && $async$self._async_evaluate0$_environment._async_environment0$_variables.length === 1) {
-                  t1.override = null;
                   t2 = $async$self._async_evaluate0$_configuration._configuration0$_values;
                   t2 = t2.get$isEmpty(t2) ? null : t2.remove$1(0, node.name);
+                  t1.override = null;
                   if (t2 != null) {
                     t1.override = t2;
-                    t3 = t2;
-                    t2 = true;
-                  } else {
+                    t2 = !t2.value.$eq(0, B.C__SassNull0);
+                  } else
                     t2 = false;
-                    t3 = null;
-                  }
-                  if (t2 && !t3.value.$eq(0, B.C__SassNull0)) {
+                  if (t2) {
                     $async$self._async_evaluate0$_addExceptionSpan$2(node, new A._EvaluateVisitor_visitVariableDeclaration_closure8(t1, $async$self, node));
                     $async$returnValue = null;
                     // goto return
@@ -82751,14 +83614,15 @@ self.util = _cliPkgRequires.util;
               }
               if (node.isGlobal && !$async$self._async_evaluate0$_environment.globalVariableExists$1(node.name)) {
                 t1 = $async$self._async_evaluate0$_environment._async_environment0$_variables.length === 1 ? string$.As_of_S : string$.As_of_R + A.declarationName0(node.span) + ": null` at the stylesheet root.";
-                $async$self._async_evaluate0$_warn$3(t1, node.span, B.Deprecation_wKk);
+                $async$self._async_evaluate0$_warn$3(t1, node.span, B.Deprecation_W6Z);
               }
               t1 = node.expression;
+              t2 = t1.accept$1($async$self);
               $async$temp1 = node;
               $async$temp2 = A;
               $async$temp3 = node;
               $async$goto = 3;
-              return A._asyncAwait(t1.accept$1($async$self), $async$visitVariableDeclaration$1);
+              return A._asyncAwait(type$.Future_Value_2._is(t2) ? t2 : A._Future$value(t2, type$.Value_2), $async$visitVariableDeclaration$1);
             case 3:
               // returning from await.
               $async$self._async_evaluate0$_addExceptionSpan$2($async$temp1, new $async$temp2._EvaluateVisitor_visitVariableDeclaration_closure10($async$self, $async$temp3, $async$self._async_evaluate0$_withoutSlash$2($async$result, t1)));
@@ -82779,7 +83643,7 @@ self.util = _cliPkgRequires.util;
     visitUseRule$body$_EvaluateVisitor0(node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value_2),
-        $async$returnValue, $async$self = this, values, _i, variable, t3, variableNodeWithSpan, configuration, t1, t2, $async$temp1, $async$temp2, $async$temp3;
+        $async$returnValue, $async$self = this, values, t3, t4, _i, variable, t5, variableNodeWithSpan, t6, t7, configuration, t1, t2, $async$temp1, $async$temp2, $async$temp3;
       var $async$visitUseRule$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -82794,7 +83658,7 @@ self.util = _cliPkgRequires.util;
             case 3:
               // then
               values = A.LinkedHashMap_LinkedHashMap$_empty(type$.String, type$.ConfiguredValue_2);
-              _i = 0;
+              t3 = type$._Future_Value_2, t4 = type$.Future_Value_2, _i = 0;
             case 6:
               // for condition
               if (!(_i < t2)) {
@@ -82803,13 +83667,21 @@ self.util = _cliPkgRequires.util;
                 break;
               }
               variable = t1[_i];
-              t3 = variable.expression;
-              variableNodeWithSpan = $async$self._async_evaluate0$_expressionNode$1(t3);
+              t5 = variable.expression;
+              variableNodeWithSpan = $async$self._async_evaluate0$_expressionNode$1(t5);
+              t6 = variable.name;
+              t5 = t5.accept$1($async$self);
+              if (!t4._is(t5)) {
+                t7 = new A._Future($.Zone__current, t3);
+                t7._state = 8;
+                t7._resultOrListeners = t5;
+                t5 = t7;
+              }
               $async$temp1 = values;
-              $async$temp2 = variable.name;
+              $async$temp2 = t6;
               $async$temp3 = A;
               $async$goto = 9;
-              return A._asyncAwait(t3.accept$1($async$self), $async$visitUseRule$1);
+              return A._asyncAwait(t5, $async$visitUseRule$1);
             case 9:
               // returning from await.
               $async$temp1.$indexSet(0, $async$temp2, new $async$temp3.ConfiguredValue0($async$self._async_evaluate0$_withoutSlash$2($async$result, variableNodeWithSpan), variable.span, variableNodeWithSpan));
@@ -82885,7 +83757,7 @@ self.util = _cliPkgRequires.util;
       var t1, _this = this;
       if (_this._async_evaluate0$_assertInModule$2(_this._async_evaluate0$__stylesheet, "_stylesheet").plainCss) {
         t1 = node.operator;
-        t1 = t1 !== B.BinaryOperator_2jN0 && t1 !== B.BinaryOperator_t8B0;
+        t1 = t1 !== B.BinaryOperator_wdM0 && t1 !== B.BinaryOperator_U770;
       } else
         t1 = false;
       if (t1)
@@ -82893,43 +83765,48 @@ self.util = _cliPkgRequires.util;
       return _this._async_evaluate0$_addExceptionSpanAsync$1$2(node, new A._EvaluateVisitor_visitBinaryOperationExpression_closure2(_this, node), type$.Value_2);
     },
     _async_evaluate0$_slash$3(left, right, node) {
-      var t1, _null = null,
+      var t1, right0, _1_2, _1_1, _null = null,
         result = left.dividedBy$1(right),
-        _1_0 = new A._Record_2(left, right),
-        _1_1 = A._InitializedCell$(new A._EvaluateVisitor__slash_closure5(_1_0)),
-        _1_2 = A._InitializedCell$(new A._EvaluateVisitor__slash_closure6(_1_0));
-      if (_1_1._readFinal$0() instanceof A.SassNumber0) {
-        left = _1_1._readFinal$0();
-        if (_1_2._readFinal$0() instanceof A.SassNumber0) {
-          right = _1_2._readFinal$0();
+        _1_2_isSet = left instanceof A.SassNumber0;
+      if (_1_2_isSet) {
+        t1 = type$.SassNumber_2;
+        t1._as(left);
+        if (right instanceof A.SassNumber0) {
+          t1._as(right);
           t1 = node.allowsSlash && this._async_evaluate0$_operandAllowsSlash$1(node.left) && this._async_evaluate0$_operandAllowsSlash$1(node.right);
+          right0 = right;
+          _1_2 = right0;
         } else {
-          right = _null;
+          right0 = _null;
+          _1_2 = right;
           t1 = false;
         }
+        _1_1 = left;
       } else {
-        right = _null;
-        left = right;
+        right0 = _null;
+        _1_2 = right0;
+        _1_1 = left;
+        left = _1_2;
         t1 = false;
       }
       if (t1)
-        return type$.SassNumber_2._as(result).withSlash$2(left, right);
-      if (_1_1._readFinal$0() instanceof A.SassNumber0 && _1_2._readFinal$0() instanceof A.SassNumber0) {
-        this._async_evaluate0$_warn$3(string$.Using__o + A.S(new A._EvaluateVisitor__slash_recommendation2().call$1(node)) + " or " + A.expressionToCalc0(node).toString$0(0) + string$.x0a_Morex20, node.get$span(node), B.Deprecation_wWh);
+        return type$.SassNumber_2._as(result).withSlash$2(left, right0);
+      if (_1_1 instanceof A.SassNumber0)
+        t1 = (_1_2_isSet ? _1_2 : right) instanceof A.SassNumber0;
+      else
+        t1 = false;
+      if (t1) {
+        this._async_evaluate0$_warn$3(string$.Using__o + A.S(new A._EvaluateVisitor__slash_recommendation2().call$1(node)) + " or " + A.expressionToCalc0(node).toString$0(0) + string$.x0a_Morex20, node.get$span(0), B.Deprecation_E8a);
         return result;
       }
       return result;
     },
     _async_evaluate0$_operandAllowsSlash$1(node) {
-      var t1, t2;
+      var t1;
       if (node instanceof A.FunctionExpression0)
         if (node.namespace == null) {
-          t1 = node.originalName;
-          if (B.Set_WfnXb.contains$1(0, A.stringReplaceAllUnchecked(t1, "_", "-").toLowerCase())) {
-            t2 = this._async_evaluate0$_environment;
-            t1 = t2.getFunction$1(A.stringReplaceAllUnchecked(t1, "_", "-")) == null;
-          } else
-            t1 = false;
+          t1 = node.name;
+          t1 = B.Set_yHF81.contains$1(0, t1.toLowerCase()) && this._async_evaluate0$_environment.getFunction$1(t1) == null;
         } else
           t1 = false;
       else
@@ -83092,8 +83969,9 @@ self.util = _cliPkgRequires.util;
             case 4:
               // returning from await.
               result = $async$result.get$isTruthy() ? ifTrue : ifFalse;
+              t1 = result.accept$1($async$self);
               $async$goto = 5;
-              return A._asyncAwait(result.accept$1($async$self), $async$visitIfExpression$1);
+              return A._asyncAwait(type$.Future_Value_2._is(t1) ? t1 : A._Future$value(t1, type$.Value_2), $async$visitIfExpression$1);
             case 5:
               // returning from await.
               $async$returnValue = $async$self._async_evaluate0$_withoutSlash$2($async$result, $async$self._async_evaluate0$_expressionNode$1(result));
@@ -83301,62 +84179,65 @@ self.util = _cliPkgRequires.util;
               t1 = {};
               $function = $async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__stylesheet, "_stylesheet").plainCss ? null : $async$self._async_evaluate0$_addExceptionSpan$2(node, new A._EvaluateVisitor_visitFunctionExpression_closure8($async$self, node));
               t1.$function = $function;
-              $async$goto = $function == null ? 3 : 4;
+              $async$goto = $function == null ? 3 : 5;
               break;
             case 3:
               // then
               if (node.namespace != null)
                 throw A.wrapException($async$self._async_evaluate0$_exception$2("Undefined function.", node.span));
-              t2 = node.originalName;
-              _0_0 = A.stringReplaceAllUnchecked(t2, "_", "-").toLowerCase();
+              t2 = node.name;
+              _0_0 = t2.toLowerCase();
               if ("min" === _0_0 || "max" === _0_0 || "round" === _0_0 || "abs" === _0_0) {
                 t3 = node.$arguments;
                 t4 = t3.named;
                 t3 = t4.get$isEmpty(t4) && t3.rest == null && B.JSArray_methods.every$1(t3.positional, new A._EvaluateVisitor_visitFunctionExpression_closure9());
               } else
                 t3 = false;
-              $async$goto = t3 ? 5 : 6;
-              break;
-            case 5:
-              // then
-              $async$goto = 7;
-              return A._asyncAwait($async$self._async_evaluate0$_visitCalculation$2$inLegacySassFunction(node, true), $async$visitFunctionExpression$1);
-            case 7:
-              // returning from await.
-              $async$returnValue = $async$result;
-              // goto return
-              $async$goto = 1;
+              $async$goto = t3 ? 6 : 7;
               break;
             case 6:
-              // join
-              $async$goto = "calc" === _0_0 || "clamp" === _0_0 || "hypot" === _0_0 || "sin" === _0_0 || "cos" === _0_0 || "tan" === _0_0 || "asin" === _0_0 || "acos" === _0_0 || "atan" === _0_0 || "sqrt" === _0_0 || "exp" === _0_0 || "sign" === _0_0 || "mod" === _0_0 || "rem" === _0_0 || "atan2" === _0_0 || "pow" === _0_0 || "log" === _0_0 ? 8 : 9;
-              break;
-            case 8:
               // then
-              $async$goto = 10;
-              return A._asyncAwait($async$self._async_evaluate0$_visitCalculation$1(node), $async$visitFunctionExpression$1);
-            case 10:
+              $async$goto = 8;
+              return A._asyncAwait($async$self._async_evaluate0$_visitCalculation$2$inLegacySassFunction(node, true), $async$visitFunctionExpression$1);
+            case 8:
               // returning from await.
               $async$returnValue = $async$result;
               // goto return
               $async$goto = 1;
               break;
-            case 9:
+            case 7:
               // join
-              if ($async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__stylesheet, "_stylesheet").plainCss)
-                $function = null;
-              else {
-                t3 = $async$self._async_evaluate0$_builtInFunctions.$index(0, A.stringReplaceAllUnchecked(t2, "_", "-"));
-                $function = t3;
-              }
-              t1.$function = $function == null ? new A.PlainCssCallable0(t2) : $function;
+              $async$goto = "calc" === _0_0 || "clamp" === _0_0 || "hypot" === _0_0 || "sin" === _0_0 || "cos" === _0_0 || "tan" === _0_0 || "asin" === _0_0 || "acos" === _0_0 || "atan" === _0_0 || "sqrt" === _0_0 || "exp" === _0_0 || "sign" === _0_0 || "mod" === _0_0 || "rem" === _0_0 || "atan2" === _0_0 || "pow" === _0_0 || "log" === _0_0 ? 9 : 10;
+              break;
+            case 9:
+              // then
+              $async$goto = 11;
+              return A._asyncAwait($async$self._async_evaluate0$_visitCalculation$1(node), $async$visitFunctionExpression$1);
+            case 11:
+              // returning from await.
+              $async$returnValue = $async$result;
+              // goto return
+              $async$goto = 1;
+              break;
+            case 10:
+              // join
+              $function = $async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__stylesheet, "_stylesheet").plainCss ? null : $async$self._async_evaluate0$_builtInFunctions.$index(0, t2);
+              t2 = t1.$function = $function == null ? new A.PlainCssCallable0(node.originalName) : $function;
+              // goto join
+              $async$goto = 4;
+              break;
+            case 5:
+              // else
+              t2 = $function;
             case 4:
               // join
+              if (B.JSString_methods.startsWith$1(node.originalName, "--") && t2 instanceof A.UserDefinedCallable0 && !B.JSString_methods.startsWith$1(t2.declaration.originalName, "--"))
+                $async$self._async_evaluate0$_warn$3(string$.Sassx20_ff, node.get$nameSpan(), B.Deprecation_qBS);
               oldInFunction = $async$self._async_evaluate0$_inFunction;
               $async$self._async_evaluate0$_inFunction = true;
-              $async$goto = 11;
+              $async$goto = 12;
               return A._asyncAwait($async$self._async_evaluate0$_addErrorSpan$1$2(node, new A._EvaluateVisitor_visitFunctionExpression_closure10(t1, $async$self, node), type$.Value_2), $async$visitFunctionExpression$1);
-            case 11:
+            case 12:
               // returning from await.
               result = $async$result;
               $async$self._async_evaluate0$_inFunction = oldInFunction;
@@ -83420,7 +84301,7 @@ self.util = _cliPkgRequires.util;
               // after for
               $arguments = t3;
               if ($async$self._async_evaluate0$_inSupportsDeclaration) {
-                $async$returnValue = new A.SassCalculation0(A.stringReplaceAllUnchecked(node.originalName, "_", "-"), A.List_List$unmodifiable($arguments, type$.Object));
+                $async$returnValue = new A.SassCalculation0(node.name, A.List_List$unmodifiable($arguments, type$.Object));
                 // goto return
                 $async$goto = 1;
                 break;
@@ -83429,7 +84310,8 @@ self.util = _cliPkgRequires.util;
               $async$self._async_evaluate0$_callableNode = node;
               try {
                 t1 = null;
-                _0_0 = A.stringReplaceAllUnchecked(node.originalName, "_", "-").toLowerCase();
+                t3 = node.name;
+                _0_0 = t3.toLowerCase();
                 $label0$0: {
                   if ("calc" === _0_0) {
                     t1 = A.SassCalculation_calc0(J.$index$asx($arguments, 0));
@@ -83515,7 +84397,7 @@ self.util = _cliPkgRequires.util;
                     t1 = A.SassCalculation_clamp0(J.$index$asx($arguments, 0), A.ListExtensions_elementAtOrNull($arguments, 1), A.ListExtensions_elementAtOrNull($arguments, 2));
                     break $label0$0;
                   }
-                  t3 = A.UnsupportedError$('Unknown calculation name "' + node.get$name(node) + '".');
+                  t3 = A.UnsupportedError$('Unknown calculation name "' + t3 + '".');
                   t1 = A.throwExpression(t3);
                 }
                 t1 = t1;
@@ -83544,10 +84426,11 @@ self.util = _cliPkgRequires.util;
       return A._asyncStartSync($async$_async_evaluate0$_visitCalculation$2$inLegacySassFunction, $async$completer);
     },
     _async_evaluate0$_checkCalculationArguments$1(node) {
-      var _0_0,
+      var t1, _0_0,
         check = new A._EvaluateVisitor__checkCalculationArguments_check2(this, node);
       $label0$0: {
-        _0_0 = A.stringReplaceAllUnchecked(node.originalName, "_", "-").toLowerCase();
+        t1 = node.name;
+        _0_0 = t1.toLowerCase();
         if ("calc" === _0_0 || "sqrt" === _0_0 || "sin" === _0_0 || "cos" === _0_0 || "tan" === _0_0 || "asin" === _0_0 || "acos" === _0_0 || "atan" === _0_0 || "abs" === _0_0 || "exp" === _0_0 || "sign" === _0_0) {
           check.call$1(1);
           break $label0$0;
@@ -83564,7 +84447,7 @@ self.util = _cliPkgRequires.util;
           check.call$1(3);
           break $label0$0;
         }
-        throw A.wrapException(A.UnsupportedError$('Unknown calculation name "' + node.get$name(node) + '".'));
+        throw A.wrapException(A.UnsupportedError$('Unknown calculation name "' + t1 + '".'));
       }
     },
     _async_evaluate0$_verifyCompatibleNumbers$2(args, nodesWithSpans) {
@@ -83601,7 +84484,7 @@ self.util = _cliPkgRequires.util;
     _visitCalculationExpression$body$_EvaluateVisitor0(node, inLegacySassFunction) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Object),
-        $async$returnValue, $async$self = this, inner, t1, result, t2, _0_0, _1_0, t3, _i, i, _box_0, $async$temp1;
+        $async$returnValue, $async$self = this, result, t2, _0_0, _1_0, t3, _i, i, _box_0, t1, inner, $async$temp1;
       var $async$_async_evaluate0$_visitCalculationExpression$2$inLegacySassFunction = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -83610,13 +84493,8 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               _box_0 = {};
-              if (node instanceof A.ParenthesizedExpression0) {
-                inner = node.expression;
-                t1 = true;
-              } else {
-                inner = null;
-                t1 = false;
-              }
+              t1 = node instanceof A.ParenthesizedExpression0;
+              inner = t1 ? node.expression : null;
               $async$goto = t1 ? 3 : 4;
               break;
             case 3:
@@ -83687,13 +84565,12 @@ self.util = _cliPkgRequires.util;
             case 7:
               // join
               _box_0.right = _box_0.left = _box_0.operator = null;
-              if (node instanceof A.BinaryOperationExpression0) {
+              t1 = node instanceof A.BinaryOperationExpression0;
+              if (t1) {
                 _box_0.operator = node.operator;
                 _box_0.left = node.left;
                 _box_0.right = node.right;
-                t1 = true;
-              } else
-                t1 = false;
+              }
               $async$goto = t1 ? 10 : 11;
               break;
             case 10:
@@ -83720,25 +84597,11 @@ self.util = _cliPkgRequires.util;
               _1_0 = $async$result;
               $label1$1: {
                 if (_1_0 instanceof A.SassNumber0) {
-                  result = _1_0;
-                  t1 = true;
-                } else {
-                  result = null;
-                  t1 = false;
-                }
-                if (t1) {
-                  t1 = result;
+                  t1 = _1_0;
                   break $label1$1;
                 }
                 if (_1_0 instanceof A.SassCalculation0) {
-                  result = _1_0;
-                  t1 = true;
-                } else {
-                  result = null;
-                  t1 = false;
-                }
-                if (t1) {
-                  t1 = result;
+                  t1 = _1_0;
                   break $label1$1;
                 }
                 if (_1_0 instanceof A.SassString0) {
@@ -83760,7 +84623,7 @@ self.util = _cliPkgRequires.util;
               break;
             case 14:
               // join
-              $async$goto = node instanceof A.ListExpression0 && !node.hasBrackets && B.ListSeparator_EVt0 === node.separator && node.contents.length >= 2 ? 16 : 17;
+              $async$goto = node instanceof A.ListExpression0 && !node.hasBrackets && B.ListSeparator_nbm0 === node.separator && node.contents.length >= 2 ? 16 : 17;
               break;
             case 16:
               // then
@@ -83810,7 +84673,7 @@ self.util = _cliPkgRequires.util;
     _async_evaluate0$_checkWhitespaceAroundCalculationOperator$1(node) {
       var t2, t3, t4, textBetweenOperands, first, last,
         t1 = node.operator;
-      if (t1 !== B.BinaryOperator_anB0 && t1 !== B.BinaryOperator_olz0)
+      if (t1 !== B.BinaryOperator_u150 && t1 !== B.BinaryOperator_SjO0)
         return;
       t1 = node.left;
       t2 = t1.get$span(t1);
@@ -83842,20 +84705,20 @@ self.util = _cliPkgRequires.util;
     _async_evaluate0$_binaryOperatorToCalculationOperator$2(operator, node) {
       var t1;
       $label0$0: {
-        if (B.BinaryOperator_anB0 === operator) {
-          t1 = B.CalculationOperator_IyK0;
+        if (B.BinaryOperator_u150 === operator) {
+          t1 = B.CalculationOperator_g2q0;
           break $label0$0;
         }
-        if (B.BinaryOperator_olz0 === operator) {
-          t1 = B.CalculationOperator_2bx0;
+        if (B.BinaryOperator_SjO0 === operator) {
+          t1 = B.CalculationOperator_CxF0;
           break $label0$0;
         }
-        if (B.BinaryOperator_qN20 === operator) {
-          t1 = B.CalculationOperator_jFr0;
+        if (B.BinaryOperator_2No0 === operator) {
+          t1 = B.CalculationOperator_1710;
           break $label0$0;
         }
-        if (B.BinaryOperator_t8B0 === operator) {
-          t1 = B.CalculationOperator_OvN0;
+        if (B.BinaryOperator_U770 === operator) {
+          t1 = B.CalculationOperator_Qf10;
           break $label0$0;
         }
         t1 = A.throwExpression(this._async_evaluate0$_exception$2(string$.This_o, node.get$operatorSpan()));
@@ -83873,10 +84736,13 @@ self.util = _cliPkgRequires.util;
         t1 = node.contents;
         previousNode = t1[t2];
         currentNode = t1[i];
-        _0_2 = A._InitializedCell$(new A._EvaluateVisitor__checkAdjacentCalculationValues_closure2(currentNode));
-        if (currentNode instanceof A.UnaryOperationExpression0)
-          t1 = B.UnaryOperator_TLI0 === _0_2._readFinal$0() || B.UnaryOperator_gg40 === _0_2._readFinal$0();
-        else
+        if (currentNode instanceof A.UnaryOperationExpression0) {
+          _0_2 = currentNode.operator;
+          if (B.UnaryOperator_AiQ0 !== _0_2)
+            t1 = B.UnaryOperator_cLp0 === _0_2;
+          else
+            t1 = true;
+        } else
           t1 = false;
         if (!t1)
           t1 = currentNode instanceof A.NumberExpression0 && currentNode.value < 0;
@@ -83973,7 +84839,7 @@ self.util = _cliPkgRequires.util;
     _runFunctionCallable$body$_EvaluateVisitor0($arguments, callable, nodeWithSpan) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Value_2),
-        $async$returnValue, $async$handler = 2, $async$currentError, $async$self = this, buffer, first, argument, restArg, rest, error, t1, t2, _i, exception, $async$exception, $async$temp1, $async$temp2;
+        $async$returnValue, $async$handler = 2, $async$currentError, $async$self = this, buffer, first, argument, restArg, rest, error, t1, t2, _i, t3, t4, exception, $async$exception, $async$temp1;
       var $async$_async_evaluate0$_runFunctionCallable$3 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1) {
           $async$currentError = $async$result;
@@ -84040,13 +84906,14 @@ self.util = _cliPkgRequires.util;
                 first = false;
               else
                 buffer._contents += ", ";
-              $async$temp1 = buffer;
-              $async$temp2 = A;
+              t3 = buffer;
+              $async$temp1 = A;
               $async$goto = 21;
               return A._asyncAwait($async$self._async_evaluate0$_evaluateToCss$1(argument), $async$_async_evaluate0$_runFunctionCallable$3);
             case 21:
               // returning from await.
-              $async$temp1._contents += $async$temp2.S($async$result);
+              t4 = $async$temp1.S($async$result);
+              t3._contents += t4;
             case 19:
               // for update
               ++_i;
@@ -84067,7 +84934,9 @@ self.util = _cliPkgRequires.util;
               rest = $async$result;
               if (!first)
                 buffer._contents += ", ";
-              buffer._contents += $async$self._async_evaluate0$_serialize$2(rest, restArg);
+              t1 = buffer;
+              t2 = $async$self._async_evaluate0$_serialize$2(rest, restArg);
+              t1._contents += t2;
             case 23:
               // join
               $async$handler = 2;
@@ -84096,9 +84965,11 @@ self.util = _cliPkgRequires.util;
               break;
             case 17:
               // after finally
-              buffer._contents += A.Primitives_stringFromCharCode(41);
-              t1 = buffer._contents;
-              $async$returnValue = new A.SassString0(t1.charCodeAt(0) == 0 ? t1 : t1, false);
+              t1 = buffer;
+              t2 = A.Primitives_stringFromCharCode(41);
+              t1._contents += t2;
+              t2 = buffer._contents;
+              $async$returnValue = new A.SassString0(t2.charCodeAt(0) == 0 ? t2 : t2, false);
               // goto return
               $async$goto = 1;
               break;
@@ -84130,7 +85001,7 @@ self.util = _cliPkgRequires.util;
     _runBuiltInCallable$body$_EvaluateVisitor0($arguments, callable, nodeWithSpan) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Value_2),
-        $async$returnValue, $async$handler = 2, $async$currentError, $async$self = this, result, error, stackTrace, message, namedSet, _0_0, declaredArguments, i, t1, argument, t2, t3, rest, argumentList, exception, message0, _box_0, evaluated, oldCallableNode, $async$exception;
+        $async$returnValue, $async$handler = 2, $async$currentError, $async$self = this, result, error, stackTrace, message, namedSet, _0_0, declaredArguments, i, t1, t2, t3, argument, t4, t5, t6, t7, rest, argumentList, exception, message0, _box_0, evaluated, oldCallableNode, $async$exception;
       var $async$_async_evaluate0$_runBuiltInCallable$3 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1) {
           $async$currentError = $async$result;
@@ -84155,7 +85026,7 @@ self.util = _cliPkgRequires.util;
               _box_0.callback = _0_0._1;
               $async$self._async_evaluate0$_addExceptionSpan$2(nodeWithSpan, new A._EvaluateVisitor__runBuiltInCallable_closure8(_box_0, evaluated, namedSet));
               declaredArguments = _box_0.overload.$arguments;
-              i = J.get$length$asx(evaluated._values[2]), t1 = declaredArguments.length;
+              i = J.get$length$asx(evaluated._values[2]), t1 = declaredArguments.length, t2 = type$._Future_Value_2, t3 = type$.Future_Value_2;
             case 4:
               // for condition
               if (!(i < t1)) {
@@ -84164,21 +85035,28 @@ self.util = _cliPkgRequires.util;
                 break;
               }
               argument = declaredArguments[i];
-              t2 = evaluated._values[2];
-              t3 = evaluated._values[0].remove$1(0, argument.name);
-              $async$goto = t3 == null ? 7 : 8;
+              t4 = evaluated._values[2];
+              t5 = evaluated._values[0].remove$1(0, argument.name);
+              $async$goto = t5 == null ? 7 : 8;
               break;
             case 7:
               // then
-              t3 = argument.defaultValue;
+              t5 = argument.defaultValue;
+              t6 = t5.accept$1($async$self);
+              if (!t3._is(t6)) {
+                t7 = new A._Future($.Zone__current, t2);
+                t7._state = 8;
+                t7._resultOrListeners = t6;
+                t6 = t7;
+              }
               $async$goto = 9;
-              return A._asyncAwait(t3.accept$1($async$self), $async$_async_evaluate0$_runBuiltInCallable$3);
+              return A._asyncAwait(t6, $async$_async_evaluate0$_runBuiltInCallable$3);
             case 9:
               // returning from await.
-              t3 = $async$self._async_evaluate0$_withoutSlash$2($async$result, t3);
+              t5 = $async$self._async_evaluate0$_withoutSlash$2($async$result, t5);
             case 8:
               // join
-              J.add$1$ax(t2, t3);
+              J.add$1$ax(t4, t5);
             case 5:
               // for update
               ++i;
@@ -84194,7 +85072,7 @@ self.util = _cliPkgRequires.util;
                 } else
                   rest = B.List_empty19;
                 t1 = evaluated._values[0];
-                argumentList = A.SassArgumentList$0(rest, t1, evaluated._values[4] === B.ListSeparator_undecided_null_undecided0 ? B.ListSeparator_rXA0 : evaluated._values[4]);
+                argumentList = A.SassArgumentList$0(rest, t1, evaluated._values[4] === B.ListSeparator_undecided_null_undecided0 ? B.ListSeparator_ECn0 : evaluated._values[4]);
                 J.add$1$ax(evaluated._values[2], argumentList);
               } else
                 argumentList = null;
@@ -84278,7 +85156,7 @@ self.util = _cliPkgRequires.util;
     _evaluateArguments$body$_EvaluateVisitor0($arguments) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Record_5_Map_String_Value_named_and_Map_String_AstNode_namedNodes_and_List_Value_positional_and_List_AstNode_positionalNodes_and_ListSeparator_separator_2),
-        $async$returnValue, $async$self = this, t1, t2, _i, expression, nodeForSpan, named, namedNodes, t3, t4, $name, value, restArgs, rest, restNodeForSpan, t5, separator, keywordRestArgs, keywordRest, keywordRestNodeForSpan, positional, positionalNodes, $async$temp1, $async$temp2;
+        $async$returnValue, $async$self = this, t1, t2, t3, t4, _i, expression, nodeForSpan, t5, t6, named, namedNodes, $name, value, t7, restArgs, rest, restNodeForSpan, separator, keywordRestArgs, keywordRest, keywordRestNodeForSpan, positional, positionalNodes, $async$temp1, $async$temp2;
       var $async$_async_evaluate0$_evaluateArguments$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -84288,7 +85166,7 @@ self.util = _cliPkgRequires.util;
               // Function start
               positional = A._setArrayType([], type$.JSArray_Value_2);
               positionalNodes = A._setArrayType([], type$.JSArray_AstNode_2);
-              t1 = $arguments.positional, t2 = t1.length, _i = 0;
+              t1 = $arguments.positional, t2 = t1.length, t3 = type$._Future_Value_2, t4 = type$.Future_Value_2, _i = 0;
             case 3:
               // for condition
               if (!(_i < t2)) {
@@ -84298,9 +85176,16 @@ self.util = _cliPkgRequires.util;
               }
               expression = t1[_i];
               nodeForSpan = $async$self._async_evaluate0$_expressionNode$1(expression);
+              t5 = expression.accept$1($async$self);
+              if (!t4._is(t5)) {
+                t6 = new A._Future($.Zone__current, t3);
+                t6._state = 8;
+                t6._resultOrListeners = t5;
+                t5 = t6;
+              }
               $async$temp1 = positional;
               $async$goto = 6;
-              return A._asyncAwait(expression.accept$1($async$self), $async$_async_evaluate0$_evaluateArguments$1);
+              return A._asyncAwait(t5, $async$_async_evaluate0$_evaluateArguments$1);
             case 6:
               // returning from await.
               $async$temp1.push($async$self._async_evaluate0$_withoutSlash$2($async$result, nodeForSpan));
@@ -84317,22 +85202,29 @@ self.util = _cliPkgRequires.util;
               named = A.LinkedHashMap_LinkedHashMap$_empty(t1, type$.Value_2);
               t2 = type$.AstNode_2;
               namedNodes = A.LinkedHashMap_LinkedHashMap$_empty(t1, t2);
-              t3 = A.MapExtensions_get_pairs0($arguments.named, t1, type$.Expression_2), t3 = t3.get$iterator(t3);
+              t5 = A.MapExtensions_get_pairs0($arguments.named, t1, type$.Expression_2), t5 = t5.get$iterator(t5);
             case 7:
               // for condition
-              if (!t3.moveNext$0()) {
+              if (!t5.moveNext$0()) {
                 // goto after for
                 $async$goto = 8;
                 break;
               }
-              t4 = t3.get$current(t3);
-              $name = t4._0;
-              value = t4._1;
+              t6 = t5.get$current(t5);
+              $name = t6._0;
+              value = t6._1;
               nodeForSpan = $async$self._async_evaluate0$_expressionNode$1(value);
+              t6 = value.accept$1($async$self);
+              if (!t4._is(t6)) {
+                t7 = new A._Future($.Zone__current, t3);
+                t7._state = 8;
+                t7._resultOrListeners = t6;
+                t6 = t7;
+              }
               $async$temp1 = named;
               $async$temp2 = $name;
               $async$goto = 9;
-              return A._asyncAwait(value.accept$1($async$self), $async$_async_evaluate0$_evaluateArguments$1);
+              return A._asyncAwait(t6, $async$_async_evaluate0$_evaluateArguments$1);
             case 9:
               // returning from await.
               $async$temp1.$indexSet(0, $async$temp2, $async$self._async_evaluate0$_withoutSlash$2($async$result, nodeForSpan));
@@ -84558,12 +85450,6 @@ self.util = _cliPkgRequires.util;
               $label1$1: {
                 if (_0_0 instanceof A.SassString0) {
                   text = _0_0._string0$_text;
-                  t5 = true;
-                } else {
-                  text = null;
-                  t5 = false;
-                }
-                if (t5) {
                   t5 = text;
                   break $label1$1;
                 }
@@ -84823,7 +85709,7 @@ self.util = _cliPkgRequires.util;
     visitCssStyleRule$body$_EvaluateVisitor0(node) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.void),
-        $async$self = this, t1, styleRule, t2, t3, t4, originalSelector, rule, oldAtRootExcludingStyleRule, _0_0, _0_1, lastChild;
+        $async$self = this, t1, styleRule, t2, nest, t3, originalSelector, rule, oldAtRootExcludingStyleRule, _0_1, lastChild;
       var $async$visitCssStyleRule$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -84832,26 +85718,36 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               if ($async$self._async_evaluate0$_declarationName != null)
-                throw A.wrapException($async$self._async_evaluate0$_exception$2(string$.Style_, node.span));
+                throw A.wrapException($async$self._async_evaluate0$_exception$2(string$.Style_n, node.span));
+              else if ($async$self._async_evaluate0$_inKeyframes && $async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__parent, "__parent") instanceof A.ModifiableCssKeyframeBlock0)
+                throw A.wrapException($async$self._async_evaluate0$_exception$2(string$.Style_k, node.span));
               t1 = $async$self._async_evaluate0$_atRootExcludingStyleRule;
               styleRule = t1 ? null : $async$self._async_evaluate0$_styleRuleIgnoringAtRoot;
-              t2 = node._style_rule0$_selector._box0$_inner.value;
-              t3 = styleRule == null;
-              t4 = t3 ? null : styleRule.originalSelector;
-              originalSelector = t2.resolveParentSelectors$2$implicitParent(t4, !t1);
-              rule = A.ModifiableCssStyleRule$0($async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__extensionStore, "_extensionStore").addSelector$2(originalSelector, $async$self._async_evaluate0$_mediaQueries), node.span, originalSelector);
+              t2 = t1 ? null : $async$self._async_evaluate0$_styleRuleIgnoringAtRoot;
+              t2 = t2 == null ? null : t2.fromPlainCss;
+              nest = t2 !== true;
+              t2 = node._style_rule0$_selector._box0$_inner;
+              if (nest) {
+                t2 = t2.value;
+                t3 = styleRule == null ? null : styleRule.originalSelector;
+                originalSelector = t2.nestWithin$3$implicitParent$preserveParentSelectors(t3, !t1, node.fromPlainCss);
+              } else
+                originalSelector = t2.value;
+              rule = A.ModifiableCssStyleRule$0($async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__extensionStore, "_extensionStore").addSelector$2(originalSelector, $async$self._async_evaluate0$_mediaQueries), node.span, node.fromPlainCss, originalSelector);
               oldAtRootExcludingStyleRule = $async$self._async_evaluate0$_atRootExcludingStyleRule;
               $async$self._async_evaluate0$_atRootExcludingStyleRule = false;
+              t1 = nest ? new A._EvaluateVisitor_visitCssStyleRule_closure5() : null;
               $async$goto = 2;
-              return A._asyncAwait($async$self._async_evaluate0$_withParent$2$4$scopeWhen$through(rule, new A._EvaluateVisitor_visitCssStyleRule_closure8($async$self, rule, node), false, new A._EvaluateVisitor_visitCssStyleRule_closure9(), type$.ModifiableCssStyleRule_2, type$.Null), $async$visitCssStyleRule$1);
+              return A._asyncAwait($async$self._async_evaluate0$_withParent$2$4$scopeWhen$through(rule, new A._EvaluateVisitor_visitCssStyleRule_closure6($async$self, rule, node), false, t1, type$.ModifiableCssStyleRule_2, type$.Null), $async$visitCssStyleRule$1);
             case 2:
               // returning from await.
               $async$self._async_evaluate0$_atRootExcludingStyleRule = oldAtRootExcludingStyleRule;
-              _0_0 = $async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__parent, "__parent").children;
-              _0_1 = A._InitializedCell$(new A._EvaluateVisitor_visitCssStyleRule_closure10(_0_0));
-              if (_0_1._readFinal$0() >= 1) {
-                lastChild = J.elementAt$1$ax(_0_0._collection$_source, _0_1._readFinal$0() - 1);
-                t1 = t3;
+              t1 = $async$self._async_evaluate0$_assertInModule$2($async$self._async_evaluate0$__parent, "__parent").children._collection$_source;
+              t2 = J.getInterceptor$asx(t1);
+              _0_1 = t2.get$length(t1);
+              if (_0_1 >= 1) {
+                lastChild = t2.elementAt$1(t1, _0_1 - 1);
+                t1 = styleRule == null;
               } else {
                 lastChild = null;
                 t1 = false;
@@ -84936,7 +85832,7 @@ self.util = _cliPkgRequires.util;
     _handleReturn$body$_EvaluateVisitor0(list, callback) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value_2),
-        $async$returnValue, t1, _i, _0_0, result, t2;
+        $async$returnValue, t1, _i, _0_0;
       var $async$_async_evaluate0$_handleReturn$1$2 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -84958,14 +85854,7 @@ self.util = _cliPkgRequires.util;
               // returning from await.
               _0_0 = $async$result;
               if (_0_0 != null) {
-                result = _0_0;
-                t2 = true;
-              } else {
-                result = null;
-                t2 = false;
-              }
-              if (t2) {
-                $async$returnValue = result;
+                $async$returnValue = _0_0;
                 // goto return
                 $async$goto = 1;
                 break;
@@ -85068,7 +85957,7 @@ self.util = _cliPkgRequires.util;
     _performInterpolation$body$_EvaluateVisitor0(interpolation, warnForColor) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.String),
-        $async$returnValue, $async$self = this, result;
+        $async$returnValue, $async$self = this;
       var $async$_async_evaluate0$_performInterpolation$2$warnForColor = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -85080,8 +85969,7 @@ self.util = _cliPkgRequires.util;
               return A._asyncAwait($async$self._async_evaluate0$_performInterpolationHelper$3$sourceMap$warnForColor(interpolation, false, warnForColor), $async$_async_evaluate0$_performInterpolation$2$warnForColor);
             case 3:
               // returning from await.
-              result = $async$result._0;
-              $async$returnValue = result;
+              $async$returnValue = $async$result._0;
               // goto return
               $async$goto = 1;
               break;
@@ -85174,7 +86062,7 @@ self.util = _cliPkgRequires.util;
                 result0 = new A.Interpolation0(result0, t6);
                 result0.Interpolation$20(t9, t6);
                 t9 = $.$get$namesByColor0();
-                $async$self._async_evaluate0$_warn$2(string$.You_pr + A.S(t9.$index(0, result)) + string$.x20in_in + result.toString$0(0) + string$.x2c_whicw + A.S(t9.$index(0, result)) + string$.x22x29__If + new A.BinaryOperationExpression0(B.BinaryOperator_anB0, new A.StringExpression0(result0, true), value, false).toString$0(0) + "'.", value.get$span(value));
+                $async$self._async_evaluate0$_warn$2(string$.You_pr + A.S(t9.$index(0, result)) + string$.x20in_in + result.toString$0(0) + string$.x2c_whicw + A.S(t9.$index(0, result)) + string$.x22x29__If + new A.BinaryOperationExpression0(B.BinaryOperator_u150, new A.StringExpression0(result0, true), value, false).toString$0(0) + "'.", value.get$span(value));
               }
               t8 += $async$self._async_evaluate0$_serialize$3$quote(result, value, false);
             case 4:
@@ -85206,7 +86094,7 @@ self.util = _cliPkgRequires.util;
     _evaluateToCss$body$_EvaluateVisitor0(expression, quote) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.String),
-        $async$returnValue, $async$self = this;
+        $async$returnValue, $async$self = this, t1;
       var $async$_async_evaluate0$_evaluateToCss$2$quote = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -85214,8 +86102,9 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
+              t1 = expression.accept$1($async$self);
               $async$goto = 3;
-              return A._asyncAwait(expression.accept$1($async$self), $async$_async_evaluate0$_evaluateToCss$2$quote);
+              return A._asyncAwait(type$.Future_Value_2._is(t1) ? t1 : A._Future$value(t1, type$.Value_2), $async$_async_evaluate0$_evaluateToCss$2$quote);
             case 3:
               // returning from await.
               $async$returnValue = $async$self._async_evaluate0$_serialize$3$quote($async$result, expression, quote);
@@ -85287,16 +86176,9 @@ self.util = _cliPkgRequires.util;
       var _0_0, grandparent, t1,
         $parent = this._async_evaluate0$_assertInModule$2(this._async_evaluate0$__parent, "__parent");
       if (through != null) {
-        for (; through.call$1($parent); $parent = grandparent) {
+        for (; through.call$1($parent); $parent = _0_0) {
           _0_0 = $parent._node$_parent;
-          if (_0_0 != null) {
-            grandparent = _0_0;
-            t1 = true;
-          } else {
-            grandparent = null;
-            t1 = false;
-          }
-          if (!t1)
+          if (_0_0 == null)
             throw A.wrapException(A.ArgumentError$(string$.throug + node.toString$0(0) + ".", null));
         }
         if ($parent.get$hasFollowingSibling()) {
@@ -85421,8 +86303,13 @@ self.util = _cliPkgRequires.util;
       return A._asyncStartSync($async$_async_evaluate0$_withStackFrame$1$3, $async$completer);
     },
     _async_evaluate0$_withoutSlash$2(value, nodeForSpan) {
-      if (value instanceof A.SassNumber0 && value.asSlash != null && true)
-        this._async_evaluate0$_warn$3(string$.Using__i + A.S(new A._EvaluateVisitor__withoutSlash_recommendation2().call$1(value)) + string$.x0a_Morex20, nodeForSpan.get$span(nodeForSpan), B.Deprecation_wWh);
+      var t1;
+      if (value instanceof A.SassNumber0)
+        t1 = value.asSlash != null;
+      else
+        t1 = false;
+      if (t1)
+        this._async_evaluate0$_warn$3(string$.Using__i + A.S(new A._EvaluateVisitor__withoutSlash_recommendation2().call$1(value)) + string$.x0a_Morex20, nodeForSpan.get$span(nodeForSpan), B.Deprecation_E8a);
       return value.withoutSlash$0();
     },
     _async_evaluate0$_stackFrame$2(member, span) {
@@ -85525,8 +86412,9 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               $async$handler = 4;
+              t1 = callback.call$0();
               $async$goto = 7;
-              return A._asyncAwait(callback.call$0(), $async$_async_evaluate0$_addExceptionSpanAsync$1$3$addStackFrame);
+              return A._asyncAwait($T._eval$1("Future<0>")._is(t1) ? t1 : A._Future$value(t1, $T), $async$_async_evaluate0$_addExceptionSpanAsync$1$3$addStackFrame);
             case 7:
               // returning from await.
               t1 = $async$result;
@@ -85587,8 +86475,9 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               $async$handler = 4;
+              t1 = callback.call$0();
               $async$goto = 7;
-              return A._asyncAwait(callback.call$0(), $async$_async_evaluate0$_addExceptionTrace$1$1);
+              return A._asyncAwait($T._eval$1("Future<0>")._is(t1) ? t1 : A._Future$value(t1, $T), $async$_async_evaluate0$_addExceptionTrace$1$1);
             case 7:
               // returning from await.
               t1 = $async$result;
@@ -85762,7 +86651,7 @@ self.util = _cliPkgRequires.util;
   };
   A._EvaluateVisitor_closure43.prototype = {
     call$1($arguments) {
-      var t2, t3, t4, $name, value,
+      var t2, t3, t4,
         t1 = J.$index$asx($arguments, 0).assertString$1("module")._string0$_text,
         module = this.$this._async_evaluate0$_environment._async_environment0$_modules.$index(0, t1);
       if (module == null)
@@ -85771,18 +86660,15 @@ self.util = _cliPkgRequires.util;
       t2 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1);
       for (t3 = A.MapExtensions_get_pairs0(module.get$variables(), type$.String, t1), t3 = t3.get$iterator(t3); t3.moveNext$0();) {
         t4 = t3.get$current(t3);
-        $name = t4._0;
-        value = t4._1;
-        value = value;
-        t2.$indexSet(0, new A.SassString0($name, true), value);
+        t2.$indexSet(0, new A.SassString0(t4._0, true), t4._1);
       }
       return new A.SassMap0(A.ConstantMap_ConstantMap$from(t2, t1, t1));
     },
-    $signature: 38
+    $signature: 36
   };
   A._EvaluateVisitor_closure44.prototype = {
     call$1($arguments) {
-      var t2, t3, t4, $name, value,
+      var t2, t3, t4,
         t1 = J.$index$asx($arguments, 0).assertString$1("module")._string0$_text,
         module = this.$this._async_evaluate0$_environment._async_environment0$_modules.$index(0, t1);
       if (module == null)
@@ -85791,18 +86677,15 @@ self.util = _cliPkgRequires.util;
       t2 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1);
       for (t3 = A.MapExtensions_get_pairs0(module.get$functions(module), type$.String, type$.AsyncCallable_2), t3 = t3.get$iterator(t3); t3.moveNext$0();) {
         t4 = t3.get$current(t3);
-        $name = t4._0;
-        value = t4._1;
-        value = value;
-        t2.$indexSet(0, new A.SassString0($name, true), new A.SassFunction0(value));
+        t2.$indexSet(0, new A.SassString0(t4._0, true), new A.SassFunction0(t4._1));
       }
       return new A.SassMap0(A.ConstantMap_ConstantMap$from(t2, t1, t1));
     },
-    $signature: 38
+    $signature: 36
   };
   A._EvaluateVisitor_closure45.prototype = {
     call$1($arguments) {
-      var t2, t3, t4, $name, value,
+      var t2, t3, t4,
         t1 = J.$index$asx($arguments, 0).assertString$1("module")._string0$_text,
         module = this.$this._async_evaluate0$_environment._async_environment0$_modules.$index(0, t1);
       if (module == null)
@@ -85811,14 +86694,11 @@ self.util = _cliPkgRequires.util;
       t2 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1);
       for (t3 = A.MapExtensions_get_pairs0(module.get$mixins(), type$.String, type$.AsyncCallable_2), t3 = t3.get$iterator(t3); t3.moveNext$0();) {
         t4 = t3.get$current(t3);
-        $name = t4._0;
-        value = t4._1;
-        value = value;
-        t2.$indexSet(0, new A.SassString0($name, true), new A.SassMixin0(value));
+        t2.$indexSet(0, new A.SassString0(t4._0, true), new A.SassMixin0(t4._1));
       }
       return new A.SassMap0(A.ConstantMap_ConstantMap$from(t2, t1, t1));
     },
-    $signature: 38
+    $signature: 36
   };
   A._EvaluateVisitor_closure46.prototype = {
     call$1($arguments) {
@@ -85841,7 +86721,7 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException("Function not found: " + $name.toString$0(0));
       return new A.SassFunction0(callable);
     },
-    $signature: 182
+    $signature: 135
   };
   A._EvaluateVisitor__closure14.prototype = {
     call$0() {
@@ -85855,7 +86735,7 @@ self.util = _cliPkgRequires.util;
         return local;
       return t1._async_evaluate0$_builtInFunctions.$index(0, normalizedName);
     },
-    $signature: 103
+    $signature: 92
   };
   A._EvaluateVisitor_closure47.prototype = {
     call$1($arguments) {
@@ -85872,7 +86752,7 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException("Mixin not found: " + $name.toString$0(0));
       return new A.SassMixin0(callable);
     },
-    $signature: 184
+    $signature: 242
   };
   A._EvaluateVisitor__closure13.prototype = {
     call$0() {
@@ -85881,7 +86761,7 @@ self.util = _cliPkgRequires.util;
         t3 = this.module;
       return t1.getMixin$2$namespace(t2, t3 == null ? null : t3._string0$_text);
     },
-    $signature: 103
+    $signature: 92
   };
   A._EvaluateVisitor_closure48.prototype = {
     call$1($arguments) {
@@ -85890,7 +86770,7 @@ self.util = _cliPkgRequires.util;
     $call$body$_EvaluateVisitor_closure4($arguments) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Value_2),
-        $async$returnValue, $async$self = this, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, $name, value, invocation, callableNode, t1, $function, args;
+        $async$returnValue, $async$self = this, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, invocation, callableNode, t1, $function, args;
       var $async$call$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -85918,10 +86798,7 @@ self.util = _cliPkgRequires.util;
                 t10 = A.LinkedHashMap_LinkedHashMap$_empty(t9, t9);
                 for (args._argument_list$_wereKeywordsAccessed = true, t8 = A.MapExtensions_get_pairs0(t8, t4, t9), t8 = t8.get$iterator(t8); t8.moveNext$0();) {
                   t11 = t8.get$current(t8);
-                  $name = t11._0;
-                  value = t11._1;
-                  value = value;
-                  t10.$indexSet(0, new A.SassString0($name, false), value);
+                  t10.$indexSet(0, new A.SassString0(t11._0, false), t11._1);
                 }
                 t2 = new A.ValueExpression0(new A.SassMap0(A.ConstantMap_ConstantMap$from(t10, t9, t9)), t2.get$span(t2));
               }
@@ -85930,11 +86807,13 @@ self.util = _cliPkgRequires.util;
               break;
             case 3:
               // then
-              t2 = $function.toString$0(0);
-              A.EvaluationContext_current0().warn$2(0, string$.Passina + t2 + "))", B.Deprecation_4iQ);
+              A.warnForDeprecation0(string$.Passina + $function.toString$0(0) + "))", B.Deprecation_MMc);
               callableNode = t1._async_evaluate0$_callableNode;
+              t2 = $function._string0$_text;
+              t3 = callableNode.get$span(callableNode);
+              t1 = t1.visitFunctionExpression$1(new A.FunctionExpression0(null, A.stringReplaceAllUnchecked(t2, "_", "-"), t2, invocation, t3));
               $async$goto = 5;
-              return A._asyncAwait(t1.visitFunctionExpression$1(new A.FunctionExpression0(null, $function._string0$_text, invocation, callableNode.get$span(callableNode))), $async$call$1);
+              return A._asyncAwait(type$.Future_Value_2._is(t1) ? t1 : A._Future$value(t1, type$.Value_2), $async$call$1);
             case 5:
               // returning from await.
               $async$returnValue = $async$result;
@@ -85962,7 +86841,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$1, $async$completer);
     },
-    $signature: 99
+    $signature: 88
   };
   A._EvaluateVisitor_closure49.prototype = {
     call$1($arguments) {
@@ -86004,7 +86883,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$1, $async$completer);
     },
-    $signature: 185
+    $signature: 241
   };
   A._EvaluateVisitor__closure11.prototype = {
     call$2(variable, value) {
@@ -86015,14 +86894,14 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException("The variable $" + $name + " was configured twice.");
       t1.$indexSet(0, $name, new A.ConfiguredValue0(value, this.span, this.callableNode));
     },
-    $signature: 104
+    $signature: 76
   };
   A._EvaluateVisitor__closure12.prototype = {
     call$2(module, _) {
       var t1 = this.$this;
       return t1._async_evaluate0$_combineCss$2$clone(module, true).accept$1(t1);
     },
-    $signature: 341
+    $signature: 320
   };
   A._EvaluateVisitor_closure50.prototype = {
     call$1($arguments) {
@@ -86059,13 +86938,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$1, $async$completer);
     },
-    $signature: 185
+    $signature: 241
   };
   A._EvaluateVisitor_run_closure2.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Record_2_Set_Uri_loadedUrls_and_CssStylesheet_stylesheet_2),
-        $async$returnValue, $async$self = this, module, t2, url, t1, _0_0;
+        $async$returnValue, $async$self = this, module, t2, t1, _0_0, url;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -86073,15 +86952,11 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              url = null;
               t1 = $async$self.node;
               _0_0 = t1.span.file.url;
+              url = null;
               if (_0_0 != null) {
                 url = _0_0;
-                t2 = true;
-              } else
-                t2 = false;
-              if (t2) {
                 t2 = $async$self.$this;
                 t2._async_evaluate0$_activeModules.$indexSet(0, url, null);
                 if (!(t2._async_evaluate0$_nodeImporter != null && J.toString$0$(url) === "stdin"))
@@ -86104,13 +86979,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 342
+    $signature: 321
   };
   A._EvaluateVisitor_run__closure2.prototype = {
     call$0() {
       return this.$this._async_evaluate0$_execute$2(this.importer, this.node);
     },
-    $signature: 343
+    $signature: 322
   };
   A._EvaluateVisitor__loadModule_closure5.prototype = {
     call$0() {
@@ -86148,12 +87023,17 @@ self.util = _cliPkgRequires.util;
               stylesheet = _1_0._0;
               importer = _1_0._1;
               isDependency = _1_0._2;
-              isDependency = isDependency;
               canonicalUrl = stylesheet.span.file.url;
               if (canonicalUrl != null) {
                 t4 = t2._async_evaluate0$_activeModules;
                 if (t4.containsKey$1(canonicalUrl)) {
-                  message = $async$self.namesInErrors ? "Module loop: " + $.$get$context().prettyUri$1(canonicalUrl) + " is already being loaded." : string$.Modulel;
+                  if ($async$self.namesInErrors) {
+                    t1 = canonicalUrl;
+                    t3 = $.$get$context();
+                    t1.toString;
+                    message = "Module loop: " + t3.prettyUri$1(t1) + " is already being loaded.";
+                  } else
+                    message = string$.Modulel;
                   t1 = A.NullableExtension_andThen0(t4.$index(0, canonicalUrl), new A._EvaluateVisitor__loadModule__closure5(t2, message));
                   throw A.wrapException(t1 == null ? t2._async_evaluate0$_exception$1(message) : t1);
                 } else
@@ -86200,13 +87080,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor__loadModule__closure5.prototype = {
     call$1(previousLoad) {
       return this.$this._async_evaluate0$_multiSpanException$3(this.message, "new load", A.LinkedHashMap_LinkedHashMap$_literal([previousLoad.get$span(previousLoad), "original load"], type$.FileSpan, type$.String));
     },
-    $signature: 105
+    $signature: 94
   };
   A._EvaluateVisitor__loadModule__closure6.prototype = {
     call$0() {
@@ -86259,8 +87139,8 @@ self.util = _cliPkgRequires.util;
             case 2:
               // returning from await.
               t3 = t1._async_evaluate0$_outOfOrderImports == null ? t5 : new A.CssStylesheet0(new A.UnmodifiableListView(t1._async_evaluate0$_addOutOfOrderImports$0(), type$.UnmodifiableListView_CssNode_2), t4);
-              $async$self.css._value = t3;
-              $async$self.preModuleComments._value = t1._async_evaluate0$_preModuleComments;
+              $async$self.css.__late_helper$_value = t3;
+              $async$self.preModuleComments.__late_helper$_value = t1._async_evaluate0$_preModuleComments;
               t1._async_evaluate0$_importer = oldImporter;
               t1._async_evaluate0$__stylesheet = oldStylesheet;
               t1._async_evaluate0$__root = oldRoot;
@@ -86282,23 +87162,23 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor__combineCss_closure5.prototype = {
     call$1(module) {
       return module.get$transitivelyContainsCss();
     },
-    $signature: 123
+    $signature: 112
   };
   A._EvaluateVisitor__combineCss_closure6.prototype = {
     call$1(target) {
       return !this.selectors.contains$1(0, target);
     },
-    $signature: 15
+    $signature: 14
   };
   A._EvaluateVisitor__combineCss_visitModule2.prototype = {
     call$1(module) {
-      var t1, t2, t3, t4, _i, upstream, _1_0, comments, t5, statements, index, _this = this;
+      var t1, t2, t3, t4, _i, upstream, _1_0, statements, index, _this = this;
       if (!_this.seen.add$1(0, module))
         return;
       if (_this.clone)
@@ -86307,15 +87187,8 @@ self.util = _cliPkgRequires.util;
         upstream = t1[_i];
         if (upstream.get$transitivelyContainsCss()) {
           _1_0 = module.get$preModuleComments().$index(0, upstream);
-          if (_1_0 != null) {
-            comments = _1_0;
-            t5 = true;
-          } else {
-            comments = null;
-            t5 = false;
-          }
-          if (t5)
-            B.JSArray_methods.addAll$1(t3.length === 0 ? t4 : t3, comments);
+          if (_1_0 != null)
+            B.JSArray_methods.addAll$1(t3.length === 0 ? t4 : t3, _1_0);
           _this.call$1(upstream);
         }
       }
@@ -86327,19 +87200,19 @@ self.util = _cliPkgRequires.util;
       B.JSArray_methods.addAll$1(t4, t1.getRange$2(statements, 0, index));
       B.JSArray_methods.addAll$1(t3, t1.getRange$2(statements, index, t1.get$length(statements)));
     },
-    $signature: 345
+    $signature: 324
   };
   A._EvaluateVisitor__extendModules_closure5.prototype = {
     call$1(target) {
       return !this.originalSelectors.contains$1(0, target);
     },
-    $signature: 15
+    $signature: 14
   };
   A._EvaluateVisitor__extendModules_closure6.prototype = {
     call$0() {
       return A._setArrayType([], type$.JSArray_ExtensionStore_2);
     },
-    $signature: 188
+    $signature: 264
   };
   A._EvaluateVisitor_visitAtRootRule_closure5.prototype = {
     call$0() {
@@ -86379,7 +87252,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitAtRootRule_closure6.prototype = {
     call$0() {
@@ -86419,7 +87292,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 30
+    $signature: 25
   };
   A._EvaluateVisitor__scopeForAtRoot_closure17.prototype = {
     call$1(callback) {
@@ -86447,7 +87320,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$1, $async$completer);
     },
-    $signature: 41
+    $signature: 38
   };
   A._EvaluateVisitor__scopeForAtRoot_closure18.prototype = {
     call$1(callback) {
@@ -86475,19 +87348,19 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$1, $async$completer);
     },
-    $signature: 41
+    $signature: 38
   };
   A._EvaluateVisitor__scopeForAtRoot_closure19.prototype = {
     call$1(callback) {
       return this.$this._async_evaluate0$_withMediaQueries$1$3(null, null, new A._EvaluateVisitor__scopeForAtRoot__closure2(this.innerScope, callback), type$.Null);
     },
-    $signature: 41
+    $signature: 38
   };
   A._EvaluateVisitor__scopeForAtRoot__closure2.prototype = {
     call$0() {
       return this.innerScope.call$1(this.callback);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor__scopeForAtRoot_closure20.prototype = {
     call$1(callback) {
@@ -86515,13 +87388,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$1, $async$completer);
     },
-    $signature: 41
+    $signature: 38
   };
   A._EvaluateVisitor__scopeForAtRoot_closure21.prototype = {
     call$1($parent) {
       return $parent instanceof A.ModifiableCssAtRule0;
     },
-    $signature: 189
+    $signature: 237
   };
   A._EvaluateVisitor__scopeForAtRoot_closure22.prototype = {
     call$1(callback) {
@@ -86549,7 +87422,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$1, $async$completer);
     },
-    $signature: 41
+    $signature: 38
   };
   A._EvaluateVisitor_visitContentRule_closure2.prototype = {
     call$0() {
@@ -86594,7 +87467,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitDeclaration_closure2.prototype = {
     call$0() {
@@ -86634,7 +87507,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitEachRule_closure8.prototype = {
     call$1(value) {
@@ -86642,13 +87515,13 @@ self.util = _cliPkgRequires.util;
         t2 = this.nodeWithSpan;
       return t1._async_evaluate0$_environment.setLocalVariable$3(this._box_0.variable, t1._async_evaluate0$_withoutSlash$2(value, t2), t2);
     },
-    $signature: 57
+    $signature: 62
   };
   A._EvaluateVisitor_visitEachRule_closure9.prototype = {
     call$1(value) {
       return this.$this._async_evaluate0$_setMultipleVariables$3(this._box_0.variables, value, this.nodeWithSpan);
     },
-    $signature: 57
+    $signature: 62
   };
   A._EvaluateVisitor_visitEachRule_closure10.prototype = {
     call$0() {
@@ -86656,7 +87529,7 @@ self.util = _cliPkgRequires.util;
         t1 = _this.$this;
       return t1._async_evaluate0$_handleReturn$2(_this.list.get$asList(), new A._EvaluateVisitor_visitEachRule__closure2(t1, _this.setVariables, _this.node));
     },
-    $signature: 76
+    $signature: 74
   };
   A._EvaluateVisitor_visitEachRule__closure2.prototype = {
     call$1(element) {
@@ -86665,19 +87538,19 @@ self.util = _cliPkgRequires.util;
       t1 = this.$this;
       return t1._async_evaluate0$_handleReturn$2(this.node.children, new A._EvaluateVisitor_visitEachRule___closure2(t1));
     },
-    $signature: 350
+    $signature: 329
   };
   A._EvaluateVisitor_visitEachRule___closure2.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 108
+    $signature: 97
   };
   A._EvaluateVisitor_visitAtRule_closure8.prototype = {
     call$1(value) {
       return this.$this._async_evaluate0$_interpolationToValue$3$trim$warnForColor(value, true, true);
     },
-    $signature: 352
+    $signature: 331
   };
   A._EvaluateVisitor_visitAtRule_closure9.prototype = {
     call$0() {
@@ -86723,7 +87596,7 @@ self.util = _cliPkgRequires.util;
             case 4:
               // else
               $async$goto = 9;
-              return A._asyncAwait(t1._async_evaluate0$_withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$0(styleRule._style_rule0$_selector, styleRule.span, styleRule.originalSelector), new A._EvaluateVisitor_visitAtRule__closure2(t1, $async$self.children), false, type$.ModifiableCssStyleRule_2, type$.Null), $async$call$0);
+              return A._asyncAwait(t1._async_evaluate0$_withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$0(styleRule._style_rule0$_selector, styleRule.span, false, styleRule.originalSelector), new A._EvaluateVisitor_visitAtRule__closure2(t1, $async$self.children), false, type$.ModifiableCssStyleRule_2, type$.Null), $async$call$0);
             case 9:
               // returning from await.
             case 3:
@@ -86734,7 +87607,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitAtRule__closure2.prototype = {
     call$0() {
@@ -86774,7 +87647,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitAtRule_closure10.prototype = {
     call$1(node) {
@@ -86809,7 +87682,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 194
+    $signature: 232
   };
   A._EvaluateVisitor_visitForRule_closure15.prototype = {
     call$0() {
@@ -86838,26 +87711,26 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 194
+    $signature: 232
   };
   A._EvaluateVisitor_visitForRule_closure16.prototype = {
     call$0() {
       return this.fromNumber.assertInt$0();
     },
-    $signature: 3
+    $signature: 10
   };
   A._EvaluateVisitor_visitForRule_closure17.prototype = {
     call$0() {
       var t1 = this.fromNumber;
       return this.toNumber.coerce$2(t1.get$numeratorUnits(t1), t1.get$denominatorUnits(t1)).assertInt$0();
     },
-    $signature: 3
+    $signature: 10
   };
   A._EvaluateVisitor_visitForRule_closure18.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value_2),
-        $async$returnValue, $async$self = this, i, t3, t4, t5, t6, t7, t8, _0_0, result, t1, t2, nodeWithSpan;
+        $async$returnValue, $async$self = this, i, t3, t4, t5, t6, t7, t8, _0_0, t1, t2, nodeWithSpan;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -86885,14 +87758,7 @@ self.util = _cliPkgRequires.util;
               // returning from await.
               _0_0 = $async$result;
               if (_0_0 != null) {
-                result = _0_0;
-                t7 = true;
-              } else {
-                result = null;
-                t7 = false;
-              }
-              if (t7) {
-                $async$returnValue = result;
+                $async$returnValue = _0_0;
                 // goto return
                 $async$goto = 1;
                 break;
@@ -86916,13 +87782,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 76
+    $signature: 74
   };
   A._EvaluateVisitor_visitForRule__closure2.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 108
+    $signature: 97
   };
   A._EvaluateVisitor_visitForwardRule_closure5.prototype = {
     call$2(module, firstLoad) {
@@ -86930,7 +87796,7 @@ self.util = _cliPkgRequires.util;
         this.$this._async_evaluate0$_registerCommentsForModule$1(module);
       this.$this._async_evaluate0$_environment.forwardModule$2(module, this.node);
     },
-    $signature: 121
+    $signature: 109
   };
   A._EvaluateVisitor_visitForwardRule_closure6.prototype = {
     call$2(module, firstLoad) {
@@ -86938,33 +87804,33 @@ self.util = _cliPkgRequires.util;
         this.$this._async_evaluate0$_registerCommentsForModule$1(module);
       this.$this._async_evaluate0$_environment.forwardModule$2(module, this.node);
     },
-    $signature: 121
+    $signature: 109
   };
   A._EvaluateVisitor__registerCommentsForModule_closure2.prototype = {
     call$0() {
       return A._setArrayType([], type$.JSArray_CssComment_2);
     },
-    $signature: 245
+    $signature: 229
   };
   A._EvaluateVisitor_visitIfRule_closure2.prototype = {
     call$1(clause) {
       var t1 = this.$this;
       return t1._async_evaluate0$_environment.scope$1$3$semiGlobal$when(new A._EvaluateVisitor_visitIfRule__closure2(t1, clause), true, clause.hasDeclarations, type$.nullable_Value_2);
     },
-    $signature: 357
+    $signature: 336
   };
   A._EvaluateVisitor_visitIfRule__closure2.prototype = {
     call$0() {
       var t1 = this.$this;
       return t1._async_evaluate0$_handleReturn$2(this.clause.children, new A._EvaluateVisitor_visitIfRule___closure2(t1));
     },
-    $signature: 76
+    $signature: 74
   };
   A._EvaluateVisitor_visitIfRule___closure2.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 108
+    $signature: 97
   };
   A._EvaluateVisitor__visitDynamicImport_closure2.prototype = {
     call$0() {
@@ -86973,7 +87839,7 @@ self.util = _cliPkgRequires.util;
     $call$body$_EvaluateVisitor__visitDynamicImport_closure0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.void),
-        $async$returnValue, $async$self = this, t1, t2, _0_0, stylesheet, t3, isDependency, t4, url, t5, t6, oldImporter, oldInDependency, loadsUserDefinedModules, children, t7, t8, t9, t10, environment, module, visitor, _box_0;
+        $async$returnValue, $async$self = this, t1, t2, _0_0, stylesheet, importer, isDependency, url, t3, oldImporter, oldInDependency, loadsUserDefinedModules, children, t4, t5, t6, t7, t8, t9, t10, environment, module, visitor, _box_0;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -86991,37 +87857,31 @@ self.util = _cliPkgRequires.util;
               // returning from await.
               _0_0 = $async$result;
               stylesheet = _box_0.stylesheet = _0_0._0;
-              t3 = _box_0.importer = _0_0._1;
+              importer = _0_0._1;
+              _box_0.importer = importer;
               isDependency = _0_0._2;
               _box_0.isDependency = isDependency;
-              t4 = isDependency;
               url = stylesheet.span.file.url;
               if (url != null) {
-                t5 = t1._async_evaluate0$_activeModules;
-                if (t5.containsKey$1(url)) {
-                  t2 = A.NullableExtension_andThen0(t5.$index(0, url), new A._EvaluateVisitor__visitDynamicImport__closure11(t1));
+                t3 = t1._async_evaluate0$_activeModules;
+                if (t3.containsKey$1(url)) {
+                  t2 = A.NullableExtension_andThen0(t3.$index(0, url), new A._EvaluateVisitor__visitDynamicImport__closure11(t1));
                   throw A.wrapException(t2 == null ? t1._async_evaluate0$_exception$1("This file is already being loaded.") : t2);
                 }
-                t5.$indexSet(0, url, t2);
+                t3.$indexSet(0, url, t2);
               }
               t2 = stylesheet._stylesheet1$_uses;
-              t5 = type$.UnmodifiableListView_UseRule_2;
-              t6 = new A.UnmodifiableListView(t2, t5);
-              if (t6.get$length(t6) === 0) {
-                t6 = new A.UnmodifiableListView(stylesheet._stylesheet1$_forwards, type$.UnmodifiableListView_ForwardRule_2);
-                t6 = t6.get$length(t6) === 0;
-              } else
-                t6 = false;
-              $async$goto = t6 ? 4 : 5;
+              t3 = type$.UnmodifiableListView_UseRule_2;
+              $async$goto = new A.UnmodifiableListView(t2, t3).get$length(0) === 0 && new A.UnmodifiableListView(stylesheet._stylesheet1$_forwards, type$.UnmodifiableListView_ForwardRule_2).get$length(0) === 0 ? 4 : 5;
               break;
             case 4:
               // then
               oldImporter = t1._async_evaluate0$_importer;
               t2 = t1._async_evaluate0$_assertInModule$2(t1._async_evaluate0$__stylesheet, "_stylesheet");
               oldInDependency = t1._async_evaluate0$_inDependency;
-              t1._async_evaluate0$_importer = t3;
+              t1._async_evaluate0$_importer = importer;
               t1._async_evaluate0$__stylesheet = stylesheet;
-              t1._async_evaluate0$_inDependency = t4;
+              t1._async_evaluate0$_inDependency = isDependency;
               $async$goto = 6;
               return A._asyncAwait(t1.visitStylesheet$1(stylesheet), $async$call$0);
             case 6:
@@ -87035,7 +87895,7 @@ self.util = _cliPkgRequires.util;
               break;
             case 5:
               // join
-              t2 = new A.UnmodifiableListView(t2, t5);
+              t2 = new A.UnmodifiableListView(t2, t3);
               if (!t2.any$1(t2, new A._EvaluateVisitor__visitDynamicImport__closure12())) {
                 t2 = new A.UnmodifiableListView(stylesheet._stylesheet1$_forwards, type$.UnmodifiableListView_ForwardRule_2);
                 loadsUserDefinedModules = t2.any$1(t2, new A._EvaluateVisitor__visitDynamicImport__closure13());
@@ -87089,25 +87949,25 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 30
+    $signature: 25
   };
   A._EvaluateVisitor__visitDynamicImport__closure11.prototype = {
     call$1(previousLoad) {
       return this.$this._async_evaluate0$_multiSpanException$3("This file is already being loaded.", "new load", A.LinkedHashMap_LinkedHashMap$_literal([previousLoad.get$span(previousLoad), "original load"], type$.FileSpan, type$.String));
     },
-    $signature: 105
+    $signature: 94
   };
   A._EvaluateVisitor__visitDynamicImport__closure12.prototype = {
     call$1(rule) {
       return rule.url.get$scheme() !== "sass";
     },
-    $signature: 197
+    $signature: 228
   };
   A._EvaluateVisitor__visitDynamicImport__closure13.prototype = {
     call$1(rule) {
       return rule.url.get$scheme() !== "sass";
     },
-    $signature: 198
+    $signature: 227
   };
   A._EvaluateVisitor__visitDynamicImport__closure14.prototype = {
     call$0() {
@@ -87151,7 +88011,7 @@ self.util = _cliPkgRequires.util;
             case 2:
               // returning from await.
               t6 = t8 ? t1._async_evaluate0$_addOutOfOrderImports$0() : A._setArrayType([], type$.JSArray_ModifiableCssNode_2);
-              $async$self.children._value = t6;
+              $async$self.children.__late_helper$_value = t6;
               t1._async_evaluate0$_importer = oldImporter;
               t1._async_evaluate0$__stylesheet = t2;
               if (t8) {
@@ -87168,9 +88028,9 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
-  A._EvaluateVisitor__applyMixin_closure9.prototype = {
+  A._EvaluateVisitor__applyMixin_closure5.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.void),
@@ -87193,7 +88053,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 30
+    $signature: 25
   };
   A._EvaluateVisitor__applyMixin__closure6.prototype = {
     call$0() {
@@ -87217,18 +88077,9 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 30
+    $signature: 25
   };
-  A._EvaluateVisitor__applyMixin_closure8.prototype = {
-    call$0() {
-      var t1 = this._1_0;
-      if (t1 == null)
-        t1 = type$.AsyncCallable_2._as(t1);
-      return type$.UserDefinedCallable_AsyncEnvironment_2._as(t1).declaration;
-    },
-    $signature: 130
-  };
-  A._EvaluateVisitor__applyMixin_closure10.prototype = {
+  A._EvaluateVisitor__applyMixin_closure6.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Null),
@@ -87251,7 +88102,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor__applyMixin__closure5.prototype = {
     call$0() {
@@ -87276,7 +88127,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 30
+    $signature: 25
   };
   A._EvaluateVisitor__applyMixin___closure2.prototype = {
     call$0() {
@@ -87316,39 +88167,39 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 30
+    $signature: 25
   };
   A._EvaluateVisitor__applyMixin____closure2.prototype = {
     call$0() {
       return this.statement.accept$1(this.$this);
     },
-    $signature: 76
+    $signature: 74
   };
   A._EvaluateVisitor_visitIncludeRule_closure8.prototype = {
     call$0() {
       var t1 = this.node;
       return this.$this._async_evaluate0$_environment.getMixin$2$namespace(t1.name, t1.namespace);
     },
-    $signature: 103
+    $signature: 92
   };
   A._EvaluateVisitor_visitIncludeRule_closure9.prototype = {
     call$1($content) {
       var t1 = this.$this;
       return new A.UserDefinedCallable0($content, t1._async_evaluate0$_environment.closure$0(), t1._async_evaluate0$_inDependency, type$.UserDefinedCallable_AsyncEnvironment_2);
     },
-    $signature: 361
+    $signature: 339
   };
   A._EvaluateVisitor_visitIncludeRule_closure10.prototype = {
     call$0() {
       return this.node.get$spanWithoutContent();
     },
-    $signature: 33
+    $signature: 27
   };
   A._EvaluateVisitor_visitMediaRule_closure8.prototype = {
     call$1(mediaQueries) {
       return this.$this._async_evaluate0$_mergeMediaQueries$2(mediaQueries, this.queries);
     },
-    $signature: 113
+    $signature: 100
   };
   A._EvaluateVisitor_visitMediaRule_closure9.prototype = {
     call$0() {
@@ -87376,13 +88227,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitMediaRule__closure2.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Null),
-        $async$self = this, styleRule, t2, t3, _i, t1, _0_0;
+        $async$self = this, t2, t3, _i, t1, _0_0;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -87392,19 +88243,12 @@ self.util = _cliPkgRequires.util;
               // Function start
               t1 = $async$self.$this;
               _0_0 = t1._async_evaluate0$_atRootExcludingStyleRule ? null : t1._async_evaluate0$_styleRuleIgnoringAtRoot;
-              if (_0_0 != null) {
-                styleRule = _0_0;
-                t2 = true;
-              } else {
-                styleRule = null;
-                t2 = false;
-              }
-              $async$goto = t2 ? 2 : 4;
+              $async$goto = _0_0 != null ? 2 : 4;
               break;
             case 2:
               // then
               $async$goto = 5;
-              return A._asyncAwait(t1._async_evaluate0$_withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$0(styleRule._style_rule0$_selector, styleRule.span, styleRule.originalSelector), new A._EvaluateVisitor_visitMediaRule___closure2(t1, $async$self.node), false, type$.ModifiableCssStyleRule_2, type$.Null), $async$call$0);
+              return A._asyncAwait(t1._async_evaluate0$_withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$0(_0_0._style_rule0$_selector, _0_0.span, false, _0_0.originalSelector), new A._EvaluateVisitor_visitMediaRule___closure2(t1, $async$self.node), false, type$.ModifiableCssStyleRule_2, type$.Null), $async$call$0);
             case 5:
               // returning from await.
               // goto join
@@ -87440,7 +88284,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitMediaRule___closure2.prototype = {
     call$0() {
@@ -87480,7 +88324,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitMediaRule_closure10.prototype = {
     call$1(node) {
@@ -87494,7 +88338,7 @@ self.util = _cliPkgRequires.util;
     },
     $signature: 8
   };
-  A._EvaluateVisitor_visitStyleRule_closure14.prototype = {
+  A._EvaluateVisitor_visitStyleRule_closure11.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Null),
@@ -87532,15 +88376,15 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
-  A._EvaluateVisitor_visitStyleRule_closure15.prototype = {
+  A._EvaluateVisitor_visitStyleRule_closure12.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule0;
     },
     $signature: 8
   };
-  A._EvaluateVisitor_visitStyleRule_closure16.prototype = {
+  A._EvaluateVisitor_visitStyleRule_closure14.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Null),
@@ -87563,7 +88407,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitStyleRule__closure2.prototype = {
     call$0() {
@@ -87603,25 +88447,25 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
-  A._EvaluateVisitor_visitStyleRule_closure17.prototype = {
+  A._EvaluateVisitor_visitStyleRule_closure13.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule0;
     },
     $signature: 8
   };
-  A._EvaluateVisitor_visitStyleRule_closure18.prototype = {
+  A._EvaluateVisitor__warnForBogusCombinators_closure2.prototype = {
     call$1(child) {
       return child instanceof A.ModifiableCssComment0;
     },
-    $signature: 148
+    $signature: 8
   };
   A._EvaluateVisitor_visitSupportsRule_closure5.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Null),
-        $async$self = this, styleRule, t2, t3, _i, t1, _0_0;
+        $async$self = this, t2, t3, _i, t1, _0_0;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -87631,19 +88475,12 @@ self.util = _cliPkgRequires.util;
               // Function start
               t1 = $async$self.$this;
               _0_0 = t1._async_evaluate0$_atRootExcludingStyleRule ? null : t1._async_evaluate0$_styleRuleIgnoringAtRoot;
-              if (_0_0 != null) {
-                styleRule = _0_0;
-                t2 = true;
-              } else {
-                styleRule = null;
-                t2 = false;
-              }
-              $async$goto = t2 ? 2 : 4;
+              $async$goto = _0_0 != null ? 2 : 4;
               break;
             case 2:
               // then
               $async$goto = 5;
-              return A._asyncAwait(t1._async_evaluate0$_withParent$2$2(A.ModifiableCssStyleRule$0(styleRule._style_rule0$_selector, styleRule.span, styleRule.originalSelector), new A._EvaluateVisitor_visitSupportsRule__closure2(t1, $async$self.node), type$.ModifiableCssStyleRule_2, type$.Null), $async$call$0);
+              return A._asyncAwait(t1._async_evaluate0$_withParent$2$2(A.ModifiableCssStyleRule$0(_0_0._style_rule0$_selector, _0_0.span, false, _0_0.originalSelector), new A._EvaluateVisitor_visitSupportsRule__closure2(t1, $async$self.node), type$.ModifiableCssStyleRule_2, type$.Null), $async$call$0);
             case 5:
               // returning from await.
               // goto join
@@ -87679,7 +88516,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitSupportsRule__closure2.prototype = {
     call$0() {
@@ -87719,7 +88556,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitSupportsRule_closure6.prototype = {
     call$1(node) {
@@ -87765,7 +88602,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 288
+    $signature: 176
   };
   A._EvaluateVisitor_visitVariableDeclaration_closure8.prototype = {
     call$0() {
@@ -87773,14 +88610,14 @@ self.util = _cliPkgRequires.util;
         t2 = this._box_0.override;
       t1.setVariable$4$global(this.node.name, t2.value, t2.assignmentNode, true);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitVariableDeclaration_closure9.prototype = {
     call$0() {
       var t1 = this.node;
       return this.$this._async_evaluate0$_environment.getVariable$2$namespace(t1.name, t1.namespace);
     },
-    $signature: 46
+    $signature: 41
   };
   A._EvaluateVisitor_visitVariableDeclaration_closure10.prototype = {
     call$0() {
@@ -87788,11 +88625,11 @@ self.util = _cliPkgRequires.util;
         t2 = this.node;
       t1._async_evaluate0$_environment.setVariable$5$global$namespace(t2.name, this.value, t1._async_evaluate0$_expressionNode$1(t2.expression), t2.isGlobal, t2.namespace);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitUseRule_closure2.prototype = {
     call$2(module, firstLoad) {
-      var t1, t2, t3, _0_0, $name, t4, t5, span;
+      var t1, t2, t3, _0_0, t4, t5, span;
       if (firstLoad)
         this.$this._async_evaluate0$_registerCommentsForModule$1(module);
       t1 = this.$this._async_evaluate0$_environment;
@@ -87802,15 +88639,8 @@ self.util = _cliPkgRequires.util;
         t1._async_environment0$_globalModules.$indexSet(0, module, t2);
         t1._async_environment0$_allModules.push(module);
         _0_0 = A.IterableExtension_firstWhereOrNull(J.get$keys$z(B.JSArray_methods.get$first(t1._async_environment0$_variables)), module.get$variables().get$containsKey());
-        if (_0_0 != null) {
-          $name = _0_0;
-          t1 = true;
-        } else {
-          $name = null;
-          t1 = false;
-        }
-        if (t1)
-          A.throwExpression(A.SassScriptException$0(string$.This_ma + A.S($name) + '".', null));
+        if (_0_0 != null)
+          A.throwExpression(A.SassScriptException$0(string$.This_ma + _0_0 + '".', null));
       } else {
         t4 = t1._async_environment0$_modules;
         if (t4.containsKey$1(t3)) {
@@ -87826,19 +88656,19 @@ self.util = _cliPkgRequires.util;
         t1._async_environment0$_allModules.push(module);
       }
     },
-    $signature: 121
+    $signature: 109
   };
   A._EvaluateVisitor_visitWarnRule_closure2.prototype = {
     call$0() {
       return this.node.expression.accept$1(this.$this);
     },
-    $signature: 80
+    $signature: 64
   };
   A._EvaluateVisitor_visitWhileRule_closure2.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Value_2),
-        $async$returnValue, $async$self = this, t1, t2, t3, _0_0, result, t4;
+        $async$returnValue, $async$self = this, t1, t2, t3, _0_0;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -87864,14 +88694,7 @@ self.util = _cliPkgRequires.util;
               // returning from await.
               _0_0 = $async$result;
               if (_0_0 != null) {
-                result = _0_0;
-                t4 = true;
-              } else {
-                result = null;
-                t4 = false;
-              }
-              if (t4) {
-                $async$returnValue = result;
+                $async$returnValue = _0_0;
                 // goto return
                 $async$goto = 1;
                 break;
@@ -87892,19 +88715,19 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 76
+    $signature: 74
   };
   A._EvaluateVisitor_visitWhileRule__closure2.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 108
+    $signature: 97
   };
   A._EvaluateVisitor_visitBinaryOperationExpression_closure2.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Value_2),
-        $async$returnValue, $async$self = this, t1, t2, left, $async$temp1, $async$temp2;
+        $async$returnValue, $async$self = this, t3, t1, t2, left, $async$temp1, $async$temp2;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -87922,59 +88745,59 @@ self.util = _cliPkgRequires.util;
             case 4:
               // switch
               switch (t1.operator) {
-                case B.BinaryOperator_2jN0:
+                case B.BinaryOperator_wdM0:
                   // goto case
                   $async$goto = 6;
                   break;
-                case B.BinaryOperator_M6L0:
+                case B.BinaryOperator_qNM0:
                   // goto case
                   $async$goto = 7;
                   break;
-                case B.BinaryOperator_SNp0:
+                case B.BinaryOperator_eDt0:
                   // goto case
                   $async$goto = 8;
                   break;
-                case B.BinaryOperator_ql50:
+                case B.BinaryOperator_g8k0:
                   // goto case
                   $async$goto = 9;
                   break;
-                case B.BinaryOperator_ViB0:
+                case B.BinaryOperator_icU0:
                   // goto case
                   $async$goto = 10;
                   break;
-                case B.BinaryOperator_cIH0:
+                case B.BinaryOperator_bEa0:
                   // goto case
                   $async$goto = 11;
                   break;
-                case B.BinaryOperator_7Tg0:
+                case B.BinaryOperator_oEm0:
                   // goto case
                   $async$goto = 12;
                   break;
-                case B.BinaryOperator_U8c0:
+                case B.BinaryOperator_miq0:
                   // goto case
                   $async$goto = 13;
                   break;
-                case B.BinaryOperator_kpg0:
+                case B.BinaryOperator_SPQ0:
                   // goto case
                   $async$goto = 14;
                   break;
-                case B.BinaryOperator_anB0:
+                case B.BinaryOperator_u150:
                   // goto case
                   $async$goto = 15;
                   break;
-                case B.BinaryOperator_olz0:
+                case B.BinaryOperator_SjO0:
                   // goto case
                   $async$goto = 16;
                   break;
-                case B.BinaryOperator_qN20:
+                case B.BinaryOperator_2No0:
                   // goto case
                   $async$goto = 17;
                   break;
-                case B.BinaryOperator_t8B0:
+                case B.BinaryOperator_U770:
                   // goto case
                   $async$goto = 18;
                   break;
-                case B.BinaryOperator_OTG0:
+                case B.BinaryOperator_KNx0:
                   // goto case
                   $async$goto = 19;
                   break;
@@ -87986,8 +88809,9 @@ self.util = _cliPkgRequires.util;
               break;
             case 6:
               // case
+              t1 = t1.right.accept$1(t2);
               $async$goto = 21;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value_2._is(t1) ? t1 : A._Future$value(t1, type$.Value_2), $async$call$0);
             case 21:
               // returning from await.
               t1 = $async$result;
@@ -88001,19 +88825,20 @@ self.util = _cliPkgRequires.util;
               break;
             case 22:
               // then
-              $async$result = left;
+              t1 = left;
               // goto join
               $async$goto = 23;
               break;
             case 24:
               // else
+              t1 = t1.right.accept$1(t2);
               $async$goto = 25;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value_2._is(t1) ? t1 : A._Future$value(t1, type$.Value_2), $async$call$0);
             case 25:
               // returning from await.
+              t1 = $async$result;
             case 23:
               // join
-              t1 = $async$result;
               // goto after switch
               $async$goto = 5;
               break;
@@ -88023,19 +88848,20 @@ self.util = _cliPkgRequires.util;
               break;
             case 26:
               // then
+              t1 = t1.right.accept$1(t2);
               $async$goto = 29;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value_2._is(t1) ? t1 : A._Future$value(t1, type$.Value_2), $async$call$0);
             case 29:
               // returning from await.
+              t1 = $async$result;
               // goto join
               $async$goto = 27;
               break;
             case 28:
               // else
-              $async$result = left;
+              t1 = left;
             case 27:
               // join
-              t1 = $async$result;
               // goto after switch
               $async$goto = 5;
               break;
@@ -88063,9 +88889,10 @@ self.util = _cliPkgRequires.util;
               break;
             case 11:
               // case
+              t1 = t1.right.accept$1(t2);
               $async$temp1 = left;
               $async$goto = 32;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value_2._is(t1) ? t1 : A._Future$value(t1, type$.Value_2), $async$call$0);
             case 32:
               // returning from await.
               t1 = $async$temp1.greaterThan$1($async$result);
@@ -88074,9 +88901,10 @@ self.util = _cliPkgRequires.util;
               break;
             case 12:
               // case
+              t1 = t1.right.accept$1(t2);
               $async$temp1 = left;
               $async$goto = 33;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value_2._is(t1) ? t1 : A._Future$value(t1, type$.Value_2), $async$call$0);
             case 33:
               // returning from await.
               t1 = $async$temp1.greaterThanOrEquals$1($async$result);
@@ -88085,9 +88913,10 @@ self.util = _cliPkgRequires.util;
               break;
             case 13:
               // case
+              t1 = t1.right.accept$1(t2);
               $async$temp1 = left;
               $async$goto = 34;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value_2._is(t1) ? t1 : A._Future$value(t1, type$.Value_2), $async$call$0);
             case 34:
               // returning from await.
               t1 = $async$temp1.lessThan$1($async$result);
@@ -88096,9 +88925,10 @@ self.util = _cliPkgRequires.util;
               break;
             case 14:
               // case
+              t1 = t1.right.accept$1(t2);
               $async$temp1 = left;
               $async$goto = 35;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value_2._is(t1) ? t1 : A._Future$value(t1, type$.Value_2), $async$call$0);
             case 35:
               // returning from await.
               t1 = $async$temp1.lessThanOrEquals$1($async$result);
@@ -88107,9 +88937,10 @@ self.util = _cliPkgRequires.util;
               break;
             case 15:
               // case
+              t1 = t1.right.accept$1(t2);
               $async$temp1 = left;
               $async$goto = 36;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value_2._is(t1) ? t1 : A._Future$value(t1, type$.Value_2), $async$call$0);
             case 36:
               // returning from await.
               t1 = $async$temp1.plus$1($async$result);
@@ -88118,9 +88949,10 @@ self.util = _cliPkgRequires.util;
               break;
             case 16:
               // case
+              t1 = t1.right.accept$1(t2);
               $async$temp1 = left;
               $async$goto = 37;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value_2._is(t1) ? t1 : A._Future$value(t1, type$.Value_2), $async$call$0);
             case 37:
               // returning from await.
               t1 = $async$temp1.minus$1($async$result);
@@ -88129,9 +88961,10 @@ self.util = _cliPkgRequires.util;
               break;
             case 17:
               // case
+              t1 = t1.right.accept$1(t2);
               $async$temp1 = left;
               $async$goto = 38;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value_2._is(t1) ? t1 : A._Future$value(t1, type$.Value_2), $async$call$0);
             case 38:
               // returning from await.
               t1 = $async$temp1.times$1($async$result);
@@ -88140,10 +88973,11 @@ self.util = _cliPkgRequires.util;
               break;
             case 18:
               // case
+              t3 = t1.right.accept$1(t2);
               $async$temp1 = t2;
               $async$temp2 = left;
               $async$goto = 39;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value_2._is(t3) ? t3 : A._Future$value(t3, type$.Value_2), $async$call$0);
             case 39:
               // returning from await.
               t1 = $async$temp1._async_evaluate0$_slash$3($async$temp2, $async$result, t1);
@@ -88152,9 +88986,10 @@ self.util = _cliPkgRequires.util;
               break;
             case 19:
               // case
+              t1 = t1.right.accept$1(t2);
               $async$temp1 = left;
               $async$goto = 40;
-              return A._asyncAwait(t1.right.accept$1(t2), $async$call$0);
+              return A._asyncAwait(type$.Future_Value_2._is(t1) ? t1 : A._Future$value(t1, type$.Value_2), $async$call$0);
             case 40:
               // returning from await.
               t1 = $async$temp1.modulo$1($async$result);
@@ -88177,41 +89012,14 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 80
-  };
-  A._EvaluateVisitor__slash_closure5.prototype = {
-    call$0() {
-      return this._1_0._0;
-    },
-    $signature: 31
-  };
-  A._EvaluateVisitor__slash_closure6.prototype = {
-    call$0() {
-      return this._1_0._1;
-    },
-    $signature: 31
+    $signature: 64
   };
   A._EvaluateVisitor__slash_recommendation2.prototype = {
     call$1(expression) {
-      var left, right, t1, _null = null;
+      var t1;
       $label0$0: {
-        if (expression instanceof A.BinaryOperationExpression0)
-          if (B.BinaryOperator_t8B0 === expression.operator) {
-            left = expression.left;
-            right = expression.right;
-            t1 = true;
-          } else {
-            right = _null;
-            left = right;
-            t1 = false;
-          }
-        else {
-          right = _null;
-          left = right;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = "math.div(" + A.S(this.call$1(left)) + ", " + A.S(this.call$1(right)) + ")";
+        if (expression instanceof A.BinaryOperationExpression0 && B.BinaryOperator_U770 === expression.operator) {
+          t1 = "math.div(" + A.S(this.call$1(expression.left)) + ", " + A.S(this.call$1(expression.right)) + ")";
           break $label0$0;
         }
         if (expression instanceof A.ParenthesizedExpression0) {
@@ -88223,26 +89031,26 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 118
+    $signature: 107
   };
   A._EvaluateVisitor_visitVariableExpression_closure2.prototype = {
     call$0() {
       var t1 = this.node;
       return this.$this._async_evaluate0$_environment.getVariable$2$namespace(t1.name, t1.namespace);
     },
-    $signature: 46
+    $signature: 41
   };
   A._EvaluateVisitor_visitUnaryOperationExpression_closure2.prototype = {
     call$0() {
       var t1, _this = this;
       switch (_this.node.operator) {
-        case B.UnaryOperator_gg40:
+        case B.UnaryOperator_cLp0:
           t1 = _this.operand.unaryPlus$0();
           break;
-        case B.UnaryOperator_TLI0:
+        case B.UnaryOperator_AiQ0:
           t1 = _this.operand.unaryMinus$0();
           break;
-        case B.UnaryOperator_Ix10:
+        case B.UnaryOperator_SJr0:
           t1 = new A.SassString0("/" + A.serializeValue0(_this.operand, false, true), false);
           break;
         case B.UnaryOperator_not_not_not0:
@@ -88253,34 +89061,33 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 31
+    $signature: 47
   };
   A._EvaluateVisitor_visitListExpression_closure2.prototype = {
     call$1(expression) {
       return expression.accept$1(this.$this);
     },
-    $signature: 368
+    $signature: 345
   };
   A._EvaluateVisitor_visitFunctionExpression_closure8.prototype = {
     call$0() {
-      var t1 = this.$this._async_evaluate0$_environment,
-        t2 = this.node;
-      return t1.getFunction$2$namespace(A.stringReplaceAllUnchecked(t2.originalName, "_", "-"), t2.namespace);
+      var t1 = this.node;
+      return this.$this._async_evaluate0$_environment.getFunction$2$namespace(t1.name, t1.namespace);
     },
-    $signature: 103
+    $signature: 92
   };
   A._EvaluateVisitor_visitFunctionExpression_closure9.prototype = {
     call$1(argument) {
       return argument.accept$1(new A._IsCalculationSafeVisitor0());
     },
-    $signature: 119
+    $signature: 132
   };
   A._EvaluateVisitor_visitFunctionExpression_closure10.prototype = {
     call$0() {
       var t1 = this.node;
       return this.$this._async_evaluate0$_runFunctionCallable$3(t1.$arguments, this._box_0.$function, t1);
     },
-    $signature: 80
+    $signature: 64
   };
   A._EvaluateVisitor__checkCalculationArguments_check2.prototype = {
     call$1(maxArgs) {
@@ -88294,7 +89101,7 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return this.call$1(null);
     },
-    $signature: 86
+    $signature: 96
   };
   A._EvaluateVisitor__visitCalculationExpression_closure2.prototype = {
     call$0() {
@@ -88333,20 +89140,14 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 151
-  };
-  A._EvaluateVisitor__checkAdjacentCalculationValues_closure2.prototype = {
-    call$0() {
-      return type$.UnaryOperationExpression_2._as(this._0_0).operator;
-    },
-    $signature: 120
+    $signature: 179
   };
   A._EvaluateVisitor_visitInterpolatedFunctionExpression_closure2.prototype = {
     call$0() {
       var t1 = this.node;
       return this.$this._async_evaluate0$_runFunctionCallable$3(t1.$arguments, this.$function, t1);
     },
-    $signature: 80
+    $signature: 64
   };
   A._EvaluateVisitor__runUserDefinedCallable_closure2.prototype = {
     call$0() {
@@ -88442,7 +89243,7 @@ self.util = _cliPkgRequires.util;
                 rest = J.get$length$asx(t2[2]) > t5 ? J.sublist$1$ax(t2[2], t5) : B.List_empty19;
                 t5 = t2[0];
                 t6 = t2[4];
-                argumentList = A.SassArgumentList$0(rest, t5, t6 === B.ListSeparator_undecided_null_undecided0 ? B.ListSeparator_rXA0 : t6);
+                argumentList = A.SassArgumentList$0(rest, t5, t6 === B.ListSeparator_undecided_null_undecided0 ? B.ListSeparator_ECn0 : t6);
                 t1._async_evaluate0$_environment.setLocalVariable$3(restArgument, argumentList, t4);
               } else
                 argumentList = null;
@@ -88485,7 +89286,7 @@ self.util = _cliPkgRequires.util;
     call$1($name) {
       return "$" + $name;
     },
-    $signature: 7
+    $signature: 5
   };
   A._EvaluateVisitor__runFunctionCallable_closure2.prototype = {
     call$0() {
@@ -88534,7 +89335,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 80
+    $signature: 64
   };
   A._EvaluateVisitor__runBuiltInCallable_closure8.prototype = {
     call$0() {
@@ -88546,25 +89347,25 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return this._box_0.callback.call$1(this.evaluated._values[2]);
     },
-    $signature: 371
+    $signature: 347
   };
   A._EvaluateVisitor__runBuiltInCallable_closure10.prototype = {
     call$1($name) {
       return "$" + $name;
     },
-    $signature: 7
+    $signature: 5
   };
   A._EvaluateVisitor__evaluateArguments_closure11.prototype = {
     call$1(value) {
       return value;
     },
-    $signature: 45
+    $signature: 42
   };
   A._EvaluateVisitor__evaluateArguments_closure12.prototype = {
     call$1(value) {
       return this.$this._async_evaluate0$_withoutSlash$2(value, this.restNodeForSpan);
     },
-    $signature: 45
+    $signature: 42
   };
   A._EvaluateVisitor__evaluateArguments_closure13.prototype = {
     call$2(key, value) {
@@ -88573,27 +89374,27 @@ self.util = _cliPkgRequires.util;
       _this.named.$indexSet(0, key, _this.$this._async_evaluate0$_withoutSlash$2(value, t1));
       _this.namedNodes.$indexSet(0, key, t1);
     },
-    $signature: 109
+    $signature: 103
   };
   A._EvaluateVisitor__evaluateArguments_closure14.prototype = {
     call$1(value) {
       return value;
     },
-    $signature: 45
+    $signature: 42
   };
   A._EvaluateVisitor__evaluateMacroArguments_closure11.prototype = {
     call$1(value) {
       var t1 = this.restArgs;
       return new A.ValueExpression0(value, t1.get$span(t1));
     },
-    $signature: 60
+    $signature: 63
   };
   A._EvaluateVisitor__evaluateMacroArguments_closure12.prototype = {
     call$1(value) {
       var t1 = this.restArgs;
       return new A.ValueExpression0(this.$this._async_evaluate0$_withoutSlash$2(value, this.restNodeForSpan), t1.get$span(t1));
     },
-    $signature: 60
+    $signature: 63
   };
   A._EvaluateVisitor__evaluateMacroArguments_closure13.prototype = {
     call$2(key, value) {
@@ -88601,14 +89402,14 @@ self.util = _cliPkgRequires.util;
         t1 = _this.restArgs;
       _this.named.$indexSet(0, key, new A.ValueExpression0(_this.$this._async_evaluate0$_withoutSlash$2(value, _this.restNodeForSpan), t1.get$span(t1)));
     },
-    $signature: 109
+    $signature: 103
   };
   A._EvaluateVisitor__evaluateMacroArguments_closure14.prototype = {
     call$1(value) {
       var t1 = this.keywordRestArgs;
       return new A.ValueExpression0(this.$this._async_evaluate0$_withoutSlash$2(value, this.keywordRestNodeForSpan), t1.get$span(t1));
     },
-    $signature: 60
+    $signature: 63
   };
   A._EvaluateVisitor__addRestMap_closure2.prototype = {
     call$2(key, value) {
@@ -88621,7 +89422,7 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException(t1._async_evaluate0$_exception$2(string$.Variab_ + key.toString$0(0) + " is not a string in " + _this.map.toString$0(0) + ".", t2.get$span(t2)));
       }
     },
-    $signature: 104
+    $signature: 76
   };
   A._EvaluateVisitor__verifyArguments_closure2.prototype = {
     call$0() {
@@ -88641,7 +89442,7 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              t1 = $async$self.node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = $async$self.$this, t3 = A._instanceType(t1)._precomputed1;
+              t1 = $async$self.node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = $async$self.$this, t2 = t2._eval$1("ListBase.E");
             case 2:
               // for condition
               if (!t1.moveNext$0()) {
@@ -88651,7 +89452,7 @@ self.util = _cliPkgRequires.util;
               }
               t4 = t1.__internal$_current;
               $async$goto = 4;
-              return A._asyncAwait((t4 == null ? t3._as(t4) : t4).accept$1(t2), $async$call$0);
+              return A._asyncAwait((t4 == null ? t2._as(t4) : t4).accept$1(t3), $async$call$0);
             case 4:
               // returning from await.
               // goto for condition
@@ -88665,7 +89466,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitCssAtRule_closure6.prototype = {
     call$1(node) {
@@ -88685,7 +89486,7 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              t1 = $async$self.node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = $async$self.$this, t3 = A._instanceType(t1)._precomputed1;
+              t1 = $async$self.node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = $async$self.$this, t2 = t2._eval$1("ListBase.E");
             case 2:
               // for condition
               if (!t1.moveNext$0()) {
@@ -88695,7 +89496,7 @@ self.util = _cliPkgRequires.util;
               }
               t4 = t1.__internal$_current;
               $async$goto = 4;
-              return A._asyncAwait((t4 == null ? t3._as(t4) : t4).accept$1(t2), $async$call$0);
+              return A._asyncAwait((t4 == null ? t2._as(t4) : t4).accept$1(t3), $async$call$0);
             case 4:
               // returning from await.
               // goto for condition
@@ -88709,7 +89510,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitCssKeyframeBlock_closure6.prototype = {
     call$1(node) {
@@ -88721,7 +89522,7 @@ self.util = _cliPkgRequires.util;
     call$1(mediaQueries) {
       return this.$this._async_evaluate0$_mergeMediaQueries$2(mediaQueries, this.node.queries);
     },
-    $signature: 113
+    $signature: 100
   };
   A._EvaluateVisitor_visitCssMediaRule_closure9.prototype = {
     call$0() {
@@ -88749,13 +89550,13 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitCssMediaRule__closure2.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Null),
-        $async$self = this, styleRule, t2, t3, t4, t1, _0_0;
+        $async$self = this, t2, t3, t4, t1, _0_0;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -88765,19 +89566,12 @@ self.util = _cliPkgRequires.util;
               // Function start
               t1 = $async$self.$this;
               _0_0 = t1._async_evaluate0$_atRootExcludingStyleRule ? null : t1._async_evaluate0$_styleRuleIgnoringAtRoot;
-              if (_0_0 != null) {
-                styleRule = _0_0;
-                t2 = true;
-              } else {
-                styleRule = null;
-                t2 = false;
-              }
-              $async$goto = t2 ? 2 : 4;
+              $async$goto = _0_0 != null ? 2 : 4;
               break;
             case 2:
               // then
               $async$goto = 5;
-              return A._asyncAwait(t1._async_evaluate0$_withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$0(styleRule._style_rule0$_selector, styleRule.span, styleRule.originalSelector), new A._EvaluateVisitor_visitCssMediaRule___closure2(t1, $async$self.node), false, type$.ModifiableCssStyleRule_2, type$.Null), $async$call$0);
+              return A._asyncAwait(t1._async_evaluate0$_withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$0(_0_0._style_rule0$_selector, _0_0.span, false, _0_0.originalSelector), new A._EvaluateVisitor_visitCssMediaRule___closure2(t1, $async$self.node), false, type$.ModifiableCssStyleRule_2, type$.Null), $async$call$0);
             case 5:
               // returning from await.
               // goto join
@@ -88785,7 +89579,7 @@ self.util = _cliPkgRequires.util;
               break;
             case 4:
               // else
-              t2 = $async$self.node.children, t2 = new A.ListIterator(t2, t2.get$length(t2)), t3 = A._instanceType(t2)._precomputed1;
+              t2 = $async$self.node.children, t3 = t2.$ti, t2 = new A.ListIterator(t2, t2.get$length(0), t3._eval$1("ListIterator<ListBase.E>")), t3 = t3._eval$1("ListBase.E");
             case 6:
               // for condition
               if (!t2.moveNext$0()) {
@@ -88811,7 +89605,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitCssMediaRule___closure2.prototype = {
     call$0() {
@@ -88825,7 +89619,7 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              t1 = $async$self.node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = $async$self.$this, t3 = A._instanceType(t1)._precomputed1;
+              t1 = $async$self.node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = $async$self.$this, t2 = t2._eval$1("ListBase.E");
             case 2:
               // for condition
               if (!t1.moveNext$0()) {
@@ -88835,7 +89629,7 @@ self.util = _cliPkgRequires.util;
               }
               t4 = t1.__internal$_current;
               $async$goto = 4;
-              return A._asyncAwait((t4 == null ? t3._as(t4) : t4).accept$1(t2), $async$call$0);
+              return A._asyncAwait((t4 == null ? t2._as(t4) : t4).accept$1(t3), $async$call$0);
             case 4:
               // returning from await.
               // goto for condition
@@ -88849,7 +89643,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitCssMediaRule_closure10.prototype = {
     call$1(node) {
@@ -88863,7 +89657,7 @@ self.util = _cliPkgRequires.util;
     },
     $signature: 8
   };
-  A._EvaluateVisitor_visitCssStyleRule_closure8.prototype = {
+  A._EvaluateVisitor_visitCssStyleRule_closure6.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Null),
@@ -88886,7 +89680,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitCssStyleRule__closure2.prototype = {
     call$0() {
@@ -88900,7 +89694,7 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              t1 = $async$self.node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = $async$self.$this, t3 = A._instanceType(t1)._precomputed1;
+              t1 = $async$self.node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = $async$self.$this, t2 = t2._eval$1("ListBase.E");
             case 2:
               // for condition
               if (!t1.moveNext$0()) {
@@ -88910,7 +89704,7 @@ self.util = _cliPkgRequires.util;
               }
               t4 = t1.__internal$_current;
               $async$goto = 4;
-              return A._asyncAwait((t4 == null ? t3._as(t4) : t4).accept$1(t2), $async$call$0);
+              return A._asyncAwait((t4 == null ? t2._as(t4) : t4).accept$1(t3), $async$call$0);
             case 4:
               // returning from await.
               // goto for condition
@@ -88924,25 +89718,19 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
-  A._EvaluateVisitor_visitCssStyleRule_closure9.prototype = {
+  A._EvaluateVisitor_visitCssStyleRule_closure5.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule0;
     },
     $signature: 8
   };
-  A._EvaluateVisitor_visitCssStyleRule_closure10.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_0._collection$_source);
-    },
-    $signature: 3
-  };
   A._EvaluateVisitor_visitCssSupportsRule_closure5.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.Null),
-        $async$self = this, styleRule, t2, t3, t4, t1, _0_0;
+        $async$self = this, t2, t3, t4, t1, _0_0;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -88952,19 +89740,12 @@ self.util = _cliPkgRequires.util;
               // Function start
               t1 = $async$self.$this;
               _0_0 = t1._async_evaluate0$_atRootExcludingStyleRule ? null : t1._async_evaluate0$_styleRuleIgnoringAtRoot;
-              if (_0_0 != null) {
-                styleRule = _0_0;
-                t2 = true;
-              } else {
-                styleRule = null;
-                t2 = false;
-              }
-              $async$goto = t2 ? 2 : 4;
+              $async$goto = _0_0 != null ? 2 : 4;
               break;
             case 2:
               // then
               $async$goto = 5;
-              return A._asyncAwait(t1._async_evaluate0$_withParent$2$2(A.ModifiableCssStyleRule$0(styleRule._style_rule0$_selector, styleRule.span, styleRule.originalSelector), new A._EvaluateVisitor_visitCssSupportsRule__closure2(t1, $async$self.node), type$.ModifiableCssStyleRule_2, type$.Null), $async$call$0);
+              return A._asyncAwait(t1._async_evaluate0$_withParent$2$2(A.ModifiableCssStyleRule$0(_0_0._style_rule0$_selector, _0_0.span, false, _0_0.originalSelector), new A._EvaluateVisitor_visitCssSupportsRule__closure2(t1, $async$self.node), type$.ModifiableCssStyleRule_2, type$.Null), $async$call$0);
             case 5:
               // returning from await.
               // goto join
@@ -88972,7 +89753,7 @@ self.util = _cliPkgRequires.util;
               break;
             case 4:
               // else
-              t2 = $async$self.node.children, t2 = new A.ListIterator(t2, t2.get$length(t2)), t3 = A._instanceType(t2)._precomputed1;
+              t2 = $async$self.node.children, t3 = t2.$ti, t2 = new A.ListIterator(t2, t2.get$length(0), t3._eval$1("ListIterator<ListBase.E>")), t3 = t3._eval$1("ListBase.E");
             case 6:
               // for condition
               if (!t2.moveNext$0()) {
@@ -88998,7 +89779,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitCssSupportsRule__closure2.prototype = {
     call$0() {
@@ -89012,7 +89793,7 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              t1 = $async$self.node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = $async$self.$this, t3 = A._instanceType(t1)._precomputed1;
+              t1 = $async$self.node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = $async$self.$this, t2 = t2._eval$1("ListBase.E");
             case 2:
               // for condition
               if (!t1.moveNext$0()) {
@@ -89022,7 +89803,7 @@ self.util = _cliPkgRequires.util;
               }
               t4 = t1.__internal$_current;
               $async$goto = 4;
-              return A._asyncAwait((t4 == null ? t3._as(t4) : t4).accept$1(t2), $async$call$0);
+              return A._asyncAwait((t4 == null ? t2._as(t4) : t4).accept$1(t3), $async$call$0);
             case 4:
               // returning from await.
               // goto for condition
@@ -89036,7 +89817,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 4
+    $signature: 2
   };
   A._EvaluateVisitor_visitCssSupportsRule_closure6.prototype = {
     call$1(node) {
@@ -89048,20 +89829,20 @@ self.util = _cliPkgRequires.util;
     call$1(targetLocations) {
       return A.InterpolationMap$0(this.interpolation, targetLocations);
     },
-    $signature: 211
+    $signature: 219
   };
   A._EvaluateVisitor__serialize_closure2.prototype = {
     call$0() {
       return A.serializeValue0(this.value, false, this.quote);
     },
-    $signature: 22
+    $signature: 26
   };
   A._EvaluateVisitor__expressionNode_closure2.prototype = {
     call$0() {
       var t1 = this.expression;
       return this.$this._async_evaluate0$_environment.getVariableNode$2$namespace(t1.name, t1.namespace);
     },
-    $signature: 212
+    $signature: 217
   };
   A._EvaluateVisitor__withoutSlash_recommendation2.prototype = {
     call$1(number) {
@@ -89072,13 +89853,6 @@ self.util = _cliPkgRequires.util;
           t1 = type$.SassNumber_2;
           before = t1._as(_1_0._0);
           after = t1._as(_1_0._1);
-          t1 = true;
-        } else {
-          before = null;
-          after = null;
-          t1 = false;
-        }
-        if (t1) {
           t1 = "math.div(" + A.S(this.call$1(before)) + ", " + A.S(this.call$1(after)) + ")";
           break $label0$0;
         }
@@ -89087,7 +89861,7 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 213
+    $signature: 216
   };
   A._EvaluateVisitor__stackFrame_closure2.prototype = {
     call$1(url) {
@@ -89095,7 +89869,7 @@ self.util = _cliPkgRequires.util;
       t1 = t1 == null ? null : t1.humanize$1(url);
       return t1 == null ? url : t1;
     },
-    $signature: 48
+    $signature: 43
   };
   A._ImportedCssVisitor2.prototype = {
     visitCssAtRule$1(node) {
@@ -89133,7 +89907,7 @@ self.util = _cliPkgRequires.util;
     },
     visitCssStylesheet$1(node) {
       var t1, t2, t3;
-      for (t1 = node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t2 = t2._eval$1("ListBase.E"); t1.moveNext$0();) {
         t3 = t1.__internal$_current;
         (t3 == null ? t2._as(t3) : t3).accept$1(this);
       }
@@ -89173,17 +89947,9 @@ self.util = _cliPkgRequires.util;
   };
   A._EvaluationContext2.prototype = {
     get$currentCallableSpan() {
-      var callableNode, t1,
-        _0_0 = this._async_evaluate0$_visitor._async_evaluate0$_callableNode;
-      if (_0_0 != null) {
-        callableNode = _0_0;
-        t1 = true;
-      } else {
-        callableNode = null;
-        t1 = false;
-      }
-      if (t1)
-        return callableNode.get$span(callableNode);
+      var _0_0 = this._async_evaluate0$_visitor._async_evaluate0$_callableNode;
+      if (_0_0 != null)
+        return _0_0.get$span(_0_0);
       throw A.wrapException(A.StateError$(string$.No_Sasc));
     },
     warn$2(_, message, deprecation) {
@@ -89213,7 +89979,7 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               if (url.get$scheme() === "file") {
-                $async$returnValue = $.$get$_filesystemImporter().canonicalize$1(0, url);
+                $async$returnValue = $.$get$FilesystemImporter_cwd0().canonicalize$1(0, url);
                 // goto return
                 $async$goto = 1;
                 break;
@@ -89242,7 +90008,7 @@ self.util = _cliPkgRequires.util;
               resultUrl = A.Uri_parse(J.toString$0$(type$.JSUrl._as(result)));
               if (resultUrl.get$scheme() !== "file")
                 A.jsThrow(new self.Error(string$.The_fiu + url.toString$0(0) + '".'));
-              $async$returnValue = $.$get$_filesystemImporter().canonicalize$1(0, resultUrl);
+              $async$returnValue = $.$get$FilesystemImporter_cwd0().canonicalize$1(0, resultUrl);
               // goto return
               $async$goto = 1;
               break;
@@ -89254,7 +90020,7 @@ self.util = _cliPkgRequires.util;
       return A._asyncStartSync($async$canonicalize$1, $async$completer);
     },
     load$1(_, url) {
-      return $.$get$_filesystemImporter().load$1(0, url);
+      return $.$get$FilesystemImporter_cwd0().load$1(0, url);
     },
     isNonCanonicalScheme$1(scheme) {
       return scheme !== "file";
@@ -89262,9 +90028,9 @@ self.util = _cliPkgRequires.util;
   };
   A.JSToDartAsyncFileImporter_canonicalize_closure.prototype = {
     call$0() {
-      return this.$this._findFileUrl.call$2(this.url.toString$0(0), {fromImport: A.fromImport0(), containingUrl: A.NullableExtension_andThen0(A.containingUrl(), A.utils1__dartToJSUrl$closure())});
+      return this.$this._findFileUrl.call$2(this.url.toString$0(0), A.canonicalizeContext0());
     },
-    $signature: 28
+    $signature: 35
   };
   A.AsyncImportCache0.prototype = {
     canonicalize$4$baseImporter$baseUrl$forImport(_, url, baseImporter, baseUrl, forImport) {
@@ -89273,7 +90039,7 @@ self.util = _cliPkgRequires.util;
     canonicalize$body$AsyncImportCache0(_, url, baseImporter, baseUrl, forImport) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl_2),
-        $async$returnValue, $async$self = this, t1, relativeResult;
+        $async$returnValue, $async$self = this, t1, resolvedUrl, key, relativeResult, t2, t3, t4, t5, t6, cacheable, i, importer, perImporterKey, t7, _1_0, _1_2_isSet, _1_2, result, _2_0, _2_1, _2_5_isSet, _2_3, _2_5, _2_3_isSet, j;
       var $async$canonicalize$4$baseImporter$baseUrl$forImport = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -89291,8 +90057,12 @@ self.util = _cliPkgRequires.util;
               break;
             case 3:
               // then
+              resolvedUrl = baseUrl == null ? null : baseUrl.resolveUri$1(url);
+              if (resolvedUrl == null)
+                resolvedUrl = url;
+              key = new A._Record_3_forImport(baseImporter, resolvedUrl, forImport);
               $async$goto = 5;
-              return A._asyncAwait(A.putIfAbsentAsync0($async$self._async_import_cache0$_relativeCanonicalizeCache, new A._Record_4_baseImporter_baseUrl_forImport([url, baseImporter, baseUrl, forImport]), new A.AsyncImportCache_canonicalize_closure1($async$self, baseImporter, baseUrl, url, forImport), type$.Record_4_Uri_and_AsyncImporter_baseImporter_and_nullable_Uri_baseUrl_and_bool_forImport_2, type$.nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl_2), $async$canonicalize$4$baseImporter$baseUrl$forImport);
+              return A._asyncAwait(A.putIfAbsentAsync0($async$self._async_import_cache0$_perImporterCanonicalizeCache, key, new A.AsyncImportCache_canonicalize_closure0($async$self, baseImporter, resolvedUrl, baseUrl, forImport, key, url), type$.Record_3_AsyncImporter_and_Uri_and_bool_forImport_2, type$.nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl_2), $async$canonicalize$4$baseImporter$baseUrl$forImport);
             case 5:
               // returning from await.
               relativeResult = $async$result;
@@ -89304,11 +90074,132 @@ self.util = _cliPkgRequires.util;
               }
             case 4:
               // join
-              $async$goto = 6;
-              return A._asyncAwait(A.putIfAbsentAsync0($async$self._async_import_cache0$_canonicalizeCache, new A._Record_2_forImport(url, forImport), new A.AsyncImportCache_canonicalize_closure2($async$self, url, baseUrl, forImport), type$.Record_2_Uri_and_bool_forImport, type$.nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl_2), $async$canonicalize$4$baseImporter$baseUrl$forImport);
+              key = new A._Record_2_forImport(url, forImport);
+              t1 = $async$self._async_import_cache0$_canonicalizeCache;
+              if (t1.containsKey$1(key)) {
+                $async$returnValue = t1.$index(0, key);
+                // goto return
+                $async$goto = 1;
+                break;
+              }
+              t2 = $async$self._async_import_cache0$_importers, t3 = type$.Record_1_nullable_Object, t4 = $async$self._async_import_cache0$_perImporterCanonicalizeCache, t5 = type$.nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl_2, t6 = type$.Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl_2, cacheable = true, i = 0;
             case 6:
+              // for condition
+              if (!(i < t2.length)) {
+                // goto after for
+                $async$goto = 8;
+                break;
+              }
+              importer = t2[i];
+              perImporterKey = new A._Record_3_forImport(importer, url, forImport);
+              if (t4.containsKey$1(perImporterKey)) {
+                t7 = t4.$index(0, perImporterKey);
+                _1_0 = new A._Record_1(t7 == null ? t5._as(t7) : t7);
+              } else
+                _1_0 = null;
+              _1_2_isSet = t3._is(_1_0);
+              if (_1_2_isSet) {
+                _1_2 = _1_0._0;
+                t7 = _1_2 != null;
+                if (t7) {
+                  t6._as(_1_2);
+                  result = _1_2;
+                } else
+                  result = null;
+              } else {
+                _1_2 = null;
+                result = null;
+                t7 = false;
+              }
+              if (t7) {
+                $async$returnValue = result;
+                // goto return
+                $async$goto = 1;
+                break;
+              }
+              if (_1_2_isSet)
+                t7 = _1_2 == null;
+              else
+                t7 = false;
+              if (t7) {
+                // goto for update
+                $async$goto = 7;
+                break;
+              }
+              $async$goto = 10;
+              return A._asyncAwait($async$self._async_import_cache0$_canonicalize$4(importer, url, baseUrl, forImport), $async$canonicalize$4$baseImporter$baseUrl$forImport);
+            case 10:
               // returning from await.
-              $async$returnValue = $async$result;
+              _2_0 = $async$result;
+              _2_1 = _2_0._0;
+              _2_5_isSet = _2_1 != null;
+              if (_2_5_isSet) {
+                result = _2_1 == null ? t6._as(_2_1) : _2_1;
+                _2_3 = _2_0._1;
+                t7 = _2_3;
+                _2_5 = t7;
+                t7 = t7 && cacheable;
+              } else {
+                _2_5 = null;
+                _2_3 = null;
+                result = null;
+                t7 = false;
+              }
+              if (t7) {
+                t1.$indexSet(0, key, result);
+                $async$returnValue = result;
+                // goto return
+                $async$goto = 1;
+                break;
+              }
+              if (_2_5_isSet) {
+                t7 = _2_5;
+                _2_3_isSet = _2_5_isSet;
+              } else {
+                _2_3 = _2_0._1;
+                t7 = _2_3;
+                _2_3_isSet = true;
+              }
+              t7 = t7 && !cacheable;
+              if (t7) {
+                t4.$indexSet(0, perImporterKey, _2_1);
+                if (_2_1 != null) {
+                  $async$returnValue = _2_1;
+                  // goto return
+                  $async$goto = 1;
+                  break;
+                }
+                // goto break $label0$1
+                $async$goto = 9;
+                break;
+              }
+              t7 = false === (_2_3_isSet ? _2_3 : _2_0._1);
+              if (t7) {
+                if (cacheable) {
+                  for (j = 0; j < i; ++j)
+                    t4.$indexSet(0, new A._Record_3_forImport(t2[j], url, forImport), null);
+                  cacheable = false;
+                }
+                if (_2_1 != null) {
+                  $async$returnValue = _2_1;
+                  // goto return
+                  $async$goto = 1;
+                  break;
+                }
+              }
+            case 9:
+              // break $label0$1
+            case 7:
+              // for update
+              ++i;
+              // goto for condition
+              $async$goto = 6;
+              break;
+            case 8:
+              // after for
+              if (cacheable)
+                t1.$indexSet(0, key, null);
+              $async$returnValue = null;
               // goto return
               $async$goto = 1;
               break;
@@ -89324,8 +90215,8 @@ self.util = _cliPkgRequires.util;
     },
     _canonicalize$body$AsyncImportCache0(importer, url, baseUrl, forImport) {
       var $async$goto = 0,
-        $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl_2),
-        $async$returnValue, $async$self = this, passContainingUrl, t1, result, canonicalize, $async$temp1;
+        $async$completer = A._makeAsyncAwaitCompleter(type$.Record_2_nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl_and_bool_2),
+        $async$returnValue, $async$self = this, t1, passContainingUrl, canonicalizeContext, result, cacheable;
       var $async$_async_import_cache0$_canonicalize$4 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -89333,31 +90224,29 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              canonicalize = forImport ? new A.AsyncImportCache__canonicalize_closure1(importer, url) : new A.AsyncImportCache__canonicalize_closure2(importer, url);
               $async$goto = baseUrl != null ? 3 : 5;
               break;
             case 3:
               // then
-              $async$temp1 = url.get$scheme() === "";
-              if ($async$temp1)
-                $async$result = $async$temp1;
-              else {
-                // goto then
-                $async$goto = 6;
-                break;
-              }
-              // goto join
-              $async$goto = 7;
+              $async$goto = url.get$scheme() !== "" ? 6 : 8;
               break;
             case 6:
               // then
-              $async$goto = 8;
-              return A._asyncAwait(importer.isNonCanonicalScheme$1(url.get$scheme()), $async$_async_import_cache0$_canonicalize$4);
-            case 8:
+              t1 = A._Future$value(importer.isNonCanonicalScheme$1(url.get$scheme()), type$.bool);
+              $async$goto = 9;
+              return A._asyncAwait(t1, $async$_async_import_cache0$_canonicalize$4);
+            case 9:
               // returning from await.
+              t1 = $async$result;
+              passContainingUrl = t1;
+              // goto join
+              $async$goto = 7;
+              break;
+            case 8:
+              // else
+              passContainingUrl = true;
             case 7:
               // join
-              passContainingUrl = $async$result;
               // goto join
               $async$goto = 4;
               break;
@@ -89366,37 +90255,41 @@ self.util = _cliPkgRequires.util;
               passContainingUrl = false;
             case 4:
               // join
-              t1 = passContainingUrl ? baseUrl : null;
-              $async$goto = 9;
-              return A._asyncAwait(A.withContainingUrl0(t1, canonicalize, type$.FutureOr_nullable_Uri), $async$_async_import_cache0$_canonicalize$4);
-            case 9:
+              canonicalizeContext = new A.CanonicalizeContext0(forImport, passContainingUrl ? baseUrl : null);
+              t1 = type$.nullable_Object;
+              t1 = A.runZoned(new A.AsyncImportCache__canonicalize_closure0(importer, url), A.LinkedHashMap_LinkedHashMap$_literal([B.Symbol__canonicalizeContext, canonicalizeContext], t1, t1), type$.FutureOr_nullable_Uri);
+              $async$goto = 10;
+              return A._asyncAwait(type$.Future_nullable_Uri._is(t1) ? t1 : A._Future$value(t1, type$.nullable_Uri), $async$_async_import_cache0$_canonicalize$4);
+            case 10:
               // returning from await.
               result = $async$result;
+              cacheable = !passContainingUrl || !canonicalizeContext._canonicalize_context$_wasContainingUrlAccessed;
               if (result == null) {
-                $async$returnValue = null;
+                $async$returnValue = new A._Record_2(null, cacheable);
                 // goto return
                 $async$goto = 1;
                 break;
               }
-              $async$goto = result.get$scheme() === "" ? 10 : 12;
+              $async$goto = result.get$scheme() === "" ? 11 : 13;
               break;
-            case 10:
+            case 11:
               // then
-              A.WarnForDeprecation_warnForDeprecation0($async$self._async_import_cache0$_logger, B.Deprecation_E5x, "Importer " + importer.toString$0(0) + " canonicalized " + url.toString$0(0) + " to " + result.toString$0(0) + string$.x2e_Rela, null, null);
+              A.WarnForDeprecation_warnForDeprecation0($async$self._async_import_cache0$_logger, B.Deprecation_Ssf, "Importer " + importer.toString$0(0) + " canonicalized " + url.toString$0(0) + " to " + result.toString$0(0) + string$.x2e_Rela, null, null);
               // goto join
-              $async$goto = 11;
+              $async$goto = 12;
               break;
-            case 12:
-              // else
-              $async$goto = 13;
-              return A._asyncAwait(importer.isNonCanonicalScheme$1(result.get$scheme()), $async$_async_import_cache0$_canonicalize$4);
             case 13:
+              // else
+              t1 = A._Future$value(importer.isNonCanonicalScheme$1(result.get$scheme()), type$.bool);
+              $async$goto = 14;
+              return A._asyncAwait(t1, $async$_async_import_cache0$_canonicalize$4);
+            case 14:
               // returning from await.
               if ($async$result)
                 throw A.wrapException("Importer " + importer.toString$0(0) + " canonicalized " + url.toString$0(0) + " to " + result.toString$0(0) + string$.x2c_whicu);
-            case 11:
+            case 12:
               // join
-              $async$returnValue = new A._Record_3_originalUrl(importer, result, url);
+              $async$returnValue = new A._Record_2(new A._Record_3_originalUrl(importer, result, url), cacheable);
               // goto return
               $async$goto = 1;
               break;
@@ -89440,35 +90333,22 @@ self.util = _cliPkgRequires.util;
       return A._asyncStartSync($async$importCanonical$4$originalUrl$quiet, $async$completer);
     },
     humanize$1(canonicalUrl) {
-      var t2,
-        t1 = this._async_import_cache0$_canonicalizeCache;
-      t1 = A.IterableNullableExtension_whereNotNull(t1.get$values(t1), type$.Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl_2);
-      t2 = t1.$ti;
+      var t1 = A.IterableNullableExtension_whereNotNull(this._async_import_cache0$_canonicalizeCache.get$values(0), type$.Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl_2),
+        t2 = t1.$ti;
       t2 = A.NullableExtension_andThen0(A.minBy(new A.MappedIterable(new A.WhereIterable(t1, new A.AsyncImportCache_humanize_closure3(canonicalUrl), t2._eval$1("WhereIterable<Iterable.E>")), new A.AsyncImportCache_humanize_closure4(), t2._eval$1("MappedIterable<Iterable.E,Uri>")), new A.AsyncImportCache_humanize_closure5()), new A.AsyncImportCache_humanize_closure6(canonicalUrl));
       return t2 == null ? canonicalUrl : t2;
     },
     sourceMapUrl$1(_, canonicalUrl) {
       var t1 = this._async_import_cache0$_resultsCache.$index(0, canonicalUrl);
-      t1 = t1 == null ? null : t1.get$sourceMapUrl(t1);
+      t1 = t1 == null ? null : t1.get$sourceMapUrl(0);
       return t1 == null ? canonicalUrl : t1;
     }
   };
-  A.AsyncImportCache_canonicalize_closure1.prototype = {
-    call$0() {
-      var _this = this,
-        t1 = _this.baseUrl,
-        t2 = t1 == null ? null : t1.resolveUri$1(_this.url);
-      if (t2 == null)
-        t2 = _this.url;
-      return _this.$this._async_import_cache0$_canonicalize$4(_this.baseImporter, t2, t1, _this.forImport);
-    },
-    $signature: 214
-  };
-  A.AsyncImportCache_canonicalize_closure2.prototype = {
+  A.AsyncImportCache_canonicalize_closure0.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl_2),
-        $async$returnValue, $async$self = this, t1, t2, t3, t4, t5, t6, _i, _0_0, result, t7;
+        $async$returnValue, $async$self = this, t1, t2, _0_0, result;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -89476,41 +90356,18 @@ self.util = _cliPkgRequires.util;
           switch ($async$goto) {
             case 0:
               // Function start
-              t1 = $async$self.$this, t2 = t1._async_import_cache0$_importers, t3 = t2.length, t4 = $async$self.url, t5 = $async$self.baseUrl, t6 = $async$self.forImport, _i = 0;
+              t1 = $async$self.$this;
+              t2 = $async$self.baseUrl;
+              $async$goto = 3;
+              return A._asyncAwait(t1._async_import_cache0$_canonicalize$4($async$self.baseImporter, $async$self.resolvedUrl, t2, $async$self.forImport), $async$call$0);
             case 3:
-              // for condition
-              if (!(_i < t2.length)) {
-                // goto after for
-                $async$goto = 5;
-                break;
-              }
-              $async$goto = 6;
-              return A._asyncAwait(t1._async_import_cache0$_canonicalize$4(t2[_i], t4, t5, t6), $async$call$0);
-            case 6:
               // returning from await.
               _0_0 = $async$result;
-              if (_0_0 != null) {
-                result = _0_0;
-                t7 = true;
-              } else {
-                result = null;
-                t7 = false;
-              }
-              if (t7) {
-                $async$returnValue = result;
-                // goto return
-                $async$goto = 1;
-                break;
-              }
-            case 4:
-              // for update
-              t2.length === t3 || (0, A.throwConcurrentModificationError)(t2), ++_i;
-              // goto for condition
-              $async$goto = 3;
-              break;
-            case 5:
-              // after for
-              $async$returnValue = null;
+              result = _0_0._0;
+              _0_0._1;
+              if (t2 != null)
+                t1._async_import_cache0$_nonCanonicalRelativeUrls.$indexSet(0, $async$self.key, $async$self.url);
+              $async$returnValue = result;
               // goto return
               $async$goto = 1;
               break;
@@ -89521,32 +90378,19 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 214
+    $signature: 354
   };
-  A.AsyncImportCache__canonicalize_closure1.prototype = {
+  A.AsyncImportCache__canonicalize_closure0.prototype = {
     call$0() {
-      var t1 = type$.nullable_Object;
-      return A.runZoned(new A.AsyncImportCache__canonicalize__closure0(this.importer, this.resolved), A.LinkedHashMap_LinkedHashMap$_literal([B.Symbol__inImportRule, true], t1, t1), type$.FutureOr_nullable_Uri);
+      return this.importer.canonicalize$1(0, this.url);
     },
-    $signature: 55
-  };
-  A.AsyncImportCache__canonicalize__closure0.prototype = {
-    call$0() {
-      return this.importer.canonicalize$1(0, this.resolved);
-    },
-    $signature: 55
-  };
-  A.AsyncImportCache__canonicalize_closure2.prototype = {
-    call$0() {
-      return this.importer.canonicalize$1(0, this.resolved);
-    },
-    $signature: 55
+    $signature: 263
   };
   A.AsyncImportCache_importCanonical_closure0.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Stylesheet_2),
-        $async$returnValue, $async$self = this, t2, t3, t4, t1, result;
+        $async$returnValue, $async$self = this, t3, t4, t1, t2, result;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -89555,8 +90399,9 @@ self.util = _cliPkgRequires.util;
             case 0:
               // Function start
               t1 = $async$self.canonicalUrl;
+              t2 = $async$self.importer.load$1(0, t1);
               $async$goto = 3;
-              return A._asyncAwait($async$self.importer.load$1(0, t1), $async$call$0);
+              return A._asyncAwait(type$.Future_nullable_ImporterResult._is(t2) ? t2 : A._Future$value(t2, type$.nullable_ImporterResult_2), $async$call$0);
             case 3:
               // returning from await.
               result = $async$result;
@@ -89582,33 +90427,33 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 379
+    $signature: 355
   };
   A.AsyncImportCache_humanize_closure3.prototype = {
     call$1(result) {
       return J.$eq$(result._1, this.canonicalUrl);
     },
-    $signature: 380
+    $signature: 356
   };
   A.AsyncImportCache_humanize_closure4.prototype = {
     call$1(result) {
       return result._2;
     },
-    $signature: 381
+    $signature: 357
   };
   A.AsyncImportCache_humanize_closure5.prototype = {
     call$1(url) {
       return url.get$path(url).length;
     },
-    $signature: 111
+    $signature: 87
   };
   A.AsyncImportCache_humanize_closure6.prototype = {
     call$1(url) {
       var t1 = $.$get$url(),
         t2 = this.canonicalUrl;
-      return url.resolve$1(A.ParsedPath_ParsedPath$parse(t2.get$path(t2), t1.style).get$basename());
+      return url.resolve$1(0, A.ParsedPath_ParsedPath$parse(t2.get$path(t2), t1.style).get$basename());
     },
-    $signature: 48
+    $signature: 43
   };
   A.AtRootQueryParser0.prototype = {
     parse$0() {
@@ -89637,7 +90482,7 @@ self.util = _cliPkgRequires.util;
       t2.expectDone$0();
       return new A.AtRootQuery0(include, atRules, atRules.contains$1(0, "all"), atRules.contains$1(0, "rule"));
     },
-    $signature: 382
+    $signature: 358
   };
   A.AtRootQuery0.prototype = {
     excludes$1(node) {
@@ -89781,11 +90626,11 @@ self.util = _cliPkgRequires.util;
       return left.get$span(left).expand$1(0, right.get$span(right));
     },
     get$operatorSpan() {
-      var t3, t4, _this = this,
-        t1 = _this.left,
+      var t3, t4,
+        t1 = this.left,
         t2 = t1.get$span(t1);
       t2 = t2.get$file(t2);
-      t3 = _this.right;
+      t3 = this.right;
       t4 = t3.get$span(t3);
       if (t2 === t4.get$file(t4)) {
         t2 = t1.get$span(t1);
@@ -89804,7 +90649,7 @@ self.util = _cliPkgRequires.util;
         t3 = A.SpanExtensions_trimRight0(A.SpanExtensions_trimLeft0(t2.span$2(0, t1.offset, t3.get$start(t3).offset)));
         t1 = t3;
       } else
-        t1 = _this.get$span(_this);
+        t1 = this.get$span(0);
       return t1;
     },
     accept$1$1(visitor) {
@@ -89814,18 +90659,11 @@ self.util = _cliPkgRequires.util;
       return this.accept$1$1(visitor, type$.dynamic);
     },
     toString$0(_) {
-      var precedence, t1, t2, right, operator, t3, _this = this,
+      var t1, t2, right, operator, t3, _this = this,
         _0_0 = _this.left;
       $label0$0: {
         if (_0_0 instanceof A.BinaryOperationExpression0) {
-          precedence = _0_0.operator.precedence;
-          t1 = true;
-        } else {
-          precedence = null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = precedence < _this.operator.precedence;
+          t1 = _0_0.operator.precedence < _this.operator.precedence;
           break $label0$0;
         }
         if (_0_0 instanceof A.ListExpression0 && !_0_0.hasBrackets && _0_0.contents.length >= 2) {
@@ -89844,12 +90682,6 @@ self.util = _cliPkgRequires.util;
       $label1$1: {
         if (right instanceof A.BinaryOperationExpression0) {
           operator = right.operator;
-          t3 = true;
-        } else {
-          operator = null;
-          t3 = false;
-        }
-        if (t3) {
           if (operator.precedence <= t2.precedence) {
             t3 = !(operator === t2 && operator.isAssociative);
             t2 = t3;
@@ -89905,7 +90737,7 @@ self.util = _cliPkgRequires.util;
       A.JSClassExtension_injectSuperclass(t1._as(B.SassBoolean_true0.constructor), jsClass);
       return jsClass;
     },
-    $signature: 24
+    $signature: 15
   };
   A.booleanClass__closure.prototype = {
     call$2($self, _) {
@@ -89919,7 +90751,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 215
+    $signature: 213
   };
   A.legacyBooleanClass_closure.prototype = {
     call$0() {
@@ -89931,7 +90763,7 @@ self.util = _cliPkgRequires.util;
       A.JSClassExtension_injectSuperclass(t1._as(B.SassBoolean_true0.constructor), jsClass);
       return jsClass;
     },
-    $signature: 24
+    $signature: 15
   };
   A.legacyBooleanClass__closure.prototype = {
     call$2(_, __) {
@@ -89945,13 +90777,13 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 216
+    $signature: 209
   };
   A.legacyBooleanClass__closure0.prototype = {
     call$1($self) {
       return $self === B.SassBoolean_true0;
     },
-    $signature: 77
+    $signature: 75
   };
   A.SassBoolean0.prototype = {
     get$isTruthy() {
@@ -90023,7 +90855,7 @@ self.util = _cliPkgRequires.util;
       this.callback.call$1($arguments);
       return B.C__SassNull0;
     },
-    $signature: 5
+    $signature: 3
   };
   A.BuiltInModule0.prototype = {
     get$upstream() {
@@ -90084,7 +90916,7 @@ self.util = _cliPkgRequires.util;
       A.JSClassExtension_injectSuperclass(t1._as(new A.SassCalculation0("calc", A.List_List$unmodifiable(A._setArrayType([A.SassNumber_SassNumber0(1, null)], type$.JSArray_Object), type$.Object)).constructor), jsClass);
       return jsClass;
     },
-    $signature: 24
+    $signature: 15
   };
   A.calculationClass__closure.prototype = {
     call$2($self, _) {
@@ -90098,14 +90930,14 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 215
+    $signature: 213
   };
   A.calculationClass__closure0.prototype = {
     call$1(argument) {
       A._assertCalculationValue(argument);
       return new A.SassCalculation0("calc", A.List_List$unmodifiable(A._setArrayType([argument], type$.JSArray_Object), type$.Object));
     },
-    $signature: 125
+    $signature: 110
   };
   A.calculationClass__closure1.prototype = {
     call$1($arguments) {
@@ -90115,7 +90947,7 @@ self.util = _cliPkgRequires.util;
       argList.forEach$1(argList, A.calculation1___assertCalculationValue$closure());
       return new A.SassCalculation0("min", A.List_List$unmodifiable(argList, t2));
     },
-    $signature: 125
+    $signature: 110
   };
   A.calculationClass__closure2.prototype = {
     call$1($arguments) {
@@ -90125,7 +90957,7 @@ self.util = _cliPkgRequires.util;
       argList.forEach$1(argList, A.calculation1___assertCalculationValue$closure());
       return new A.SassCalculation0("max", A.List_List$unmodifiable(argList, t2));
     },
-    $signature: 125
+    $signature: 110
   };
   A.calculationClass__closure3.prototype = {
     call$3(min, value, max) {
@@ -90151,7 +90983,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null, null];
     },
-    $signature: 387
+    $signature: 363
   };
   A.calculationClass__closure4.prototype = {
     call$2($self, $name) {
@@ -90165,13 +90997,13 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 388
+    $signature: 364
   };
   A.calculationClass__closure5.prototype = {
     call$1($self) {
       return new self.immutable.List($self.$arguments);
     },
-    $signature: 389
+    $signature: 365
   };
   A.calculationOperationClass_closure.prototype = {
     call$0() {
@@ -90181,14 +91013,14 @@ self.util = _cliPkgRequires.util;
         t3 = type$.Function;
       A.LinkedHashMap_LinkedHashMap$_literal(["equals", new A.calculationOperationClass__closure0(), "hashCode", new A.calculationOperationClass__closure1()], t2, t3).forEach$1(0, A.JSClassExtension_get_defineMethod(jsClass));
       A.LinkedHashMap_LinkedHashMap$_literal(["operator", new A.calculationOperationClass__closure2(), "left", new A.calculationOperationClass__closure3(), "right", new A.calculationOperationClass__closure4()], t2, t3).forEach$1(0, A.JSClassExtension_get_defineGetter(jsClass));
-      A.JSClassExtension_injectSuperclass(t1._as(A.SassCalculation_operateInternal0(B.CalculationOperator_IyK0, A.SassNumber_SassNumber0(1, null), A.SassNumber_SassNumber0(1, null), false, false).constructor), jsClass);
+      A.JSClassExtension_injectSuperclass(t1._as(A.SassCalculation_operateInternal0(B.CalculationOperator_g2q0, A.SassNumber_SassNumber0(1, null), A.SassNumber_SassNumber0(1, null), false, false).constructor), jsClass);
       return jsClass;
     },
-    $signature: 24
+    $signature: 15
   };
   A.calculationOperationClass__closure.prototype = {
     call$4($self, strOperator, left, right) {
-      var operator = A.IterableExtension_firstWhereOrNull(B.List_cUt, new A.calculationOperationClass___closure(strOperator));
+      var operator = A.IterableExtension_firstWhereOrNull(B.List_kUZ, new A.calculationOperationClass___closure(strOperator));
       if (operator == null)
         A.jsThrow0(new self.Error("Invalid operator: " + strOperator));
       A._assertCalculationValue(left);
@@ -90197,43 +91029,43 @@ self.util = _cliPkgRequires.util;
     },
     "call*": "call$4",
     $requiredArgCount: 4,
-    $signature: 390
+    $signature: 366
   };
   A.calculationOperationClass___closure.prototype = {
     call$1(value) {
       return value.operator === this.strOperator;
     },
-    $signature: 391
+    $signature: 367
   };
   A.calculationOperationClass__closure0.prototype = {
     call$2($self, other) {
       return $self.$eq(0, other);
     },
-    $signature: 392
+    $signature: 368
   };
   A.calculationOperationClass__closure1.prototype = {
     call$1($self) {
-      return $self.get$hashCode($self);
+      return $self.get$hashCode(0);
     },
-    $signature: 393
+    $signature: 369
   };
   A.calculationOperationClass__closure2.prototype = {
     call$1($self) {
       return $self._calculation0$_operator.operator;
     },
-    $signature: 394
+    $signature: 370
   };
   A.calculationOperationClass__closure3.prototype = {
     call$1($self) {
       return $self._calculation0$_left;
     },
-    $signature: 219
+    $signature: 207
   };
   A.calculationOperationClass__closure4.prototype = {
     call$1($self) {
       return $self._calculation0$_right;
     },
-    $signature: 219
+    $signature: 207
   };
   A.calculationInterpolationClass_closure.prototype = {
     call$0() {
@@ -90246,31 +91078,31 @@ self.util = _cliPkgRequires.util;
       A.JSClassExtension_injectSuperclass(t1._as(new A.CalculationInterpolation("").constructor), jsClass);
       return jsClass;
     },
-    $signature: 24
+    $signature: 15
   };
   A.calculationInterpolationClass__closure.prototype = {
     call$2($self, value) {
       return new A.CalculationInterpolation(value);
     },
-    $signature: 396
+    $signature: 372
   };
   A.calculationInterpolationClass__closure0.prototype = {
     call$2($self, other) {
       return other instanceof A.CalculationInterpolation && $self._calculation0$_value === other._calculation0$_value;
     },
-    $signature: 397
+    $signature: 373
   };
   A.calculationInterpolationClass__closure1.prototype = {
     call$1($self) {
       return B.JSString_methods.get$hashCode($self._calculation0$_value);
     },
-    $signature: 398
+    $signature: 374
   };
   A.calculationInterpolationClass__closure2.prototype = {
     call$1($self) {
       return $self._calculation0$_value;
     },
-    $signature: 399
+    $signature: 375
   };
   A.SassCalculation0.prototype = {
     get$isSpecialNumber() {
@@ -90308,143 +91140,11 @@ self.util = _cliPkgRequires.util;
       return B.JSString_methods.get$hashCode(this.name) ^ B.C_ListEquality0.hash$1(this.$arguments);
     }
   };
-  A.SassCalculation_sign_closure0.prototype = {
-    call$0() {
-      return type$.SassNumber_2._as(this._0_0)._number1$_value;
-    },
-    $signature: 92
-  };
-  A.SassCalculation_round_closure9.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature: 14
-  };
-  A.SassCalculation_round_closure10.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 28
-  };
-  A.SassCalculation_round_closure11.prototype = {
-    call$0() {
-      return this._0_2._readFinal$0() == null;
-    },
-    $signature: 1
-  };
-  A.SassCalculation_round_closure12.prototype = {
-    call$0() {
-      return this._0_0._2;
-    },
-    $signature: 28
-  };
-  A.SassCalculation_round_closure13.prototype = {
-    call$0() {
-      return this._0_5._readFinal$0() == null;
-    },
-    $signature: 1
-  };
-  A.SassCalculation_round_closure14.prototype = {
-    call$0() {
-      return type$.SassString_2._as(this._0_1._readFinal$0())._string0$_text;
-    },
-    $signature: 22
-  };
-  A.SassCalculation_round_closure15.prototype = {
-    call$0() {
-      return "nearest" === this._0_8._readFinal$0();
-    },
-    $signature: 1
-  };
-  A.SassCalculation_round_closure16.prototype = {
-    call$0() {
-      return "up" === this._0_8._readFinal$0();
-    },
-    $signature: 1
-  };
-  A.SassCalculation_round_closure17.prototype = {
-    call$0() {
-      return "down" === this._0_8._readFinal$0();
-    },
-    $signature: 1
-  };
-  A.SassCalculation_round_closure18.prototype = {
-    call$0() {
-      return "to-zero" === this._0_8._readFinal$0();
-    },
-    $signature: 1
-  };
-  A.SassCalculation__roundWithStep_closure7.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature: 22
-  };
-  A.SassCalculation__roundWithStep_closure6.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 92
-  };
-  A.SassCalculation__roundWithStep_closure8.prototype = {
-    call$0() {
-      return "nearest" === this._0_1._readFinal$0();
-    },
-    $signature: 1
-  };
-  A.SassCalculation__roundWithStep_closure9.prototype = {
-    call$0() {
-      return "to-zero" === this._0_1._readFinal$0();
-    },
-    $signature: 1
-  };
-  A.SassCalculation__roundWithStep_closure10.prototype = {
-    call$0() {
-      return this._0_2._readFinal$0() > 0;
-    },
-    $signature: 1
-  };
-  A.SassCalculation__roundWithStep_closure11.prototype = {
-    call$0() {
-      return "up" === this._0_1._readFinal$0();
-    },
-    $signature: 1
-  };
-  A.SassCalculation__roundWithStep_closure12.prototype = {
-    call$0() {
-      return "down" === this._0_1._readFinal$0();
-    },
-    $signature: 1
-  };
-  A.SassCalculation__simplify_closure3.prototype = {
-    call$0() {
-      return "calc" === this._0_0.name;
-    },
-    $signature: 1
-  };
-  A.SassCalculation__simplify_closure4.prototype = {
-    call$0() {
-      return type$.SassCalculation_2._as(this._0_0).$arguments;
-    },
-    $signature: 138
-  };
-  A.SassCalculation__simplify_closure5.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_12._readFinal$0()) === 1;
-    },
-    $signature: 1
-  };
-  A.SassCalculation__simplify_closure6.prototype = {
-    call$0() {
-      return J.$index$asx(this._0_12._readFinal$0(), 0);
-    },
-    $signature: 14
-  };
   A.SassCalculation__verifyLength_closure0.prototype = {
     call$1(arg) {
       return arg instanceof A.SassString0;
     },
-    $signature: 77
+    $signature: 75
   };
   A.CalculationOperation0.prototype = {
     $eq(_, other) {
@@ -90486,6 +91186,35 @@ self.util = _cliPkgRequires.util;
       return this.span;
     }
   };
+  A.updateCanonicalizeContextPrototype_closure.prototype = {
+    call$1($self) {
+      return $self._canonicalize_context$_fromImport;
+    },
+    $signature: 376
+  };
+  A.updateCanonicalizeContextPrototype_closure0.prototype = {
+    call$1($self) {
+      $self._canonicalize_context$_wasContainingUrlAccessed = true;
+      return A.NullableExtension_andThen0($self._canonicalize_context$_containingUrl, A.utils1__dartToJSUrl$closure());
+    },
+    $signature: 377
+  };
+  A.CanonicalizeContext0.prototype = {
+    withFromImport$1$2(fromImport, callback) {
+      var t1,
+        oldFromImport = this._canonicalize_context$_fromImport;
+      this._canonicalize_context$_fromImport = true;
+      try {
+        t1 = callback.call$0();
+        return t1;
+      } finally {
+        this._canonicalize_context$_fromImport = oldFromImport;
+      }
+    },
+    withFromImport$2(fromImport, callback) {
+      return this.withFromImport$1$2(fromImport, callback, type$.dynamic);
+    }
+  };
   A.Chokidar0.prototype = {};
   A.ChokidarOptions0.prototype = {};
   A.ChokidarWatcher0.prototype = {};
@@ -90530,17 +91259,9 @@ self.util = _cliPkgRequires.util;
       return this._clone_css$_visitChildren$2(A.ModifiableCssMediaRule$0(node.queries, node.span), node);
     },
     visitCssStyleRule$1(node) {
-      var newSelector, t1,
-        _0_0 = this._clone_css$_oldToNewSelectors.$index(0, node._style_rule0$_selector._box0$_inner.value);
-      if (_0_0 != null) {
-        newSelector = _0_0;
-        t1 = true;
-      } else {
-        newSelector = null;
-        t1 = false;
-      }
-      if (t1)
-        return this._clone_css$_visitChildren$2(A.ModifiableCssStyleRule$0(newSelector, node.span, node.originalSelector), node);
+      var _0_0 = this._clone_css$_oldToNewSelectors.$index(0, node._style_rule0$_selector._box0$_inner.value);
+      if (_0_0 != null)
+        return this._clone_css$_visitChildren$2(A.ModifiableCssStyleRule$0(_0_0, node.span, false, node.originalSelector), node);
       else
         throw A.wrapException(A.StateError$(string$.The_Ex));
     },
@@ -90584,51 +91305,51 @@ self.util = _cliPkgRequires.util;
     call$1($arguments) {
       return A._rgb0("rgb", $arguments);
     },
-    $signature: 5
+    $signature: 3
   };
   A.global_closure33.prototype = {
     call$1($arguments) {
       return A._rgb0("rgb", $arguments);
     },
-    $signature: 5
+    $signature: 3
   };
   A.global_closure34.prototype = {
     call$1($arguments) {
       return A._rgbTwoArg0("rgb", $arguments);
     },
-    $signature: 5
+    $signature: 3
   };
   A.global_closure35.prototype = {
     call$1($arguments) {
       var parsed = A._parseChannels0("rgb", A._setArrayType(["$red", "$green", "$blue"], type$.JSArray_String), J.get$first$ax($arguments));
       return parsed instanceof A.SassString0 ? parsed : A._rgb0("rgb", type$.List_Value_2._as(parsed));
     },
-    $signature: 5
+    $signature: 3
   };
   A.global_closure36.prototype = {
     call$1($arguments) {
       return A._rgb0("rgba", $arguments);
     },
-    $signature: 5
+    $signature: 3
   };
   A.global_closure37.prototype = {
     call$1($arguments) {
       return A._rgb0("rgba", $arguments);
     },
-    $signature: 5
+    $signature: 3
   };
   A.global_closure38.prototype = {
     call$1($arguments) {
       return A._rgbTwoArg0("rgba", $arguments);
     },
-    $signature: 5
+    $signature: 3
   };
   A.global_closure39.prototype = {
     call$1($arguments) {
       var parsed = A._parseChannels0("rgba", A._setArrayType(["$red", "$green", "$blue"], type$.JSArray_String), J.get$first$ax($arguments));
       return parsed instanceof A.SassString0 ? parsed : A._rgb0("rgba", type$.List_Value_2._as(parsed));
     },
-    $signature: 5
+    $signature: 3
   };
   A.global_closure40.prototype = {
     call$1($arguments) {
@@ -90641,23 +91362,23 @@ self.util = _cliPkgRequires.util;
         return A._functionString0("invert", t1.take$1($arguments, 1));
       }
       color = t1.$index($arguments, 0).assertColor$1("color");
-      t1 = color.get$red(color);
-      t2 = color.get$green(color);
-      return A._mixColors0(color.changeRgb$3$blue$green$red(255 - color.get$blue(color), 255 - t2, 255 - t1), color, weight);
+      t1 = color.get$red(0);
+      t2 = color.get$green(0);
+      return A._mixColors0(color.changeRgb$3$blue$green$red(255 - color.get$blue(0), 255 - t2, 255 - t1), color, weight);
     },
-    $signature: 5
+    $signature: 3
   };
   A.global_closure41.prototype = {
     call$1($arguments) {
       return A._hsl0("hsl", $arguments);
     },
-    $signature: 5
+    $signature: 3
   };
   A.global_closure42.prototype = {
     call$1($arguments) {
       return A._hsl0("hsl", $arguments);
     },
-    $signature: 5
+    $signature: 3
   };
   A.global_closure43.prototype = {
     call$1($arguments) {
@@ -90667,26 +91388,26 @@ self.util = _cliPkgRequires.util;
       else
         throw A.wrapException(A.SassScriptException$0("Missing argument $lightness.", null));
     },
-    $signature: 17
+    $signature: 19
   };
   A.global_closure44.prototype = {
     call$1($arguments) {
       var parsed = A._parseChannels0("hsl", A._setArrayType(["$hue", "$saturation", "$lightness"], type$.JSArray_String), J.get$first$ax($arguments));
       return parsed instanceof A.SassString0 ? parsed : A._hsl0("hsl", type$.List_Value_2._as(parsed));
     },
-    $signature: 5
+    $signature: 3
   };
   A.global_closure45.prototype = {
     call$1($arguments) {
       return A._hsl0("hsla", $arguments);
     },
-    $signature: 5
+    $signature: 3
   };
   A.global_closure46.prototype = {
     call$1($arguments) {
       return A._hsl0("hsla", $arguments);
     },
-    $signature: 5
+    $signature: 3
   };
   A.global_closure47.prototype = {
     call$1($arguments) {
@@ -90696,14 +91417,14 @@ self.util = _cliPkgRequires.util;
       else
         throw A.wrapException(A.SassScriptException$0("Missing argument $lightness.", null));
     },
-    $signature: 17
+    $signature: 19
   };
   A.global_closure48.prototype = {
     call$1($arguments) {
       var parsed = A._parseChannels0("hsla", A._setArrayType(["$hue", "$saturation", "$lightness"], type$.JSArray_String), J.get$first$ax($arguments));
       return parsed instanceof A.SassString0 ? parsed : A._hsl0("hsla", type$.List_Value_2._as(parsed));
     },
-    $signature: 5
+    $signature: 3
   };
   A.global_closure49.prototype = {
     call$1($arguments) {
@@ -90712,34 +91433,34 @@ self.util = _cliPkgRequires.util;
         return A._functionString0("grayscale", $arguments);
       return t1.$index($arguments, 0).assertColor$1("color").changeHsl$1$saturation(0);
     },
-    $signature: 5
+    $signature: 3
   };
   A.global_closure50.prototype = {
     call$1($arguments) {
       var t1 = J.getInterceptor$asx($arguments),
         color = t1.$index($arguments, 0).assertColor$1("color"),
         degrees = A._angleValue0(t1.$index($arguments, 1), "degrees");
-      return color.changeHsl$1$hue(color.get$hue(color) + degrees);
+      return color.changeHsl$1$hue(color.get$hue(0) + degrees);
     },
-    $signature: 36
+    $signature: 28
   };
   A.global_closure51.prototype = {
     call$1($arguments) {
       var t1 = J.getInterceptor$asx($arguments),
         color = t1.$index($arguments, 0).assertColor$1("color"),
         amount = t1.$index($arguments, 1).assertNumber$1("amount");
-      return color.changeHsl$1$lightness(B.JSNumber_methods.clamp$2(color.get$lightness(color) + amount.valueInRange$3(0, 100, "amount"), 0, 100));
+      return color.changeHsl$1$lightness(B.JSNumber_methods.clamp$2(color.get$lightness(0) + amount.valueInRange$3(0, 100, "amount"), 0, 100));
     },
-    $signature: 36
+    $signature: 28
   };
   A.global_closure52.prototype = {
     call$1($arguments) {
       var t1 = J.getInterceptor$asx($arguments),
         color = t1.$index($arguments, 0).assertColor$1("color"),
         amount = t1.$index($arguments, 1).assertNumber$1("amount");
-      return color.changeHsl$1$lightness(B.JSNumber_methods.clamp$2(color.get$lightness(color) - amount.valueInRange$3(0, 100, "amount"), 0, 100));
+      return color.changeHsl$1$lightness(B.JSNumber_methods.clamp$2(color.get$lightness(0) - amount.valueInRange$3(0, 100, "amount"), 0, 100));
     },
-    $signature: 36
+    $signature: 28
   };
   A.global_closure53.prototype = {
     call$1($arguments) {
@@ -90748,25 +91469,25 @@ self.util = _cliPkgRequires.util;
         return A._functionString0("saturate", $arguments);
       return new A.SassString0("saturate(" + A.serializeValue0(t1.$index($arguments, 0).assertNumber$1("amount"), false, true) + ")", false);
     },
-    $signature: 17
+    $signature: 19
   };
   A.global_closure54.prototype = {
     call$1($arguments) {
       var t1 = J.getInterceptor$asx($arguments),
         color = t1.$index($arguments, 0).assertColor$1("color"),
         amount = t1.$index($arguments, 1).assertNumber$1("amount");
-      return color.changeHsl$1$saturation(B.JSNumber_methods.clamp$2(color.get$saturation(color) + amount.valueInRange$3(0, 100, "amount"), 0, 100));
+      return color.changeHsl$1$saturation(B.JSNumber_methods.clamp$2(color.get$saturation(0) + amount.valueInRange$3(0, 100, "amount"), 0, 100));
     },
-    $signature: 36
+    $signature: 28
   };
   A.global_closure55.prototype = {
     call$1($arguments) {
       var t1 = J.getInterceptor$asx($arguments),
         color = t1.$index($arguments, 0).assertColor$1("color"),
         amount = t1.$index($arguments, 1).assertNumber$1("amount");
-      return color.changeHsl$1$saturation(B.JSNumber_methods.clamp$2(color.get$saturation(color) - amount.valueInRange$3(0, 100, "amount"), 0, 100));
+      return color.changeHsl$1$saturation(B.JSNumber_methods.clamp$2(color.get$saturation(0) - amount.valueInRange$3(0, 100, "amount"), 0, 100));
     },
-    $signature: 36
+    $signature: 28
   };
   A.global_closure56.prototype = {
     call$1($arguments) {
@@ -90775,7 +91496,7 @@ self.util = _cliPkgRequires.util;
         return A._functionString0("alpha", $arguments);
       return A.SassNumber_SassNumber0(argument.assertColor$1("color")._color1$_alpha, null);
     },
-    $signature: 5
+    $signature: 3
   };
   A.global_closure57.prototype = {
     call$1($arguments) {
@@ -90789,13 +91510,13 @@ self.util = _cliPkgRequires.util;
       else
         throw A.wrapException(A.SassScriptException$0("Only 1 argument allowed, but " + t1 + " were passed.", null));
     },
-    $signature: 17
+    $signature: 19
   };
   A.global__closure0.prototype = {
     call$1(argument) {
       return argument instanceof A.SassString0 && !argument._string0$_hasQuotes && B.JSString_methods.contains$1(argument._string0$_text, $.$get$_microsoftFilterStart0());
     },
-    $signature: 54
+    $signature: 53
   };
   A.global_closure58.prototype = {
     call$1($arguments) {
@@ -90804,49 +91525,45 @@ self.util = _cliPkgRequires.util;
         return A._functionString0("opacity", $arguments);
       return A.SassNumber_SassNumber0(t1.$index($arguments, 0).assertColor$1("color")._color1$_alpha, null);
     },
-    $signature: 5
+    $signature: 3
   };
   A.module_closure12.prototype = {
     call$1($arguments) {
-      var result, t2, color,
+      var result, color, t2,
         t1 = J.getInterceptor$asx($arguments),
         weight = t1.$index($arguments, 1).assertNumber$1("weight");
       if (t1.$index($arguments, 0) instanceof A.SassNumber0) {
         if (weight._number1$_value !== 100 || !weight.hasUnit$1("%"))
           throw A.wrapException(string$.Only_oa);
         result = A._functionString0("invert", t1.take$1($arguments, 1));
-        t1 = A.S(t1.$index($arguments, 0));
-        t2 = result.toString$0(0);
-        A.EvaluationContext_current0().warn$2(0, "Passing a number (" + t1 + string$.x29x20to_ci + t2, B.Deprecation_LT8);
+        A.warnForDeprecation0("Passing a number (" + A.S(t1.$index($arguments, 0)) + string$.x29x20to_ci + result.toString$0(0), B.Deprecation_EfO);
         return result;
       }
       color = t1.$index($arguments, 0).assertColor$1("color");
-      t1 = color.get$red(color);
-      t2 = color.get$green(color);
-      return A._mixColors0(color.changeRgb$3$blue$green$red(255 - color.get$blue(color), 255 - t2, 255 - t1), color, weight);
+      t1 = color.get$red(0);
+      t2 = color.get$green(0);
+      return A._mixColors0(color.changeRgb$3$blue$green$red(255 - color.get$blue(0), 255 - t2, 255 - t1), color, weight);
     },
-    $signature: 5
+    $signature: 3
   };
   A.module_closure13.prototype = {
     call$1($arguments) {
-      var result, t2,
+      var result,
         t1 = J.getInterceptor$asx($arguments);
       if (t1.$index($arguments, 0) instanceof A.SassNumber0) {
         result = A._functionString0("grayscale", t1.take$1($arguments, 1));
-        t1 = A.S(t1.$index($arguments, 0));
-        t2 = result.toString$0(0);
-        A.EvaluationContext_current0().warn$2(0, "Passing a number (" + t1 + string$.x29x20to_cg + t2, B.Deprecation_LT8);
+        A.warnForDeprecation0("Passing a number (" + A.S(t1.$index($arguments, 0)) + string$.x29x20to_cg + result.toString$0(0), B.Deprecation_EfO);
         return result;
       }
       return t1.$index($arguments, 0).assertColor$1("color").changeHsl$1$saturation(0);
     },
-    $signature: 5
+    $signature: 3
   };
   A.module_closure14.prototype = {
     call$1($arguments) {
       return A._hwb0($arguments);
     },
-    $signature: 5
+    $signature: 3
   };
   A.module_closure15.prototype = {
     call$1($arguments) {
@@ -90856,35 +91573,32 @@ self.util = _cliPkgRequires.util;
       else
         return A._hwb0(type$.List_Value_2._as(parsed));
     },
-    $signature: 5
+    $signature: 3
   };
   A.module_closure16.prototype = {
     call$1($arguments) {
-      var t1 = J.get$first$ax($arguments).assertColor$1("color");
-      return A.SassNumber_SassNumber0(t1.get$whiteness(t1), "%");
+      return A.SassNumber_SassNumber0(J.get$first$ax($arguments).assertColor$1("color").get$whiteness(0), "%");
     },
     $signature: 12
   };
   A.module_closure17.prototype = {
     call$1($arguments) {
-      var t1 = J.get$first$ax($arguments).assertColor$1("color");
-      return A.SassNumber_SassNumber0(t1.get$blackness(t1), "%");
+      return A.SassNumber_SassNumber0(J.get$first$ax($arguments).assertColor$1("color").get$blackness(0), "%");
     },
     $signature: 12
   };
   A.module_closure18.prototype = {
     call$1($arguments) {
-      var result, t1,
+      var result,
         argument = J.$index$asx($arguments, 0);
       if (argument instanceof A.SassString0 && !argument._string0$_hasQuotes && B.JSString_methods.contains$1(argument._string0$_text, $.$get$_microsoftFilterStart0())) {
         result = A._functionString0("alpha", $arguments);
-        t1 = result.toString$0(0);
-        A.EvaluationContext_current0().warn$2(0, string$.Using_c + t1, B.Deprecation_LT8);
+        A.warnForDeprecation0(string$.Using_c + result.toString$0(0), B.Deprecation_EfO);
         return result;
       }
       return A.SassNumber_SassNumber0(argument.assertColor$1("color")._color1$_alpha, null);
     },
-    $signature: 5
+    $signature: 3
   };
   A.module_closure19.prototype = {
     call$1($arguments) {
@@ -90892,53 +91606,47 @@ self.util = _cliPkgRequires.util;
         t1 = J.getInterceptor$asx($arguments);
       if (B.JSArray_methods.every$1(t1.$index($arguments, 0).get$asList(), new A.module__closure4())) {
         result = A._functionString0("alpha", $arguments);
-        t1 = result.toString$0(0);
-        A.EvaluationContext_current0().warn$2(0, string$.Using_c + t1, B.Deprecation_LT8);
+        A.warnForDeprecation0(string$.Using_c + result.toString$0(0), B.Deprecation_EfO);
         return result;
       }
       throw A.wrapException(A.SassScriptException$0("Only 1 argument allowed, but " + t1.get$length($arguments) + " were passed.", null));
     },
-    $signature: 17
+    $signature: 19
   };
   A.module__closure4.prototype = {
     call$1(argument) {
       return argument instanceof A.SassString0 && !argument._string0$_hasQuotes && B.JSString_methods.contains$1(argument._string0$_text, $.$get$_microsoftFilterStart0());
     },
-    $signature: 54
+    $signature: 53
   };
   A.module_closure20.prototype = {
     call$1($arguments) {
-      var result, t2,
+      var result,
         t1 = J.getInterceptor$asx($arguments);
       if (t1.$index($arguments, 0) instanceof A.SassNumber0) {
         result = A._functionString0("opacity", $arguments);
-        t1 = A.S(t1.$index($arguments, 0));
-        t2 = result.toString$0(0);
-        A.EvaluationContext_current0().warn$2(0, "Passing a number (" + t1 + string$.x20to_co + t2, B.Deprecation_LT8);
+        A.warnForDeprecation0("Passing a number (" + A.S(t1.$index($arguments, 0)) + string$.x20to_co + result.toString$0(0), B.Deprecation_EfO);
         return result;
       }
       return A.SassNumber_SassNumber0(t1.$index($arguments, 0).assertColor$1("color")._color1$_alpha, null);
     },
-    $signature: 5
+    $signature: 3
   };
   A._red_closure0.prototype = {
     call$1($arguments) {
-      var t1 = J.get$first$ax($arguments).assertColor$1("color");
-      return A.SassNumber_SassNumber0(t1.get$red(t1), null);
+      return A.SassNumber_SassNumber0(J.get$first$ax($arguments).assertColor$1("color").get$red(0), null);
     },
     $signature: 12
   };
   A._green_closure0.prototype = {
     call$1($arguments) {
-      var t1 = J.get$first$ax($arguments).assertColor$1("color");
-      return A.SassNumber_SassNumber0(t1.get$green(t1), null);
+      return A.SassNumber_SassNumber0(J.get$first$ax($arguments).assertColor$1("color").get$green(0), null);
     },
     $signature: 12
   };
   A._blue_closure0.prototype = {
     call$1($arguments) {
-      var t1 = J.get$first$ax($arguments).assertColor$1("color");
-      return A.SassNumber_SassNumber0(t1.get$blue(t1), null);
+      return A.SassNumber_SassNumber0(J.get$first$ax($arguments).assertColor$1("color").get$blue(0), null);
     },
     $signature: 12
   };
@@ -90947,71 +91655,68 @@ self.util = _cliPkgRequires.util;
       var t1 = J.getInterceptor$asx($arguments);
       return A._mixColors0(t1.$index($arguments, 0).assertColor$1("color1"), t1.$index($arguments, 1).assertColor$1("color2"), t1.$index($arguments, 2).assertNumber$1("weight"));
     },
-    $signature: 36
+    $signature: 28
   };
   A._hue_closure0.prototype = {
     call$1($arguments) {
-      var t1 = J.get$first$ax($arguments).assertColor$1("color");
-      return A.SassNumber_SassNumber0(t1.get$hue(t1), "deg");
+      return A.SassNumber_SassNumber0(J.get$first$ax($arguments).assertColor$1("color").get$hue(0), "deg");
     },
     $signature: 12
   };
   A._saturation_closure0.prototype = {
     call$1($arguments) {
-      var t1 = J.get$first$ax($arguments).assertColor$1("color");
-      return A.SassNumber_SassNumber0(t1.get$saturation(t1), "%");
+      return A.SassNumber_SassNumber0(J.get$first$ax($arguments).assertColor$1("color").get$saturation(0), "%");
     },
     $signature: 12
   };
   A._lightness_closure0.prototype = {
     call$1($arguments) {
-      var t1 = J.get$first$ax($arguments).assertColor$1("color");
-      return A.SassNumber_SassNumber0(t1.get$lightness(t1), "%");
+      return A.SassNumber_SassNumber0(J.get$first$ax($arguments).assertColor$1("color").get$lightness(0), "%");
     },
     $signature: 12
   };
   A._complement_closure0.prototype = {
     call$1($arguments) {
       var color = J.$index$asx($arguments, 0).assertColor$1("color");
-      return color.changeHsl$1$hue(color.get$hue(color) + 180);
+      return color.changeHsl$1$hue(color.get$hue(0) + 180);
     },
-    $signature: 36
+    $signature: 28
   };
   A._adjust_closure0.prototype = {
     call$1($arguments) {
       return A._updateComponents0($arguments, true, false, false);
     },
-    $signature: 36
+    $signature: 28
   };
   A._scale_closure0.prototype = {
     call$1($arguments) {
       return A._updateComponents0($arguments, false, false, true);
     },
-    $signature: 36
+    $signature: 28
   };
   A._change_closure0.prototype = {
     call$1($arguments) {
       return A._updateComponents0($arguments, false, true, false);
     },
-    $signature: 36
+    $signature: 28
   };
   A._ieHexStr_closure0.prototype = {
     call$1($arguments) {
       var color = J.$index$asx($arguments, 0).assertColor$1("color"),
         t1 = new A._ieHexStr_closure_hexString0();
-      return new A.SassString0("#" + A.S(t1.call$1(A.fuzzyRound0(color._color1$_alpha * 255))) + A.S(t1.call$1(color.get$red(color))) + A.S(t1.call$1(color.get$green(color))) + A.S(t1.call$1(color.get$blue(color))), false);
+      return new A.SassString0("#" + A.S(t1.call$1(A.fuzzyRound0(color._color1$_alpha * 255))) + A.S(t1.call$1(color.get$red(0))) + A.S(t1.call$1(color.get$green(0))) + A.S(t1.call$1(color.get$blue(0))), false);
     },
-    $signature: 17
+    $signature: 19
   };
   A._ieHexStr_closure_hexString0.prototype = {
     call$1(component) {
       return B.JSString_methods.padLeft$2(B.JSInt_methods.toRadixString$1(component, 16), 2, "0").toUpperCase();
     },
-    $signature: 223
+    $signature: 191
   };
   A._updateComponents_getParam0.prototype = {
     call$5$assertPercent$checkPercent$checkUnitless($name, max, assertPercent, checkPercent, checkUnitless) {
-      var t2, t3, t4, _this = this,
+      var t2, _this = this,
         t1 = _this.keywords.remove$1(0, $name),
         number = t1 == null ? null : t1.assertNumber$1($name);
       if (number == null)
@@ -91019,11 +91724,8 @@ self.util = _cliPkgRequires.util;
       t1 = _this.scale;
       t2 = !t1;
       if (t2 && checkUnitless)
-        if (number.get$hasUnits()) {
-          t3 = number.get$unitString();
-          t4 = number.unitSuggestion$1($name);
-          A.EvaluationContext_current0().warn$2(0, "$" + $name + ": Passing a number with unit " + t3 + string$.x20is_de + t4 + string$.x0a_Morex3a, B.Deprecation_0bn);
-        }
+        if (number.get$hasUnits())
+          A.warnForDeprecation0("$" + $name + ": Passing a number with unit " + number.get$unitString() + string$.x20is_de + number.unitSuggestion$1($name) + string$.x0a_Morex3a, B.Deprecation_oCX);
       if (t2 && checkPercent)
         A._checkPercent0(number, $name);
       if (!t2 || assertPercent)
@@ -91050,19 +91752,19 @@ self.util = _cliPkgRequires.util;
     call$3$assertPercent($name, max, assertPercent) {
       return this.call$5$assertPercent$checkPercent$checkUnitless($name, max, assertPercent, false, false);
     },
-    $signature: 227
+    $signature: 189
   };
   A._updateComponents_closure1.prototype = {
     call$1(hue) {
       return A._angleValue0(hue, "hue");
     },
-    $signature: 116
+    $signature: 95
   };
   A._updateComponents_closure2.prototype = {
     call$1($name) {
       return "$" + $name;
     },
-    $signature: 7
+    $signature: 5
   };
   A._updateComponents_updateValue0.prototype = {
     call$3(current, param, max) {
@@ -91076,19 +91778,19 @@ self.util = _cliPkgRequires.util;
       t1 = param > 0 ? max - current : current;
       return current + t1 * (param / 100);
     },
-    $signature: 232
+    $signature: 251
   };
   A._updateComponents_updateRgb0.prototype = {
     call$2(current, param) {
       return A.fuzzyRound0(this.updateValue.call$3(current, param, 255));
     },
-    $signature: 238
+    $signature: 249
   };
   A._functionString_closure0.prototype = {
     call$1(argument) {
       return A.serializeValue0(argument, false, true);
     },
-    $signature: 225
+    $signature: 136
   };
   A._removedColorFunction_closure0.prototype = {
     call$1($arguments) {
@@ -91098,43 +91800,31 @@ self.util = _cliPkgRequires.util;
         t4 = this.negative ? "-" : "";
       throw A.wrapException(A.SassScriptException$0("The function " + t1 + string$.x28__isn + t3 + ", $" + this.argument + ": " + t4 + A.S(t2.$index($arguments, 1)) + string$.x29x0a_Mor + t1, null));
     },
-    $signature: 406
+    $signature: 384
   };
   A._rgb_closure0.prototype = {
     call$1(alpha) {
       return A._percentageOrUnitless0(alpha.assertNumber$1("alpha"), 1, "alpha");
     },
-    $signature: 116
+    $signature: 95
   };
   A._hsl_closure0.prototype = {
     call$1(alpha) {
       return A._percentageOrUnitless0(alpha.assertNumber$1("alpha"), 1, "alpha");
     },
-    $signature: 116
+    $signature: 95
   };
   A._hwb_closure0.prototype = {
     call$1(alpha) {
       return A._percentageOrUnitless0(alpha.assertNumber$1("alpha"), 1, "alpha");
     },
-    $signature: 116
+    $signature: 95
   };
-  A._parseChannels_closure2.prototype = {
-    call$0() {
-      return this._0_0[0];
-    },
-    $signature: 31
-  };
-  A._parseChannels_closure3.prototype = {
+  A._parseChannels_closure0.prototype = {
     call$1(value) {
       return value.get$isVar();
     },
-    $signature: 54
-  };
-  A._parseChannels_closure4.prototype = {
-    call$0() {
-      return type$.SassNumber_2._as(this._1_0).asSlash;
-    },
-    $signature: 407
+    $signature: 53
   };
   A.colorClass_closure.prototype = {
     call$0() {
@@ -91145,7 +91835,7 @@ self.util = _cliPkgRequires.util;
       A.JSClassExtension_injectSuperclass(t1._as(A.SassColor$rgb0(0, 0, 0, 1).constructor), jsClass);
       return jsClass;
     },
-    $signature: 24
+    $signature: 15
   };
   A.colorClass__closure.prototype = {
     call$2($self, color) {
@@ -91183,7 +91873,7 @@ self.util = _cliPkgRequires.util;
         return A.SassColor_SassColor$hwb0(t2, t3, t4, A._asBool($.$get$_isUndefined().call$1(t1)) ? 1 : t1);
       }
     },
-    $signature: 408
+    $signature: 385
   };
   A.colorClass__closure0.prototype = {
     call$2($self, options) {
@@ -91192,37 +91882,37 @@ self.util = _cliPkgRequires.util;
       if (t1.get$whiteness(options) != null || t1.get$blackness(options) != null) {
         t2 = t1.get$hue(options);
         if (t2 == null)
-          t2 = $self.get$hue($self);
+          t2 = $self.get$hue(0);
         t3 = t1.get$whiteness(options);
         if (t3 == null)
-          t3 = $self.get$whiteness($self);
+          t3 = $self.get$whiteness(0);
         t4 = t1.get$blackness(options);
         if (t4 == null)
-          t4 = $self.get$blackness($self);
+          t4 = $self.get$blackness(0);
         t1 = t1.get$alpha(options);
         return $self.changeHwb$4$alpha$blackness$hue$whiteness(t1 == null ? $self._color1$_alpha : t1, t4, t2, t3);
       } else if (t1.get$hue(options) != null || t1.get$saturation(options) != null || t1.get$lightness(options) != null) {
         t2 = t1.get$hue(options);
         if (t2 == null)
-          t2 = $self.get$hue($self);
+          t2 = $self.get$hue(0);
         t3 = t1.get$saturation(options);
         if (t3 == null)
-          t3 = $self.get$saturation($self);
+          t3 = $self.get$saturation(0);
         t4 = t1.get$lightness(options);
         if (t4 == null)
-          t4 = $self.get$lightness($self);
+          t4 = $self.get$lightness(0);
         t1 = t1.get$alpha(options);
         return $self.changeHsl$4$alpha$hue$lightness$saturation(t1 == null ? $self._color1$_alpha : t1, t2, t4, t3);
       } else if (t1.get$red(options) != null || t1.get$green(options) != null || t1.get$blue(options) != null) {
         t2 = A.NullableExtension_andThen0(t1.get$red(options), A.number2__fuzzyRound$closure());
         if (t2 == null)
-          t2 = $self.get$red($self);
+          t2 = $self.get$red(0);
         t3 = A.NullableExtension_andThen0(t1.get$green(options), A.number2__fuzzyRound$closure());
         if (t3 == null)
-          t3 = $self.get$green($self);
+          t3 = $self.get$green(0);
         t4 = A.NullableExtension_andThen0(t1.get$blue(options), A.number2__fuzzyRound$closure());
         if (t4 == null)
-          t4 = $self.get$blue($self);
+          t4 = $self.get$blue(0);
         t1 = t1.get$alpha(options);
         return $self.changeRgb$4$alpha$blue$green$red(t1 == null ? $self._color1$_alpha : t1, t4, t3, t2);
       } else {
@@ -91230,61 +91920,61 @@ self.util = _cliPkgRequires.util;
         return $self.changeAlpha$1(t1 == null ? $self._color1$_alpha : t1);
       }
     },
-    $signature: 409
+    $signature: 386
   };
   A.colorClass__closure1.prototype = {
     call$1($self) {
-      return $self.get$red($self);
+      return $self.get$red(0);
     },
-    $signature: 131
+    $signature: 116
   };
   A.colorClass__closure2.prototype = {
     call$1($self) {
-      return $self.get$green($self);
+      return $self.get$green(0);
     },
-    $signature: 131
+    $signature: 116
   };
   A.colorClass__closure3.prototype = {
     call$1($self) {
-      return $self.get$blue($self);
+      return $self.get$blue(0);
     },
-    $signature: 131
+    $signature: 116
   };
   A.colorClass__closure4.prototype = {
     call$1($self) {
-      return $self.get$hue($self);
+      return $self.get$hue(0);
     },
-    $signature: 64
+    $signature: 57
   };
   A.colorClass__closure5.prototype = {
     call$1($self) {
-      return $self.get$saturation($self);
+      return $self.get$saturation(0);
     },
-    $signature: 64
+    $signature: 57
   };
   A.colorClass__closure6.prototype = {
     call$1($self) {
-      return $self.get$lightness($self);
+      return $self.get$lightness(0);
     },
-    $signature: 64
+    $signature: 57
   };
   A.colorClass__closure7.prototype = {
     call$1($self) {
-      return $self.get$whiteness($self);
+      return $self.get$whiteness(0);
     },
-    $signature: 64
+    $signature: 57
   };
   A.colorClass__closure8.prototype = {
     call$1($self) {
-      return $self.get$blackness($self);
+      return $self.get$blackness(0);
     },
-    $signature: 64
+    $signature: 57
   };
   A.colorClass__closure9.prototype = {
     call$1($self) {
       return $self._color1$_alpha;
     },
-    $signature: 64
+    $signature: 57
   };
   A._Channels.prototype = {};
   A._NodeSassColor.prototype = {};
@@ -91312,7 +92002,8 @@ self.util = _cliPkgRequires.util;
       J.set$dartValue$x(thisArg, A.SassColor$rgb0(t1, t2, t3, t4 == null ? 1 : t4));
     },
     call$2(thisArg, redOrArgb) {
-      return this.call$6(thisArg, redOrArgb, null, null, null, null);
+      var _null = null;
+      return this.call$6(thisArg, redOrArgb, _null, _null, _null, _null);
     },
     call$3(thisArg, redOrArgb, green) {
       return this.call$6(thisArg, redOrArgb, green, null, null, null);
@@ -91328,59 +92019,59 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null, null, null, null];
     },
-    $signature: 412
+    $signature: 389
   };
   A.legacyColorClass_closure0.prototype = {
     call$1(thisArg) {
       return J.get$red$x(J.get$dartValue$x(thisArg));
     },
-    $signature: 133
+    $signature: 118
   };
   A.legacyColorClass_closure1.prototype = {
     call$1(thisArg) {
       return J.get$green$x(J.get$dartValue$x(thisArg));
     },
-    $signature: 133
+    $signature: 118
   };
   A.legacyColorClass_closure2.prototype = {
     call$1(thisArg) {
       return J.get$blue$x(J.get$dartValue$x(thisArg));
     },
-    $signature: 133
+    $signature: 118
   };
   A.legacyColorClass_closure3.prototype = {
     call$1(thisArg) {
       return J.get$dartValue$x(thisArg)._color1$_alpha;
     },
-    $signature: 414
+    $signature: 391
   };
   A.legacyColorClass_closure4.prototype = {
     call$2(thisArg, value) {
       var t1 = J.getInterceptor$x(thisArg);
       t1.set$dartValue(thisArg, t1.get$dartValue(thisArg).changeRgb$1$red(A.fuzzyRound0(B.JSNumber_methods.clamp$2(value, 0, 255))));
     },
-    $signature: 107
+    $signature: 106
   };
   A.legacyColorClass_closure5.prototype = {
     call$2(thisArg, value) {
       var t1 = J.getInterceptor$x(thisArg);
       t1.set$dartValue(thisArg, t1.get$dartValue(thisArg).changeRgb$1$green(A.fuzzyRound0(B.JSNumber_methods.clamp$2(value, 0, 255))));
     },
-    $signature: 107
+    $signature: 106
   };
   A.legacyColorClass_closure6.prototype = {
     call$2(thisArg, value) {
       var t1 = J.getInterceptor$x(thisArg);
       t1.set$dartValue(thisArg, t1.get$dartValue(thisArg).changeRgb$1$blue(A.fuzzyRound0(B.JSNumber_methods.clamp$2(value, 0, 255))));
     },
-    $signature: 107
+    $signature: 106
   };
   A.legacyColorClass_closure7.prototype = {
     call$2(thisArg, value) {
       var t1 = J.getInterceptor$x(thisArg);
       t1.set$dartValue(thisArg, t1.get$dartValue(thisArg).changeRgb$1$alpha(B.JSNumber_methods.clamp$2(value, 0, 1)));
     },
-    $signature: 107
+    $signature: 106
   };
   A.SassColor0.prototype = {
     get$red(_) {
@@ -91432,12 +92123,10 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     get$whiteness(_) {
-      var _this = this;
-      return Math.min(Math.min(_this.get$red(_this), _this.get$green(_this)), _this.get$blue(_this)) / 255 * 100;
+      return Math.min(Math.min(this.get$red(0), this.get$green(0)), this.get$blue(0)) / 255 * 100;
     },
     get$blackness(_) {
-      var _this = this;
-      return 100 - Math.max(Math.max(_this.get$red(_this), _this.get$green(_this)), _this.get$blue(_this)) / 255 * 100;
+      return 100 - Math.max(Math.max(this.get$red(0), this.get$green(0)), this.get$blue(0)) / 255 * 100;
     },
     accept$1$1(visitor) {
       return visitor.visitColor$1(this);
@@ -91450,9 +92139,9 @@ self.util = _cliPkgRequires.util;
     },
     changeRgb$4$alpha$blue$green$red(alpha, blue, green, red) {
       var _this = this,
-        t1 = red == null ? _this.get$red(_this) : red,
-        t2 = green == null ? _this.get$green(_this) : green,
-        t3 = blue == null ? _this.get$blue(_this) : blue;
+        t1 = red == null ? _this.get$red(0) : red,
+        t2 = green == null ? _this.get$green(0) : green,
+        t3 = blue == null ? _this.get$blue(0) : blue;
       return A.SassColor$rgb0(t1, t2, t3, alpha == null ? _this._color1$_alpha : alpha);
     },
     changeRgb$3$blue$green$red(blue, green, red) {
@@ -91472,9 +92161,9 @@ self.util = _cliPkgRequires.util;
     },
     changeHsl$4$alpha$hue$lightness$saturation(alpha, hue, lightness, saturation) {
       var _this = this,
-        t1 = hue == null ? _this.get$hue(_this) : hue,
-        t2 = saturation == null ? _this.get$saturation(_this) : saturation,
-        t3 = lightness == null ? _this.get$lightness(_this) : lightness;
+        t1 = hue == null ? _this.get$hue(0) : hue,
+        t2 = saturation == null ? _this.get$saturation(0) : saturation,
+        t3 = lightness == null ? _this.get$lightness(0) : lightness;
       return A.SassColor$hsl(t1, t2, t3, alpha == null ? _this._color1$_alpha : alpha);
     },
     changeHsl$1$saturation(saturation) {
@@ -91487,7 +92176,7 @@ self.util = _cliPkgRequires.util;
       return this.changeHsl$4$alpha$hue$lightness$saturation(null, hue, null, null);
     },
     changeHwb$4$alpha$blackness$hue$whiteness(alpha, blackness, hue, whiteness) {
-      var t1 = hue == null ? this.get$hue(this) : hue;
+      var t1 = hue == null ? this.get$hue(0) : hue;
       return A.SassColor_SassColor$hwb0(t1, whiteness, blackness, alpha);
     },
     changeAlpha$1(alpha) {
@@ -91513,17 +92202,17 @@ self.util = _cliPkgRequires.util;
       var _this = this;
       if (other == null)
         return false;
-      return other instanceof A.SassColor0 && other.get$red(other) === _this.get$red(_this) && other.get$green(other) === _this.get$green(_this) && other.get$blue(other) === _this.get$blue(_this) && other._color1$_alpha === _this._color1$_alpha;
+      return other instanceof A.SassColor0 && other.get$red(0) === _this.get$red(0) && other.get$green(0) === _this.get$green(0) && other.get$blue(0) === _this.get$blue(0) && other._color1$_alpha === _this._color1$_alpha;
     },
     get$hashCode(_) {
       var _this = this;
-      return B.JSInt_methods.get$hashCode(_this.get$red(_this)) ^ B.JSInt_methods.get$hashCode(_this.get$green(_this)) ^ B.JSInt_methods.get$hashCode(_this.get$blue(_this)) ^ B.JSNumber_methods.get$hashCode(_this._color1$_alpha);
+      return B.JSInt_methods.get$hashCode(_this.get$red(0)) ^ B.JSInt_methods.get$hashCode(_this.get$green(0)) ^ B.JSInt_methods.get$hashCode(_this.get$blue(0)) ^ B.JSNumber_methods.get$hashCode(_this._color1$_alpha);
     },
     _color1$_rgbToHsl$0() {
       var t2, lightness, _this = this,
-        scaledRed = _this.get$red(_this) / 255,
-        scaledGreen = _this.get$green(_this) / 255,
-        scaledBlue = _this.get$blue(_this) / 255,
+        scaledRed = _this.get$red(0) / 255,
+        scaledGreen = _this.get$green(0) / 255,
+        scaledBlue = _this.get$blue(0) / 255,
         max = Math.max(Math.max(scaledRed, scaledGreen), scaledBlue),
         min = Math.min(Math.min(scaledRed, scaledGreen), scaledBlue),
         delta = max - min,
@@ -91551,9 +92240,9 @@ self.util = _cliPkgRequires.util;
     },
     _color1$_hslToRgb$0() {
       var _this = this,
-        scaledHue = _this.get$hue(_this) / 360,
-        scaledSaturation = _this.get$saturation(_this) / 100,
-        scaledLightness = _this.get$lightness(_this) / 100,
+        scaledHue = _this.get$hue(0) / 360,
+        scaledSaturation = _this.get$saturation(0) / 100,
+        scaledLightness = _this.get$lightness(0) / 100,
         m2 = scaledLightness <= 0.5 ? scaledLightness * (scaledSaturation + 1) : scaledLightness + scaledSaturation - scaledLightness * scaledSaturation,
         m1 = scaledLightness * 2 - m2;
       _this._color1$_red = A.fuzzyRound0(A.SassColor__hueToRgb0(m1, m2, scaledHue + 0.3333333333333333) * 255);
@@ -91565,7 +92254,7 @@ self.util = _cliPkgRequires.util;
     call$1(hue) {
       return A.fuzzyRound0((A.SassColor__hueToRgb0(0, 1, hue) * this.factor + this._box_0.scaledWhiteness) * 255);
     },
-    $signature: 210
+    $signature: 159
   };
   A._ColorFormatEnum0.prototype = {
     toString$0(_) {
@@ -91597,7 +92286,7 @@ self.util = _cliPkgRequires.util;
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.NodeCompileResult),
-        $async$returnValue, $async$self = this, t5, t6, t7, t8, t9, t10, t11, result, t1, t2, t3, t4;
+        $async$returnValue, $async$self = this, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, result, t1, t2, t3, t4;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -91621,8 +92310,7 @@ self.util = _cliPkgRequires.util;
               t8 = t2 ? null : J.get$sourceMap$x(t1);
               if (t8 == null)
                 t8 = false;
-              t9 = t2 ? null : J.get$logger$x(t1);
-              t9 = new A.JSToDartLogger(t9, new A.StderrLogger0($async$self.color), $async$self.ascii);
+              t9 = $async$self.logger;
               if (t2)
                 t10 = null;
               else {
@@ -91630,8 +92318,11 @@ self.util = _cliPkgRequires.util;
                 t10 = t10 == null ? null : J.map$1$1$ax(t10, new A.compileAsync__closure(), type$.AsyncImporter);
               }
               t11 = A._parseFunctions0(t2 ? null : J.get$functions$x(t1), true);
+              t12 = A._parseDeprecations(t9, t2 ? null : J.get$fatalDeprecations$x(t1), true);
+              t13 = A._parseDeprecations(t9, t2 ? null : J.get$silenceDeprecations$x(t1), false);
+              t14 = A._parseDeprecations(t9, t2 ? null : J.get$futureDeprecations$x(t1), false);
               $async$goto = 3;
-              return A._asyncAwait(A.compileAsync0($async$self.path, t7, null, t11, null, A.AsyncImportCache$(t10, t3, t9, null), null, null, t9, null, t4, t8, t5, null, true, t6), $async$call$0);
+              return A._asyncAwait(A.compileAsync0($async$self.path, t7, t12, t11, t14, A.AsyncImportCache$(t10, t3, t9, null), null, null, t9, null, t4, t13, t8, t5, null, true, t6), $async$call$0);
             case 3:
               // returning from await.
               result = $async$result;
@@ -91647,19 +92338,19 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 230
+    $signature: 201
   };
   A.compileAsync__closure.prototype = {
     call$1(importer) {
       return A._parseAsyncImporter(importer);
     },
-    $signature: 231
+    $signature: 200
   };
   A.compileStringAsync_closure.prototype = {
     call$0() {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.NodeCompileResult),
-        $async$returnValue, $async$self = this, t7, t8, t9, t10, t11, t12, t13, t14, result, t1, t2, t3, t4, t5, t6;
+        $async$returnValue, $async$self = this, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, result, t1, t2, t3, t4, t5, t6;
       var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -91685,8 +92376,7 @@ self.util = _cliPkgRequires.util;
               t10 = t2 ? null : J.get$sourceMap$x(t1);
               if (t10 == null)
                 t10 = false;
-              t11 = t2 ? null : J.get$logger$x(t1);
-              t11 = new A.JSToDartLogger(t11, new A.StderrLogger0($async$self.color), $async$self.ascii);
+              t11 = $async$self.logger;
               if (t2)
                 t12 = null;
               else {
@@ -91697,8 +92387,11 @@ self.util = _cliPkgRequires.util;
               if (t13 == null)
                 t13 = (t2 ? null : J.get$url$x(t1)) == null ? new A.NoOpImporter0() : null;
               t14 = A._parseFunctions0(t2 ? null : J.get$functions$x(t1), true);
+              t15 = A._parseDeprecations(t11, t2 ? null : J.get$fatalDeprecations$x(t1), true);
+              t16 = A._parseDeprecations(t11, t2 ? null : J.get$silenceDeprecations$x(t1), false);
+              t17 = A._parseDeprecations(t11, t2 ? null : J.get$futureDeprecations$x(t1), false);
               $async$goto = 3;
-              return A._asyncAwait(A.compileStringAsync0($async$self.text, t9, t14, A.AsyncImportCache$(t12, t5, t11, null), t13, null, null, t11, null, t6, t10, t7, t3, t4, true, t8), $async$call$0);
+              return A._asyncAwait(A.compileStringAsync0($async$self.text, t9, t15, t14, t17, A.AsyncImportCache$(t12, t5, t11, null), t13, null, null, t11, null, t6, t16, t10, t7, t3, t4, true, t8), $async$call$0);
             case 3:
               // returning from await.
               result = $async$result;
@@ -91714,19 +92407,19 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$0, $async$completer);
     },
-    $signature: 230
+    $signature: 201
   };
   A.compileStringAsync__closure.prototype = {
     call$1(importer) {
       return A._parseAsyncImporter(importer);
     },
-    $signature: 231
+    $signature: 200
   };
   A.compileStringAsync__closure0.prototype = {
     call$1(importer) {
       return A._parseAsyncImporter(importer);
     },
-    $signature: 418
+    $signature: 395
   };
   A._wrapAsyncSassExceptions_closure.prototype = {
     call$1(error) {
@@ -91737,43 +92430,7 @@ self.util = _cliPkgRequires.util;
         t1 = A.jsThrow(error == null ? type$.Object._as(error) : error);
       return t1;
     },
-    $signature: 419
-  };
-  A._simplifyValue_closure.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature: 22
-  };
-  A._simplifyValue_closure0.prototype = {
-    call$0() {
-      return "calc" === this._0_1._readFinal$0();
-    },
-    $signature: 1
-  };
-  A._simplifyValue_closure1.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 138
-  };
-  A._simplifyValue_closure2.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_4._readFinal$0());
-    },
-    $signature: 3
-  };
-  A._simplifyValue_closure3.prototype = {
-    call$0() {
-      return J.$index$asx(this._0_4._readFinal$0(), 0);
-    },
-    $signature: 14
-  };
-  A._simplifyValue_closure4.prototype = {
-    call$0() {
-      return "clamp" === this._0_1._readFinal$0();
-    },
-    $signature: 1
+    $signature: 396
   };
   A._parseFunctions_closure0.prototype = {
     call$2(signature, callback) {
@@ -91781,15 +92438,15 @@ self.util = _cliPkgRequires.util;
         t1 = this.result;
       if (!this.asynch) {
         callable = A._Cell$();
-        callable._value = A.Callable_Callable$fromSignature(signature, new A._parseFunctions__closure2(callback, callable), true);
+        callable.__late_helper$_value = A.Callable_Callable$fromSignature(signature, new A._parseFunctions__closure2(callback, callable), true);
         t1.push(callable._readLocal$0());
       } else {
         callable = A._Cell$();
-        callable._value = A.AsyncCallable_AsyncCallable$fromSignature(signature, new A._parseFunctions__closure3(callback, callable), true);
+        callable.__late_helper$_value = A.AsyncCallable_AsyncCallable$fromSignature(signature, new A._parseFunctions__closure3(callback, callable), true);
         t1.push(callable._readLocal$0());
       }
     },
-    $signature: 135
+    $signature: 120
   };
   A._parseFunctions__closure2.prototype = {
     call$1($arguments) {
@@ -91805,13 +92462,13 @@ self.util = _cliPkgRequires.util;
       else
         throw A.wrapException(_s42_ + J.get$name$x(t2.readLocal$0()) + '": ' + A.S(result) + " is not a sass.Value.");
     },
-    $signature: 5
+    $signature: 3
   };
   A._parseFunctions___closure6.prototype = {
     call$0() {
       return type$.Function._as(this.callback).call$1(A.toJSArray(this.$arguments));
     },
-    $signature: 58
+    $signature: 60
   };
   A._parseFunctions__closure3.prototype = {
     call$1($arguments) {
@@ -91854,24 +92511,355 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$1, $async$completer);
     },
-    $signature: 99
+    $signature: 88
   };
   A._parseFunctions___closure5.prototype = {
     call$0() {
       return type$.Function._as(this.callback).call$1(A.toJSArray(this.$arguments));
     },
-    $signature: 58
+    $signature: 60
+  };
+  A._parseDeprecations_closure.prototype = {
+    call$0() {
+      return new A._SyncStarIterable(this.$call$body$_parseDeprecations_closure(), type$._SyncStarIterable_Deprecation);
+    },
+    $call$body$_parseDeprecations_closure() {
+      var $async$self = this;
+      return function() {
+        var $async$goto = 0, $async$handler = 1, $async$currentError, t1, t2, t3, t4, item, t5, id, deprecation, version;
+        return function $async$call$0($async$iterator, $async$errorCode, $async$result) {
+          if ($async$errorCode === 1) {
+            $async$currentError = $async$result;
+            $async$goto = $async$handler;
+          }
+          while (true)
+            switch ($async$goto) {
+              case 0:
+                // Function start
+                t1 = J.get$iterator$ax($async$self.deprecations), t2 = type$.Deprecation_2, t3 = $async$self.supportVersions, t4 = $async$self.logger;
+              case 2:
+                // for condition
+                if (!t1.moveNext$0()) {
+                  // goto after for
+                  $async$goto = 3;
+                  break;
+                }
+                item = t1.get$current(t1);
+                t5 = typeof item == "string";
+                id = t5 ? item : null;
+                $async$goto = t5 ? 4 : 5;
+                break;
+              case 4:
+                // then
+                deprecation = A.Deprecation_fromId0(id);
+                $async$goto = deprecation == null ? 6 : 8;
+                break;
+              case 6:
+                // then
+                t4.internalWarn$4$deprecation$span$trace('Invalid deprecation "' + A.S(id) + '".', null, null, null);
+                // goto join
+                $async$goto = 7;
+                break;
+              case 8:
+                // else
+                $async$goto = 9;
+                return $async$iterator._async$_current = deprecation, 1;
+              case 9:
+                // after yield
+              case 7:
+                // join
+                // goto for condition
+                $async$goto = 2;
+                break;
+              case 5:
+                // join
+                t5 = t2._is(item);
+                id = t5 ? J.get$id$x(item) : null;
+                $async$goto = t5 ? 10 : 11;
+                break;
+              case 10:
+                // then
+                deprecation = A.Deprecation_fromId0(id);
+                $async$goto = deprecation == null ? 12 : 14;
+                break;
+              case 12:
+                // then
+                t4.internalWarn$4$deprecation$span$trace('Invalid deprecation "' + A.S(id) + '".', null, null, null);
+                // goto join
+                $async$goto = 13;
+                break;
+              case 14:
+                // else
+                $async$goto = 15;
+                return $async$iterator._async$_current = deprecation, 1;
+              case 15:
+                // after yield
+              case 13:
+                // join
+                // goto for condition
+                $async$goto = 2;
+                break;
+              case 11:
+                // join
+                if (item instanceof A.Version) {
+                  t5 = t3;
+                  version = item;
+                } else {
+                  version = null;
+                  t5 = false;
+                }
+                $async$goto = t5 ? 16 : 17;
+                break;
+              case 16:
+                // then
+                $async$goto = 18;
+                return $async$iterator._yieldStar$1(A.Deprecation_forVersion0(version));
+              case 18:
+                // after yield
+              case 17:
+                // join
+                // goto for condition
+                $async$goto = 2;
+                break;
+              case 3:
+                // after for
+                // implicit return
+                return 0;
+              case 1:
+                // rethrow
+                return $async$iterator._datum = $async$currentError, 3;
+            }
+        };
+      };
+    },
+    $signature: 398
+  };
+  A.nodePackageImporterClass_closure.prototype = {
+    call$0() {
+      return type$.JSClass._as(A.allowInteropCaptureThisNamed("sass.NodePackageImporter", new A.nodePackageImporterClass__closure()));
+    },
+    $signature: 15
+  };
+  A.nodePackageImporterClass__closure.prototype = {
+    call$2($self, entrypointDirectory) {
+      var directory, t1, filename, t2, _null = null,
+        _0_3 = A.entrypointFilename();
+      $label0$0: {
+        if (entrypointDirectory != null) {
+          directory = entrypointDirectory == null ? A._asString(entrypointDirectory) : entrypointDirectory;
+          t1 = directory;
+          break $label0$0;
+        }
+        if (_0_3 != null) {
+          filename = _0_3 == null ? A._asString(_0_3) : _0_3;
+          t1 = $.$get$context().dirname$1(filename);
+          break $label0$0;
+        }
+        t1 = A.throwExpression("The Node package importer cannot determine an entry point because `require.main.filename` is not defined. Please provide an `entryPointDirectory` to the `NodePackageImporter`.");
+      }
+      t2 = new A.NodePackageImporter0();
+      if (A.isBrowser())
+        A.throwExpression(string$.The_No);
+      t2._node_package$__NodePackageImporter__entryPointDirectory_F = A.absolute(t1, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null);
+      return t2;
+    },
+    call$1($self) {
+      return this.call$2($self, null);
+    },
+    "call*": "call$2",
+    $requiredArgCount: 1,
+    $defaultValues() {
+      return [null];
+    },
+    $signature: 399
   };
   A._compileStylesheet_closure1.prototype = {
     call$1(url) {
       return url === "" ? A.Uri_Uri$dataFromString(A.String_String$fromCharCodes(B.NativeUint32List_methods.sublist$2(this.stylesheet.span.file._decodedChars, 0, null), 0, null), B.C_Utf8Codec, null).get$_text() : this.importCache.sourceMapUrl$1(0, A.Uri_parse(url)).toString$0(0);
     },
-    $signature: 7
+    $signature: 5
   };
   A.CompileOptions.prototype = {};
   A.CompileStringOptions.prototype = {};
   A.NodeCompileResult.prototype = {};
   A.CompileResult0.prototype = {};
+  A.Compiler.prototype = {};
+  A.AsyncCompiler.prototype = {
+    addCompilation$1(compilation) {
+      this.compilations.add$1(0, A.promiseToFuture0(compilation, type$.dynamic).catchError$1(new A.AsyncCompiler_addCompilation_closure()));
+    }
+  };
+  A.AsyncCompiler_addCompilation_closure.prototype = {
+    call$1(err) {
+    },
+    $signature: 61
+  };
+  A.compilerClass_closure.prototype = {
+    call$0() {
+      var t1 = type$.JSClass,
+        jsClass = t1._as(A.allowInteropCaptureThisNamed("sass.Compiler", new A.compilerClass__closure()));
+      A.LinkedHashMap_LinkedHashMap$_literal(["compile", new A.compilerClass__closure0(), "compileString", new A.compilerClass__closure1(), "dispose", new A.compilerClass__closure2()], type$.String, type$.Function).forEach$1(0, A.JSClassExtension_get_defineMethod(jsClass));
+      A.JSClassExtension_injectSuperclass(t1._as(new A.Compiler().constructor), jsClass);
+      return jsClass;
+    },
+    $signature: 15
+  };
+  A.compilerClass__closure.prototype = {
+    call$1($self) {
+      return A.LinkedHashSet_LinkedHashSet$_literal([A.jsThrow(new self.Error("Compiler can not be directly constructed. Please use `sass.initCompiler()` instead."))], type$.Never);
+    },
+    $signature: 199
+  };
+  A.compilerClass__closure0.prototype = {
+    call$3($self, path, options) {
+      if ($self._disposed)
+        A.jsThrow(new self.Error("Compiler has already been disposed."));
+      return A.compile0(path, options);
+    },
+    call$2($self, path) {
+      return this.call$3($self, path, null);
+    },
+    "call*": "call$3",
+    $requiredArgCount: 2,
+    $defaultValues() {
+      return [null];
+    },
+    $signature: 401
+  };
+  A.compilerClass__closure1.prototype = {
+    call$3($self, source, options) {
+      if ($self._disposed)
+        A.jsThrow(new self.Error("Compiler has already been disposed."));
+      return A.compileString0(source, options);
+    },
+    call$2($self, source) {
+      return this.call$3($self, source, null);
+    },
+    "call*": "call$3",
+    $requiredArgCount: 2,
+    $defaultValues() {
+      return [null];
+    },
+    $signature: 402
+  };
+  A.compilerClass__closure2.prototype = {
+    call$1($self) {
+      $self._disposed = true;
+    },
+    $signature: 403
+  };
+  A.asyncCompilerClass_closure.prototype = {
+    call$0() {
+      var t1 = type$.JSClass,
+        jsClass = t1._as(A.allowInteropCaptureThisNamed("sass.AsyncCompiler", new A.asyncCompilerClass__closure()));
+      A.LinkedHashMap_LinkedHashMap$_literal(["compileAsync", new A.asyncCompilerClass__closure0(), "compileStringAsync", new A.asyncCompilerClass__closure1(), "dispose", new A.asyncCompilerClass__closure2()], type$.String, type$.Function).forEach$1(0, A.JSClassExtension_get_defineMethod(jsClass));
+      A.JSClassExtension_injectSuperclass(t1._as(new A.AsyncCompiler(new A.FutureGroup(new A._AsyncCompleter(new A._Future($.Zone__current, type$._Future_List_void), type$._AsyncCompleter_List_void), [], type$.FutureGroup_void)).constructor), jsClass);
+      return jsClass;
+    },
+    $signature: 15
+  };
+  A.asyncCompilerClass__closure.prototype = {
+    call$1($self) {
+      return A.LinkedHashSet_LinkedHashSet$_literal([A.jsThrow(new self.Error("AsyncCompiler can not be directly constructed. Please use `sass.initAsyncCompiler()` instead."))], type$.Never);
+    },
+    $signature: 199
+  };
+  A.asyncCompilerClass__closure0.prototype = {
+    call$3($self, path, options) {
+      var compilation;
+      if ($self._disposed)
+        A.jsThrow(new self.Error("Compiler has already been disposed."));
+      compilation = A.compileAsync1(path, options);
+      $self.addCompilation$1(compilation);
+      return compilation;
+    },
+    call$2($self, path) {
+      return this.call$3($self, path, null);
+    },
+    "call*": "call$3",
+    $requiredArgCount: 2,
+    $defaultValues() {
+      return [null];
+    },
+    $signature: 404
+  };
+  A.asyncCompilerClass__closure1.prototype = {
+    call$3($self, source, options) {
+      var compilation;
+      if ($self._disposed)
+        A.jsThrow(new self.Error("Compiler has already been disposed."));
+      compilation = A.compileStringAsync1(source, options);
+      $self.addCompilation$1(compilation);
+      return compilation;
+    },
+    call$2($self, source) {
+      return this.call$3($self, source, null);
+    },
+    "call*": "call$3",
+    $requiredArgCount: 2,
+    $defaultValues() {
+      return [null];
+    },
+    $signature: 405
+  };
+  A.asyncCompilerClass__closure2.prototype = {
+    call$1($self) {
+      $self._disposed = true;
+      return A.futureToPromise0(new A.asyncCompilerClass___closure($self).call$0());
+    },
+    $signature: 406
+  };
+  A.asyncCompilerClass___closure.prototype = {
+    call$0() {
+      var $async$goto = 0,
+        $async$completer = A._makeAsyncAwaitCompleter(type$.Null),
+        $async$self = this, t1;
+      var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
+        if ($async$errorCode === 1)
+          return A._asyncRethrow($async$result, $async$completer);
+        while (true)
+          switch ($async$goto) {
+            case 0:
+              // Function start
+              t1 = $async$self.self.compilations;
+              t1.close$0(0);
+              $async$goto = 2;
+              return A._asyncAwait(t1._future_group$_completer.future, $async$call$0);
+            case 2:
+              // returning from await.
+              // implicit return
+              return A._asyncReturn(null, $async$completer);
+          }
+      });
+      return A._asyncStartSync($async$call$0, $async$completer);
+    },
+    $signature: 2
+  };
+  A.initAsyncCompiler_closure.prototype = {
+    call$0() {
+      var $async$goto = 0,
+        $async$completer = A._makeAsyncAwaitCompleter(type$.AsyncCompiler),
+        $async$returnValue;
+      var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
+        if ($async$errorCode === 1)
+          return A._asyncRethrow($async$result, $async$completer);
+        while (true)
+          switch ($async$goto) {
+            case 0:
+              // Function start
+              $async$returnValue = new A.AsyncCompiler(new A.FutureGroup(new A._AsyncCompleter(new A._Future($.Zone__current, type$._Future_List_void), type$._AsyncCompleter_List_void), [], type$.FutureGroup_void));
+              // goto return
+              $async$goto = 1;
+              break;
+            case 1:
+              // return
+              return A._asyncReturn($async$returnValue, $async$completer);
+          }
+      });
+      return A._asyncStartSync($async$call$0, $async$completer);
+    },
+    $signature: 407
+  };
   A.ComplexSassNumber0.prototype = {
     get$numeratorUnits(_) {
       return this._complex0$_numeratorUnits;
@@ -91914,24 +92902,25 @@ self.util = _cliPkgRequires.util;
       return value;
     },
     get$singleCompound() {
-      var _0_0, _0_4, selector, t1;
+      var _0_0, _0_4, t1, selector, _null = null;
       if (this.leadingCombinators.length !== 0)
-        return null;
+        return _null;
       _0_0 = this.components;
-      _0_4 = A._InitializedCell$(new A.ComplexSelector_singleCompound_closure0(_0_0));
       $label0$0: {
         if (_0_0.length === 1) {
-          selector = _0_4._readFinal$0().selector;
-          t1 = _0_4._readFinal$0().combinators.length <= 0;
+          _0_4 = _0_0[0];
+          t1 = _0_4;
+          selector = t1.selector;
+          t1 = _0_4.combinators.length <= 0;
         } else {
-          selector = null;
+          selector = _null;
           t1 = false;
         }
         if (t1) {
           t1 = selector;
           break $label0$0;
         }
-        t1 = null;
+        t1 = _null;
         break $label0$0;
       }
       return t1;
@@ -91946,44 +92935,33 @@ self.util = _cliPkgRequires.util;
       return this.leadingCombinators.length === 0 && other.leadingCombinators.length === 0 && A.complexIsSuperselector0(this.components, other.components);
     },
     withAdditionalCombinators$1(combinators) {
-      var _0_0, _0_1, initial, last, t1, t2, _this = this, _null = null;
+      var _0_0, _0_1, t1, initial, last, _this = this;
       if (combinators.length === 0)
         return _this;
       _0_0 = _this.components;
-      _0_1 = A._InitializedCell$(new A.ComplexSelector_withAdditionalCombinators_closure0(_0_0));
       $label0$0: {
-        if (_0_1._readFinal$0() >= 1) {
-          initial = B.JSArray_methods.sublist$2(_0_0, 0, _0_1._readFinal$0() - 1);
-          last = _0_0[_0_1._readFinal$0() - 1];
-          last = last;
-          t1 = true;
-        } else {
-          last = _null;
-          initial = last;
-          t1 = false;
-        }
-        if (t1) {
+        _0_1 = _0_0.length;
+        if (_0_1 >= 1) {
+          t1 = _0_1 - 1;
+          initial = B.JSArray_methods.sublist$2(_0_0, 0, t1);
+          last = _0_0[t1];
           t1 = A.List_List$of(initial, true, type$.ComplexSelectorComponent_2);
           t1.push(last.withAdditionalCombinators$1(combinators));
-          t2 = _this.lineBreak || false;
-          t2 = A.ComplexSelector$0(_this.leadingCombinators, t1, _this.span, t2);
-          t1 = t2;
+          t1 = A.ComplexSelector$0(_this.leadingCombinators, t1, _this.span, _this.lineBreak);
           break $label0$0;
         }
-        if (_0_1._readFinal$0() <= 0) {
+        if (_0_1 <= 0) {
           t1 = A.List_List$of(_this.leadingCombinators, true, type$.CssValue_Combinator_2);
           B.JSArray_methods.addAll$1(t1, combinators);
-          t2 = _this.lineBreak || false;
-          t2 = A.ComplexSelector$0(t1, B.List_empty13, _this.span, t2);
-          t1 = t2;
+          t1 = A.ComplexSelector$0(t1, B.List_empty15, _this.span, _this.lineBreak);
           break $label0$0;
         }
-        t1 = _null;
+        throw A.wrapException(A.ReachabilityError$(string$.None_o));
       }
       return t1;
     },
     concatenate$3$forceLineBreak(child, span, forceLineBreak) {
-      var t2, _0_1, initial, last, t3, t4, _this = this,
+      var t2, _0_1, initial, last, _this = this,
         t1 = child.leadingCombinators,
         _0_0 = _this.components;
       if (t1.length === 0) {
@@ -91992,28 +92970,21 @@ self.util = _cliPkgRequires.util;
         t2 = _this.lineBreak || child.lineBreak || forceLineBreak;
         return A.ComplexSelector$0(_this.leadingCombinators, t1, span, t2);
       } else {
-        _0_1 = A._InitializedCell$(new A.ComplexSelector_concatenate_closure0(_0_0));
-        if (_0_1._readFinal$0() >= 1) {
-          initial = B.JSArray_methods.sublist$2(_0_0, 0, _0_1._readFinal$0() - 1);
-          last = _0_0[_0_1._readFinal$0() - 1];
-          last = last;
-          t2 = true;
-        } else {
-          initial = null;
-          last = null;
-          t2 = false;
-        }
-        t3 = _this.leadingCombinators;
-        t4 = child.components;
-        if (t2) {
+        _0_1 = _0_0.length;
+        if (_0_1 >= 1) {
+          t2 = _0_1 - 1;
+          initial = B.JSArray_methods.sublist$2(_0_0, 0, t2);
+          last = _0_0[t2];
           t2 = A.List_List$of(initial, true, type$.ComplexSelectorComponent_2);
           t2.push(last.withAdditionalCombinators$1(t1));
-          B.JSArray_methods.addAll$1(t2, t4);
-          return A.ComplexSelector$0(t3, t2, span, _this.lineBreak || child.lineBreak || forceLineBreak);
+          B.JSArray_methods.addAll$1(t2, child.components);
+          t1 = _this.lineBreak || child.lineBreak || forceLineBreak;
+          return A.ComplexSelector$0(_this.leadingCombinators, t2, span, t1);
         } else {
-          t2 = A.List_List$of(t3, true, type$.CssValue_Combinator_2);
+          t2 = A.List_List$of(_this.leadingCombinators, true, type$.CssValue_Combinator_2);
           B.JSArray_methods.addAll$1(t2, t1);
-          return A.ComplexSelector$0(t2, t4, span, _this.lineBreak || child.lineBreak || forceLineBreak);
+          t1 = _this.lineBreak || child.lineBreak || forceLineBreak;
+          return A.ComplexSelector$0(t2, child.components, span, t1);
         }
       }
     },
@@ -92033,25 +93004,7 @@ self.util = _cliPkgRequires.util;
     call$2(sum, component) {
       return sum + component.selector.get$specificity();
     },
-    $signature: 421
-  };
-  A.ComplexSelector_singleCompound_closure0.prototype = {
-    call$0() {
-      return this._0_0[0];
-    },
-    $signature: 422
-  };
-  A.ComplexSelector_withAdditionalCombinators_closure0.prototype = {
-    call$0() {
-      return this._0_0.length;
-    },
-    $signature: 3
-  };
-  A.ComplexSelector_concatenate_closure0.prototype = {
-    call$0() {
-      return this._0_0.length;
-    },
-    $signature: 3
+    $signature: 408
   };
   A.ComplexSelectorComponent0.prototype = {
     withAdditionalCombinators$1(combinators) {
@@ -92089,7 +93042,7 @@ self.util = _cliPkgRequires.util;
     call$1(combinator) {
       return " " + combinator.toString$0(0);
     },
-    $signature: 423
+    $signature: 409
   };
   A.CompoundSelector0.prototype = {
     get$specificity() {
@@ -92103,6 +93056,17 @@ self.util = _cliPkgRequires.util;
       }
       return value;
     },
+    get$hasComplicatedSuperselectorSemantics() {
+      var result, _this = this,
+        value = _this._compound$__CompoundSelector_hasComplicatedSuperselectorSemantics_FI;
+      if (value === $) {
+        result = B.JSArray_methods.any$1(_this.components, new A.CompoundSelector_hasComplicatedSuperselectorSemantics_closure0());
+        _this._compound$__CompoundSelector_hasComplicatedSuperselectorSemantics_FI !== $ && A.throwUnnamedLateFieldADI();
+        _this._compound$__CompoundSelector_hasComplicatedSuperselectorSemantics_FI = result;
+        value = result;
+      }
+      return value;
+    },
     accept$1$1(visitor) {
       return visitor.visitCompoundSelector$1(this);
     },
@@ -92122,48 +93086,35 @@ self.util = _cliPkgRequires.util;
     call$2(sum, component) {
       return sum + component.get$specificity();
     },
-    $signature: 424
+    $signature: 410
+  };
+  A.CompoundSelector_hasComplicatedSuperselectorSemantics_closure0.prototype = {
+    call$1(component) {
+      return component.get$hasComplicatedSuperselectorSemantics();
+    },
+    $signature: 14
   };
   A.Configuration0.prototype = {
     throughForward$1($forward) {
-      var _0_0, prefix, t1, _1_0, shownVariables, _2_0, hiddenVariables,
+      var _0_0, _1_0, _2_0, t1, hiddenVariables,
         newValues = this._configuration0$_values;
       if (newValues.get$isEmpty(newValues))
         return B.Configuration_Map_empty_null0;
       _0_0 = $forward.prefix;
-      if (_0_0 != null) {
-        prefix = _0_0;
-        t1 = true;
-      } else {
-        prefix = null;
-        t1 = false;
-      }
-      if (t1)
-        newValues = new A.UnprefixedMapView0(newValues, prefix, type$.UnprefixedMapView_ConfiguredValue_2);
+      if (_0_0 != null)
+        newValues = new A.UnprefixedMapView0(newValues, _0_0, type$.UnprefixedMapView_ConfiguredValue_2);
       _1_0 = $forward.shownVariables;
-      if (_1_0 != null) {
-        shownVariables = _1_0;
-        t1 = true;
-      } else {
-        shownVariables = null;
-        t1 = false;
-      }
-      if (t1)
-        newValues = new A.LimitedMapView0(newValues, shownVariables._base.intersection$1(new A.MapKeySet(newValues, type$.MapKeySet_nullable_Object)), type$.LimitedMapView_String_ConfiguredValue_2);
+      if (_1_0 != null)
+        newValues = new A.LimitedMapView0(newValues, _1_0._base.intersection$1(new A.MapKeySet(newValues, type$.MapKeySet_nullable_Object)), type$.LimitedMapView_String_ConfiguredValue_2);
       else {
         _2_0 = $forward.hiddenVariables;
         if (_2_0 != null) {
+          t1 = _2_0._base.get$isNotEmpty(0);
           hiddenVariables = _2_0;
-          t1 = true;
         } else {
           hiddenVariables = null;
           t1 = false;
         }
-        if (t1) {
-          t1 = hiddenVariables._base;
-          t1 = t1.get$isNotEmpty(t1);
-        } else
-          t1 = false;
         if (t1)
           newValues = A.LimitedMapView$blocklist0(newValues, hiddenVariables, type$.String, type$.ConfiguredValue_2);
       }
@@ -92174,13 +93125,11 @@ self.util = _cliPkgRequires.util;
       return new A.Configuration0(values, t1 == null ? this : t1);
     },
     toString$0(_) {
-      var t2, t3, $name, value,
+      var t2, t3,
         t1 = A._setArrayType([], type$.JSArray_String);
       for (t2 = A.MapExtensions_get_pairs0(new A.UnmodifiableMapView(this._configuration0$_values, type$.UnmodifiableMapView_String_ConfiguredValue_2), type$.String, type$.ConfiguredValue_2), t2 = t2.get$iterator(t2); t2.moveNext$0();) {
         t3 = t2.get$current(t2);
-        $name = t3._0;
-        value = t3._1;
-        t1.push("$" + $name + ": " + value.toString$0(0));
+        t1.push("$" + t3._0 + ": " + t3._1.toString$0(0));
       }
       return "(" + B.JSArray_methods.join$1(t1, ",") + ")";
     }
@@ -92233,7 +93182,7 @@ self.util = _cliPkgRequires.util;
     },
     toString$0(_) {
       var t1 = this.$arguments;
-      return t1.get$isEmpty(t1) ? "@content;" : "@content(" + t1.toString$0(0) + ");";
+      return t1.get$isEmpty(0) ? "@content;" : "@content(" + t1.toString$0(0) + ");";
     },
     $isAstNode0: 1,
     $isStatement0: 1,
@@ -92245,17 +93194,20 @@ self.util = _cliPkgRequires.util;
     call$1($function) {
       return $function.name;
     },
-    $signature: 425
+    $signature: 411
   };
   A.CssParser0.prototype = {
     get$plainCss() {
       return true;
     },
     silentComment$0() {
-      var t1 = this.scanner,
-        t2 = t1._string_scanner$_position;
-      this.super$Parser$silentComment0();
-      this.error$2(0, string$.Silent, t1.spanFrom$1(new A._SpanScannerState(t1, t2)));
+      var t1, t2, _this = this;
+      if (_this._stylesheet0$_inExpression)
+        return false;
+      t1 = _this.scanner;
+      t2 = t1._string_scanner$_position;
+      _this.super$Parser$silentComment0();
+      _this.error$2(0, string$.Silent, t1.spanFrom$1(new A._SpanScannerState(t1, t2)));
     },
     atRule$2$root(child, root) {
       var $name, _0_0, _this = this,
@@ -92267,7 +93219,7 @@ self.util = _cliPkgRequires.util;
       _0_0 = $name.get$asPlain();
       $label0$0: {
         if ("at-root" === _0_0 || "content" === _0_0 || "debug" === _0_0 || "each" === _0_0 || "error" === _0_0 || "extend" === _0_0 || "for" === _0_0 || "function" === _0_0 || "if" === _0_0 || "include" === _0_0 || "mixin" === _0_0 || "return" === _0_0 || "warn" === _0_0 || "while" === _0_0)
-          _this._css$_forbiddenAtRoot$1(start);
+          _this._css$_forbiddenAtRule$1(start);
         if ("import" === _0_0) {
           t1 = _this._css$_cssImportRule$1(start);
           break $label0$0;
@@ -92289,7 +93241,7 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    _css$_forbiddenAtRoot$1(start) {
+    _css$_forbiddenAtRule$1(start) {
       this.almostAnyValue$0();
       this.error$2(0, "This at-rule isn't allowed in plain CSS.", this.scanner.spanFrom$1(start));
     },
@@ -92325,22 +93277,15 @@ self.util = _cliPkgRequires.util;
       return new A.ParenthesizedExpression0(expression, t1.spanFrom$1(new A._SpanScannerState(t1, t2)));
     },
     identifierLike$0() {
-      var specialFunction, t2, allowEmptySecondArg, $arguments, t3, t4, _this = this, _null = null,
+      var t2, allowEmptySecondArg, $arguments, t3, t4, _this = this,
         t1 = _this.scanner,
         start = new A._SpanScannerState(t1, t1._string_scanner$_position),
         identifier = _this.interpolatedIdentifier$0(),
         plain = identifier.get$asPlain(),
         lower = plain.toLowerCase(),
         _0_0 = _this.trySpecialFunction$2(lower, start);
-      if (_0_0 != null) {
-        specialFunction = _0_0;
-        t2 = true;
-      } else {
-        specialFunction = _null;
-        t2 = false;
-      }
-      if (t2)
-        return specialFunction;
+      if (_0_0 != null)
+        return _0_0;
       t2 = t1._string_scanner$_position;
       if (t1.scanChar$1(46))
         return _this.namespacedExpression$2(plain, start);
@@ -92367,7 +93312,10 @@ self.util = _cliPkgRequires.util;
         _this.error$2(0, string$.This_f, t1.spanFrom$1(start));
       t2 = t1.spanFrom$1(new A._SpanScannerState(t1, t2));
       t3 = type$.Expression_2;
-      return new A.FunctionExpression0(_null, plain, new A.ArgumentInvocation0(A.List_List$unmodifiable($arguments, t3), A.ConstantMap_ConstantMap$from(B.Map_empty14, type$.String, t3), _null, _null, t2), t1.spanFrom$1(start));
+      t4 = A.List_List$unmodifiable($arguments, t3);
+      t3 = A.ConstantMap_ConstantMap$from(B.Map_empty14, type$.String, t3);
+      t1 = t1.spanFrom$1(start);
+      return new A.FunctionExpression0(null, A.stringReplaceAllUnchecked(plain, "_", "-"), plain, new A.ArgumentInvocation0(t4, t3, null, null, t2), t1);
     },
     namespacedExpression$2(namespace, start) {
       var expression = this.super$StylesheetParser$namespacedExpression0(namespace, start);
@@ -92412,7 +93360,7 @@ self.util = _cliPkgRequires.util;
       return this.accept$1$1(visitor, type$.dynamic);
     },
     toString$0(_) {
-      var t3, _0_0, children,
+      var t3, _0_0,
         buffer = new A.StringBuffer(""),
         t1 = this.name,
         t2 = "" + t1.toString$0(0);
@@ -92424,15 +93372,8 @@ self.util = _cliPkgRequires.util;
         buffer._contents = t1 + t3.toString$0(0);
       }
       _0_0 = this.children;
-      if (_0_0 != null) {
-        children = _0_0;
-        t1 = true;
-      } else {
-        children = null;
-        t1 = false;
-      }
-      if (t1)
-        return buffer.toString$0(0) + " {" + (children && B.JSArray_methods).join$1(children, " ") + "}";
+      if (_0_0 != null)
+        return buffer.toString$0(0) + " {" + B.JSArray_methods.join$1(_0_0, " ") + "}";
       else
         return buffer.toString$0(0) + ";";
     },
@@ -92442,23 +93383,11 @@ self.util = _cliPkgRequires.util;
   };
   A.SupportsDeclaration0.prototype = {
     get$isCustomProperty() {
-      var text, t1,
+      var t1,
         _0_0 = this.name;
       $label0$0: {
-        if (_0_0 instanceof A.StringExpression0)
-          if (!_0_0.hasQuotes) {
-            text = _0_0.text;
-            t1 = true;
-          } else {
-            text = null;
-            t1 = false;
-          }
-        else {
-          text = null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = B.JSString_methods.startsWith$1(text.get$initialPlain(), "--");
+        if (_0_0 instanceof A.StringExpression0 && !_0_0.hasQuotes) {
+          t1 = B.JSString_methods.startsWith$1(_0_0.text.get$initialPlain(), "--");
           break $label0$0;
         }
         t1 = false;
@@ -92478,62 +93407,107 @@ self.util = _cliPkgRequires.util;
     _enumToString$0() {
       return "Deprecation." + this._name;
     },
+    get$deprecatedIn(_) {
+      return A.NullableExtension_andThen0(this._deprecation$_deprecatedIn, A.version_Version___parse_tearOff$closure());
+    },
+    get$obsoleteIn(_) {
+      return null;
+    },
     toString$0(_) {
       return this.id;
     }
   };
-  A.DeprecationHandlingLogger0.prototype = {
-    warn$4$deprecation$span$trace(_, message, deprecation, span, trace) {
-      this._deprecation_handling$_inner.warn$4$deprecation$span$trace(0, message, deprecation, span, trace);
+  A.Deprecation_fromId_closure0.prototype = {
+    call$1(deprecation) {
+      return deprecation.id === this.id;
     },
-    warn$3$span$trace($receiver, message, span, trace) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, span, trace);
+    $signature: 412
+  };
+  A.DeprecationProcessingLogger0.prototype = {
+    DeprecationProcessingLogger$5$fatalDeprecations$futureDeprecations$limitRepetition$silenceDeprecations0(_inner, fatalDeprecations, futureDeprecations, limitRepetition, silenceDeprecations) {
+      var t1, t2, t3, t4, t5, t6, _1_7, _this = this, _null = null;
+      for (t1 = _this.fatalDeprecations, t1 = A._LinkedHashSetIterator$(t1, t1._modifications, A._instanceType(t1)._precomputed1), t2 = _this.silenceDeprecations, t3 = t1.$ti._precomputed1, t4 = _this.futureDeprecations; t1.moveNext$0();) {
+        t5 = t1._collection$_current;
+        if (t5 == null)
+          t5 = t3._as(t5);
+        if (t5.isFuture && !t4.contains$1(0, t5)) {
+          t5 = t5.toString$0(0);
+          _this.internalWarn$4$deprecation$span$trace("Future " + t5 + string$.x20deprex20m, _null, _null, _null);
+          continue;
+        }
+        t6 = t2.contains$1(0, t5);
+        if (t6) {
+          t5 = t5.toString$0(0);
+          _this.internalWarn$4$deprecation$span$trace("Ignoring setting to silence " + t5 + string$.x20deprex2c, _null, _null, _null);
+          continue;
+        }
+      }
+      for (t1 = A._LinkedHashSetIterator$(t2, t2._modifications, A._instanceType(t2)._precomputed1), t2 = t1.$ti._precomputed1; t1.moveNext$0();) {
+        t3 = t1._collection$_current;
+        if (t3 == null)
+          t3 = t2._as(t3);
+        if (B.Deprecation_oty === t3) {
+          _this.internalWarn$4$deprecation$span$trace(string$.User_a, _null, _null, _null);
+          continue;
+        }
+        _1_7 = t3.isFuture;
+        if (_1_7 && t4.contains$1(0, t3)) {
+          t3 = t3.toString$0(0);
+          _this.internalWarn$4$deprecation$span$trace("Conflicting options for future " + t3 + " deprecation cancel each other out.", _null, _null, _null);
+          continue;
+        }
+        if (_1_7) {
+          t3 = t3.toString$0(0);
+          _this.internalWarn$4$deprecation$span$trace("Future " + t3 + string$.x20deprex20i, _null, _null, _null);
+          continue;
+        }
+      }
+      for (t1 = A._LinkedHashSetIterator$(t4, t4._modifications, A._instanceType(t4)._precomputed1), t2 = t1.$ti._precomputed1; t1.moveNext$0();) {
+        t3 = t1._collection$_current;
+        if (t3 == null)
+          t3 = t2._as(t3);
+        if (!t3.isFuture) {
+          t3 = t3.toString$0(0);
+          _this.internalWarn$4$deprecation$span$trace(t3 + string$.x20is_noaf, _null, _null, _null);
+        }
+      }
     },
-    warn$2$span($receiver, message, span) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, span, null);
+    internalWarn$4$deprecation$span$trace(message, deprecation, span, trace) {
+      if (deprecation != null)
+        this._deprecation_processing$_handleDeprecation$4$span$trace(deprecation, message, span, trace);
+      else
+        this._deprecation_processing$_inner.warn$3$span$trace(0, message, span, trace);
     },
-    warn$2$trace($receiver, message, trace) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, null, trace);
-    },
-    warnForDeprecation$4$span$trace(deprecation, message, span, trace) {
-      var _0_0, _0_1, _0_3, t1, t2, count, _this = this, _null = null;
+    _deprecation_processing$_handleDeprecation$4$span$trace(deprecation, message, span, trace) {
+      var _0_3_isSet, span0, t1, _0_3, t2, count, _1_0, _this = this, _null = null;
+      if (deprecation.isFuture && !_this.futureDeprecations.contains$1(0, deprecation))
+        return;
       if (_this.fatalDeprecations.contains$1(0, deprecation)) {
-        message += string$.x0a_This + deprecation.toString$0(0) + string$.x20depre;
-        _0_0 = new A._Record_2(span, trace);
-        _0_1 = A._InitializedCell$(new A.DeprecationHandlingLogger_warnForDeprecation_closure1(_0_0));
-        _0_3 = A._InitializedCell$(new A.DeprecationHandlingLogger_warnForDeprecation_closure2(_0_0));
+        message += string$.x0a_This + deprecation.toString$0(0) + string$.x20deprex20t;
         $label0$0: {
-          if (_0_1.readFinal$0() != null) {
-            span = _0_1.readFinal$0();
-            t1 = true;
+          _0_3_isSet = span != null;
+          if (_0_3_isSet) {
+            span0 = span == null ? type$.FileSpan._as(span) : span;
+            t1 = trace != null;
+            _0_3 = trace;
           } else {
-            span = _null;
-            t1 = false;
-          }
-          if (t1)
-            if (_0_3.readFinal$0() != null) {
-              trace = _0_3.readFinal$0();
-              t1 = true;
-            } else {
-              trace = _null;
-              t1 = false;
-            }
-          else {
-            trace = _null;
+            span0 = _null;
+            _0_3 = span0;
             t1 = false;
           }
           if (t1) {
-            t1 = A.SassRuntimeException$0(message, span, trace, _null);
+            if (_0_3_isSet)
+              trace = _0_3;
+            t1 = A.SassRuntimeException$0(message, span0, trace == null ? type$.Trace._as(trace) : trace, _null);
             break $label0$0;
           }
-          if (_0_1.readFinal$0() != null) {
-            span = _0_1.readFinal$0();
-            t1 = true;
-          } else {
+          if (span != null)
+            t1 = (_0_3_isSet ? _0_3 : trace) == null;
+          else {
             span = _null;
             t1 = false;
           }
-          if (t1 && _0_3.readFinal$0() == null) {
+          if (t1) {
             t1 = A.SassException$0(message, span, _null);
             break $label0$0;
           }
@@ -92542,56 +93516,106 @@ self.util = _cliPkgRequires.util;
         }
         throw A.wrapException(t1);
       }
-      if (deprecation.isFuture && !_this.futureDeprecations.contains$1(0, deprecation))
+      if (_this.silenceDeprecations.contains$1(0, deprecation))
         return;
       if (_this.limitRepetition) {
-        t1 = _this._deprecation_handling$_warningCounts;
+        t1 = _this._deprecation_processing$_warningCounts;
         t2 = t1.$index(0, deprecation);
         count = (t2 == null ? 0 : t2) + 1;
         t1.$indexSet(0, deprecation, count);
         if (count > 5)
           return;
       }
-      _this._deprecation_handling$_inner.warn$4$deprecation$span$trace(0, message, true, span, trace);
+      _1_0 = _this._deprecation_processing$_inner;
+      if (_1_0 instanceof A.LoggerWithDeprecationType)
+        _1_0.internalWarn$4$deprecation$span$trace(message, deprecation, span, trace);
+      else
+        _1_0.warn$4$deprecation$span$trace(0, message, true, span, trace);
     },
     debug$2(_, message, span) {
-      return this._deprecation_handling$_inner.debug$2(0, message, span);
+      return this._deprecation_processing$_inner.debug$2(0, message, span);
     },
     summarize$1$js(js) {
-      var t2, total,
-        t1 = this._deprecation_handling$_warningCounts;
-      t1 = t1.get$values(t1);
-      t2 = A._instanceType(t1);
-      total = A.IterableIntegerExtension_get_sum(new A.MappedIterable(new A.WhereIterable(t1, new A.DeprecationHandlingLogger_summarize_closure1(), t2._eval$1("WhereIterable<Iterable.E>")), new A.DeprecationHandlingLogger_summarize_closure2(), t2._eval$1("MappedIterable<Iterable.E,int>")));
+      var t1 = this._deprecation_processing$_warningCounts.get$values(0),
+        t2 = A._instanceType(t1),
+        total = A.IterableIntegerExtension_get_sum(new A.MappedIterable(new A.WhereIterable(t1, new A.DeprecationProcessingLogger_summarize_closure1(), t2._eval$1("WhereIterable<Iterable.E>")), new A.DeprecationProcessingLogger_summarize_closure2(), t2._eval$1("MappedIterable<Iterable.E,int>")));
       if (total > 0) {
         t1 = js ? "" : string$.x0aRun_i;
-        this._deprecation_handling$_inner.warn$1(0, "" + total + string$.x20repet + t1);
+        this._deprecation_processing$_inner.warn$1(0, "" + total + string$.x20repet + t1);
       }
     }
   };
-  A.DeprecationHandlingLogger_warnForDeprecation_closure1.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature: 186
-  };
-  A.DeprecationHandlingLogger_warnForDeprecation_closure2.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 187
-  };
-  A.DeprecationHandlingLogger_summarize_closure1.prototype = {
+  A.DeprecationProcessingLogger_summarize_closure1.prototype = {
     call$1(count) {
       return count > 5;
     },
-    $signature: 47
+    $signature: 45
   };
-  A.DeprecationHandlingLogger_summarize_closure2.prototype = {
+  A.DeprecationProcessingLogger_summarize_closure2.prototype = {
     call$1(count) {
       return count - 5;
     },
-    $signature: 191
+    $signature: 150
+  };
+  A.Deprecation1.prototype = {};
+  A.deprecations_closure.prototype = {
+    call$0() {
+      var t1, _0_8_isSet, _0_8,
+        _0_0 = this.deprecation;
+      $label0$0: {
+        if (_0_0.isFuture) {
+          t1 = "future";
+          break $label0$0;
+        }
+        _0_8_isSet = A.NullableExtension_andThen0(_0_0._deprecation$_deprecatedIn, A.version_Version___parse_tearOff$closure()) == null;
+        if (_0_8_isSet) {
+          _0_8 = _0_0.get$obsoleteIn(0) == null;
+          t1 = _0_8;
+        } else {
+          _0_8 = null;
+          t1 = false;
+        }
+        if (t1) {
+          t1 = "user";
+          break $label0$0;
+        }
+        if (_0_8_isSet ? _0_8 : _0_0.get$obsoleteIn(0) == null) {
+          t1 = "active";
+          break $label0$0;
+        }
+        t1 = "obsolete";
+        break $label0$0;
+      }
+      return t1;
+    },
+    $signature: 26
+  };
+  A.versionClass_closure.prototype = {
+    call$0() {
+      var t1 = type$.JSClass,
+        jsClass = t1._as(A.allowInteropCaptureThisNamed("sass.Version", new A.versionClass__closure()));
+      jsClass.parse = A.allowInteropNamed("parse", new A.versionClass__closure0());
+      A.JSClassExtension_injectSuperclass(t1._as(A.Version_Version(0, 0, 0, null).constructor), jsClass);
+      return jsClass;
+    },
+    $signature: 15
+  };
+  A.versionClass__closure.prototype = {
+    call$4($self, major, minor, patch) {
+      return A.Version_Version(major, minor, patch, null);
+    },
+    "call*": "call$4",
+    $requiredArgCount: 4,
+    $signature: 413
+  };
+  A.versionClass__closure0.prototype = {
+    call$1(version) {
+      var v = A.Version_Version$parse(version);
+      if (v.preRelease.length !== 0 || v.build.length !== 0)
+        throw A.wrapException(A.FormatException$("Build identifiers and prerelease versions not supported.", null, null));
+      return v;
+    },
+    $signature: 198
   };
   A.DynamicImport0.prototype = {
     toString$0(_) {
@@ -92623,7 +93647,7 @@ self.util = _cliPkgRequires.util;
     call$1(variable) {
       return "$" + variable;
     },
-    $signature: 7
+    $signature: 5
   };
   A.EmptyExtensionStore0.prototype = {
     get$_extension_store$_extensions() {
@@ -92641,6 +93665,12 @@ self.util = _cliPkgRequires.util;
     extensionsWhereTarget$1(callback) {
       return B.List_empty17;
     },
+    addSelector$2(selector, mediaContext) {
+      throw A.wrapException(A.UnsupportedError$("addSelector() can't be called for a const ExtensionStore."));
+    },
+    addExtension$4(extender, target, extend, mediaContext) {
+      throw A.wrapException(A.UnsupportedError$("addExtension() can't be called for a const ExtensionStore."));
+    },
     addExtensions$1(extenders) {
       throw A.wrapException(A.UnsupportedError$(string$.addExt));
     },
@@ -92670,7 +93700,7 @@ self.util = _cliPkgRequires.util;
       if (forwardedModules == null)
         forwardedModules = _this._environment0$_forwardedModules = A.LinkedHashMap_LinkedHashMap$_empty(type$.Module_Callable_2, type$.AstNode_2);
       view = A.ForwardedModuleView_ifNecessary0(module, rule, type$.Callable_2);
-      for (t1 = A.LinkedHashMapKeyIterator$(forwardedModules, forwardedModules._modifications); t1.moveNext$0();) {
+      for (t1 = A.LinkedHashMapKeyIterator$(forwardedModules, forwardedModules.__js_helper$_modifications); t1.moveNext$0();) {
         t2 = t1.__js_helper$_current;
         _this._environment0$_assertNoConflicts$5(view.get$variables(), t2.get$variables(), view, t2, "variable");
         _this._environment0$_assertNoConflicts$5(view.get$functions(view), t2.get$functions(t2), view, t2, "function");
@@ -92692,7 +93722,6 @@ self.util = _cliPkgRequires.util;
         t4 = t2.get$current(t2);
         $name = t4._0;
         small = t4._1;
-        small = small;
         large = larger.$index(0, $name);
         if (large == null)
           continue;
@@ -92735,17 +93764,17 @@ self.util = _cliPkgRequires.util;
         forwardedModules = _this._environment0$_forwardedModules = A.LinkedHashMap_LinkedHashMap$_empty(type$.Module_Callable_2, type$.AstNode_2);
       t1 = type$.String;
       t2 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
-      for (t3 = A.LinkedHashMapKeyIterator$(forwarded, forwarded._modifications); t3.moveNext$0();)
+      for (t3 = A.LinkedHashMapKeyIterator$(forwarded, forwarded.__js_helper$_modifications); t3.moveNext$0();)
         for (t4 = t3.__js_helper$_current.get$variables(), t4 = J.get$iterator$ax(t4.get$keys(t4)); t4.moveNext$0();)
           t2.add$1(0, t4.get$current(t4));
       t3 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
-      for (t4 = A.LinkedHashMapKeyIterator$(forwarded, forwarded._modifications); t4.moveNext$0();) {
+      for (t4 = A.LinkedHashMapKeyIterator$(forwarded, forwarded.__js_helper$_modifications); t4.moveNext$0();) {
         t5 = t4.__js_helper$_current;
         for (t5 = t5.get$functions(t5), t5 = J.get$iterator$ax(t5.get$keys(t5)); t5.moveNext$0();)
           t3.add$1(0, t5.get$current(t5));
       }
       t1 = A.LinkedHashSet_LinkedHashSet$_empty(t1);
-      for (t4 = A.LinkedHashMapKeyIterator$(forwarded, forwarded._modifications); t4.moveNext$0();)
+      for (t4 = A.LinkedHashMapKeyIterator$(forwarded, forwarded.__js_helper$_modifications); t4.moveNext$0();)
         for (t5 = t4.__js_helper$_current.get$mixins(), t5 = J.get$iterator$ax(t5.get$keys(t5)); t5.moveNext$0();)
           t1.add$1(0, t5.get$current(t5));
       t4 = _this._environment0$_variables;
@@ -92818,7 +93847,7 @@ self.util = _cliPkgRequires.util;
           t5 = t6;
         B.JSArray_methods.addAll$1(B.JSArray_methods.get$last(t5), new A.LinkedHashMapKeyIterable(forwarded, A._instanceType(forwarded)._eval$1("LinkedHashMapKeyIterable<1>")));
       }
-      for (t2 = A._LinkedHashSetIterator$(t2, t2._collection$_modifications), t5 = _this._environment0$_variableIndices, t6 = _this._environment0$_variableNodes, t7 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
+      for (t2 = A._LinkedHashSetIterator$(t2, t2._modifications, t2.$ti._precomputed1), t5 = _this._environment0$_variableIndices, t6 = _this._environment0$_variableNodes, t7 = t2.$ti._precomputed1; t2.moveNext$0();) {
         t8 = t2._collection$_current;
         if (t8 == null)
           t8 = t7._as(t8);
@@ -92826,14 +93855,14 @@ self.util = _cliPkgRequires.util;
         J.remove$1$z(B.JSArray_methods.get$last(t4), t8);
         J.remove$1$z(B.JSArray_methods.get$last(t6), t8);
       }
-      for (t2 = A._LinkedHashSetIterator$(t3, t3._collection$_modifications), t3 = _this._environment0$_functionIndices, t4 = _this._environment0$_functions, t5 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
+      for (t2 = A._LinkedHashSetIterator$(t3, t3._modifications, t3.$ti._precomputed1), t3 = _this._environment0$_functionIndices, t4 = _this._environment0$_functions, t5 = t2.$ti._precomputed1; t2.moveNext$0();) {
         t6 = t2._collection$_current;
         if (t6 == null)
           t6 = t5._as(t6);
         t3.remove$1(0, t6);
         J.remove$1$z(B.JSArray_methods.get$last(t4), t6);
       }
-      for (t1 = A._LinkedHashSetIterator$(t1, t1._collection$_modifications), t2 = _this._environment0$_mixinIndices, t3 = _this._environment0$_mixins, t4 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = A._LinkedHashSetIterator$(t1, t1._modifications, t1.$ti._precomputed1), t2 = _this._environment0$_mixinIndices, t3 = _this._environment0$_mixins, t4 = t1.$ti._precomputed1; t1.moveNext$0();) {
         t5 = t1._collection$_current;
         if (t5 == null)
           t5 = t4._as(t5);
@@ -92842,7 +93871,7 @@ self.util = _cliPkgRequires.util;
       }
     },
     getVariable$2$namespace($name, namespace) {
-      var t1, _0_0, index, t2, _1_0, _this = this;
+      var t1, _0_0, _1_0, _this = this;
       if (namespace != null)
         return _this._environment0$_getModule$1(namespace).get$variables().$index(0, $name);
       if (_this._environment0$_lastVariableName === $name) {
@@ -92854,31 +93883,17 @@ self.util = _cliPkgRequires.util;
       t1 = _this._environment0$_variableIndices;
       _0_0 = t1.$index(0, $name);
       if (_0_0 != null) {
-        index = _0_0;
-        t2 = true;
-      } else {
-        index = null;
-        t2 = false;
-      }
-      if (t2) {
         _this._environment0$_lastVariableName = $name;
-        _this._environment0$_lastVariableIndex = index;
-        t1 = J.$index$asx(_this._environment0$_variables[index], $name);
+        _this._environment0$_lastVariableIndex = _0_0;
+        t1 = J.$index$asx(_this._environment0$_variables[_0_0], $name);
         return t1 == null ? _this._environment0$_getVariableFromGlobalModule$1($name) : t1;
       } else {
         _1_0 = _this._environment0$_variableIndex$1($name);
         if (_1_0 != null) {
-          index = _1_0;
-          t2 = true;
-        } else {
-          index = null;
-          t2 = false;
-        }
-        if (t2) {
           _this._environment0$_lastVariableName = $name;
-          _this._environment0$_lastVariableIndex = index;
-          t1.$indexSet(0, $name, index);
-          t1 = J.$index$asx(_this._environment0$_variables[index], $name);
+          _this._environment0$_lastVariableIndex = _1_0;
+          t1.$indexSet(0, $name, _1_0);
+          t1 = J.$index$asx(_this._environment0$_variables[_1_0], $name);
           return t1 == null ? _this._environment0$_getVariableFromGlobalModule$1($name) : t1;
         } else
           return _this._environment0$_getVariableFromGlobalModule$1($name);
@@ -92891,7 +93906,7 @@ self.util = _cliPkgRequires.util;
       return this._environment0$_fromOneModule$3($name, "variable", new A.Environment__getVariableFromGlobalModule_closure0($name));
     },
     getVariableNode$2$namespace($name, namespace) {
-      var t1, _0_0, index, t2, _1_0, _this = this;
+      var t1, _0_0, _1_0, _this = this;
       if (namespace != null)
         return _this._environment0$_getModule$1(namespace).get$variableNodes().$index(0, $name);
       if (_this._environment0$_lastVariableName === $name) {
@@ -92903,50 +93918,29 @@ self.util = _cliPkgRequires.util;
       t1 = _this._environment0$_variableIndices;
       _0_0 = t1.$index(0, $name);
       if (_0_0 != null) {
-        index = _0_0;
-        t2 = true;
-      } else {
-        index = null;
-        t2 = false;
-      }
-      if (t2) {
         _this._environment0$_lastVariableName = $name;
-        _this._environment0$_lastVariableIndex = index;
-        t1 = J.$index$asx(_this._environment0$_variableNodes[index], $name);
+        _this._environment0$_lastVariableIndex = _0_0;
+        t1 = J.$index$asx(_this._environment0$_variableNodes[_0_0], $name);
         return t1 == null ? _this._environment0$_getVariableNodeFromGlobalModule$1($name) : t1;
       } else {
         _1_0 = _this._environment0$_variableIndex$1($name);
         if (_1_0 != null) {
-          index = _1_0;
-          t2 = true;
-        } else {
-          index = null;
-          t2 = false;
-        }
-        if (t2) {
           _this._environment0$_lastVariableName = $name;
-          _this._environment0$_lastVariableIndex = index;
-          t1.$indexSet(0, $name, index);
-          t1 = J.$index$asx(_this._environment0$_variableNodes[index], $name);
+          _this._environment0$_lastVariableIndex = _1_0;
+          t1.$indexSet(0, $name, _1_0);
+          t1 = J.$index$asx(_this._environment0$_variableNodes[_1_0], $name);
           return t1 == null ? _this._environment0$_getVariableNodeFromGlobalModule$1($name) : t1;
         } else
           return _this._environment0$_getVariableNodeFromGlobalModule$1($name);
       }
     },
     _environment0$_getVariableNodeFromGlobalModule$1($name) {
-      var t1, t2, _0_0, value;
+      var t1, t2, _0_0;
       for (t1 = this._environment0$_importedModules, t2 = this._environment0$_globalModules, t2 = new A.LinkedHashMapKeyIterable(t1, A._instanceType(t1)._eval$1("LinkedHashMapKeyIterable<1>")).followedBy$1(0, new A.LinkedHashMapKeyIterable(t2, A._instanceType(t2)._eval$1("LinkedHashMapKeyIterable<1>"))), t2 = new A.FollowedByIterator(J.get$iterator$ax(t2.__internal$_first), t2._second); t2.moveNext$0();) {
         t1 = t2._currentIterator;
         _0_0 = t1.get$current(t1).get$variableNodes().$index(0, $name);
-        if (_0_0 != null) {
-          value = _0_0;
-          t1 = true;
-        } else {
-          value = null;
-          t1 = false;
-        }
-        if (t1)
-          return value;
+        if (_0_0 != null)
+          return _0_0;
       }
       return null;
     },
@@ -92989,9 +93983,9 @@ self.util = _cliPkgRequires.util;
       }
       nestedForwardedModules = _this._environment0$_nestedForwardedModules;
       if (nestedForwardedModules != null && !_this._environment0$_variableIndices.containsKey$1($name) && _this._environment0$_variableIndex$1($name) == null)
-        for (t1 = new A.ReversedListIterable(nestedForwardedModules, A.instanceType(nestedForwardedModules)._eval$1("ReversedListIterable<1>")), t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
-          t3 = t1.__internal$_current;
-          for (t3 = J.get$reversed$ax(t3 == null ? t2._as(t3) : t3), t3 = new A.ListIterator(t3, t3.get$length(t3)), t4 = A._instanceType(t3)._precomputed1; t3.moveNext$0();) {
+        for (t1 = A._arrayInstanceType(nestedForwardedModules)._eval$1("ReversedListIterable<1>"), t2 = new A.ReversedListIterable(nestedForwardedModules, t1), t2 = new A.ListIterator(t2, t2.get$length(0), t1._eval$1("ListIterator<ListIterable.E>")), t1 = t1._eval$1("ListIterable.E"); t2.moveNext$0();) {
+          t3 = t2.__internal$_current;
+          for (t3 = J.get$reversed$ax(t3 == null ? t1._as(t3) : t3), t4 = t3.$ti, t3 = new A.ListIterator(t3, t3.get$length(0), t4._eval$1("ListIterator<ListIterable.E>")), t4 = t4._eval$1("ListIterable.E"); t3.moveNext$0();) {
             t5 = t3.__internal$_current;
             if (t5 == null)
               t5 = t4._as(t5);
@@ -93030,7 +94024,7 @@ self.util = _cliPkgRequires.util;
       J.$indexSet$ax(_this._environment0$_variableNodes[index], $name, nodeWithSpan);
     },
     getFunction$2$namespace($name, namespace) {
-      var t1, _0_0, index, t2, _1_0, _this = this;
+      var t1, _0_0, _1_0, _this = this;
       if (namespace != null) {
         t1 = _this._environment0$_getModule$1(namespace);
         return t1.get$functions(t1).$index(0, $name);
@@ -93038,27 +94032,13 @@ self.util = _cliPkgRequires.util;
       t1 = _this._environment0$_functionIndices;
       _0_0 = t1.$index(0, $name);
       if (_0_0 != null) {
-        index = _0_0;
-        t2 = true;
-      } else {
-        index = null;
-        t2 = false;
-      }
-      if (t2) {
-        t1 = J.$index$asx(_this._environment0$_functions[index], $name);
+        t1 = J.$index$asx(_this._environment0$_functions[_0_0], $name);
         return t1 == null ? _this._environment0$_getFunctionFromGlobalModule$1($name) : t1;
       } else {
         _1_0 = _this._environment0$_functionIndex$1($name);
         if (_1_0 != null) {
-          index = _1_0;
-          t2 = true;
-        } else {
-          index = null;
-          t2 = false;
-        }
-        if (t2) {
-          t1.$indexSet(0, $name, index);
-          t1 = J.$index$asx(_this._environment0$_functions[index], $name);
+          t1.$indexSet(0, $name, _1_0);
+          t1 = J.$index$asx(_this._environment0$_functions[_1_0], $name);
           return t1 == null ? _this._environment0$_getFunctionFromGlobalModule$1($name) : t1;
         } else
           return _this._environment0$_getFunctionFromGlobalModule$1($name);
@@ -93078,33 +94058,19 @@ self.util = _cliPkgRequires.util;
       return null;
     },
     getMixin$2$namespace($name, namespace) {
-      var t1, _0_0, index, t2, _1_0, _this = this;
+      var t1, _0_0, _1_0, _this = this;
       if (namespace != null)
         return _this._environment0$_getModule$1(namespace).get$mixins().$index(0, $name);
       t1 = _this._environment0$_mixinIndices;
       _0_0 = t1.$index(0, $name);
       if (_0_0 != null) {
-        index = _0_0;
-        t2 = true;
-      } else {
-        index = null;
-        t2 = false;
-      }
-      if (t2) {
-        t1 = J.$index$asx(_this._environment0$_mixins[index], $name);
+        t1 = J.$index$asx(_this._environment0$_mixins[_0_0], $name);
         return t1 == null ? _this._environment0$_getMixinFromGlobalModule$1($name) : t1;
       } else {
         _1_0 = _this._environment0$_mixinIndex$1($name);
         if (_1_0 != null) {
-          index = _1_0;
-          t2 = true;
-        } else {
-          index = null;
-          t2 = false;
-        }
-        if (t2) {
-          t1.$indexSet(0, $name, index);
-          t1 = J.$index$asx(_this._environment0$_mixins[index], $name);
+          t1.$indexSet(0, $name, _1_0);
+          t1 = J.$index$asx(_this._environment0$_mixins[_1_0], $name);
           return t1 == null ? _this._environment0$_getMixinFromGlobalModule$1($name) : t1;
         } else
           return _this._environment0$_getMixinFromGlobalModule$1($name);
@@ -93181,14 +94147,14 @@ self.util = _cliPkgRequires.util;
           t1.pop();
       }
     },
-    scope$1$1(callback, $T) {
-      return this.scope$1$3$semiGlobal$when(callback, false, true, $T);
+    scope$1$1(callback) {
+      return this.scope$1$3$semiGlobal$when(callback, false, true);
     },
-    scope$1$2$when(callback, when, $T) {
-      return this.scope$1$3$semiGlobal$when(callback, false, when, $T);
+    scope$1$2$when(callback, when) {
+      return this.scope$1$3$semiGlobal$when(callback, false, when);
     },
-    scope$1$2$semiGlobal(callback, semiGlobal, $T) {
-      return this.scope$1$3$semiGlobal$when(callback, semiGlobal, true, $T);
+    scope$1$2$semiGlobal(callback, semiGlobal) {
+      return this.scope$1$3$semiGlobal$when(callback, semiGlobal, true);
     },
     toImplicitConfiguration$0() {
       var t2, t3, t4, i, values, nodes, t5, t6, $name, value,
@@ -93215,59 +94181,30 @@ self.util = _cliPkgRequires.util;
       return A._EnvironmentModule__EnvironmentModule1(this, new A.CssStylesheet0(new A.UnmodifiableListView(B.List_empty16, type$.UnmodifiableListView_CssNode_2), A.SourceFile$decoded(B.List_empty4, "<dummy module>").span$1(0, 0)), B.Map_empty9, B.C_EmptyExtensionStore0, A.NullableExtension_andThen0(this._environment0$_forwardedModules, new A.Environment_toDummyModule_closure0()));
     },
     _environment0$_getModule$1(namespace) {
-      var module, t1,
-        _0_0 = this._environment0$_modules.$index(0, namespace);
-      if (_0_0 != null) {
-        module = _0_0;
-        t1 = true;
-      } else {
-        module = null;
-        t1 = false;
-      }
-      if (t1)
-        return module;
+      var _0_0 = this._environment0$_modules.$index(0, namespace);
+      if (_0_0 != null)
+        return _0_0;
       throw A.wrapException(A.SassScriptException$0('There is no module with the namespace "' + namespace + '".', null));
     },
     _environment0$_fromOneModule$1$3($name, type, callback) {
-      var nestedForwardedModules, t1, t2, t3, t4, t5, _1_0, value, _2_0, identity, valueInModule, identityFromModule, module, node, _null = null,
+      var t1, t2, t3, t4, t5, _1_0, _2_0, value, identity, valueInModule, identityFromModule, module, node,
         _0_0 = this._environment0$_nestedForwardedModules;
-      if (_0_0 != null) {
-        nestedForwardedModules = _0_0;
-        t1 = true;
-      } else {
-        nestedForwardedModules = _null;
-        t1 = false;
-      }
-      if (t1)
-        for (t1 = new A.ReversedListIterable(nestedForwardedModules, A.instanceType(nestedForwardedModules)._eval$1("ReversedListIterable<1>")), t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
-          t3 = t1.__internal$_current;
-          for (t3 = J.get$reversed$ax(t3 == null ? t2._as(t3) : t3), t3 = new A.ListIterator(t3, t3.get$length(t3)), t4 = A._instanceType(t3)._precomputed1; t3.moveNext$0();) {
+      if (_0_0 != null)
+        for (t1 = A._arrayInstanceType(_0_0)._eval$1("ReversedListIterable<1>"), t2 = new A.ReversedListIterable(_0_0, t1), t2 = new A.ListIterator(t2, t2.get$length(0), t1._eval$1("ListIterator<ListIterable.E>")), t1 = t1._eval$1("ListIterable.E"); t2.moveNext$0();) {
+          t3 = t2.__internal$_current;
+          for (t3 = J.get$reversed$ax(t3 == null ? t1._as(t3) : t3), t4 = t3.$ti, t3 = new A.ListIterator(t3, t3.get$length(0), t4._eval$1("ListIterator<ListIterable.E>")), t4 = t4._eval$1("ListIterable.E"); t3.moveNext$0();) {
             t5 = t3.__internal$_current;
             _1_0 = callback.call$1(t5 == null ? t4._as(t5) : t5);
-            if (_1_0 != null) {
-              value = _1_0;
-              t5 = true;
-            } else {
-              value = _null;
-              t5 = false;
-            }
-            if (t5)
-              return value;
+            if (_1_0 != null)
+              return _1_0;
           }
         }
-      for (t1 = this._environment0$_importedModules, t1 = A.LinkedHashMapKeyIterator$(t1, t1._modifications); t1.moveNext$0();) {
+      for (t1 = this._environment0$_importedModules, t1 = A.LinkedHashMapKeyIterator$(t1, t1.__js_helper$_modifications); t1.moveNext$0();) {
         _2_0 = callback.call$1(t1.__js_helper$_current);
-        if (_2_0 != null) {
-          value = _2_0;
-          t2 = true;
-        } else {
-          value = _null;
-          t2 = false;
-        }
-        if (t2)
-          return value;
+        if (_2_0 != null)
+          return _2_0;
       }
-      for (t1 = this._environment0$_globalModules, t2 = A.LinkedHashMapKeyIterator$(t1, t1._modifications), t3 = type$.Callable_2, identity = _null, value = identity; t2.moveNext$0();) {
+      for (t1 = this._environment0$_globalModules, t2 = A.LinkedHashMapKeyIterator$(t1, t1.__js_helper$_modifications), t3 = type$.Callable_2, value = null, identity = null; t2.moveNext$0();) {
         t4 = t2.__js_helper$_current;
         valueInModule = callback.call$1(t4);
         if (valueInModule == null)
@@ -93299,7 +94236,7 @@ self.util = _cliPkgRequires.util;
     call$1(module) {
       return module.get$variables().$index(0, this.name);
     },
-    $signature: 427
+    $signature: 416
   };
   A.Environment_setVariable_closure2.prototype = {
     call$0() {
@@ -93307,13 +94244,13 @@ self.util = _cliPkgRequires.util;
       t1._environment0$_lastVariableName = this.name;
       return t1._environment0$_lastVariableIndex = 0;
     },
-    $signature: 3
+    $signature: 10
   };
   A.Environment_setVariable_closure3.prototype = {
     call$1(module) {
       return module.get$variables().containsKey$1(this.name) ? module : null;
     },
-    $signature: 428
+    $signature: 417
   };
   A.Environment_setVariable_closure4.prototype = {
     call$0() {
@@ -93321,31 +94258,31 @@ self.util = _cliPkgRequires.util;
         t2 = t1._environment0$_variableIndex$1(this.name);
       return t2 == null ? t1._environment0$_variables.length - 1 : t2;
     },
-    $signature: 3
+    $signature: 10
   };
   A.Environment__getFunctionFromGlobalModule_closure0.prototype = {
     call$1(module) {
       return module.get$functions(module).$index(0, this.name);
     },
-    $signature: 234
+    $signature: 196
   };
   A.Environment__getMixinFromGlobalModule_closure0.prototype = {
     call$1(module) {
       return module.get$mixins().$index(0, this.name);
     },
-    $signature: 234
+    $signature: 196
   };
   A.Environment_toModule_closure0.prototype = {
     call$1(modules) {
       return new A.MapKeySet(modules, type$.MapKeySet_Module_Callable_2);
     },
-    $signature: 235
+    $signature: 194
   };
   A.Environment_toDummyModule_closure0.prototype = {
     call$1(modules) {
       return new A.MapKeySet(modules, type$.MapKeySet_Module_Callable_2);
     },
-    $signature: 235
+    $signature: 194
   };
   A._EnvironmentModule1.prototype = {
     get$url(_) {
@@ -93353,17 +94290,10 @@ self.util = _cliPkgRequires.util;
       return t1.get$span(t1).file.url;
     },
     setVariable$3($name, value, nodeWithSpan) {
-      var module, t1, t2,
+      var t1, t2,
         _0_0 = this._environment0$_modulesByVariable.$index(0, $name);
       if (_0_0 != null) {
-        module = _0_0;
-        t1 = true;
-      } else {
-        module = null;
-        t1 = false;
-      }
-      if (t1) {
-        module.setVariable$3($name, value, nodeWithSpan);
+        _0_0.setVariable$3($name, value, nodeWithSpan);
         return;
       }
       t1 = this._environment0$_environment;
@@ -93386,12 +94316,15 @@ self.util = _cliPkgRequires.util;
       return A._EnvironmentModule$_1(_this._environment0$_environment, _0_0._0, _this.preModuleComments, _0_0._1, _this._environment0$_modulesByVariable, _this.variables, _this.variableNodes, _this.functions, _this.mixins, true, _this.transitivelyContainsExtensions);
     },
     toString$0(_) {
-      var t1 = this.css;
+      var t2,
+        t1 = this.css;
       if (t1.get$span(t1).file.url == null)
         t1 = "<unknown url>";
       else {
-        t1 = t1.get$span(t1);
-        t1 = $.$get$context().prettyUri$1(t1.file.url);
+        t1 = t1.get$span(t1).file.url;
+        t2 = $.$get$context();
+        t1.toString;
+        t1 = t2.prettyUri$1(t1);
       }
       return t1;
     },
@@ -93431,37 +94364,37 @@ self.util = _cliPkgRequires.util;
     call$1(module) {
       return module.get$variables();
     },
-    $signature: 431
+    $signature: 631
   };
   A._EnvironmentModule__EnvironmentModule_closure12.prototype = {
     call$1(module) {
       return module.get$variableNodes();
     },
-    $signature: 649
+    $signature: 421
   };
   A._EnvironmentModule__EnvironmentModule_closure13.prototype = {
     call$1(module) {
       return module.get$functions(module);
     },
-    $signature: 236
+    $signature: 193
   };
   A._EnvironmentModule__EnvironmentModule_closure14.prototype = {
     call$1(module) {
       return module.get$mixins();
     },
-    $signature: 236
+    $signature: 193
   };
   A._EnvironmentModule__EnvironmentModule_closure15.prototype = {
     call$1(module) {
       return module.get$transitivelyContainsCss();
     },
-    $signature: 136
+    $signature: 121
   };
   A._EnvironmentModule__EnvironmentModule_closure16.prototype = {
     call$1(module) {
       return module.get$transitivelyContainsExtensions();
     },
-    $signature: 136
+    $signature: 121
   };
   A.ErrorRule0.prototype = {
     accept$1$1(visitor) {
@@ -93532,15 +94465,11 @@ self.util = _cliPkgRequires.util;
       return this._evaluate0$_assertInModule$1$2(value, $name, type$.dynamic);
     },
     _evaluate0$_loadModule$7$baseUrl$configuration$namesInErrors(url, stackFrame, nodeWithSpan, callback, baseUrl, configuration, namesInErrors) {
-      var _0_0, t2, _this = this, t1 = {};
+      var t2, _this = this, t1 = {},
+        _0_0 = _this._evaluate0$_builtInModules.$index(0, url);
       t1.builtInModule = null;
-      _0_0 = _this._evaluate0$_builtInModules.$index(0, url);
       if (_0_0 != null) {
         t1.builtInModule = _0_0;
-        t2 = true;
-      } else
-        t2 = false;
-      if (t2) {
         if (configuration instanceof A.ExplicitConfiguration0) {
           t1 = namesInErrors ? "Built-in module " + url.toString$0(0) + " can't be configured." : "Built-in modules can't be configured.";
           t2 = configuration.nodeWithSpan;
@@ -93558,18 +94487,11 @@ self.util = _cliPkgRequires.util;
       return this._evaluate0$_loadModule$7$baseUrl$configuration$namesInErrors(url, stackFrame, nodeWithSpan, callback, null, null, false);
     },
     _evaluate0$_execute$5$configuration$namesInErrors$nodeWithSpan(importer, stylesheet, configuration, namesInErrors, nodeWithSpan) {
-      var alreadyLoaded, t2, currentConfiguration, t3, message, existingSpan, configurationSpan, environment, css, preModuleComments, extensionStore, module, _this = this,
+      var currentConfiguration, t2, t3, message, existingSpan, configurationSpan, environment, css, preModuleComments, extensionStore, module, _this = this,
         url = stylesheet.span.file.url,
         t1 = _this._evaluate0$_modules,
         _0_0 = t1.$index(0, url);
       if (_0_0 != null) {
-        alreadyLoaded = _0_0;
-        t2 = true;
-      } else {
-        alreadyLoaded = null;
-        t2 = false;
-      }
-      if (t2) {
         t1 = configuration == null;
         currentConfiguration = t1 ? _this._evaluate0$_configuration : configuration;
         t2 = _this._evaluate0$_moduleConfigurations.$index(0, url);
@@ -93577,7 +94499,12 @@ self.util = _cliPkgRequires.util;
         t2 = t3 == null ? t2 : t3;
         t3 = currentConfiguration._configuration0$__originalConfiguration;
         if (t2 !== (t3 == null ? currentConfiguration : t3) && currentConfiguration instanceof A.ExplicitConfiguration0) {
-          message = namesInErrors ? $.$get$context().prettyUri$1(url) + string$.x20was_a : string$.This_mw;
+          if (namesInErrors) {
+            t2 = $.$get$context();
+            url.toString;
+            message = t2.prettyUri$1(url) + string$.x20was_a;
+          } else
+            message = string$.This_mw;
           t2 = _this._evaluate0$_moduleNodes.$index(0, url);
           existingSpan = t2 == null ? null : t2.get$span(t2);
           if (t1) {
@@ -93590,9 +94517,9 @@ self.util = _cliPkgRequires.util;
             t1.$indexSet(0, existingSpan, "original load");
           if (configurationSpan != null)
             t1.$indexSet(0, configurationSpan, "configuration");
-          throw A.wrapException(t1.get$isEmpty(t1) ? _this._evaluate0$_exception$1(message) : _this._evaluate0$_multiSpanException$3(message, "new load", t1));
+          throw A.wrapException(t1.get$isEmpty(0) ? _this._evaluate0$_exception$1(message) : _this._evaluate0$_multiSpanException$3(message, "new load", t1));
         }
-        return alreadyLoaded;
+        return _0_0;
       }
       environment = A.Environment$0();
       css = A._Cell$();
@@ -93622,8 +94549,7 @@ self.util = _cliPkgRequires.util;
           t1 = _this._evaluate0$_assertInModule$2(_this._evaluate0$__root, _s5_).children;
           break $label0$0;
         }
-        t1 = _this._evaluate0$_assertInModule$2(_this._evaluate0$__root, _s5_);
-        t1 = t1.children;
+        t1 = _this._evaluate0$_assertInModule$2(_this._evaluate0$__root, _s5_).children;
         t1 = A.List_List$of(A.SubListIterable$(t1, 0, A.checkNotNullable(_this._evaluate0$_assertInModule$2(_this._evaluate0$__endOfImports, _s13_), "count", type$.int), t1.$ti._eval$1("ListBase.E")), true, type$.ModifiableCssNode_2);
         B.JSArray_methods.addAll$1(t1, _0_0);
         t2 = _this._evaluate0$_assertInModule$2(_this._evaluate0$__root, _s5_).children;
@@ -93633,19 +94559,12 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     _evaluate0$_combineCss$2$clone(root, clone) {
-      var selectors, _0_0, unsatisfiedExtension, t1, imports, css, sorted, t2;
+      var selectors, _0_0, t1, imports, css, sorted, t2;
       if (!B.JSArray_methods.any$1(root.get$upstream(), new A._EvaluateVisitor__combineCss_closure3())) {
         selectors = root.get$extensionStore().get$simpleSelectors();
         _0_0 = A.IterableExtension_get_firstOrNull(root.get$extensionStore().extensionsWhereTarget$1(new A._EvaluateVisitor__combineCss_closure4(selectors)));
-        if (_0_0 != null) {
-          unsatisfiedExtension = _0_0;
-          t1 = true;
-        } else {
-          unsatisfiedExtension = null;
-          t1 = false;
-        }
-        if (t1)
-          this._evaluate0$_throwForUnsatisfiedExtension$1(unsatisfiedExtension);
+        if (_0_0 != null)
+          this._evaluate0$_throwForUnsatisfiedExtension$1(_0_0);
         return root.get$css(root);
       }
       t1 = type$.JSArray_CssNode_2;
@@ -93664,10 +94583,10 @@ self.util = _cliPkgRequires.util;
       return this._evaluate0$_combineCss$2$clone(root, false);
     },
     _evaluate0$_extendModules$1(sortedModules) {
-      var t1, t2, t3, originalSelectors, $self, t4, t5, _i, upstream, _0_0, url, t6,
+      var t1, t2, t3, originalSelectors, $self, t4, t5, _i, upstream, _0_0,
         downstreamExtensionStores = A.LinkedHashMap_LinkedHashMap$_empty(type$.Uri, type$.List_ExtensionStore_2),
         unsatisfiedExtensions = new A._LinkedIdentityHashSet(type$._LinkedIdentityHashSet_Extension_2);
-      for (t1 = A._ListQueueIterator$(sortedModules), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = A._ListQueueIterator$(sortedModules, sortedModules.$ti._precomputed1), t2 = t1.$ti._precomputed1; t1.moveNext$0();) {
         t3 = t1._collection$_current;
         if (t3 == null)
           t3 = t2._as(t3);
@@ -93683,20 +94602,13 @@ self.util = _cliPkgRequires.util;
         for (t4 = t3.get$upstream(), t5 = t4.length, _i = 0; _i < t4.length; t4.length === t5 || (0, A.throwConcurrentModificationError)(t4), ++_i) {
           upstream = t4[_i];
           _0_0 = upstream.get$url(upstream);
-          if (_0_0 != null) {
-            url = _0_0;
-            t6 = true;
-          } else {
-            url = null;
-            t6 = false;
-          }
-          if (t6)
-            J.add$1$ax(downstreamExtensionStores.putIfAbsent$2(url, new A._EvaluateVisitor__extendModules_closure4()), t3.get$extensionStore());
+          if (_0_0 != null)
+            J.add$1$ax(downstreamExtensionStores.putIfAbsent$2(_0_0, new A._EvaluateVisitor__extendModules_closure4()), t3.get$extensionStore());
         }
         unsatisfiedExtensions.removeAll$1(t3.get$extensionStore().extensionsWhereTarget$1(originalSelectors.get$contains(originalSelectors)));
       }
       if (unsatisfiedExtensions._collection$_length !== 0)
-        this._evaluate0$_throwForUnsatisfiedExtension$1(unsatisfiedExtensions.get$first(unsatisfiedExtensions));
+        this._evaluate0$_throwForUnsatisfiedExtension$1(unsatisfiedExtensions.get$first(0));
     },
     _evaluate0$_throwForUnsatisfiedExtension$1(extension) {
       throw A.wrapException(A.SassException$0(string$.The_ta + extension.target.toString$0(0) + ' !optional" to avoid this error.', extension.span, null));
@@ -93723,52 +94635,27 @@ self.util = _cliPkgRequires.util;
       return null;
     },
     visitAtRootRule$1(node) {
-      var unparsedQuery, t1, _1_0, query, $parent, included, _2_0, grandparent, t2, root, first, rest, innerCopy, outerCopy, _i, copy, _this = this, _null = null,
+      var t1, _2_0, root, first, rest, innerCopy, outerCopy, _i, copy, _this = this,
         _s8_ = "__parent",
-        _0_0 = node.query;
-      if (_0_0 != null) {
-        unparsedQuery = _0_0;
-        t1 = true;
-      } else {
-        unparsedQuery = _null;
-        t1 = false;
-      }
-      if (t1) {
-        _1_0 = _this._evaluate0$_performInterpolationWithMap$2$warnForColor(unparsedQuery, true);
-        query = A.AtRootQueryParser$0(_1_0._0, _this._evaluate0$_logger, _null).parse$0();
-      } else
-        query = B.AtRootQuery_UsS0;
-      $parent = _this._evaluate0$_assertInModule$2(_this._evaluate0$__parent, _s8_);
-      included = A._setArrayType([], type$.JSArray_ModifiableCssParentNode_2);
-      for (t1 = type$.CssStylesheet_2; !t1._is($parent); $parent = grandparent) {
+        _0_0 = node.query,
+        query = _0_0 != null ? A.AtRootQueryParser$0(_this._evaluate0$_performInterpolationWithMap$2$warnForColor(_0_0, true)._0, _this._evaluate0$_logger, null).parse$0() : B.AtRootQuery_n2q0,
+        $parent = _this._evaluate0$_assertInModule$2(_this._evaluate0$__parent, _s8_),
+        included = A._setArrayType([], type$.JSArray_ModifiableCssParentNode_2);
+      for (t1 = type$.CssStylesheet_2; !t1._is($parent); $parent = _2_0) {
         if (!query.excludes$1($parent))
           included.push($parent);
         _2_0 = $parent._node$_parent;
-        if (_2_0 != null) {
-          grandparent = _2_0;
-          t2 = true;
-        } else {
-          grandparent = _null;
-          t2 = false;
-        }
-        if (!t2)
+        if (_2_0 == null)
           throw A.wrapException(A.StateError$(string$.CssNod));
       }
       root = _this._evaluate0$_trimIncluded$1(included);
       if (root === _this._evaluate0$_assertInModule$2(_this._evaluate0$__parent, _s8_)) {
         _this._evaluate0$_environment.scope$1$2$when(new A._EvaluateVisitor_visitAtRootRule_closure3(_this, node), node.hasDeclarations, type$.Null);
-        return _null;
+        return null;
       }
       if (included.length >= 1) {
         first = included[0];
         rest = B.JSArray_methods.sublist$1(included, 1);
-        t1 = true;
-      } else {
-        rest = _null;
-        first = rest;
-        t1 = false;
-      }
-      if (t1) {
         innerCopy = first.copyWithoutChildren$0();
         for (t1 = rest.length, outerCopy = innerCopy, _i = 0; _i < rest.length; rest.length === t1 || (0, A.throwConcurrentModificationError)(rest), ++_i, outerCopy = copy) {
           copy = rest[_i].copyWithoutChildren$0();
@@ -93778,38 +94665,24 @@ self.util = _cliPkgRequires.util;
       } else
         innerCopy = root;
       _this._evaluate0$_scopeForAtRoot$4(node, innerCopy, query, included).call$1(new A._EvaluateVisitor_visitAtRootRule_closure4(_this, node));
-      return _null;
+      return null;
     },
     _evaluate0$_trimIncluded$1(nodes) {
-      var $parent, t1, innermostContiguous, i, t2, _0_0, grandparent, t3, _1_0, root, _this = this, _null = null, _s5_ = "_root",
+      var $parent, t1, innermostContiguous, i, t2, _0_0, _1_0, root, _this = this, _null = null, _s5_ = "_root",
         _s22_ = " to be an ancestor of ";
       if (nodes.length === 0)
         return _this._evaluate0$_assertInModule$2(_this._evaluate0$__root, _s5_);
       $parent = _this._evaluate0$_assertInModule$2(_this._evaluate0$__parent, "__parent");
-      for (t1 = nodes.length, innermostContiguous = _null, i = 0; i < t1; ++i, $parent = grandparent) {
-        for (; t2 = nodes[i], $parent !== t2; innermostContiguous = _null, $parent = grandparent) {
+      for (t1 = nodes.length, innermostContiguous = _null, i = 0; i < t1; ++i, $parent = _1_0) {
+        for (; t2 = nodes[i], $parent !== t2; innermostContiguous = _null, $parent = _0_0) {
           _0_0 = $parent._node$_parent;
-          if (_0_0 != null) {
-            grandparent = _0_0;
-            t3 = true;
-          } else {
-            grandparent = _null;
-            t3 = false;
-          }
-          if (!t3)
+          if (_0_0 == null)
             throw A.wrapException(A.ArgumentError$("Expected " + t2.toString$0(0) + _s22_ + _this.toString$0(0) + ".", _null));
         }
         if (innermostContiguous == null)
           innermostContiguous = i;
         _1_0 = $parent._node$_parent;
-        if (_1_0 != null) {
-          grandparent = _1_0;
-          t3 = true;
-        } else {
-          grandparent = _null;
-          t3 = false;
-        }
-        if (!t3)
+        if (_1_0 == null)
           throw A.wrapException(A.ArgumentError$("Expected " + t2.toString$0(0) + _s22_ + _this.toString$0(0) + ".", _null));
       }
       if ($parent !== _this._evaluate0$_assertInModule$2(_this._evaluate0$__root, _s5_))
@@ -93848,54 +94721,46 @@ self.util = _cliPkgRequires.util;
       return null;
     },
     visitDeclaration$1(node) {
-      var t2, $name, _0_0, declarationName, t3, _1_0, expression, value, t4, t5, _2_0, oldDeclarationName, _this = this, _null = null, t1 = {};
+      var t2, _0_0, t3, $name, _1_0, _2_0, value, t4, t5, _3_0, oldDeclarationName, _this = this, _null = null,
+        _s8_ = "__parent",
+        t1 = {};
       if ((_this._evaluate0$_atRootExcludingStyleRule ? _null : _this._evaluate0$_styleRuleIgnoringAtRoot) == null && !_this._evaluate0$_inUnknownAtRule && !_this._evaluate0$_inKeyframes)
         throw A.wrapException(_this._evaluate0$_exception$2(string$.Declarm, node.span));
       if (_this._evaluate0$_declarationName != null && B.JSString_methods.startsWith$1(node.name.get$initialPlain(), "--"))
         throw A.wrapException(_this._evaluate0$_exception$2(string$.Declarw, node.span));
+      t2 = _this._evaluate0$_assertInModule$2(_this._evaluate0$__parent, _s8_)._node$_parent.children;
+      _0_0 = t2.get$last(t2);
+      t2 = _this._evaluate0$_assertInModule$2(_this._evaluate0$__parent, _s8_);
+      if (t2 !== _0_0) {
+        t2 = type$.SourceSpan;
+        t3 = type$.String;
+        _this._evaluate0$_warn$3(string$.Sassx27s, new A.MultiSpan0(node.span, "declaration", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([_0_0.get$span(_0_0), "nested rule"], t2, t3), t2, t3)), B.Deprecation_FGJ);
+      }
       t2 = node.name;
       $name = _this._evaluate0$_interpolationToValue$2$warnForColor(t2, true);
-      _0_0 = _this._evaluate0$_declarationName;
-      if (_0_0 != null) {
-        declarationName = _0_0;
-        t3 = true;
-      } else {
-        declarationName = _null;
-        t3 = false;
-      }
-      if (t3)
-        $name = new A.CssValue0(A.S(declarationName) + "-" + A.S($name.value), $name.span, type$.CssValue_String_2);
-      _1_0 = node.value;
-      if (_1_0 != null) {
-        expression = _1_0;
-        t3 = true;
-      } else {
-        expression = _null;
-        t3 = false;
-      }
-      if (t3) {
-        value = expression.accept$1(_this);
+      _1_0 = _this._evaluate0$_declarationName;
+      if (_1_0 != null)
+        $name = new A.CssValue0(_1_0 + "-" + A.S($name.value), $name.span, type$.CssValue_String_2);
+      _2_0 = node.value;
+      if (_2_0 != null) {
+        value = _2_0.accept$1(_this);
         if (!value.get$isBlank() || value.get$asList().length === 0) {
-          t3 = _this._evaluate0$_assertInModule$2(_this._evaluate0$__parent, "__parent");
-          t4 = expression.get$span(expression);
+          t3 = _this._evaluate0$_assertInModule$2(_this._evaluate0$__parent, _s8_);
+          t4 = _2_0.get$span(_2_0);
           t2 = B.JSString_methods.startsWith$1(t2.get$initialPlain(), "--");
           if (_this._evaluate0$_sourceMap) {
-            t5 = A.NullableExtension_andThen0(_1_0, _this.get$_evaluate0$_expressionNode());
+            t5 = A.NullableExtension_andThen0(_2_0, _this.get$_evaluate0$_expressionNode());
             t5 = t5 == null ? _null : J.get$span$z(t5);
           } else
             t5 = _null;
           t3.addChild$1(A.ModifiableCssDeclaration$0($name, new A.CssValue0(value, t4, type$.CssValue_Value_2), node.span, t2, t5));
         } else if (J.startsWith$1$s($name.value, "--"))
-          throw A.wrapException(_this._evaluate0$_exception$2("Custom property values may not be empty.", expression.get$span(expression)));
+          throw A.wrapException(_this._evaluate0$_exception$2("Custom property values may not be empty.", _2_0.get$span(_2_0)));
       }
+      _3_0 = node.children;
       t1.children = null;
-      _2_0 = node.children;
-      if (_2_0 != null) {
-        t1.children = _2_0;
-        t2 = true;
-      } else
-        t2 = false;
-      if (t2) {
+      if (_3_0 != null) {
+        t1.children = _3_0;
         oldDeclarationName = _this._evaluate0$_declarationName;
         _this._evaluate0$_declarationName = $name.value;
         _this._evaluate0$_environment.scope$1$2$when(new A._EvaluateVisitor_visitDeclaration_closure1(t1, _this), node.hasDeclarations, type$.Null);
@@ -93904,7 +94769,7 @@ self.util = _cliPkgRequires.util;
       return _null;
     },
     visitEachRule$1(node) {
-      var t2, _this = this, _box_0 = {},
+      var _this = this, _box_0 = {},
         t1 = node.list,
         list = t1.accept$1(_this),
         nodeWithSpan = _this._evaluate0$_expressionNode$1(t1),
@@ -93913,17 +94778,12 @@ self.util = _cliPkgRequires.util;
         _box_0.variable = null;
         if (_0_0.length === 1) {
           _box_0.variable = _0_0[0];
-          t1 = true;
-        } else
-          t1 = false;
-        if (t1) {
           t1 = new A._EvaluateVisitor_visitEachRule_closure5(_box_0, _this, nodeWithSpan);
           break $label0$0;
         }
-        t1 = _box_0.variables = null;
+        _box_0.variables = null;
         _box_0.variables = _0_0;
-        t2 = new A._EvaluateVisitor_visitEachRule_closure6(_box_0, _this, nodeWithSpan);
-        t1 = t2;
+        t1 = new A._EvaluateVisitor_visitEachRule_closure6(_box_0, _this, nodeWithSpan);
         break $label0$0;
       }
       return _this._evaluate0$_environment.scope$1$2$semiGlobal(new A._EvaluateVisitor_visitEachRule_closure7(_this, list, t1, node), true, type$.nullable_Value_2);
@@ -93954,10 +94814,10 @@ self.util = _cliPkgRequires.util;
         complex.accept$1(visitor);
         t6 = B.JSString_methods.trim$0(visitor._serialize0$_buffer.toString$0(0));
         t7 = complex.accept$1(B.C__IsUselessVisitor0) ? "can't" : "shouldn't";
-        _this._evaluate0$_warn$3('The selector "' + t6 + '" is invalid CSS and ' + t7 + string$.x20be_an, new A.MultiSpan0(A.SpanExtensions_trimRight0(complex.span), "invalid selector", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([t3, "@extend rule"], t4, t5), t4, t5)), B.Deprecation_XV6);
+        _this._evaluate0$_warn$3('The selector "' + t6 + '" is invalid CSS and ' + t7 + string$.x20be_an, new A.MultiSpan0(A.SpanExtensions_trimRight0(complex.span), "invalid selector", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([t3, "@extend rule"], t4, t5), t4, t5)), B.Deprecation_5pG);
       }
       _0_0 = _this._evaluate0$_performInterpolationWithMap$2$warnForColor(node.selector, true);
-      for (t1 = A.SelectorList_SelectorList$parse0(A.trimAscii0(_0_0._0, true), false, true, _0_0._1, _this._evaluate0$_logger).components, t2 = t1.length, t3 = styleRule._style_rule0$_selector._box0$_inner, _i = 0; _i < t2; ++_i) {
+      for (t1 = A.SelectorList_SelectorList$parse0(A.trimAscii0(_0_0._0, true), false, _0_0._1, _this._evaluate0$_logger, false).components, t2 = t1.length, t3 = styleRule._style_rule0$_selector._box0$_inner, _i = 0; _i < t2; ++_i) {
         complex = t1[_i];
         compound = complex.get$singleCompound();
         if (compound == null)
@@ -94051,12 +94911,12 @@ self.util = _cliPkgRequires.util;
           t4 = variable.name;
           oldValue = t1.get$isEmpty(t1) ? _null : t1.remove$1(0, t4);
           if (oldValue != null)
-            t5 = true;
+            t5 = !oldValue.value.$eq(0, B.C__SassNull0);
           else {
             oldValue = _null;
             t5 = false;
           }
-          if (t5 && !oldValue.value.$eq(0, B.C__SassNull0)) {
+          if (t5) {
             newValues.$indexSet(0, t4, oldValue);
             continue;
           }
@@ -94075,8 +94935,7 @@ self.util = _cliPkgRequires.util;
         t1 = _this._evaluate0$__root;
       if (t1 == null)
         return;
-      t1 = _this._evaluate0$_assertInModule$2(t1, _s5_).children;
-      if (t1.get$length(t1) === 0 || !module.get$transitivelyContainsCss())
+      if (_this._evaluate0$_assertInModule$2(t1, _s5_).children.get$length(0) === 0 || !module.get$transitivelyContainsCss())
         return;
       t1 = _this._evaluate0$_preModuleComments;
       if (t1 == null)
@@ -94173,69 +95032,55 @@ self.util = _cliPkgRequires.util;
       return this._evaluate0$_withStackFrame$3("@import", $import, new A._EvaluateVisitor__visitDynamicImport_closure1(this, $import));
     },
     _evaluate0$_loadStylesheet$4$baseUrl$forImport(url, span, baseUrl, forImport) {
-      var importCache, _0_0, importer, canonicalUrl, originalUrl, _1_0, isDependency, stylesheet, _2_0, result, _3_0, error, stackTrace, error0, stackTrace0, message, t1, t2, t3, t4, exception, message0, _this = this,
+      var _0_0, importCache, _1_0, importer, canonicalUrl, originalUrl, isDependency, _2_0, stylesheet, _3_0, result, error, stackTrace, error0, stackTrace0, message, t1, t2, t3, t4, exception, message0, _this = this,
         _s11_ = "_stylesheet";
       baseUrl = baseUrl;
       try {
         _this._evaluate0$_importSpan = span;
-        importCache = null;
         _0_0 = _this._evaluate0$_importCache;
+        importCache = null;
         if (_0_0 != null) {
           importCache = _0_0;
-          t1 = true;
-        } else
-          t1 = false;
-        if (t1) {
           if (baseUrl == null)
             baseUrl = _this._evaluate0$_assertInModule$2(_this._evaluate0$__stylesheet, _s11_).span.file.url;
+          _1_0 = J.canonicalize$4$baseImporter$baseUrl$forImport$x(importCache, A.Uri_parse(url), _this._evaluate0$_importer, baseUrl, forImport);
           importer = null;
           canonicalUrl = null;
           originalUrl = null;
-          _1_0 = J.canonicalize$4$baseImporter$baseUrl$forImport$x(importCache, A.Uri_parse(url), _this._evaluate0$_importer, baseUrl, forImport);
           if (type$.Record_3_nullable_Object_and_nullable_Object_and_nullable_Object_originalUrl._is(_1_0)) {
             importer = _1_0._0;
             canonicalUrl = _1_0._1;
             originalUrl = _1_0._2;
-            t1 = true;
-          } else
-            t1 = false;
-          if (t1) {
             _this._evaluate0$_loadedUrls.add$1(0, canonicalUrl);
             isDependency = _this._evaluate0$_inDependency || !J.$eq$(importer, _this._evaluate0$_importer);
-            stylesheet = null;
             t1 = importCache;
             t2 = importer;
             t3 = canonicalUrl;
             t4 = originalUrl;
             _2_0 = t1.importCanonical$4$originalUrl$quiet(t2, t3, t4, _this._evaluate0$_quietDeps && isDependency);
+            stylesheet = null;
             if (_2_0 != null) {
               stylesheet = _2_0;
-              t1 = true;
-            } else
-              t1 = false;
-            if (t1) {
               t1 = stylesheet;
               t2 = importer;
               return new A._Record_3_importer_isDependency(t1, t2, isDependency);
             }
           }
-        } else {
-          result = null;
+        }
+        if (_this._nodeImporter != null) {
           t1 = baseUrl;
-          _3_0 = _this._evaluate0$_importLikeNode$3(url, t1 == null ? _this._evaluate0$_assertInModule$2(_this._evaluate0$__stylesheet, _s11_).span.file.url : t1, forImport);
+          _3_0 = _this._importLikeNode$3(url, t1 == null ? _this._evaluate0$_assertInModule$2(_this._evaluate0$__stylesheet, _s11_).span.file.url : t1, forImport);
+          result = null;
           if (_3_0 != null) {
             result = _3_0;
-            t1 = true;
-          } else
-            t1 = false;
-          if (t1) {
             t1 = _this._evaluate0$_loadedUrls;
             A.NullableExtension_andThen0(result._0.span.file.url, t1.get$add(t1));
             t1 = result;
             return t1;
           }
         }
-        if (B.JSString_methods.startsWith$1(url, "package:") && true)
+        t1 = B.JSString_methods.startsWith$1(url, "package:");
+        if (t1)
           throw A.wrapException(string$.x22packa);
         else
           throw A.wrapException("Can't find stylesheet to import.");
@@ -94269,9 +95114,9 @@ self.util = _cliPkgRequires.util;
     _evaluate0$_loadStylesheet$3$forImport(url, span, forImport) {
       return this._evaluate0$_loadStylesheet$4$baseUrl$forImport(url, span, null, forImport);
     },
-    _evaluate0$_importLikeNode$3(originalUrl, previous, forImport) {
+    _importLikeNode$3(originalUrl, previous, forImport) {
       var isDependency, url, t2, _this = this,
-        t1 = _this._evaluate0$_nodeImporter,
+        t1 = _this._nodeImporter,
         result = t1.loadRelative$3(originalUrl, previous, forImport);
       if (result != null)
         isDependency = _this._evaluate0$_inDependency;
@@ -94282,16 +95127,15 @@ self.util = _cliPkgRequires.util;
         isDependency = true;
       }
       url = result._1;
-      t1 = J.startsWith$1$s(url, "file") ? A.Syntax_forPath0(url) : B.Syntax_SCSS_scss0;
+      t1 = B.JSString_methods.startsWith$1(url, "file") ? A.Syntax_forPath0(url) : B.Syntax_SCSS_scss0;
       t2 = _this._evaluate0$_quietDeps && isDependency ? $.$get$Logger_quiet0() : _this._evaluate0$_logger;
       return new A._Record_3_importer_isDependency(A.Stylesheet_Stylesheet$parse0(result._0, t1, t2, url), null, isDependency);
     },
     _evaluate0$_applyMixin$5(mixin, contentCallable, $arguments, nodeWithSpan, nodeWithSpanWithoutContent) {
-      var _1_8, t1, _0_0, _this = this,
+      var t1, _0_0, _1_8, t2, _this = this,
         _s37_ = "Mixin doesn't accept a content block.",
         _s10_ = "invocation";
       $label0$0: {
-        _1_8 = A._InitializedCell$(new A._EvaluateVisitor__applyMixin_closure5(mixin));
         if (mixin == null)
           throw A.wrapException(_this._evaluate0$_exception$2("Undefined mixin.", nodeWithSpan.get$span(nodeWithSpan)));
         t1 = mixin instanceof A.BuiltInCallable0;
@@ -94301,22 +95145,33 @@ self.util = _cliPkgRequires.util;
           throw A.wrapException(A.MultiSpanSassRuntimeException$0(_s37_, nodeWithSpanWithoutContent.get$span(nodeWithSpanWithoutContent), _s10_, A.LinkedHashMap_LinkedHashMap$_literal([_0_0._0.get$spanWithName(), "declaration"], type$.FileSpan, type$.String), _this._evaluate0$_stackTrace$1(nodeWithSpanWithoutContent.get$span(nodeWithSpanWithoutContent)), null));
         }
         if (t1) {
-          _this._evaluate0$_environment.withContent$2(contentCallable, new A._EvaluateVisitor__applyMixin_closure6(_this, $arguments, mixin, nodeWithSpanWithoutContent));
+          _this._evaluate0$_environment.withContent$2(contentCallable, new A._EvaluateVisitor__applyMixin_closure3(_this, $arguments, mixin, nodeWithSpanWithoutContent));
           break $label0$0;
         }
         t1 = type$.UserDefinedCallable_Environment_2._is(mixin);
-        if (t1 && _1_8._readFinal$0() instanceof A.MixinRule0 && !_1_8._readFinal$0().get$hasContent() && contentCallable != null)
+        if (t1) {
+          _1_8 = mixin.declaration;
+          if (_1_8 instanceof A.MixinRule0)
+            t2 = !type$.MixinRule_2._as(_1_8).get$hasContent() && contentCallable != null;
+          else
+            t2 = false;
+        } else
+          t2 = false;
+        if (t2)
           throw A.wrapException(A.MultiSpanSassRuntimeException$0(_s37_, nodeWithSpanWithoutContent.get$span(nodeWithSpanWithoutContent), _s10_, A.LinkedHashMap_LinkedHashMap$_literal([mixin.declaration.$arguments.get$spanWithName(), "declaration"], type$.FileSpan, type$.String), _this._evaluate0$_stackTrace$1(nodeWithSpanWithoutContent.get$span(nodeWithSpanWithoutContent)), null));
         if (t1) {
-          _this._evaluate0$_runUserDefinedCallable$1$4($arguments, mixin, nodeWithSpanWithoutContent, new A._EvaluateVisitor__applyMixin_closure7(_this, contentCallable, mixin, nodeWithSpanWithoutContent), type$.Null);
+          _this._evaluate0$_runUserDefinedCallable$1$4($arguments, mixin, nodeWithSpanWithoutContent, new A._EvaluateVisitor__applyMixin_closure4(_this, contentCallable, mixin, nodeWithSpanWithoutContent), type$.Null);
           break $label0$0;
         }
         throw A.wrapException(A.UnsupportedError$("Unknown callable type " + mixin.toString$0(0) + "."));
       }
     },
     visitIncludeRule$1(node) {
-      var _this = this;
-      _this._evaluate0$_applyMixin$5(_this._evaluate0$_addExceptionSpan$2(node, new A._EvaluateVisitor_visitIncludeRule_closure5(_this, node)), A.NullableExtension_andThen0(node.content, new A._EvaluateVisitor_visitIncludeRule_closure6(_this)), node.$arguments, node, new A._FakeAstNode0(new A._EvaluateVisitor_visitIncludeRule_closure7(node)));
+      var _this = this,
+        mixin = _this._evaluate0$_addExceptionSpan$2(node, new A._EvaluateVisitor_visitIncludeRule_closure5(_this, node));
+      if (B.JSString_methods.startsWith$1(node.originalName, "--") && mixin instanceof A.UserDefinedCallable0 && !B.JSString_methods.startsWith$1(mixin.declaration.originalName, "--"))
+        _this._evaluate0$_warn$3(string$.Sassx20_m, node.get$nameSpan(), B.Deprecation_qBS);
+      _this._evaluate0$_applyMixin$5(mixin, A.NullableExtension_andThen0(node.content, new A._EvaluateVisitor_visitIncludeRule_closure6(_this)), node.$arguments, node, new A._FakeAstNode0(new A._EvaluateVisitor_visitIncludeRule_closure7(node)));
       return null;
     },
     visitMixinRule$1(node) {
@@ -94369,26 +95224,23 @@ self.util = _cliPkgRequires.util;
       return null;
     },
     _evaluate0$_mergeMediaQueries$2(queries1, queries2) {
-      var t1, t2, t3, t4, _0_0, result, t5,
+      var t1, t2, t3, t4, _0_0, t5, result,
         queries = A._setArrayType([], type$.JSArray_CssMediaQuery_2);
       for (t1 = J.get$iterator$ax(queries1), t2 = J.getInterceptor$ax(queries2); t1.moveNext$0();) {
         t3 = t1.get$current(t1);
-        for (t4 = t2.get$iterator(queries2); t4.moveNext$0();) {
-          _0_0 = t3.merge$1(t4.get$current(t4));
-          if (B._SingletonCssMediaQueryMergeResult_00 === _0_0)
-            continue;
-          if (B._SingletonCssMediaQueryMergeResult_10 === _0_0)
-            return null;
-          if (_0_0 instanceof A.MediaQuerySuccessfulMergeResult0) {
-            result = _0_0;
-            t5 = true;
-          } else {
-            result = null;
-            t5 = false;
+        for (t4 = t2.get$iterator(queries2); t4.moveNext$0();)
+          $label0$1: {
+            _0_0 = t3.merge$1(t4.get$current(t4));
+            if (B._SingletonCssMediaQueryMergeResult_00 === _0_0)
+              continue;
+            if (B._SingletonCssMediaQueryMergeResult_10 === _0_0)
+              return null;
+            t5 = _0_0 instanceof A.MediaQuerySuccessfulMergeResult0;
+            result = t5 ? _0_0 : null;
+            if (t5)
+              queries.push(result.query);
+            break $label0$1;
           }
-          if (t5)
-            queries.push(result.query);
-        }
       }
       return queries;
     },
@@ -94400,63 +95252,90 @@ self.util = _cliPkgRequires.util;
       return null;
     },
     visitStyleRule$1(node) {
-      var t1, _0_0, selectorText, selectorMap, t2, parsedSelector, rule, oldAtRootExcludingStyleRule, t3, t4, t5, _i, complex, visitor, t6, t7, t8, t9, _this = this, _null = null,
-        _s11_ = "_stylesheet",
-        _s8_ = "__parent";
+      var t1, _0_0, selectorText, selectorMap, parsedSelector, nest, t2, _i, _1_0, first, t3, rule, oldAtRootExcludingStyleRule, _this = this, _null = null,
+        _s8_ = "__parent",
+        _s11_ = "_stylesheet";
       if (_this._evaluate0$_declarationName != null)
-        throw A.wrapException(_this._evaluate0$_exception$2(string$.Style_, node.span));
+        throw A.wrapException(_this._evaluate0$_exception$2(string$.Style_n, node.span));
+      else if (_this._evaluate0$_inKeyframes && _this._evaluate0$_assertInModule$2(_this._evaluate0$__parent, _s8_) instanceof A.ModifiableCssKeyframeBlock0)
+        throw A.wrapException(_this._evaluate0$_exception$2(string$.Style_k, node.span));
       t1 = node.selector;
       _0_0 = _this._evaluate0$_performInterpolationWithMap$2$warnForColor(t1, true);
       selectorText = _0_0._0;
       selectorMap = _0_0._1;
       if (_this._evaluate0$_inKeyframes) {
-        _this._evaluate0$_withParent$2$4$scopeWhen$through(A.ModifiableCssKeyframeBlock$0(new A.CssValue0(A.List_List$unmodifiable(A.KeyframeSelectorParser$0(selectorText, selectorMap, _this._evaluate0$_logger).parse$0(), type$.String), t1.span, type$.CssValue_List_String_2), node.span), new A._EvaluateVisitor_visitStyleRule_closure9(_this, node), node.hasDeclarations, new A._EvaluateVisitor_visitStyleRule_closure10(), type$.ModifiableCssKeyframeBlock_2, type$.Null);
+        _this._evaluate0$_withParent$2$4$scopeWhen$through(A.ModifiableCssKeyframeBlock$0(new A.CssValue0(A.List_List$unmodifiable(A.KeyframeSelectorParser$0(selectorText, selectorMap, _this._evaluate0$_logger).parse$0(), type$.String), t1.span, type$.CssValue_List_String_2), node.span), new A._EvaluateVisitor_visitStyleRule_closure7(_this, node), node.hasDeclarations, new A._EvaluateVisitor_visitStyleRule_closure8(), type$.ModifiableCssKeyframeBlock_2, type$.Null);
         return _null;
       }
-      t1 = A.SelectorList_SelectorList$parse0(selectorText, !_this._evaluate0$_assertInModule$2(_this._evaluate0$__stylesheet, _s11_).plainCss, !_this._evaluate0$_assertInModule$2(_this._evaluate0$__stylesheet, _s11_).plainCss, selectorMap, _this._evaluate0$_logger);
-      t2 = _this._evaluate0$_styleRuleIgnoringAtRoot;
-      t2 = t2 == null ? _null : t2.originalSelector;
-      parsedSelector = t1.resolveParentSelectors$2$implicitParent(t2, !_this._evaluate0$_atRootExcludingStyleRule);
-      rule = A.ModifiableCssStyleRule$0(_this._evaluate0$_assertInModule$2(_this._evaluate0$__extensionStore, "_extensionStore").addSelector$2(parsedSelector, _this._evaluate0$_mediaQueries), node.span, parsedSelector);
+      parsedSelector = A.SelectorList_SelectorList$parse0(selectorText, true, selectorMap, _this._evaluate0$_logger, _this._evaluate0$_assertInModule$2(_this._evaluate0$__stylesheet, _s11_).plainCss);
+      t1 = _this._evaluate0$_atRootExcludingStyleRule ? _null : _this._evaluate0$_styleRuleIgnoringAtRoot;
+      t1 = t1 == null ? _null : t1.fromPlainCss;
+      nest = t1 !== true;
+      if (nest) {
+        if (_this._evaluate0$_assertInModule$2(_this._evaluate0$__stylesheet, _s11_).plainCss)
+          for (t1 = parsedSelector.components, t2 = t1.length, _i = 0; _i < t2; ++_i) {
+            _1_0 = t1[_i].leadingCombinators;
+            if (_1_0.length >= 1) {
+              first = _1_0[0];
+              t3 = _this._evaluate0$_assertInModule$2(_this._evaluate0$__stylesheet, _s11_);
+              t3 = t3.plainCss;
+            } else {
+              first = _null;
+              t3 = false;
+            }
+            if (t3)
+              throw A.wrapException(_this._evaluate0$_exception$2(string$.Top_lel, first.span));
+          }
+        t1 = _this._evaluate0$_styleRuleIgnoringAtRoot;
+        t1 = t1 == null ? _null : t1.originalSelector;
+        parsedSelector = parsedSelector.nestWithin$3$implicitParent$preserveParentSelectors(t1, !_this._evaluate0$_atRootExcludingStyleRule, _this._evaluate0$_assertInModule$2(_this._evaluate0$__stylesheet, _s11_).plainCss);
+      }
+      rule = A.ModifiableCssStyleRule$0(_this._evaluate0$_assertInModule$2(_this._evaluate0$__extensionStore, "_extensionStore").addSelector$2(parsedSelector, _this._evaluate0$_mediaQueries), node.span, _this._evaluate0$_assertInModule$2(_this._evaluate0$__stylesheet, _s11_).plainCss, parsedSelector);
       oldAtRootExcludingStyleRule = _this._evaluate0$_atRootExcludingStyleRule;
-      _this._evaluate0$_atRootExcludingStyleRule = false;
-      _this._evaluate0$_withParent$2$4$scopeWhen$through(rule, new A._EvaluateVisitor_visitStyleRule_closure11(_this, rule, node), node.hasDeclarations, new A._EvaluateVisitor_visitStyleRule_closure12(), type$.ModifiableCssStyleRule_2, type$.Null);
+      t1 = _this._evaluate0$_atRootExcludingStyleRule = false;
+      t2 = nest ? new A._EvaluateVisitor_visitStyleRule_closure9() : _null;
+      _this._evaluate0$_withParent$2$4$scopeWhen$through(rule, new A._EvaluateVisitor_visitStyleRule_closure10(_this, rule, node), node.hasDeclarations, t2, type$.ModifiableCssStyleRule_2, type$.Null);
       _this._evaluate0$_atRootExcludingStyleRule = oldAtRootExcludingStyleRule;
+      _this._evaluate0$_warnForBogusCombinators$1(rule);
+      if ((_this._evaluate0$_atRootExcludingStyleRule ? _null : _this._evaluate0$_styleRuleIgnoringAtRoot) == null) {
+        t1 = _this._evaluate0$_assertInModule$2(_this._evaluate0$__parent, _s8_).children;
+        t1 = !t1.get$isEmpty(t1);
+      }
+      if (t1) {
+        t1 = _this._evaluate0$_assertInModule$2(_this._evaluate0$__parent, _s8_).children;
+        t1.get$last(t1).isGroupEnd = true;
+      }
+      return _null;
+    },
+    _evaluate0$_warnForBogusCombinators$1(rule) {
+      var t1, t2, t3, t4, t5, _i, complex, visitor, t6, t7, t8, t9, _this = this, _null = null;
       if (!rule.accept$1(B._IsInvisibleVisitor_false_false0))
-        for (t1 = parsedSelector.components, t2 = t1.length, t3 = type$.SourceSpan, t4 = type$.String, t5 = rule.children, _i = 0; _i < t2; ++_i) {
+        for (t1 = rule._style_rule0$_selector._box0$_inner.value.components, t2 = t1.length, t3 = type$.SourceSpan, t4 = type$.String, t5 = rule.children, _i = 0; _i < t2; ++_i) {
           complex = t1[_i];
           if (!complex.accept$1(B._IsBogusVisitor_true0))
             continue;
           if (complex.accept$1(B.C__IsUselessVisitor0)) {
             visitor = A._SerializeVisitor$0(_null, true, _null, true, false, _null, true);
             complex.accept$1(visitor);
-            _this._evaluate0$_warn$3('The selector "' + B.JSString_methods.trim$0(visitor._serialize0$_buffer.toString$0(0)) + string$.x22x20is_ix20, A.SpanExtensions_trimRight0(complex.span), B.Deprecation_XV6);
+            _this._evaluate0$_warn$3('The selector "' + B.JSString_methods.trim$0(visitor._serialize0$_buffer.toString$0(0)) + string$.x22x20is_ix20, A.SpanExtensions_trimRight0(complex.span), B.Deprecation_5pG);
           } else if (complex.leadingCombinators.length !== 0) {
-            visitor = A._SerializeVisitor$0(_null, true, _null, true, false, _null, true);
-            complex.accept$1(visitor);
-            _this._evaluate0$_warn$3('The selector "' + B.JSString_methods.trim$0(visitor._serialize0$_buffer.toString$0(0)) + string$.x22x20is_ix0a, A.SpanExtensions_trimRight0(complex.span), B.Deprecation_XV6);
+            if (!_this._evaluate0$_assertInModule$2(_this._evaluate0$__stylesheet, "_stylesheet").plainCss) {
+              visitor = A._SerializeVisitor$0(_null, true, _null, true, false, _null, true);
+              complex.accept$1(visitor);
+              _this._evaluate0$_warn$3('The selector "' + B.JSString_methods.trim$0(visitor._serialize0$_buffer.toString$0(0)) + string$.x22x20is_ix0a, A.SpanExtensions_trimRight0(complex.span), B.Deprecation_5pG);
+            }
           } else {
             visitor = A._SerializeVisitor$0(_null, true, _null, true, false, _null, true);
             complex.accept$1(visitor);
             t6 = B.JSString_methods.trim$0(visitor._serialize0$_buffer.toString$0(0));
             t7 = complex.accept$1(B._IsBogusVisitor_false0) ? string$.x20It_wi : "";
             t8 = A.SpanExtensions_trimRight0(complex.span);
-            if (t5.get$length(t5) === 0)
+            if (t5.get$length(0) === 0)
               A.throwExpression(A.IterableElementError_noElement());
             t9 = J.get$span$z(t5.$index(0, 0));
-            _this._evaluate0$_warn$3('The selector "' + t6 + string$.x22x20is_o + t7 + string$.x0aThis_, new A.MultiSpan0(t8, "invalid selector", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([t9, "this is not a style rule" + (t5.every$1(t5, new A._EvaluateVisitor_visitStyleRule_closure13()) ? "\n(try converting to a //-style comment)" : "")], t3, t4), t3, t4)), B.Deprecation_XV6);
+            _this._evaluate0$_warn$3('The selector "' + t6 + string$.x22x20is_o + t7 + string$.x0aThis_, new A.MultiSpan0(t8, "invalid selector", A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_literal([t9, "this is not a style rule" + (t5.every$1(t5, new A._EvaluateVisitor__warnForBogusCombinators_closure1()) ? "\n(try converting to a //-style comment)" : "")], t3, t4), t3, t4)), B.Deprecation_5pG);
           }
         }
-      if ((_this._evaluate0$_atRootExcludingStyleRule ? _null : _this._evaluate0$_styleRuleIgnoringAtRoot) == null) {
-        t1 = _this._evaluate0$_assertInModule$2(_this._evaluate0$__parent, _s8_).children;
-        t1 = !t1.get$isEmpty(t1);
-      } else
-        t1 = false;
-      if (t1) {
-        t1 = _this._evaluate0$_assertInModule$2(_this._evaluate0$__parent, _s8_).children;
-        t1.get$last(t1).isGroupEnd = true;
-      }
-      return _null;
     },
     visitSupportsRule$1(node) {
       var t1, _this = this;
@@ -94467,78 +95346,37 @@ self.util = _cliPkgRequires.util;
       return null;
     },
     _evaluate0$_visitSupportsCondition$1(condition) {
-      var operation, t1, t2, negation, interpolation, $function, anything, _this = this, _null = null, _box_0 = {};
+      var t1, _this = this, _box_0 = {};
       $label0$0: {
         if (condition instanceof A.SupportsOperation0) {
-          operation = condition;
-          t1 = true;
-        } else {
-          operation = _null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = operation.left;
-          t2 = operation.operator;
-          t2 = _this._evaluate0$_parenthesize$2(t1, t2) + " " + t2 + " " + _this._evaluate0$_parenthesize$2(operation.right, t2);
-          t1 = t2;
+          t1 = condition.operator;
+          t1 = _this._evaluate0$_parenthesize$2(condition.left, t1) + " " + t1 + " " + _this._evaluate0$_parenthesize$2(condition.right, t1);
           break $label0$0;
         }
         if (condition instanceof A.SupportsNegation0) {
-          negation = condition;
-          t1 = true;
-        } else {
-          negation = _null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = "not " + _this._evaluate0$_parenthesize$1(negation.condition);
+          t1 = "not " + _this._evaluate0$_parenthesize$1(condition.condition);
           break $label0$0;
         }
         if (condition instanceof A.SupportsInterpolation0) {
-          interpolation = condition;
-          t1 = true;
-        } else {
-          interpolation = _null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = interpolation.expression;
+          t1 = condition.expression;
           t1 = _this._evaluate0$_serialize$3$quote(t1.accept$1(_this), t1, false);
           break $label0$0;
         }
         _box_0.declaration = null;
         if (condition instanceof A.SupportsDeclaration0) {
           _box_0.declaration = condition;
-          t1 = true;
-        } else
-          t1 = false;
-        if (t1) {
           t1 = _this._evaluate0$_withSupportsDeclaration$1(new A._EvaluateVisitor__visitSupportsCondition_closure1(_box_0, _this));
           break $label0$0;
         }
         if (condition instanceof A.SupportsFunction0) {
-          $function = condition;
-          t1 = true;
-        } else {
-          $function = _null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = _this._evaluate0$_performInterpolation$1($function.name) + "(" + _this._evaluate0$_performInterpolation$1($function.$arguments) + ")";
+          t1 = _this._evaluate0$_performInterpolation$1(condition.name) + "(" + _this._evaluate0$_performInterpolation$1(condition.$arguments) + ")";
           break $label0$0;
         }
         if (condition instanceof A.SupportsAnything0) {
-          anything = condition;
-          t1 = true;
-        } else {
-          anything = _null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = "(" + _this._evaluate0$_performInterpolation$1(anything.contents) + ")";
+          t1 = "(" + _this._evaluate0$_performInterpolation$1(condition.contents) + ")";
           break $label0$0;
         }
-        t1 = A.throwExpression(A.ArgumentError$("Unknown supports condition type " + A.getRuntimeTypeOfDartObject(condition).toString$0(0) + ".", _null));
+        t1 = A.throwExpression(A.ArgumentError$("Unknown supports condition type " + A.getRuntimeTypeOfDartObject(condition).toString$0(0) + ".", null));
       }
       return t1;
     },
@@ -94573,21 +95411,18 @@ self.util = _cliPkgRequires.util;
       return this._evaluate0$_parenthesize$2(condition, null);
     },
     visitVariableDeclaration$1(node) {
-      var t2, t3, value, _this = this, _null = null, t1 = {};
+      var t2, value, _this = this, _null = null, t1 = {};
       if (node.isGuarded) {
         if (node.namespace == null && _this._evaluate0$_environment._environment0$_variables.length === 1) {
-          t1.override = null;
           t2 = _this._evaluate0$_configuration._configuration0$_values;
           t2 = t2.get$isEmpty(t2) ? _null : t2.remove$1(0, node.name);
+          t1.override = null;
           if (t2 != null) {
             t1.override = t2;
-            t3 = t2;
-            t2 = true;
-          } else {
-            t3 = _null;
+            t2 = !t2.value.$eq(0, B.C__SassNull0);
+          } else
             t2 = false;
-          }
-          if (t2 && !t3.value.$eq(0, B.C__SassNull0)) {
+          if (t2) {
             _this._evaluate0$_addExceptionSpan$2(node, new A._EvaluateVisitor_visitVariableDeclaration_closure5(t1, _this, node));
             return _null;
           }
@@ -94598,7 +95433,7 @@ self.util = _cliPkgRequires.util;
       }
       if (node.isGlobal && !_this._evaluate0$_environment.globalVariableExists$1(node.name)) {
         t1 = _this._evaluate0$_environment._environment0$_variables.length === 1 ? string$.As_of_S : string$.As_of_R + A.declarationName0(node.span) + ": null` at the stylesheet root.";
-        _this._evaluate0$_warn$3(t1, node.span, B.Deprecation_wKk);
+        _this._evaluate0$_warn$3(t1, node.span, B.Deprecation_W6Z);
       }
       t1 = node.expression;
       _this._evaluate0$_addExceptionSpan$2(node, new A._EvaluateVisitor_visitVariableDeclaration_closure7(_this, node, _this._evaluate0$_withoutSlash$2(t1.accept$1(_this), t1)));
@@ -94637,7 +95472,7 @@ self.util = _cliPkgRequires.util;
       var t1, _this = this;
       if (_this._evaluate0$_assertInModule$2(_this._evaluate0$__stylesheet, "_stylesheet").plainCss) {
         t1 = node.operator;
-        t1 = t1 !== B.BinaryOperator_2jN0 && t1 !== B.BinaryOperator_t8B0;
+        t1 = t1 !== B.BinaryOperator_wdM0 && t1 !== B.BinaryOperator_U770;
       } else
         t1 = false;
       if (t1)
@@ -94645,43 +95480,48 @@ self.util = _cliPkgRequires.util;
       return _this._evaluate0$_addExceptionSpan$2(node, new A._EvaluateVisitor_visitBinaryOperationExpression_closure1(_this, node));
     },
     _evaluate0$_slash$3(left, right, node) {
-      var t1, _null = null,
+      var t1, right0, _1_2, _1_1, _null = null,
         result = left.dividedBy$1(right),
-        _1_0 = new A._Record_2(left, right),
-        _1_1 = A._InitializedCell$(new A._EvaluateVisitor__slash_closure3(_1_0)),
-        _1_2 = A._InitializedCell$(new A._EvaluateVisitor__slash_closure4(_1_0));
-      if (_1_1._readFinal$0() instanceof A.SassNumber0) {
-        left = _1_1._readFinal$0();
-        if (_1_2._readFinal$0() instanceof A.SassNumber0) {
-          right = _1_2._readFinal$0();
+        _1_2_isSet = left instanceof A.SassNumber0;
+      if (_1_2_isSet) {
+        t1 = type$.SassNumber_2;
+        t1._as(left);
+        if (right instanceof A.SassNumber0) {
+          t1._as(right);
           t1 = node.allowsSlash && this._evaluate0$_operandAllowsSlash$1(node.left) && this._evaluate0$_operandAllowsSlash$1(node.right);
+          right0 = right;
+          _1_2 = right0;
         } else {
-          right = _null;
+          right0 = _null;
+          _1_2 = right;
           t1 = false;
         }
+        _1_1 = left;
       } else {
-        right = _null;
-        left = right;
+        right0 = _null;
+        _1_2 = right0;
+        _1_1 = left;
+        left = _1_2;
         t1 = false;
       }
       if (t1)
-        return type$.SassNumber_2._as(result).withSlash$2(left, right);
-      if (_1_1._readFinal$0() instanceof A.SassNumber0 && _1_2._readFinal$0() instanceof A.SassNumber0) {
-        this._evaluate0$_warn$3(string$.Using__o + A.S(new A._EvaluateVisitor__slash_recommendation1().call$1(node)) + " or " + A.expressionToCalc0(node).toString$0(0) + string$.x0a_Morex20, node.get$span(node), B.Deprecation_wWh);
+        return type$.SassNumber_2._as(result).withSlash$2(left, right0);
+      if (_1_1 instanceof A.SassNumber0)
+        t1 = (_1_2_isSet ? _1_2 : right) instanceof A.SassNumber0;
+      else
+        t1 = false;
+      if (t1) {
+        this._evaluate0$_warn$3(string$.Using__o + A.S(new A._EvaluateVisitor__slash_recommendation1().call$1(node)) + " or " + A.expressionToCalc0(node).toString$0(0) + string$.x0a_Morex20, node.get$span(0), B.Deprecation_E8a);
         return result;
       }
       return result;
     },
     _evaluate0$_operandAllowsSlash$1(node) {
-      var t1, t2;
+      var t1;
       if (node instanceof A.FunctionExpression0)
         if (node.namespace == null) {
-          t1 = node.originalName;
-          if (B.Set_WfnXb.contains$1(0, A.stringReplaceAllUnchecked(t1, "_", "-").toLowerCase())) {
-            t2 = this._evaluate0$_environment;
-            t1 = t2.getFunction$1(A.stringReplaceAllUnchecked(t1, "_", "-")) == null;
-          } else
-            t1 = false;
+          t1 = node.name;
+          t1 = B.Set_yHF81.contains$1(0, t1.toLowerCase()) && this._evaluate0$_environment.getFunction$1(t1) == null;
         } else
           t1 = false;
       else
@@ -94781,8 +95621,8 @@ self.util = _cliPkgRequires.util;
       if ($function == null) {
         if (node.namespace != null)
           throw A.wrapException(_this._evaluate0$_exception$2("Undefined function.", node.span));
-        t2 = node.originalName;
-        _0_0 = A.stringReplaceAllUnchecked(t2, "_", "-").toLowerCase();
+        t2 = node.name;
+        _0_0 = t2.toLowerCase();
         if ("min" === _0_0 || "max" === _0_0 || "round" === _0_0 || "abs" === _0_0) {
           t3 = node.$arguments;
           t4 = t3.named;
@@ -94793,14 +95633,12 @@ self.util = _cliPkgRequires.util;
           return _this._evaluate0$_visitCalculation$2$inLegacySassFunction(node, true);
         if ("calc" === _0_0 || "clamp" === _0_0 || "hypot" === _0_0 || "sin" === _0_0 || "cos" === _0_0 || "tan" === _0_0 || "asin" === _0_0 || "acos" === _0_0 || "atan" === _0_0 || "sqrt" === _0_0 || "exp" === _0_0 || "sign" === _0_0 || "mod" === _0_0 || "rem" === _0_0 || "atan2" === _0_0 || "pow" === _0_0 || "log" === _0_0)
           return _this._evaluate0$_visitCalculation$1(node);
-        if (_this._evaluate0$_assertInModule$2(_this._evaluate0$__stylesheet, _s11_).plainCss)
-          $function = null;
-        else {
-          t3 = _this._evaluate0$_builtInFunctions.$index(0, A.stringReplaceAllUnchecked(t2, "_", "-"));
-          $function = t3;
-        }
-        t1.$function = $function == null ? new A.PlainCssCallable0(t2) : $function;
-      }
+        $function = _this._evaluate0$_assertInModule$2(_this._evaluate0$__stylesheet, _s11_).plainCss ? null : _this._evaluate0$_builtInFunctions.$index(0, t2);
+        t2 = t1.$function = $function == null ? new A.PlainCssCallable0(node.originalName) : $function;
+      } else
+        t2 = $function;
+      if (B.JSString_methods.startsWith$1(node.originalName, "--") && t2 instanceof A.UserDefinedCallable0 && !B.JSString_methods.startsWith$1(t2.declaration.originalName, "--"))
+        _this._evaluate0$_warn$3(string$.Sassx20_ff, node.get$nameSpan(), B.Deprecation_qBS);
       oldInFunction = _this._evaluate0$_inFunction;
       _this._evaluate0$_inFunction = true;
       result = _this._evaluate0$_addErrorSpan$2(node, new A._EvaluateVisitor_visitFunctionExpression_closure7(t1, _this, node));
@@ -94821,12 +95659,13 @@ self.util = _cliPkgRequires.util;
         t3.push(_this._evaluate0$_visitCalculationExpression$2$inLegacySassFunction(t2[_i], inLegacySassFunction));
       $arguments = t3;
       if (_this._evaluate0$_inSupportsDeclaration)
-        return new A.SassCalculation0(A.stringReplaceAllUnchecked(node.originalName, "_", "-"), A.List_List$unmodifiable($arguments, type$.Object));
+        return new A.SassCalculation0(node.name, A.List_List$unmodifiable($arguments, type$.Object));
       oldCallableNode = _this._evaluate0$_callableNode;
       _this._evaluate0$_callableNode = node;
       try {
         t1 = null;
-        _0_0 = A.stringReplaceAllUnchecked(node.originalName, "_", "-").toLowerCase();
+        t3 = node.name;
+        _0_0 = t3.toLowerCase();
         $label0$0: {
           if ("calc" === _0_0) {
             t1 = A.SassCalculation_calc0(J.$index$asx($arguments, 0));
@@ -94912,7 +95751,7 @@ self.util = _cliPkgRequires.util;
             t1 = A.SassCalculation_clamp0(J.$index$asx($arguments, 0), A.ListExtensions_elementAtOrNull($arguments, 1), A.ListExtensions_elementAtOrNull($arguments, 2));
             break $label0$0;
           }
-          t3 = A.UnsupportedError$('Unknown calculation name "' + node.get$name(node) + '".');
+          t3 = A.UnsupportedError$('Unknown calculation name "' + t3 + '".');
           t1 = A.throwExpression(t3);
         }
         t1 = t1;
@@ -94935,10 +95774,11 @@ self.util = _cliPkgRequires.util;
       return this._evaluate0$_visitCalculation$2$inLegacySassFunction(node, false);
     },
     _evaluate0$_checkCalculationArguments$1(node) {
-      var _0_0,
+      var t1, _0_0,
         check = new A._EvaluateVisitor__checkCalculationArguments_check1(this, node);
       $label0$0: {
-        _0_0 = A.stringReplaceAllUnchecked(node.originalName, "_", "-").toLowerCase();
+        t1 = node.name;
+        _0_0 = t1.toLowerCase();
         if ("calc" === _0_0 || "sqrt" === _0_0 || "sin" === _0_0 || "cos" === _0_0 || "tan" === _0_0 || "asin" === _0_0 || "acos" === _0_0 || "atan" === _0_0 || "abs" === _0_0 || "exp" === _0_0 || "sign" === _0_0) {
           check.call$1(1);
           break $label0$0;
@@ -94955,7 +95795,7 @@ self.util = _cliPkgRequires.util;
           check.call$1(3);
           break $label0$0;
         }
-        throw A.wrapException(A.UnsupportedError$('Unknown calculation name "' + node.get$name(node) + '".'));
+        throw A.wrapException(A.UnsupportedError$('Unknown calculation name "' + t1 + '".'));
       }
     },
     _evaluate0$_verifyCompatibleNumbers$2(args, nodesWithSpans) {
@@ -94987,14 +95827,9 @@ self.util = _cliPkgRequires.util;
       }
     },
     _evaluate0$_visitCalculationExpression$2$inLegacySassFunction(node, inLegacySassFunction) {
-      var inner, t1, result, t2, _0_0, _1_0, t3, _i, i, _this = this, _null = null, _box_0 = {};
-      if (node instanceof A.ParenthesizedExpression0) {
-        inner = node.expression;
-        t1 = true;
-      } else {
-        inner = _null;
-        t1 = false;
-      }
+      var result, t2, _0_0, _1_0, t3, _i, i, _this = this, _null = null, _box_0 = {},
+        t1 = node instanceof A.ParenthesizedExpression0,
+        inner = t1 ? node.expression : _null;
       if (t1) {
         result = _this._evaluate0$_visitCalculationExpression$2$inLegacySassFunction(inner, inLegacySassFunction);
         return result instanceof A.SassString0 ? new A.SassString0("(" + result._string0$_text + ")", false) : result;
@@ -95030,13 +95865,12 @@ self.util = _cliPkgRequires.util;
         return t1;
       }
       _box_0.right = _box_0.left = _box_0.operator = null;
-      if (node instanceof A.BinaryOperationExpression0) {
+      t1 = node instanceof A.BinaryOperationExpression0;
+      if (t1) {
         _box_0.operator = node.operator;
         _box_0.left = node.left;
         _box_0.right = node.right;
-        t1 = true;
-      } else
-        t1 = false;
+      }
       if (t1) {
         _this._evaluate0$_checkWhitespaceAroundCalculationOperator$1(node);
         return _this._evaluate0$_addExceptionSpan$2(node, new A._EvaluateVisitor__visitCalculationExpression_closure1(_box_0, _this, node, inLegacySassFunction));
@@ -95045,25 +95879,11 @@ self.util = _cliPkgRequires.util;
         _1_0 = node.accept$1(_this);
         $label1$1: {
           if (_1_0 instanceof A.SassNumber0) {
-            result = _1_0;
-            t1 = true;
-          } else {
-            result = _null;
-            t1 = false;
-          }
-          if (t1) {
-            t1 = result;
+            t1 = _1_0;
             break $label1$1;
           }
           if (_1_0 instanceof A.SassCalculation0) {
-            result = _1_0;
-            t1 = true;
-          } else {
-            result = _null;
-            t1 = false;
-          }
-          if (t1) {
-            t1 = result;
+            t1 = _1_0;
             break $label1$1;
           }
           if (_1_0 instanceof A.SassString0) {
@@ -95081,7 +95901,7 @@ self.util = _cliPkgRequires.util;
         }
         return t1;
       }
-      if (node instanceof A.ListExpression0 && !node.hasBrackets && B.ListSeparator_EVt0 === node.separator && node.contents.length >= 2) {
+      if (node instanceof A.ListExpression0 && !node.hasBrackets && B.ListSeparator_nbm0 === node.separator && node.contents.length >= 2) {
         t1 = A._setArrayType([], type$.JSArray_Object);
         for (t2 = node.contents, t3 = t2.length, _i = 0; _i < t3; ++_i)
           t1.push(_this._evaluate0$_visitCalculationExpression$2$inLegacySassFunction(t2[_i], inLegacySassFunction));
@@ -95098,7 +95918,7 @@ self.util = _cliPkgRequires.util;
     _evaluate0$_checkWhitespaceAroundCalculationOperator$1(node) {
       var t2, t3, t4, textBetweenOperands, first, last,
         t1 = node.operator;
-      if (t1 !== B.BinaryOperator_anB0 && t1 !== B.BinaryOperator_olz0)
+      if (t1 !== B.BinaryOperator_u150 && t1 !== B.BinaryOperator_SjO0)
         return;
       t1 = node.left;
       t2 = t1.get$span(t1);
@@ -95130,20 +95950,20 @@ self.util = _cliPkgRequires.util;
     _evaluate0$_binaryOperatorToCalculationOperator$2(operator, node) {
       var t1;
       $label0$0: {
-        if (B.BinaryOperator_anB0 === operator) {
-          t1 = B.CalculationOperator_IyK0;
+        if (B.BinaryOperator_u150 === operator) {
+          t1 = B.CalculationOperator_g2q0;
           break $label0$0;
         }
-        if (B.BinaryOperator_olz0 === operator) {
-          t1 = B.CalculationOperator_2bx0;
+        if (B.BinaryOperator_SjO0 === operator) {
+          t1 = B.CalculationOperator_CxF0;
           break $label0$0;
         }
-        if (B.BinaryOperator_qN20 === operator) {
-          t1 = B.CalculationOperator_jFr0;
+        if (B.BinaryOperator_2No0 === operator) {
+          t1 = B.CalculationOperator_1710;
           break $label0$0;
         }
-        if (B.BinaryOperator_t8B0 === operator) {
-          t1 = B.CalculationOperator_OvN0;
+        if (B.BinaryOperator_U770 === operator) {
+          t1 = B.CalculationOperator_Qf10;
           break $label0$0;
         }
         t1 = A.throwExpression(this._evaluate0$_exception$2(string$.This_o, node.get$operatorSpan()));
@@ -95161,10 +95981,13 @@ self.util = _cliPkgRequires.util;
         t1 = node.contents;
         previousNode = t1[t2];
         currentNode = t1[i];
-        _0_2 = A._InitializedCell$(new A._EvaluateVisitor__checkAdjacentCalculationValues_closure1(currentNode));
-        if (currentNode instanceof A.UnaryOperationExpression0)
-          t1 = B.UnaryOperator_TLI0 === _0_2._readFinal$0() || B.UnaryOperator_gg40 === _0_2._readFinal$0();
-        else
+        if (currentNode instanceof A.UnaryOperationExpression0) {
+          _0_2 = currentNode.operator;
+          if (B.UnaryOperator_AiQ0 !== _0_2)
+            t1 = B.UnaryOperator_cLp0 === _0_2;
+          else
+            t1 = true;
+        } else
           t1 = false;
         if (!t1)
           t1 = currentNode instanceof A.NumberExpression0 && currentNode.value < 0;
@@ -95198,7 +96021,7 @@ self.util = _cliPkgRequires.util;
       return result;
     },
     _evaluate0$_runFunctionCallable$3($arguments, callable, nodeWithSpan) {
-      var buffer, first, argument, restArg, rest, error, t1, t2, _i, t3, exception, _this = this;
+      var buffer, first, argument, restArg, rest, error, t1, t2, _i, t3, t4, exception, _this = this;
       if (callable instanceof A.BuiltInCallable0)
         return _this._evaluate0$_withoutSlash$2(_this._evaluate0$_runBuiltInCallable$3($arguments, callable, nodeWithSpan), nodeWithSpan);
       else if (type$.UserDefinedCallable_Environment_2._is(callable))
@@ -95216,15 +96039,19 @@ self.util = _cliPkgRequires.util;
               first = false;
             else
               buffer._contents += ", ";
-            t3 = argument;
-            buffer._contents += _this._evaluate0$_serialize$3$quote(t3.accept$1(_this), t3, true);
+            t3 = buffer;
+            t4 = argument;
+            t4 = _this._evaluate0$_serialize$3$quote(t4.accept$1(_this), t4, true);
+            t3._contents += t4;
           }
           restArg = $arguments.rest;
           if (restArg != null) {
             rest = restArg.accept$1(_this);
             if (!first)
               buffer._contents += ", ";
-            buffer._contents += _this._evaluate0$_serialize$2(rest, restArg);
+            t1 = buffer;
+            t2 = _this._evaluate0$_serialize$2(rest, restArg);
+            t1._contents += t2;
           }
         } catch (exception) {
           t1 = A.unwrapException(exception);
@@ -95236,9 +96063,11 @@ self.util = _cliPkgRequires.util;
           } else
             throw exception;
         }
-        buffer._contents += A.Primitives_stringFromCharCode(41);
-        t1 = buffer._contents;
-        return new A.SassString0(t1.charCodeAt(0) == 0 ? t1 : t1, false);
+        t1 = buffer;
+        t2 = A.Primitives_stringFromCharCode(41);
+        t1._contents += t2;
+        t2 = buffer._contents;
+        return new A.SassString0(t2.charCodeAt(0) == 0 ? t2 : t2, false);
       } else
         throw A.wrapException(A.ArgumentError$("Unknown callable type " + J.get$runtimeType$(callable).toString$0(0) + ".", null));
     },
@@ -95271,7 +96100,7 @@ self.util = _cliPkgRequires.util;
         } else
           rest = B.List_empty19;
         t1 = evaluated._values[0];
-        argumentList = A.SassArgumentList$0(rest, t1, evaluated._values[4] === B.ListSeparator_undecided_null_undecided0 ? B.ListSeparator_rXA0 : evaluated._values[4]);
+        argumentList = A.SassArgumentList$0(rest, t1, evaluated._values[4] === B.ListSeparator_undecided_null_undecided0 ? B.ListSeparator_ECn0 : evaluated._values[4]);
         evaluated._values[2].push(argumentList);
       } else
         argumentList = null;
@@ -95302,11 +96131,7 @@ self.util = _cliPkgRequires.util;
         return result;
       if (argumentList._argument_list$_wereKeywordsAccessed)
         return result;
-      t1 = evaluated._values[0];
-      t1 = t1.get$keys(t1);
-      t1 = A.pluralize0("argument", t1.get$length(t1), null);
-      t2 = evaluated._values[0];
-      throw A.wrapException(A.MultiSpanSassRuntimeException$0("No " + t1 + " named " + A.toSentence0(t2.get$keys(t2).map$1$1(0, new A._EvaluateVisitor__runBuiltInCallable_closure7(), type$.Object), "or") + ".", nodeWithSpan.get$span(nodeWithSpan), "invocation", A.LinkedHashMap_LinkedHashMap$_literal([_box_0.overload.get$spanWithName(), "declaration"], type$.FileSpan, type$.String), _this._evaluate0$_stackTrace$1(nodeWithSpan.get$span(nodeWithSpan)), null));
+      throw A.wrapException(A.MultiSpanSassRuntimeException$0("No " + A.pluralize0("argument", evaluated._values[0].get$keys(0).get$length(0), null) + " named " + A.toSentence0(evaluated._values[0].get$keys(0).map$1$1(0, new A._EvaluateVisitor__runBuiltInCallable_closure7(), type$.Object), "or") + ".", nodeWithSpan.get$span(nodeWithSpan), "invocation", A.LinkedHashMap_LinkedHashMap$_literal([_box_0.overload.get$spanWithName(), "declaration"], type$.FileSpan, type$.String), _this._evaluate0$_stackTrace$1(nodeWithSpan.get$span(nodeWithSpan)), null));
     },
     _evaluate0$_evaluateArguments$1($arguments) {
       var t1, t2, _i, expression, nodeForSpan, named, namedNodes, t3, t4, $name, value, restArgs, rest, restNodeForSpan, t5, separator, keywordRestArgs, keywordRest, keywordRestNodeForSpan, _this = this,
@@ -95435,12 +96260,6 @@ self.util = _cliPkgRequires.util;
             $label1$1: {
               if (_0_0 instanceof A.SassString0) {
                 text = _0_0._string0$_text;
-                t5 = true;
-              } else {
-                text = null;
-                t5 = false;
-              }
-              if (t5) {
                 t5 = text;
                 break $label1$1;
               }
@@ -95533,27 +96352,38 @@ self.util = _cliPkgRequires.util;
       _this._evaluate0$_withParent$2$4$scopeWhen$through(A.ModifiableCssMediaRule$0(t1, node.span), new A._EvaluateVisitor_visitCssMediaRule_closure6(_this, mergedQueries, node, mergedSources), false, new A._EvaluateVisitor_visitCssMediaRule_closure7(mergedSources), type$.ModifiableCssMediaRule_2, type$.Null);
     },
     visitCssStyleRule$1(node) {
-      var t1, styleRule, t2, t3, t4, originalSelector, rule, oldAtRootExcludingStyleRule, _0_0, _0_1, lastChild, _this = this;
+      var t1, styleRule, t2, nest, t3, originalSelector, rule, oldAtRootExcludingStyleRule, _0_1, lastChild, _this = this, _null = null,
+        _s8_ = "__parent";
       if (_this._evaluate0$_declarationName != null)
-        throw A.wrapException(_this._evaluate0$_exception$2(string$.Style_, node.span));
+        throw A.wrapException(_this._evaluate0$_exception$2(string$.Style_n, node.span));
+      else if (_this._evaluate0$_inKeyframes && _this._evaluate0$_assertInModule$2(_this._evaluate0$__parent, _s8_) instanceof A.ModifiableCssKeyframeBlock0)
+        throw A.wrapException(_this._evaluate0$_exception$2(string$.Style_k, node.span));
       t1 = _this._evaluate0$_atRootExcludingStyleRule;
-      styleRule = t1 ? null : _this._evaluate0$_styleRuleIgnoringAtRoot;
-      t2 = node._style_rule0$_selector._box0$_inner.value;
-      t3 = styleRule == null;
-      t4 = t3 ? null : styleRule.originalSelector;
-      originalSelector = t2.resolveParentSelectors$2$implicitParent(t4, !t1);
-      rule = A.ModifiableCssStyleRule$0(_this._evaluate0$_assertInModule$2(_this._evaluate0$__extensionStore, "_extensionStore").addSelector$2(originalSelector, _this._evaluate0$_mediaQueries), node.span, originalSelector);
+      styleRule = t1 ? _null : _this._evaluate0$_styleRuleIgnoringAtRoot;
+      t2 = t1 ? _null : _this._evaluate0$_styleRuleIgnoringAtRoot;
+      t2 = t2 == null ? _null : t2.fromPlainCss;
+      nest = t2 !== true;
+      t2 = node._style_rule0$_selector._box0$_inner;
+      if (nest) {
+        t2 = t2.value;
+        t3 = styleRule == null ? _null : styleRule.originalSelector;
+        originalSelector = t2.nestWithin$3$implicitParent$preserveParentSelectors(t3, !t1, node.fromPlainCss);
+      } else
+        originalSelector = t2.value;
+      rule = A.ModifiableCssStyleRule$0(_this._evaluate0$_assertInModule$2(_this._evaluate0$__extensionStore, "_extensionStore").addSelector$2(originalSelector, _this._evaluate0$_mediaQueries), node.span, node.fromPlainCss, originalSelector);
       oldAtRootExcludingStyleRule = _this._evaluate0$_atRootExcludingStyleRule;
       _this._evaluate0$_atRootExcludingStyleRule = false;
-      _this._evaluate0$_withParent$2$4$scopeWhen$through(rule, new A._EvaluateVisitor_visitCssStyleRule_closure5(_this, rule, node), false, new A._EvaluateVisitor_visitCssStyleRule_closure6(), type$.ModifiableCssStyleRule_2, type$.Null);
+      t1 = nest ? new A._EvaluateVisitor_visitCssStyleRule_closure3() : _null;
+      _this._evaluate0$_withParent$2$4$scopeWhen$through(rule, new A._EvaluateVisitor_visitCssStyleRule_closure4(_this, rule, node), false, t1, type$.ModifiableCssStyleRule_2, type$.Null);
       _this._evaluate0$_atRootExcludingStyleRule = oldAtRootExcludingStyleRule;
-      _0_0 = _this._evaluate0$_assertInModule$2(_this._evaluate0$__parent, "__parent").children;
-      _0_1 = A._InitializedCell$(new A._EvaluateVisitor_visitCssStyleRule_closure7(_0_0));
-      if (_0_1._readFinal$0() >= 1) {
-        lastChild = J.elementAt$1$ax(_0_0._collection$_source, _0_1._readFinal$0() - 1);
-        t1 = t3;
+      t1 = _this._evaluate0$_assertInModule$2(_this._evaluate0$__parent, _s8_).children._collection$_source;
+      t2 = J.getInterceptor$asx(t1);
+      _0_1 = t2.get$length(t1);
+      if (_0_1 >= 1) {
+        lastChild = t2.elementAt$1(t1, _0_1 - 1);
+        t1 = styleRule == null;
       } else {
-        lastChild = null;
+        lastChild = _null;
         t1 = false;
       }
       if (t1)
@@ -95571,18 +96401,11 @@ self.util = _cliPkgRequires.util;
       _this._evaluate0$_withParent$2$4$scopeWhen$through(A.ModifiableCssSupportsRule$0(node.condition, node.span), new A._EvaluateVisitor_visitCssSupportsRule_closure3(_this, node), false, new A._EvaluateVisitor_visitCssSupportsRule_closure4(), type$.ModifiableCssSupportsRule_2, type$.Null);
     },
     _evaluate0$_handleReturn$1$2(list, callback) {
-      var t1, _i, _0_0, result, t2;
+      var t1, _i, _0_0;
       for (t1 = list.length, _i = 0; _i < list.length; list.length === t1 || (0, A.throwConcurrentModificationError)(list), ++_i) {
         _0_0 = callback.call$1(list[_i]);
-        if (_0_0 != null) {
-          result = _0_0;
-          t2 = true;
-        } else {
-          result = null;
-          t2 = false;
-        }
-        if (t2)
-          return result;
+        if (_0_0 != null)
+          return _0_0;
       }
       return null;
     },
@@ -95612,8 +96435,7 @@ self.util = _cliPkgRequires.util;
       return this._evaluate0$_interpolationToValue$3$trim$warnForColor(interpolation, false, warnForColor);
     },
     _evaluate0$_performInterpolation$2$warnForColor(interpolation, warnForColor) {
-      var _0_0 = this._evaluate0$_performInterpolationHelper$3$sourceMap$warnForColor(interpolation, false, warnForColor);
-      return _0_0._0;
+      return this._evaluate0$_performInterpolationHelper$3$sourceMap$warnForColor(interpolation, false, warnForColor)._0;
     },
     _evaluate0$_performInterpolation$1(interpolation) {
       return this._evaluate0$_performInterpolation$2$warnForColor(interpolation, false);
@@ -95648,7 +96470,7 @@ self.util = _cliPkgRequires.util;
           result0 = new A.Interpolation0(result0, t6);
           result0.Interpolation$20(t9, t6);
           t9 = $.$get$namesByColor0();
-          _this._evaluate0$_warn$2(string$.You_pr + A.S(t9.$index(0, result)) + string$.x20in_in + result.toString$0(0) + string$.x2c_whicw + A.S(t9.$index(0, result)) + string$.x22x29__If + new A.BinaryOperationExpression0(B.BinaryOperator_anB0, new A.StringExpression0(result0, true), value, false).toString$0(0) + "'.", value.get$span(value));
+          _this._evaluate0$_warn$2(string$.You_pr + A.S(t9.$index(0, result)) + string$.x20in_in + result.toString$0(0) + string$.x2c_whicw + A.S(t9.$index(0, result)) + string$.x22x29__If + new A.BinaryOperationExpression0(B.BinaryOperator_u150, new A.StringExpression0(result0, true), value, false).toString$0(0) + "'.", value.get$span(value));
         }
         t8 += _this._evaluate0$_serialize$3$quote(result, value, false);
       }
@@ -95688,16 +96510,9 @@ self.util = _cliPkgRequires.util;
       var _0_0, grandparent, t1,
         $parent = this._evaluate0$_assertInModule$2(this._evaluate0$__parent, "__parent");
       if (through != null) {
-        for (; through.call$1($parent); $parent = grandparent) {
+        for (; through.call$1($parent); $parent = _0_0) {
           _0_0 = $parent._node$_parent;
-          if (_0_0 != null) {
-            grandparent = _0_0;
-            t1 = true;
-          } else {
-            grandparent = null;
-            t1 = false;
-          }
-          if (!t1)
+          if (_0_0 == null)
             throw A.wrapException(A.ArgumentError$(string$.throug + node.toString$0(0) + ".", null));
         }
         if ($parent.get$hasFollowingSibling()) {
@@ -95756,8 +96571,13 @@ self.util = _cliPkgRequires.util;
       return this._evaluate0$_withStackFrame$1$3(member, nodeWithSpan, callback, type$.dynamic);
     },
     _evaluate0$_withoutSlash$2(value, nodeForSpan) {
-      if (value instanceof A.SassNumber0 && value.asSlash != null && true)
-        this._evaluate0$_warn$3(string$.Using__i + A.S(new A._EvaluateVisitor__withoutSlash_recommendation1().call$1(value)) + string$.x0a_Morex20, nodeForSpan.get$span(nodeForSpan), B.Deprecation_wWh);
+      var t1;
+      if (value instanceof A.SassNumber0)
+        t1 = value.asSlash != null;
+      else
+        t1 = false;
+      if (t1)
+        this._evaluate0$_warn$3(string$.Using__i + A.S(new A._EvaluateVisitor__withoutSlash_recommendation1().call$1(value)) + string$.x0a_Morex20, nodeForSpan.get$span(nodeForSpan), B.Deprecation_E8a);
       return value.withoutSlash$0();
     },
     _evaluate0$_stackFrame$2(member, span) {
@@ -95948,7 +96768,7 @@ self.util = _cliPkgRequires.util;
   };
   A._EvaluateVisitor_closure30.prototype = {
     call$1($arguments) {
-      var t2, t3, t4, $name, value,
+      var t2, t3, t4,
         t1 = J.$index$asx($arguments, 0).assertString$1("module")._string0$_text,
         module = this.$this._evaluate0$_environment._environment0$_modules.$index(0, t1);
       if (module == null)
@@ -95957,18 +96777,15 @@ self.util = _cliPkgRequires.util;
       t2 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1);
       for (t3 = A.MapExtensions_get_pairs0(module.get$variables(), type$.String, t1), t3 = t3.get$iterator(t3); t3.moveNext$0();) {
         t4 = t3.get$current(t3);
-        $name = t4._0;
-        value = t4._1;
-        value = value;
-        t2.$indexSet(0, new A.SassString0($name, true), value);
+        t2.$indexSet(0, new A.SassString0(t4._0, true), t4._1);
       }
       return new A.SassMap0(A.ConstantMap_ConstantMap$from(t2, t1, t1));
     },
-    $signature: 38
+    $signature: 36
   };
   A._EvaluateVisitor_closure31.prototype = {
     call$1($arguments) {
-      var t2, t3, t4, $name, value,
+      var t2, t3, t4,
         t1 = J.$index$asx($arguments, 0).assertString$1("module")._string0$_text,
         module = this.$this._evaluate0$_environment._environment0$_modules.$index(0, t1);
       if (module == null)
@@ -95977,18 +96794,15 @@ self.util = _cliPkgRequires.util;
       t2 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1);
       for (t3 = A.MapExtensions_get_pairs0(module.get$functions(module), type$.String, type$.Callable_2), t3 = t3.get$iterator(t3); t3.moveNext$0();) {
         t4 = t3.get$current(t3);
-        $name = t4._0;
-        value = t4._1;
-        value = value;
-        t2.$indexSet(0, new A.SassString0($name, true), new A.SassFunction0(value));
+        t2.$indexSet(0, new A.SassString0(t4._0, true), new A.SassFunction0(t4._1));
       }
       return new A.SassMap0(A.ConstantMap_ConstantMap$from(t2, t1, t1));
     },
-    $signature: 38
+    $signature: 36
   };
   A._EvaluateVisitor_closure32.prototype = {
     call$1($arguments) {
-      var t2, t3, t4, $name, value,
+      var t2, t3, t4,
         t1 = J.$index$asx($arguments, 0).assertString$1("module")._string0$_text,
         module = this.$this._evaluate0$_environment._environment0$_modules.$index(0, t1);
       if (module == null)
@@ -95997,14 +96811,11 @@ self.util = _cliPkgRequires.util;
       t2 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1);
       for (t3 = A.MapExtensions_get_pairs0(module.get$mixins(), type$.String, type$.Callable_2), t3 = t3.get$iterator(t3); t3.moveNext$0();) {
         t4 = t3.get$current(t3);
-        $name = t4._0;
-        value = t4._1;
-        value = value;
-        t2.$indexSet(0, new A.SassString0($name, true), new A.SassMixin0(value));
+        t2.$indexSet(0, new A.SassString0(t4._0, true), new A.SassMixin0(t4._1));
       }
       return new A.SassMap0(A.ConstantMap_ConstantMap$from(t2, t1, t1));
     },
-    $signature: 38
+    $signature: 36
   };
   A._EvaluateVisitor_closure33.prototype = {
     call$1($arguments) {
@@ -96027,7 +96838,7 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException("Function not found: " + $name.toString$0(0));
       return new A.SassFunction0(callable);
     },
-    $signature: 182
+    $signature: 135
   };
   A._EvaluateVisitor__closure10.prototype = {
     call$0() {
@@ -96041,7 +96852,7 @@ self.util = _cliPkgRequires.util;
         return local;
       return t1._evaluate0$_builtInFunctions.$index(0, normalizedName);
     },
-    $signature: 102
+    $signature: 85
   };
   A._EvaluateVisitor_closure34.prototype = {
     call$1($arguments) {
@@ -96058,7 +96869,7 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException("Mixin not found: " + $name.toString$0(0));
       return new A.SassMixin0(callable);
     },
-    $signature: 184
+    $signature: 242
   };
   A._EvaluateVisitor__closure9.prototype = {
     call$0() {
@@ -96067,11 +96878,11 @@ self.util = _cliPkgRequires.util;
         t3 = this.module;
       return t1.getMixin$2$namespace(t2, t3 == null ? null : t3._string0$_text);
     },
-    $signature: 102
+    $signature: 85
   };
   A._EvaluateVisitor_closure35.prototype = {
     call$1($arguments) {
-      var t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, $name, value, invocation, callableNode, callable, _null = null,
+      var t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, invocation, callableNode, callable,
         t1 = J.getInterceptor$asx($arguments),
         $function = t1.$index($arguments, 0),
         args = type$.SassArgumentList_2._as(t1.$index($arguments, 1));
@@ -96086,25 +96897,23 @@ self.util = _cliPkgRequires.util;
       args._argument_list$_wereKeywordsAccessed = true;
       t8 = args._argument_list$_keywords;
       if (t8.get$isEmpty(t8))
-        t2 = _null;
+        t2 = null;
       else {
         t9 = type$.Value_2;
         t10 = A.LinkedHashMap_LinkedHashMap$_empty(t9, t9);
         for (args._argument_list$_wereKeywordsAccessed = true, t8 = A.MapExtensions_get_pairs0(t8, t4, t9), t8 = t8.get$iterator(t8); t8.moveNext$0();) {
           t11 = t8.get$current(t8);
-          $name = t11._0;
-          value = t11._1;
-          value = value;
-          t10.$indexSet(0, new A.SassString0($name, false), value);
+          t10.$indexSet(0, new A.SassString0(t11._0, false), t11._1);
         }
         t2 = new A.ValueExpression0(new A.SassMap0(A.ConstantMap_ConstantMap$from(t10, t9, t9)), t2.get$span(t2));
       }
       invocation = new A.ArgumentInvocation0(A.List_List$unmodifiable(t3, t5), A.ConstantMap_ConstantMap$from(A.LinkedHashMap_LinkedHashMap$_empty(t4, t5), t4, t5), new A.ValueExpression0(args, t7), t2, t6);
       if ($function instanceof A.SassString0) {
-        t2 = $function.toString$0(0);
-        A.EvaluationContext_current0().warn$2(0, string$.Passina + t2 + "))", B.Deprecation_4iQ);
+        A.warnForDeprecation0(string$.Passina + $function.toString$0(0) + "))", B.Deprecation_MMc);
         callableNode = t1._evaluate0$_callableNode;
-        return t1.visitFunctionExpression$1(new A.FunctionExpression0(_null, $function._string0$_text, invocation, callableNode.get$span(callableNode)));
+        t2 = $function._string0$_text;
+        t3 = callableNode.get$span(callableNode);
+        return t1.visitFunctionExpression$1(new A.FunctionExpression0(null, A.stringReplaceAllUnchecked(t2, "_", "-"), t2, invocation, t3));
       }
       callable = $function.assertFunction$1("function").callable;
       if (type$.Callable_2._is(callable)) {
@@ -96112,9 +96921,9 @@ self.util = _cliPkgRequires.util;
         t2.toString;
         return t1._evaluate0$_runFunctionCallable$3(invocation, callable, t2);
       } else
-        throw A.wrapException(A.SassScriptException$0("The function " + callable.get$name(callable) + string$.x20is_as, _null));
+        throw A.wrapException(A.SassScriptException$0("The function " + callable.get$name(callable) + string$.x20is_as, null));
     },
-    $signature: 5
+    $signature: 3
   };
   A._EvaluateVisitor_closure36.prototype = {
     call$1($arguments) {
@@ -96136,7 +96945,7 @@ self.util = _cliPkgRequires.util;
       t1._evaluate0$_loadModule$7$baseUrl$configuration$namesInErrors(url, "load-css()", t2, new A._EvaluateVisitor__closure8(t1), t3.get$sourceUrl(t3), configuration, true);
       t1._evaluate0$_assertConfigurationIsEmpty$2$nameInError(configuration, true);
     },
-    $signature: 239
+    $signature: 192
   };
   A._EvaluateVisitor__closure7.prototype = {
     call$2(variable, value) {
@@ -96147,14 +96956,14 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException("The variable $" + $name + " was configured twice.");
       t1.$indexSet(0, $name, new A.ConfiguredValue0(value, this.span, this.callableNode));
     },
-    $signature: 104
+    $signature: 76
   };
   A._EvaluateVisitor__closure8.prototype = {
     call$2(module, _) {
       var t1 = this.$this;
       return t1._evaluate0$_combineCss$2$clone(module, true).accept$1(t1);
     },
-    $signature: 95
+    $signature: 80
   };
   A._EvaluateVisitor_closure37.prototype = {
     call$1($arguments) {
@@ -96176,35 +96985,32 @@ self.util = _cliPkgRequires.util;
       else
         throw A.wrapException(A.SassScriptException$0("The mixin " + callable.get$name(callable) + string$.x20is_as, null));
     },
-    $signature: 239
+    $signature: 192
   };
   A._EvaluateVisitor_run_closure1.prototype = {
     call$0() {
-      var module, t2, _this = this, url = null,
+      var module, t2, _this = this,
         t1 = _this.node,
-        _0_0 = t1.span.file.url;
+        _0_0 = t1.span.file.url,
+        url = null;
       if (_0_0 != null) {
         url = _0_0;
-        t2 = true;
-      } else
-        t2 = false;
-      if (t2) {
         t2 = _this.$this;
         t2._evaluate0$_activeModules.$indexSet(0, url, null);
-        if (!(t2._evaluate0$_nodeImporter != null && J.toString$0$(url) === "stdin"))
+        if (!(t2._nodeImporter != null && J.toString$0$(url) === "stdin"))
           t2._evaluate0$_loadedUrls.add$1(0, url);
       }
       t2 = _this.$this;
       module = t2._evaluate0$_addExceptionTrace$1(new A._EvaluateVisitor_run__closure1(t2, _this.importer, t1));
       return new A._Record_2_loadedUrls_stylesheet(t2._evaluate0$_loadedUrls, t2._evaluate0$_combineCss$1(module));
     },
-    $signature: 439
+    $signature: 428
   };
   A._EvaluateVisitor_run__closure1.prototype = {
     call$0() {
       return this.$this._evaluate0$_execute$2(this.importer, this.node);
     },
-    $signature: 440
+    $signature: 429
   };
   A._EvaluateVisitor__loadModule_closure3.prototype = {
     call$0() {
@@ -96214,19 +97020,23 @@ self.util = _cliPkgRequires.util;
   };
   A._EvaluateVisitor__loadModule_closure4.prototype = {
     call$0() {
-      var canonicalUrl, oldInDependency, isDependency, t4, message, _this = this, t1 = {}, stylesheet = null, importer = null,
+      var canonicalUrl, oldInDependency, t4, message, _this = this, t1 = {}, stylesheet = null, importer = null,
         t2 = _this.$this,
         t3 = _this.nodeWithSpan,
         _1_0 = t2._evaluate0$_loadStylesheet$3$baseUrl(_this.url.toString$0(0), t3.get$span(t3), _this.baseUrl);
       stylesheet = _1_0._0;
       importer = _1_0._1;
-      isDependency = _1_0._2;
-      isDependency = isDependency;
       canonicalUrl = stylesheet.span.file.url;
       if (canonicalUrl != null) {
         t4 = t2._evaluate0$_activeModules;
         if (t4.containsKey$1(canonicalUrl)) {
-          message = _this.namesInErrors ? "Module loop: " + $.$get$context().prettyUri$1(canonicalUrl) + " is already being loaded." : string$.Modulel;
+          if (_this.namesInErrors) {
+            t1 = canonicalUrl;
+            t3 = $.$get$context();
+            t1.toString;
+            message = "Module loop: " + t3.prettyUri$1(t1) + " is already being loaded.";
+          } else
+            message = string$.Modulel;
           t1 = A.NullableExtension_andThen0(t4.$index(0, canonicalUrl), new A._EvaluateVisitor__loadModule__closure3(t2, message));
           throw A.wrapException(t1 == null ? t2._evaluate0$_exception$1(message) : t1);
         } else
@@ -96234,7 +97044,7 @@ self.util = _cliPkgRequires.util;
       }
       t4 = t2._evaluate0$_modules.containsKey$1(canonicalUrl);
       oldInDependency = t2._evaluate0$_inDependency;
-      t2._evaluate0$_inDependency = isDependency;
+      t2._evaluate0$_inDependency = _1_0._2;
       t1.module = null;
       try {
         t1.module = t2._evaluate0$_execute$5$configuration$namesInErrors$nodeWithSpan(importer, stylesheet, _this.configuration, _this.namesInErrors, t3);
@@ -96244,13 +97054,13 @@ self.util = _cliPkgRequires.util;
       }
       t2._evaluate0$_addExceptionSpan$3$addStackFrame(t3, new A._EvaluateVisitor__loadModule__closure4(t1, _this.callback, !t4), false);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor__loadModule__closure3.prototype = {
     call$1(previousLoad) {
       return this.$this._evaluate0$_multiSpanException$3(this.message, "new load", A.LinkedHashMap_LinkedHashMap$_literal([previousLoad.get$span(previousLoad), "original load"], type$.FileSpan, type$.String));
     },
-    $signature: 105
+    $signature: 94
   };
   A._EvaluateVisitor__loadModule__closure4.prototype = {
     call$0() {
@@ -96291,8 +97101,8 @@ self.util = _cliPkgRequires.util;
         t1._evaluate0$_configuration = t6;
       t1.visitStylesheet$1(t3);
       t3 = t1._evaluate0$_outOfOrderImports == null ? t5 : new A.CssStylesheet0(new A.UnmodifiableListView(t1._evaluate0$_addOutOfOrderImports$0(), type$.UnmodifiableListView_CssNode_2), t4);
-      _this.css._value = t3;
-      _this.preModuleComments._value = t1._evaluate0$_preModuleComments;
+      _this.css.__late_helper$_value = t3;
+      _this.preModuleComments.__late_helper$_value = t1._evaluate0$_preModuleComments;
       t1._evaluate0$_importer = oldImporter;
       t1._evaluate0$__stylesheet = oldStylesheet;
       t1._evaluate0$__root = oldRoot;
@@ -96309,23 +97119,23 @@ self.util = _cliPkgRequires.util;
       t1._evaluate0$_inKeyframes = oldInKeyframes;
       t1._evaluate0$_configuration = oldConfiguration;
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor__combineCss_closure3.prototype = {
     call$1(module) {
       return module.get$transitivelyContainsCss();
     },
-    $signature: 136
+    $signature: 121
   };
   A._EvaluateVisitor__combineCss_closure4.prototype = {
     call$1(target) {
       return !this.selectors.contains$1(0, target);
     },
-    $signature: 15
+    $signature: 14
   };
   A._EvaluateVisitor__combineCss_visitModule1.prototype = {
     call$1(module) {
-      var t1, t2, t3, t4, _i, upstream, _1_0, comments, t5, statements, index, _this = this;
+      var t1, t2, t3, t4, _i, upstream, _1_0, statements, index, _this = this;
       if (!_this.seen.add$1(0, module))
         return;
       if (_this.clone)
@@ -96334,15 +97144,8 @@ self.util = _cliPkgRequires.util;
         upstream = t1[_i];
         if (upstream.get$transitivelyContainsCss()) {
           _1_0 = module.get$preModuleComments().$index(0, upstream);
-          if (_1_0 != null) {
-            comments = _1_0;
-            t5 = true;
-          } else {
-            comments = null;
-            t5 = false;
-          }
-          if (t5)
-            B.JSArray_methods.addAll$1(t3.length === 0 ? t4 : t3, comments);
+          if (_1_0 != null)
+            B.JSArray_methods.addAll$1(t3.length === 0 ? t4 : t3, _1_0);
           _this.call$1(upstream);
         }
       }
@@ -96354,19 +97157,19 @@ self.util = _cliPkgRequires.util;
       B.JSArray_methods.addAll$1(t4, t1.getRange$2(statements, 0, index));
       B.JSArray_methods.addAll$1(t3, t1.getRange$2(statements, index, t1.get$length(statements)));
     },
-    $signature: 441
+    $signature: 430
   };
   A._EvaluateVisitor__extendModules_closure3.prototype = {
     call$1(target) {
       return !this.originalSelectors.contains$1(0, target);
     },
-    $signature: 15
+    $signature: 14
   };
   A._EvaluateVisitor__extendModules_closure4.prototype = {
     call$0() {
       return A._setArrayType([], type$.JSArray_ExtensionStore_2);
     },
-    $signature: 188
+    $signature: 264
   };
   A._EvaluateVisitor_visitAtRootRule_closure3.prototype = {
     call$0() {
@@ -96374,7 +97177,7 @@ self.util = _cliPkgRequires.util;
       for (t1 = this.node.children, t2 = t1.length, t3 = this.$this, _i = 0; _i < t2; ++_i)
         t1[_i].accept$1(t3);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitAtRootRule_closure4.prototype = {
     call$0() {
@@ -96392,7 +97195,7 @@ self.util = _cliPkgRequires.util;
       t1._evaluate0$_environment.scope$1$2$when(callback, this.node.hasDeclarations, type$.void);
       t1._evaluate0$__parent = t2;
     },
-    $signature: 39
+    $signature: 32
   };
   A._EvaluateVisitor__scopeForAtRoot_closure12.prototype = {
     call$1(callback) {
@@ -96402,19 +97205,19 @@ self.util = _cliPkgRequires.util;
       this.innerScope.call$1(callback);
       t1._evaluate0$_atRootExcludingStyleRule = oldAtRootExcludingStyleRule;
     },
-    $signature: 39
+    $signature: 32
   };
   A._EvaluateVisitor__scopeForAtRoot_closure13.prototype = {
     call$1(callback) {
       return this.$this._evaluate0$_withMediaQueries$3(null, null, new A._EvaluateVisitor__scopeForAtRoot__closure1(this.innerScope, callback));
     },
-    $signature: 39
+    $signature: 32
   };
   A._EvaluateVisitor__scopeForAtRoot__closure1.prototype = {
     call$0() {
       return this.innerScope.call$1(this.callback);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor__scopeForAtRoot_closure14.prototype = {
     call$1(callback) {
@@ -96424,13 +97227,13 @@ self.util = _cliPkgRequires.util;
       this.innerScope.call$1(callback);
       t1._evaluate0$_inKeyframes = wasInKeyframes;
     },
-    $signature: 39
+    $signature: 32
   };
   A._EvaluateVisitor__scopeForAtRoot_closure15.prototype = {
     call$1($parent) {
       return $parent instanceof A.ModifiableCssAtRule0;
     },
-    $signature: 189
+    $signature: 237
   };
   A._EvaluateVisitor__scopeForAtRoot_closure16.prototype = {
     call$1(callback) {
@@ -96440,7 +97243,7 @@ self.util = _cliPkgRequires.util;
       this.innerScope.call$1(callback);
       t1._evaluate0$_inUnknownAtRule = wasInUnknownAtRule;
     },
-    $signature: 39
+    $signature: 32
   };
   A._EvaluateVisitor_visitContentRule_closure1.prototype = {
     call$0() {
@@ -96449,7 +97252,7 @@ self.util = _cliPkgRequires.util;
         t1[_i].accept$1(t3);
       return null;
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitDeclaration_closure1.prototype = {
     call$0() {
@@ -96457,7 +97260,7 @@ self.util = _cliPkgRequires.util;
       for (t1 = this._box_0.children, t2 = t1.length, t3 = this.$this, _i = 0; _i < t2; ++_i)
         t1[_i].accept$1(t3);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitEachRule_closure5.prototype = {
     call$1(value) {
@@ -96465,13 +97268,13 @@ self.util = _cliPkgRequires.util;
         t2 = this.nodeWithSpan;
       return t1._evaluate0$_environment.setLocalVariable$3(this._box_0.variable, t1._evaluate0$_withoutSlash$2(value, t2), t2);
     },
-    $signature: 57
+    $signature: 62
   };
   A._EvaluateVisitor_visitEachRule_closure6.prototype = {
     call$1(value) {
       return this.$this._evaluate0$_setMultipleVariables$3(this._box_0.variables, value, this.nodeWithSpan);
     },
-    $signature: 57
+    $signature: 62
   };
   A._EvaluateVisitor_visitEachRule_closure7.prototype = {
     call$0() {
@@ -96479,7 +97282,7 @@ self.util = _cliPkgRequires.util;
         t1 = _this.$this;
       return t1._evaluate0$_handleReturn$2(_this.list.get$asList(), new A._EvaluateVisitor_visitEachRule__closure1(t1, _this.setVariables, _this.node));
     },
-    $signature: 46
+    $signature: 41
   };
   A._EvaluateVisitor_visitEachRule__closure1.prototype = {
     call$1(element) {
@@ -96488,19 +97291,19 @@ self.util = _cliPkgRequires.util;
       t1 = this.$this;
       return t1._evaluate0$_handleReturn$2(this.node.children, new A._EvaluateVisitor_visitEachRule___closure1(t1));
     },
-    $signature: 241
+    $signature: 190
   };
   A._EvaluateVisitor_visitEachRule___closure1.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 93
+    $signature: 101
   };
   A._EvaluateVisitor_visitAtRule_closure5.prototype = {
     call$1(value) {
       return this.$this._evaluate0$_interpolationToValue$3$trim$warnForColor(value, true, true);
     },
-    $signature: 444
+    $signature: 433
   };
   A._EvaluateVisitor_visitAtRule_closure6.prototype = {
     call$0() {
@@ -96511,9 +97314,9 @@ self.util = _cliPkgRequires.util;
         for (t2 = _this.children, t3 = t2.length, _i = 0; _i < t3; ++_i)
           t2[_i].accept$1(t1);
       else
-        t1._evaluate0$_withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$0(styleRule._style_rule0$_selector, styleRule.span, styleRule.originalSelector), new A._EvaluateVisitor_visitAtRule__closure1(t1, _this.children), false, type$.ModifiableCssStyleRule_2, type$.Null);
+        t1._evaluate0$_withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$0(styleRule._style_rule0$_selector, styleRule.span, false, styleRule.originalSelector), new A._EvaluateVisitor_visitAtRule__closure1(t1, _this.children), false, type$.ModifiableCssStyleRule_2, type$.Null);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitAtRule__closure1.prototype = {
     call$0() {
@@ -96521,7 +97324,7 @@ self.util = _cliPkgRequires.util;
       for (t1 = this.children, t2 = t1.length, t3 = this.$this, _i = 0; _i < t2; ++_i)
         t1[_i].accept$1(t3);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitAtRule_closure7.prototype = {
     call$1(node) {
@@ -96533,30 +97336,30 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return this.node.from.accept$1(this.$this).assertNumber$0();
     },
-    $signature: 243
+    $signature: 212
   };
   A._EvaluateVisitor_visitForRule_closure10.prototype = {
     call$0() {
       return this.node.to.accept$1(this.$this).assertNumber$0();
     },
-    $signature: 243
+    $signature: 212
   };
   A._EvaluateVisitor_visitForRule_closure11.prototype = {
     call$0() {
       return this.fromNumber.assertInt$0();
     },
-    $signature: 3
+    $signature: 10
   };
   A._EvaluateVisitor_visitForRule_closure12.prototype = {
     call$0() {
       var t1 = this.fromNumber;
       return this.toNumber.coerce$2(t1.get$numeratorUnits(t1), t1.get$denominatorUnits(t1)).assertInt$0();
     },
-    $signature: 3
+    $signature: 10
   };
   A._EvaluateVisitor_visitForRule_closure13.prototype = {
     call$0() {
-      var i, t3, t4, t5, t6, t7, t8, _0_0, result, _this = this,
+      var i, t3, t4, t5, t6, t7, t8, _0_0, _this = this,
         t1 = _this.$this,
         t2 = _this.node,
         nodeWithSpan = t1._evaluate0$_expressionNode$1(t2.from);
@@ -96565,25 +97368,18 @@ self.util = _cliPkgRequires.util;
         t8 = t6.get$numeratorUnits(t6);
         t7.setLocalVariable$3(t5, A.SassNumber_SassNumber$withUnits0(i, t6.get$denominatorUnits(t6), t8), nodeWithSpan);
         _0_0 = t1._evaluate0$_handleReturn$2(t2, new A._EvaluateVisitor_visitForRule__closure1(t1));
-        if (_0_0 != null) {
-          result = _0_0;
-          t7 = true;
-        } else {
-          result = null;
-          t7 = false;
-        }
-        if (t7)
-          return result;
+        if (_0_0 != null)
+          return _0_0;
       }
       return null;
     },
-    $signature: 46
+    $signature: 41
   };
   A._EvaluateVisitor_visitForRule__closure1.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 93
+    $signature: 101
   };
   A._EvaluateVisitor_visitForwardRule_closure3.prototype = {
     call$2(module, firstLoad) {
@@ -96591,7 +97387,7 @@ self.util = _cliPkgRequires.util;
         this.$this._evaluate0$_registerCommentsForModule$1(module);
       this.$this._evaluate0$_environment.forwardModule$2(module, this.node);
     },
-    $signature: 95
+    $signature: 80
   };
   A._EvaluateVisitor_visitForwardRule_closure4.prototype = {
     call$2(module, firstLoad) {
@@ -96599,70 +97395,64 @@ self.util = _cliPkgRequires.util;
         this.$this._evaluate0$_registerCommentsForModule$1(module);
       this.$this._evaluate0$_environment.forwardModule$2(module, this.node);
     },
-    $signature: 95
+    $signature: 80
   };
   A._EvaluateVisitor__registerCommentsForModule_closure1.prototype = {
     call$0() {
       return A._setArrayType([], type$.JSArray_CssComment_2);
     },
-    $signature: 245
+    $signature: 229
   };
   A._EvaluateVisitor_visitIfRule_closure1.prototype = {
     call$1(clause) {
       var t1 = this.$this;
       return t1._evaluate0$_environment.scope$1$3$semiGlobal$when(new A._EvaluateVisitor_visitIfRule__closure1(t1, clause), true, clause.hasDeclarations, type$.nullable_Value_2);
     },
-    $signature: 446
+    $signature: 435
   };
   A._EvaluateVisitor_visitIfRule__closure1.prototype = {
     call$0() {
       var t1 = this.$this;
       return t1._evaluate0$_handleReturn$2(this.clause.children, new A._EvaluateVisitor_visitIfRule___closure1(t1));
     },
-    $signature: 46
+    $signature: 41
   };
   A._EvaluateVisitor_visitIfRule___closure1.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 93
+    $signature: 101
   };
   A._EvaluateVisitor__visitDynamicImport_closure1.prototype = {
     call$0() {
-      var t1, t2, _0_0, stylesheet, t3, isDependency, t4, url, t5, t6, oldImporter, oldInDependency, loadsUserDefinedModules, children, t7, t8, t9, t10, environment, module, visitor, _null = null, _box_0 = {};
+      var t1, t2, _0_0, stylesheet, importer, isDependency, url, t3, oldImporter, oldInDependency, loadsUserDefinedModules, children, t4, t5, t6, t7, t8, t9, t10, environment, module, visitor, _box_0 = {};
       _box_0.isDependency = _box_0.importer = _box_0.stylesheet = null;
       t1 = this.$this;
       t2 = this.$import;
       _0_0 = t1._evaluate0$_loadStylesheet$3$forImport(t2.urlString, t2.span, true);
       stylesheet = _box_0.stylesheet = _0_0._0;
-      t3 = _box_0.importer = _0_0._1;
+      importer = _0_0._1;
+      _box_0.importer = importer;
       isDependency = _0_0._2;
       _box_0.isDependency = isDependency;
-      t4 = isDependency;
       url = stylesheet.span.file.url;
       if (url != null) {
-        t5 = t1._evaluate0$_activeModules;
-        if (t5.containsKey$1(url)) {
-          t2 = A.NullableExtension_andThen0(t5.$index(0, url), new A._EvaluateVisitor__visitDynamicImport__closure7(t1));
+        t3 = t1._evaluate0$_activeModules;
+        if (t3.containsKey$1(url)) {
+          t2 = A.NullableExtension_andThen0(t3.$index(0, url), new A._EvaluateVisitor__visitDynamicImport__closure7(t1));
           throw A.wrapException(t2 == null ? t1._evaluate0$_exception$1("This file is already being loaded.") : t2);
         }
-        t5.$indexSet(0, url, t2);
+        t3.$indexSet(0, url, t2);
       }
       t2 = stylesheet._stylesheet1$_uses;
-      t5 = type$.UnmodifiableListView_UseRule_2;
-      t6 = new A.UnmodifiableListView(t2, t5);
-      if (t6.get$length(t6) === 0) {
-        t6 = new A.UnmodifiableListView(stylesheet._stylesheet1$_forwards, type$.UnmodifiableListView_ForwardRule_2);
-        t6 = t6.get$length(t6) === 0;
-      } else
-        t6 = false;
-      if (t6) {
+      t3 = type$.UnmodifiableListView_UseRule_2;
+      if (new A.UnmodifiableListView(t2, t3).get$length(0) === 0 && new A.UnmodifiableListView(stylesheet._stylesheet1$_forwards, type$.UnmodifiableListView_ForwardRule_2).get$length(0) === 0) {
         oldImporter = t1._evaluate0$_importer;
         t2 = t1._evaluate0$_assertInModule$2(t1._evaluate0$__stylesheet, "_stylesheet");
         oldInDependency = t1._evaluate0$_inDependency;
-        t1._evaluate0$_importer = t3;
+        t1._evaluate0$_importer = importer;
         t1._evaluate0$__stylesheet = stylesheet;
-        t1._evaluate0$_inDependency = t4;
+        t1._evaluate0$_inDependency = isDependency;
         t1.visitStylesheet$1(stylesheet);
         t1._evaluate0$_importer = oldImporter;
         t1._evaluate0$__stylesheet = t2;
@@ -96670,7 +97460,7 @@ self.util = _cliPkgRequires.util;
         t1._evaluate0$_activeModules.remove$1(0, url);
         return;
       }
-      t2 = new A.UnmodifiableListView(t2, t5);
+      t2 = new A.UnmodifiableListView(t2, t3);
       if (!t2.any$1(t2, new A._EvaluateVisitor__visitDynamicImport__closure8())) {
         t2 = new A.UnmodifiableListView(stylesheet._stylesheet1$_forwards, type$.UnmodifiableListView_ForwardRule_2);
         loadsUserDefinedModules = t2.any$1(t2, new A._EvaluateVisitor__visitDynamicImport__closure9());
@@ -96690,7 +97480,7 @@ self.util = _cliPkgRequires.util;
       t9 = A._setArrayType(t9.slice(0), A._arrayInstanceType(t9));
       t10 = t2._environment0$_mixins;
       t10 = A._setArrayType(t10.slice(0), A._arrayInstanceType(t10));
-      environment = A.Environment$_0(A.LinkedHashMap_LinkedHashMap$_empty(t3, t4), A.LinkedHashMap_LinkedHashMap$_empty(t3, t5), A.LinkedHashMap_LinkedHashMap$_empty(t4, t5), t2._environment0$_importedModules, _null, _null, t6, t7, t8, t9, t10, t2._environment0$_content);
+      environment = A.Environment$_0(A.LinkedHashMap_LinkedHashMap$_empty(t3, t4), A.LinkedHashMap_LinkedHashMap$_empty(t3, t5), A.LinkedHashMap_LinkedHashMap$_empty(t4, t5), t2._environment0$_importedModules, null, null, t6, t7, t8, t9, t10, t2._environment0$_content);
       t1._evaluate0$_withEnvironment$2(environment, new A._EvaluateVisitor__visitDynamicImport__closure10(_box_0, t1, loadsUserDefinedModules, environment, children));
       module = environment.toDummyModule$0();
       t1._evaluate0$_environment.importForwards$1(module);
@@ -96709,19 +97499,19 @@ self.util = _cliPkgRequires.util;
     call$1(previousLoad) {
       return this.$this._evaluate0$_multiSpanException$3("This file is already being loaded.", "new load", A.LinkedHashMap_LinkedHashMap$_literal([previousLoad.get$span(previousLoad), "original load"], type$.FileSpan, type$.String));
     },
-    $signature: 105
+    $signature: 94
   };
   A._EvaluateVisitor__visitDynamicImport__closure8.prototype = {
     call$1(rule) {
       return rule.url.get$scheme() !== "sass";
     },
-    $signature: 197
+    $signature: 228
   };
   A._EvaluateVisitor__visitDynamicImport__closure9.prototype = {
     call$1(rule) {
       return rule.url.get$scheme() !== "sass";
     },
-    $signature: 198
+    $signature: 227
   };
   A._EvaluateVisitor__visitDynamicImport__closure10.prototype = {
     call$0() {
@@ -96753,7 +97543,7 @@ self.util = _cliPkgRequires.util;
         t1._evaluate0$_configuration = _this.environment.toImplicitConfiguration$0();
       t1.visitStylesheet$1(t6.stylesheet);
       t6 = t8 ? t1._evaluate0$_addOutOfOrderImports$0() : A._setArrayType([], type$.JSArray_ModifiableCssNode_2);
-      _this.children._value = t6;
+      _this.children.__late_helper$_value = t6;
       t1._evaluate0$_importer = oldImporter;
       t1._evaluate0$__stylesheet = t2;
       if (t8) {
@@ -96765,9 +97555,9 @@ self.util = _cliPkgRequires.util;
       t1._evaluate0$_configuration = oldConfiguration;
       t1._evaluate0$_inDependency = oldInDependency;
     },
-    $signature: 2
+    $signature: 1
   };
-  A._EvaluateVisitor__applyMixin_closure6.prototype = {
+  A._EvaluateVisitor__applyMixin_closure3.prototype = {
     call$0() {
       var _this = this,
         t1 = _this.$this;
@@ -96782,22 +97572,13 @@ self.util = _cliPkgRequires.util;
     },
     $signature: 0
   };
-  A._EvaluateVisitor__applyMixin_closure5.prototype = {
-    call$0() {
-      var t1 = this._1_0;
-      if (t1 == null)
-        t1 = type$.Callable_2._as(t1);
-      return type$.UserDefinedCallable_Environment_2._as(t1).declaration;
-    },
-    $signature: 130
-  };
-  A._EvaluateVisitor__applyMixin_closure7.prototype = {
+  A._EvaluateVisitor__applyMixin_closure4.prototype = {
     call$0() {
       var _this = this,
         t1 = _this.$this;
       t1._evaluate0$_environment.withContent$2(_this.contentCallable, new A._EvaluateVisitor__applyMixin__closure3(t1, _this.mixin, _this.nodeWithSpanWithoutContent));
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor__applyMixin__closure3.prototype = {
     call$0() {
@@ -96818,33 +97599,33 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return this.statement.accept$1(this.$this);
     },
-    $signature: 46
+    $signature: 41
   };
   A._EvaluateVisitor_visitIncludeRule_closure5.prototype = {
     call$0() {
       var t1 = this.node;
       return this.$this._evaluate0$_environment.getMixin$2$namespace(t1.name, t1.namespace);
     },
-    $signature: 102
+    $signature: 85
   };
   A._EvaluateVisitor_visitIncludeRule_closure6.prototype = {
     call$1($content) {
       var t1 = this.$this;
       return new A.UserDefinedCallable0($content, t1._evaluate0$_environment.closure$0(), t1._evaluate0$_inDependency, type$.UserDefinedCallable_Environment_2);
     },
-    $signature: 447
+    $signature: 436
   };
   A._EvaluateVisitor_visitIncludeRule_closure7.prototype = {
     call$0() {
       return this.node.get$spanWithoutContent();
     },
-    $signature: 33
+    $signature: 27
   };
   A._EvaluateVisitor_visitMediaRule_closure5.prototype = {
     call$1(mediaQueries) {
       return this.$this._evaluate0$_mergeMediaQueries$2(mediaQueries, this.queries);
     },
-    $signature: 113
+    $signature: 100
   };
   A._EvaluateVisitor_visitMediaRule_closure6.prototype = {
     call$0() {
@@ -96855,27 +97636,20 @@ self.util = _cliPkgRequires.util;
         t2 = _this.queries;
       t1._evaluate0$_withMediaQueries$3(t2, _this.mergedSources, new A._EvaluateVisitor_visitMediaRule__closure1(t1, _this.node));
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitMediaRule__closure1.prototype = {
     call$0() {
-      var styleRule, t2, t3, _i,
+      var t2, t3, _i,
         t1 = this.$this,
         _0_0 = t1._evaluate0$_atRootExcludingStyleRule ? null : t1._evaluate0$_styleRuleIgnoringAtRoot;
-      if (_0_0 != null) {
-        styleRule = _0_0;
-        t2 = true;
-      } else {
-        styleRule = null;
-        t2 = false;
-      }
-      if (t2)
-        t1._evaluate0$_withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$0(styleRule._style_rule0$_selector, styleRule.span, styleRule.originalSelector), new A._EvaluateVisitor_visitMediaRule___closure1(t1, this.node), false, type$.ModifiableCssStyleRule_2, type$.Null);
+      if (_0_0 != null)
+        t1._evaluate0$_withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$0(_0_0._style_rule0$_selector, _0_0.span, false, _0_0.originalSelector), new A._EvaluateVisitor_visitMediaRule___closure1(t1, this.node), false, type$.ModifiableCssStyleRule_2, type$.Null);
       else
         for (t2 = this.node.children, t3 = t2.length, _i = 0; _i < t3; ++_i)
           t2[_i].accept$1(t1);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitMediaRule___closure1.prototype = {
     call$0() {
@@ -96883,7 +97657,7 @@ self.util = _cliPkgRequires.util;
       for (t1 = this.node.children, t2 = t1.length, t3 = this.$this, _i = 0; _i < t2; ++_i)
         t1[_i].accept$1(t3);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitMediaRule_closure7.prototype = {
     call$1(node) {
@@ -96897,26 +97671,26 @@ self.util = _cliPkgRequires.util;
     },
     $signature: 8
   };
-  A._EvaluateVisitor_visitStyleRule_closure9.prototype = {
+  A._EvaluateVisitor_visitStyleRule_closure7.prototype = {
     call$0() {
       var t1, t2, t3, _i;
       for (t1 = this.node.children, t2 = t1.length, t3 = this.$this, _i = 0; _i < t2; ++_i)
         t1[_i].accept$1(t3);
     },
-    $signature: 2
+    $signature: 1
   };
-  A._EvaluateVisitor_visitStyleRule_closure10.prototype = {
+  A._EvaluateVisitor_visitStyleRule_closure8.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule0;
     },
     $signature: 8
   };
-  A._EvaluateVisitor_visitStyleRule_closure11.prototype = {
+  A._EvaluateVisitor_visitStyleRule_closure10.prototype = {
     call$0() {
       var t1 = this.$this;
       t1._evaluate0$_withStyleRule$2(this.rule, new A._EvaluateVisitor_visitStyleRule__closure1(t1, this.node));
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitStyleRule__closure1.prototype = {
     call$0() {
@@ -96924,39 +97698,32 @@ self.util = _cliPkgRequires.util;
       for (t1 = this.node.children, t2 = t1.length, t3 = this.$this, _i = 0; _i < t2; ++_i)
         t1[_i].accept$1(t3);
     },
-    $signature: 2
+    $signature: 1
   };
-  A._EvaluateVisitor_visitStyleRule_closure12.prototype = {
+  A._EvaluateVisitor_visitStyleRule_closure9.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule0;
     },
     $signature: 8
   };
-  A._EvaluateVisitor_visitStyleRule_closure13.prototype = {
+  A._EvaluateVisitor__warnForBogusCombinators_closure1.prototype = {
     call$1(child) {
       return child instanceof A.ModifiableCssComment0;
     },
-    $signature: 148
+    $signature: 8
   };
   A._EvaluateVisitor_visitSupportsRule_closure3.prototype = {
     call$0() {
-      var styleRule, t2, t3, _i,
+      var t2, t3, _i,
         t1 = this.$this,
         _0_0 = t1._evaluate0$_atRootExcludingStyleRule ? null : t1._evaluate0$_styleRuleIgnoringAtRoot;
-      if (_0_0 != null) {
-        styleRule = _0_0;
-        t2 = true;
-      } else {
-        styleRule = null;
-        t2 = false;
-      }
-      if (t2)
-        t1._evaluate0$_withParent$2$2(A.ModifiableCssStyleRule$0(styleRule._style_rule0$_selector, styleRule.span, styleRule.originalSelector), new A._EvaluateVisitor_visitSupportsRule__closure1(t1, this.node), type$.ModifiableCssStyleRule_2, type$.Null);
+      if (_0_0 != null)
+        t1._evaluate0$_withParent$2$2(A.ModifiableCssStyleRule$0(_0_0._style_rule0$_selector, _0_0.span, false, _0_0.originalSelector), new A._EvaluateVisitor_visitSupportsRule__closure1(t1, this.node), type$.ModifiableCssStyleRule_2, type$.Null);
       else
         for (t2 = this.node.children, t3 = t2.length, _i = 0; _i < t3; ++_i)
           t2[_i].accept$1(t1);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitSupportsRule__closure1.prototype = {
     call$0() {
@@ -96964,7 +97731,7 @@ self.util = _cliPkgRequires.util;
       for (t1 = this.node.children, t2 = t1.length, t3 = this.$this, _i = 0; _i < t2; ++_i)
         t1[_i].accept$1(t3);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitSupportsRule_closure4.prototype = {
     call$1(node) {
@@ -96983,7 +97750,7 @@ self.util = _cliPkgRequires.util;
       t2 = t2.declaration.value;
       return "(" + t3 + ":" + t4 + t1._evaluate0$_serialize$3$quote(t2.accept$1(t1), t2, true) + ")";
     },
-    $signature: 22
+    $signature: 26
   };
   A._EvaluateVisitor_visitVariableDeclaration_closure5.prototype = {
     call$0() {
@@ -96991,14 +97758,14 @@ self.util = _cliPkgRequires.util;
         t2 = this._box_0.override;
       t1.setVariable$4$global(this.node.name, t2.value, t2.assignmentNode, true);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitVariableDeclaration_closure6.prototype = {
     call$0() {
       var t1 = this.node;
       return this.$this._evaluate0$_environment.getVariable$2$namespace(t1.name, t1.namespace);
     },
-    $signature: 46
+    $signature: 41
   };
   A._EvaluateVisitor_visitVariableDeclaration_closure7.prototype = {
     call$0() {
@@ -97006,11 +97773,11 @@ self.util = _cliPkgRequires.util;
         t2 = this.node;
       t1._evaluate0$_environment.setVariable$5$global$namespace(t2.name, this.value, t1._evaluate0$_expressionNode$1(t2.expression), t2.isGlobal, t2.namespace);
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitUseRule_closure1.prototype = {
     call$2(module, firstLoad) {
-      var t1, t2, t3, _0_0, $name, t4, t5, span;
+      var t1, t2, t3, _0_0, t4, t5, span;
       if (firstLoad)
         this.$this._evaluate0$_registerCommentsForModule$1(module);
       t1 = this.$this._evaluate0$_environment;
@@ -97020,15 +97787,8 @@ self.util = _cliPkgRequires.util;
         t1._environment0$_globalModules.$indexSet(0, module, t2);
         t1._environment0$_allModules.push(module);
         _0_0 = A.IterableExtension_firstWhereOrNull(J.get$keys$z(B.JSArray_methods.get$first(t1._environment0$_variables)), module.get$variables().get$containsKey());
-        if (_0_0 != null) {
-          $name = _0_0;
-          t1 = true;
-        } else {
-          $name = null;
-          t1 = false;
-        }
-        if (t1)
-          A.throwExpression(A.SassScriptException$0(string$.This_ma + A.S($name) + '".', null));
+        if (_0_0 != null)
+          A.throwExpression(A.SassScriptException$0(string$.This_ma + _0_0 + '".', null));
       } else {
         t4 = t1._environment0$_modules;
         if (t4.containsKey$1(t3)) {
@@ -97044,38 +97804,31 @@ self.util = _cliPkgRequires.util;
         t1._environment0$_allModules.push(module);
       }
     },
-    $signature: 95
+    $signature: 80
   };
   A._EvaluateVisitor_visitWarnRule_closure1.prototype = {
     call$0() {
       return this.node.expression.accept$1(this.$this);
     },
-    $signature: 31
+    $signature: 47
   };
   A._EvaluateVisitor_visitWhileRule_closure1.prototype = {
     call$0() {
-      var t1, t2, t3, _0_0, result, t4;
+      var t1, t2, t3, _0_0;
       for (t1 = this.node, t2 = t1.condition, t3 = this.$this, t1 = t1.children; t2.accept$1(t3).get$isTruthy();) {
         _0_0 = t3._evaluate0$_handleReturn$2(t1, new A._EvaluateVisitor_visitWhileRule__closure1(t3));
-        if (_0_0 != null) {
-          result = _0_0;
-          t4 = true;
-        } else {
-          result = null;
-          t4 = false;
-        }
-        if (t4)
-          return result;
+        if (_0_0 != null)
+          return _0_0;
       }
       return null;
     },
-    $signature: 46
+    $signature: 41
   };
   A._EvaluateVisitor_visitWhileRule__closure1.prototype = {
     call$1(child) {
       return child.accept$1(this.$this);
     },
-    $signature: 93
+    $signature: 101
   };
   A._EvaluateVisitor_visitBinaryOperationExpression_closure1.prototype = {
     call$0() {
@@ -97083,47 +97836,47 @@ self.util = _cliPkgRequires.util;
         t2 = this.$this,
         left = t1.left.accept$1(t2);
       switch (t1.operator) {
-        case B.BinaryOperator_2jN0:
+        case B.BinaryOperator_wdM0:
           t1 = t1.right.accept$1(t2);
           t1 = new A.SassString0(A.serializeValue0(left, false, true) + "=" + A.serializeValue0(t1, false, true), false);
           break;
-        case B.BinaryOperator_M6L0:
+        case B.BinaryOperator_qNM0:
           t1 = left.get$isTruthy() ? left : t1.right.accept$1(t2);
           break;
-        case B.BinaryOperator_SNp0:
+        case B.BinaryOperator_eDt0:
           t1 = left.get$isTruthy() ? t1.right.accept$1(t2) : left;
           break;
-        case B.BinaryOperator_ql50:
+        case B.BinaryOperator_g8k0:
           t1 = left.$eq(0, t1.right.accept$1(t2)) ? B.SassBoolean_true0 : B.SassBoolean_false0;
           break;
-        case B.BinaryOperator_ViB0:
+        case B.BinaryOperator_icU0:
           t1 = !left.$eq(0, t1.right.accept$1(t2)) ? B.SassBoolean_true0 : B.SassBoolean_false0;
           break;
-        case B.BinaryOperator_cIH0:
+        case B.BinaryOperator_bEa0:
           t1 = left.greaterThan$1(t1.right.accept$1(t2));
           break;
-        case B.BinaryOperator_7Tg0:
+        case B.BinaryOperator_oEm0:
           t1 = left.greaterThanOrEquals$1(t1.right.accept$1(t2));
           break;
-        case B.BinaryOperator_U8c0:
+        case B.BinaryOperator_miq0:
           t1 = left.lessThan$1(t1.right.accept$1(t2));
           break;
-        case B.BinaryOperator_kpg0:
+        case B.BinaryOperator_SPQ0:
           t1 = left.lessThanOrEquals$1(t1.right.accept$1(t2));
           break;
-        case B.BinaryOperator_anB0:
+        case B.BinaryOperator_u150:
           t1 = left.plus$1(t1.right.accept$1(t2));
           break;
-        case B.BinaryOperator_olz0:
+        case B.BinaryOperator_SjO0:
           t1 = left.minus$1(t1.right.accept$1(t2));
           break;
-        case B.BinaryOperator_qN20:
+        case B.BinaryOperator_2No0:
           t1 = left.times$1(t1.right.accept$1(t2));
           break;
-        case B.BinaryOperator_t8B0:
+        case B.BinaryOperator_U770:
           t1 = t2._evaluate0$_slash$3(left, t1.right.accept$1(t2), t1);
           break;
-        case B.BinaryOperator_OTG0:
+        case B.BinaryOperator_KNx0:
           t1 = left.modulo$1(t1.right.accept$1(t2));
           break;
         default:
@@ -97131,41 +97884,14 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 31
-  };
-  A._EvaluateVisitor__slash_closure3.prototype = {
-    call$0() {
-      return this._1_0._0;
-    },
-    $signature: 31
-  };
-  A._EvaluateVisitor__slash_closure4.prototype = {
-    call$0() {
-      return this._1_0._1;
-    },
-    $signature: 31
+    $signature: 47
   };
   A._EvaluateVisitor__slash_recommendation1.prototype = {
     call$1(expression) {
-      var left, right, t1, _null = null;
+      var t1;
       $label0$0: {
-        if (expression instanceof A.BinaryOperationExpression0)
-          if (B.BinaryOperator_t8B0 === expression.operator) {
-            left = expression.left;
-            right = expression.right;
-            t1 = true;
-          } else {
-            right = _null;
-            left = right;
-            t1 = false;
-          }
-        else {
-          right = _null;
-          left = right;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = "math.div(" + A.S(this.call$1(left)) + ", " + A.S(this.call$1(right)) + ")";
+        if (expression instanceof A.BinaryOperationExpression0 && B.BinaryOperator_U770 === expression.operator) {
+          t1 = "math.div(" + A.S(this.call$1(expression.left)) + ", " + A.S(this.call$1(expression.right)) + ")";
           break $label0$0;
         }
         if (expression instanceof A.ParenthesizedExpression0) {
@@ -97177,26 +97903,26 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 118
+    $signature: 107
   };
   A._EvaluateVisitor_visitVariableExpression_closure1.prototype = {
     call$0() {
       var t1 = this.node;
       return this.$this._evaluate0$_environment.getVariable$2$namespace(t1.name, t1.namespace);
     },
-    $signature: 46
+    $signature: 41
   };
   A._EvaluateVisitor_visitUnaryOperationExpression_closure1.prototype = {
     call$0() {
       var t1, _this = this;
       switch (_this.node.operator) {
-        case B.UnaryOperator_gg40:
+        case B.UnaryOperator_cLp0:
           t1 = _this.operand.unaryPlus$0();
           break;
-        case B.UnaryOperator_TLI0:
+        case B.UnaryOperator_AiQ0:
           t1 = _this.operand.unaryMinus$0();
           break;
-        case B.UnaryOperator_Ix10:
+        case B.UnaryOperator_SJr0:
           t1 = new A.SassString0("/" + A.serializeValue0(_this.operand, false, true), false);
           break;
         case B.UnaryOperator_not_not_not0:
@@ -97207,34 +97933,33 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 31
+    $signature: 47
   };
   A._EvaluateVisitor_visitListExpression_closure1.prototype = {
     call$1(expression) {
       return expression.accept$1(this.$this);
     },
-    $signature: 448
+    $signature: 437
   };
   A._EvaluateVisitor_visitFunctionExpression_closure5.prototype = {
     call$0() {
-      var t1 = this.$this._evaluate0$_environment,
-        t2 = this.node;
-      return t1.getFunction$2$namespace(A.stringReplaceAllUnchecked(t2.originalName, "_", "-"), t2.namespace);
+      var t1 = this.node;
+      return this.$this._evaluate0$_environment.getFunction$2$namespace(t1.name, t1.namespace);
     },
-    $signature: 102
+    $signature: 85
   };
   A._EvaluateVisitor_visitFunctionExpression_closure6.prototype = {
     call$1(argument) {
       return argument.accept$1(new A._IsCalculationSafeVisitor0());
     },
-    $signature: 119
+    $signature: 132
   };
   A._EvaluateVisitor_visitFunctionExpression_closure7.prototype = {
     call$0() {
       var t1 = this.node;
       return this.$this._evaluate0$_runFunctionCallable$3(t1.$arguments, this._box_0.$function, t1);
     },
-    $signature: 31
+    $signature: 47
   };
   A._EvaluateVisitor__checkCalculationArguments_check1.prototype = {
     call$1(maxArgs) {
@@ -97248,7 +97973,7 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return this.call$1(null);
     },
-    $signature: 86
+    $signature: 96
   };
   A._EvaluateVisitor__visitCalculationExpression_closure1.prototype = {
     call$0() {
@@ -97258,20 +97983,14 @@ self.util = _cliPkgRequires.util;
         t3 = _this.inLegacySassFunction;
       return A.SassCalculation_operateInternal0(t1._evaluate0$_binaryOperatorToCalculationOperator$2(t2.operator, _this.node), t1._evaluate0$_visitCalculationExpression$2$inLegacySassFunction(t2.left, t3), t1._evaluate0$_visitCalculationExpression$2$inLegacySassFunction(t2.right, t3), t3, !t1._evaluate0$_inSupportsDeclaration);
     },
-    $signature: 14
-  };
-  A._EvaluateVisitor__checkAdjacentCalculationValues_closure1.prototype = {
-    call$0() {
-      return type$.UnaryOperationExpression_2._as(this._0_0).operator;
-    },
-    $signature: 120
+    $signature: 79
   };
   A._EvaluateVisitor_visitInterpolatedFunctionExpression_closure1.prototype = {
     call$0() {
       var t1 = this.node;
       return this.$this._evaluate0$_runFunctionCallable$3(t1.$arguments, this.$function, t1);
     },
-    $signature: 31
+    $signature: 47
   };
   A._EvaluateVisitor__runUserDefinedCallable_closure1.prototype = {
     call$0() {
@@ -97331,7 +98050,7 @@ self.util = _cliPkgRequires.util;
         rest = J.get$length$asx(t2[2]) > t5 ? J.sublist$1$ax(t2[2], t5) : B.List_empty19;
         t5 = t2[0];
         t6 = t2[4];
-        argumentList = A.SassArgumentList$0(rest, t5, t6 === B.ListSeparator_undecided_null_undecided0 ? B.ListSeparator_rXA0 : t6);
+        argumentList = A.SassArgumentList$0(rest, t5, t6 === B.ListSeparator_undecided_null_undecided0 ? B.ListSeparator_ECn0 : t6);
         t1._evaluate0$_environment.setLocalVariable$3(restArgument, argumentList, t4);
       } else
         argumentList = null;
@@ -97345,7 +98064,7 @@ self.util = _cliPkgRequires.util;
         return result;
       argumentWord = A.pluralize0("argument", t5, null);
       t2 = t2[0];
-      t5 = A.instanceType(t2)._eval$1("LinkedHashMapKeyIterable<1>");
+      t5 = A._instanceType(t2)._eval$1("LinkedHashMapKeyIterable<1>");
       throw A.wrapException(A.MultiSpanSassRuntimeException$0("No " + argumentWord + " named " + A.toSentence0(A.MappedIterable_MappedIterable(new A.LinkedHashMapKeyIterable(t2, t5), new A._EvaluateVisitor__runUserDefinedCallable____closure1(), t5._eval$1("Iterable.E"), type$.Object), "or") + ".", t4.get$span(t4), "invocation", A.LinkedHashMap_LinkedHashMap$_literal([t3.get$spanWithName(), "declaration"], type$.FileSpan, type$.String), t1._evaluate0$_stackTrace$1(t4.get$span(t4)), null));
     },
     $signature() {
@@ -97356,7 +98075,7 @@ self.util = _cliPkgRequires.util;
     call$1($name) {
       return "$" + $name;
     },
-    $signature: 7
+    $signature: 5
   };
   A._EvaluateVisitor__runFunctionCallable_closure1.prototype = {
     call$0() {
@@ -97368,7 +98087,7 @@ self.util = _cliPkgRequires.util;
       }
       throw A.wrapException(t4._evaluate0$_exception$2("Function finished without @return.", t1.span));
     },
-    $signature: 31
+    $signature: 47
   };
   A._EvaluateVisitor__runBuiltInCallable_closure5.prototype = {
     call$0() {
@@ -97380,25 +98099,25 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return this._box_0.callback.call$1(this.evaluated._values[2]);
     },
-    $signature: 31
+    $signature: 47
   };
   A._EvaluateVisitor__runBuiltInCallable_closure7.prototype = {
     call$1($name) {
       return "$" + $name;
     },
-    $signature: 7
+    $signature: 5
   };
   A._EvaluateVisitor__evaluateArguments_closure7.prototype = {
     call$1(value) {
       return value;
     },
-    $signature: 45
+    $signature: 42
   };
   A._EvaluateVisitor__evaluateArguments_closure8.prototype = {
     call$1(value) {
       return this.$this._evaluate0$_withoutSlash$2(value, this.restNodeForSpan);
     },
-    $signature: 45
+    $signature: 42
   };
   A._EvaluateVisitor__evaluateArguments_closure9.prototype = {
     call$2(key, value) {
@@ -97407,27 +98126,27 @@ self.util = _cliPkgRequires.util;
       _this.named.$indexSet(0, key, _this.$this._evaluate0$_withoutSlash$2(value, t1));
       _this.namedNodes.$indexSet(0, key, t1);
     },
-    $signature: 109
+    $signature: 103
   };
   A._EvaluateVisitor__evaluateArguments_closure10.prototype = {
     call$1(value) {
       return value;
     },
-    $signature: 45
+    $signature: 42
   };
   A._EvaluateVisitor__evaluateMacroArguments_closure7.prototype = {
     call$1(value) {
       var t1 = this.restArgs;
       return new A.ValueExpression0(value, t1.get$span(t1));
     },
-    $signature: 60
+    $signature: 63
   };
   A._EvaluateVisitor__evaluateMacroArguments_closure8.prototype = {
     call$1(value) {
       var t1 = this.restArgs;
       return new A.ValueExpression0(this.$this._evaluate0$_withoutSlash$2(value, this.restNodeForSpan), t1.get$span(t1));
     },
-    $signature: 60
+    $signature: 63
   };
   A._EvaluateVisitor__evaluateMacroArguments_closure9.prototype = {
     call$2(key, value) {
@@ -97435,14 +98154,14 @@ self.util = _cliPkgRequires.util;
         t1 = _this.restArgs;
       _this.named.$indexSet(0, key, new A.ValueExpression0(_this.$this._evaluate0$_withoutSlash$2(value, _this.restNodeForSpan), t1.get$span(t1)));
     },
-    $signature: 109
+    $signature: 103
   };
   A._EvaluateVisitor__evaluateMacroArguments_closure10.prototype = {
     call$1(value) {
       var t1 = this.keywordRestArgs;
       return new A.ValueExpression0(this.$this._evaluate0$_withoutSlash$2(value, this.keywordRestNodeForSpan), t1.get$span(t1));
     },
-    $signature: 60
+    $signature: 63
   };
   A._EvaluateVisitor__addRestMap_closure1.prototype = {
     call$2(key, value) {
@@ -97455,7 +98174,7 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException(t1._evaluate0$_exception$2(string$.Variab_ + key.toString$0(0) + " is not a string in " + _this.map.toString$0(0) + ".", t2.get$span(t2)));
       }
     },
-    $signature: 104
+    $signature: 76
   };
   A._EvaluateVisitor__verifyArguments_closure1.prototype = {
     call$0() {
@@ -97466,12 +98185,12 @@ self.util = _cliPkgRequires.util;
   A._EvaluateVisitor_visitCssAtRule_closure3.prototype = {
     call$0() {
       var t1, t2, t3, t4;
-      for (t1 = this.node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = this.$this, t3 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = this.node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = this.$this, t2 = t2._eval$1("ListBase.E"); t1.moveNext$0();) {
         t4 = t1.__internal$_current;
-        (t4 == null ? t3._as(t4) : t4).accept$1(t2);
+        (t4 == null ? t2._as(t4) : t4).accept$1(t3);
       }
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitCssAtRule_closure4.prototype = {
     call$1(node) {
@@ -97482,12 +98201,12 @@ self.util = _cliPkgRequires.util;
   A._EvaluateVisitor_visitCssKeyframeBlock_closure3.prototype = {
     call$0() {
       var t1, t2, t3, t4;
-      for (t1 = this.node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = this.$this, t3 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = this.node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = this.$this, t2 = t2._eval$1("ListBase.E"); t1.moveNext$0();) {
         t4 = t1.__internal$_current;
-        (t4 == null ? t3._as(t4) : t4).accept$1(t2);
+        (t4 == null ? t2._as(t4) : t4).accept$1(t3);
       }
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitCssKeyframeBlock_closure4.prototype = {
     call$1(node) {
@@ -97499,7 +98218,7 @@ self.util = _cliPkgRequires.util;
     call$1(mediaQueries) {
       return this.$this._evaluate0$_mergeMediaQueries$2(mediaQueries, this.node.queries);
     },
-    $signature: 113
+    $signature: 100
   };
   A._EvaluateVisitor_visitCssMediaRule_closure6.prototype = {
     call$0() {
@@ -97510,39 +98229,32 @@ self.util = _cliPkgRequires.util;
         t2 = _this.node.queries;
       t1._evaluate0$_withMediaQueries$3(t2, _this.mergedSources, new A._EvaluateVisitor_visitCssMediaRule__closure1(t1, _this.node));
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitCssMediaRule__closure1.prototype = {
     call$0() {
-      var styleRule, t2, t3, t4,
+      var t2, t3, t4,
         t1 = this.$this,
         _0_0 = t1._evaluate0$_atRootExcludingStyleRule ? null : t1._evaluate0$_styleRuleIgnoringAtRoot;
-      if (_0_0 != null) {
-        styleRule = _0_0;
-        t2 = true;
-      } else {
-        styleRule = null;
-        t2 = false;
-      }
-      if (t2)
-        t1._evaluate0$_withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$0(styleRule._style_rule0$_selector, styleRule.span, styleRule.originalSelector), new A._EvaluateVisitor_visitCssMediaRule___closure1(t1, this.node), false, type$.ModifiableCssStyleRule_2, type$.Null);
+      if (_0_0 != null)
+        t1._evaluate0$_withParent$2$3$scopeWhen(A.ModifiableCssStyleRule$0(_0_0._style_rule0$_selector, _0_0.span, false, _0_0.originalSelector), new A._EvaluateVisitor_visitCssMediaRule___closure1(t1, this.node), false, type$.ModifiableCssStyleRule_2, type$.Null);
       else
-        for (t2 = this.node.children, t2 = new A.ListIterator(t2, t2.get$length(t2)), t3 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
+        for (t2 = this.node.children, t3 = t2.$ti, t2 = new A.ListIterator(t2, t2.get$length(0), t3._eval$1("ListIterator<ListBase.E>")), t3 = t3._eval$1("ListBase.E"); t2.moveNext$0();) {
           t4 = t2.__internal$_current;
           (t4 == null ? t3._as(t4) : t4).accept$1(t1);
         }
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitCssMediaRule___closure1.prototype = {
     call$0() {
       var t1, t2, t3, t4;
-      for (t1 = this.node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = this.$this, t3 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = this.node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = this.$this, t2 = t2._eval$1("ListBase.E"); t1.moveNext$0();) {
         t4 = t1.__internal$_current;
-        (t4 == null ? t3._as(t4) : t4).accept$1(t2);
+        (t4 == null ? t2._as(t4) : t4).accept$1(t3);
       }
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitCssMediaRule_closure7.prototype = {
     call$1(node) {
@@ -97556,66 +98268,53 @@ self.util = _cliPkgRequires.util;
     },
     $signature: 8
   };
-  A._EvaluateVisitor_visitCssStyleRule_closure5.prototype = {
+  A._EvaluateVisitor_visitCssStyleRule_closure4.prototype = {
     call$0() {
       var t1 = this.$this;
       t1._evaluate0$_withStyleRule$2(this.rule, new A._EvaluateVisitor_visitCssStyleRule__closure1(t1, this.node));
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitCssStyleRule__closure1.prototype = {
     call$0() {
       var t1, t2, t3, t4;
-      for (t1 = this.node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = this.$this, t3 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = this.node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = this.$this, t2 = t2._eval$1("ListBase.E"); t1.moveNext$0();) {
         t4 = t1.__internal$_current;
-        (t4 == null ? t3._as(t4) : t4).accept$1(t2);
+        (t4 == null ? t2._as(t4) : t4).accept$1(t3);
       }
     },
-    $signature: 2
+    $signature: 1
   };
-  A._EvaluateVisitor_visitCssStyleRule_closure6.prototype = {
+  A._EvaluateVisitor_visitCssStyleRule_closure3.prototype = {
     call$1(node) {
       return node instanceof A.ModifiableCssStyleRule0;
     },
     $signature: 8
   };
-  A._EvaluateVisitor_visitCssStyleRule_closure7.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_0._collection$_source);
-    },
-    $signature: 3
-  };
   A._EvaluateVisitor_visitCssSupportsRule_closure3.prototype = {
     call$0() {
-      var styleRule, t2, t3, t4,
+      var t2, t3, t4,
         t1 = this.$this,
         _0_0 = t1._evaluate0$_atRootExcludingStyleRule ? null : t1._evaluate0$_styleRuleIgnoringAtRoot;
-      if (_0_0 != null) {
-        styleRule = _0_0;
-        t2 = true;
-      } else {
-        styleRule = null;
-        t2 = false;
-      }
-      if (t2)
-        t1._evaluate0$_withParent$2$2(A.ModifiableCssStyleRule$0(styleRule._style_rule0$_selector, styleRule.span, styleRule.originalSelector), new A._EvaluateVisitor_visitCssSupportsRule__closure1(t1, this.node), type$.ModifiableCssStyleRule_2, type$.Null);
+      if (_0_0 != null)
+        t1._evaluate0$_withParent$2$2(A.ModifiableCssStyleRule$0(_0_0._style_rule0$_selector, _0_0.span, false, _0_0.originalSelector), new A._EvaluateVisitor_visitCssSupportsRule__closure1(t1, this.node), type$.ModifiableCssStyleRule_2, type$.Null);
       else
-        for (t2 = this.node.children, t2 = new A.ListIterator(t2, t2.get$length(t2)), t3 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
+        for (t2 = this.node.children, t3 = t2.$ti, t2 = new A.ListIterator(t2, t2.get$length(0), t3._eval$1("ListIterator<ListBase.E>")), t3 = t3._eval$1("ListBase.E"); t2.moveNext$0();) {
           t4 = t2.__internal$_current;
           (t4 == null ? t3._as(t4) : t4).accept$1(t1);
         }
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitCssSupportsRule__closure1.prototype = {
     call$0() {
       var t1, t2, t3, t4;
-      for (t1 = this.node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = this.$this, t3 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = this.node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t3 = this.$this, t2 = t2._eval$1("ListBase.E"); t1.moveNext$0();) {
         t4 = t1.__internal$_current;
-        (t4 == null ? t3._as(t4) : t4).accept$1(t2);
+        (t4 == null ? t2._as(t4) : t4).accept$1(t3);
       }
     },
-    $signature: 2
+    $signature: 1
   };
   A._EvaluateVisitor_visitCssSupportsRule_closure4.prototype = {
     call$1(node) {
@@ -97627,20 +98326,20 @@ self.util = _cliPkgRequires.util;
     call$1(targetLocations) {
       return A.InterpolationMap$0(this.interpolation, targetLocations);
     },
-    $signature: 211
+    $signature: 219
   };
   A._EvaluateVisitor__serialize_closure1.prototype = {
     call$0() {
       return A.serializeValue0(this.value, false, this.quote);
     },
-    $signature: 22
+    $signature: 26
   };
   A._EvaluateVisitor__expressionNode_closure1.prototype = {
     call$0() {
       var t1 = this.expression;
       return this.$this._evaluate0$_environment.getVariableNode$2$namespace(t1.name, t1.namespace);
     },
-    $signature: 212
+    $signature: 217
   };
   A._EvaluateVisitor__withoutSlash_recommendation1.prototype = {
     call$1(number) {
@@ -97651,13 +98350,6 @@ self.util = _cliPkgRequires.util;
           t1 = type$.SassNumber_2;
           before = t1._as(_1_0._0);
           after = t1._as(_1_0._1);
-          t1 = true;
-        } else {
-          before = null;
-          after = null;
-          t1 = false;
-        }
-        if (t1) {
           t1 = "math.div(" + A.S(this.call$1(before)) + ", " + A.S(this.call$1(after)) + ")";
           break $label0$0;
         }
@@ -97666,7 +98358,7 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 213
+    $signature: 216
   };
   A._EvaluateVisitor__stackFrame_closure1.prototype = {
     call$1(url) {
@@ -97674,7 +98366,7 @@ self.util = _cliPkgRequires.util;
       t1 = t1 == null ? null : t1.humanize$1(url);
       return t1 == null ? url : t1;
     },
-    $signature: 48
+    $signature: 43
   };
   A._ImportedCssVisitor1.prototype = {
     visitCssAtRule$1(node) {
@@ -97712,7 +98404,7 @@ self.util = _cliPkgRequires.util;
     },
     visitCssStylesheet$1(node) {
       var t1, t2, t3;
-      for (t1 = node.children, t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = node.children, t2 = t1.$ti, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t2 = t2._eval$1("ListBase.E"); t1.moveNext$0();) {
         t3 = t1.__internal$_current;
         (t3 == null ? t2._as(t3) : t3).accept$1(this);
       }
@@ -97752,17 +98444,9 @@ self.util = _cliPkgRequires.util;
   };
   A._EvaluationContext1.prototype = {
     get$currentCallableSpan() {
-      var callableNode, t1,
-        _0_0 = this._evaluate0$_visitor._evaluate0$_callableNode;
-      if (_0_0 != null) {
-        callableNode = _0_0;
-        t1 = true;
-      } else {
-        callableNode = null;
-        t1 = false;
-      }
-      if (t1)
-        return callableNode.get$span(callableNode);
+      var _0_0 = this._evaluate0$_visitor._evaluate0$_callableNode;
+      if (_0_0 != null)
+        return _0_0.get$span(_0_0);
       throw A.wrapException(A.StateError$(string$.No_Sasc));
     },
     warn$2(_, message, deprecation) {
@@ -97854,19 +98538,19 @@ self.util = _cliPkgRequires.util;
       A.LinkedHashMap_LinkedHashMap$_literal(["sassMessage", new A.exceptionClass__closure(), "sassStack", new A.exceptionClass__closure0(), "span", new A.exceptionClass__closure1()], type$.String, type$.Function).forEach$1(0, A.JSClassExtension_get_defineGetter(jsClass));
       return jsClass;
     },
-    $signature: 24
+    $signature: 15
   };
   A.exceptionClass__closure.prototype = {
     call$1(exception) {
       return J.get$_dartException$x(exception)._span_exception$_message;
     },
-    $signature: 244
+    $signature: 262
   };
   A.exceptionClass__closure0.prototype = {
     call$1(exception) {
       return J.get$trace$z(J.get$_dartException$x(exception)).toString$0(0);
     },
-    $signature: 244
+    $signature: 262
   };
   A.exceptionClass__closure1.prototype = {
     call$1(exception) {
@@ -97874,27 +98558,25 @@ self.util = _cliPkgRequires.util;
         t2 = J.getInterceptor$z(t1);
       return A.SourceSpanException.prototype.get$span.call(t2, t1);
     },
-    $signature: 450
+    $signature: 439
   };
   A.SassException0.prototype = {
     get$trace(_) {
-      return A.Trace$(A._setArrayType([A.frameForSpan0(A.SourceSpanException.prototype.get$span.call(this, this), "root stylesheet", null)], type$.JSArray_Frame), null);
+      return A.Trace$(A._setArrayType([A.frameForSpan0(A.SourceSpanException.prototype.get$span.call(this, 0), "root stylesheet", null)], type$.JSArray_Frame), null);
     },
     get$span(_) {
-      return A.SourceSpanException.prototype.get$span.call(this, this);
+      return A.SourceSpanException.prototype.get$span.call(this, 0);
     },
     withAdditionalSpan$2(span, label) {
-      var _this = this;
-      return A.MultiSpanSassException$0(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, _this), "", A.LinkedHashMap_LinkedHashMap$_literal([span, label], type$.FileSpan, type$.String), _this.loadedUrls);
+      return A.MultiSpanSassException$0(this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(this, 0), "", A.LinkedHashMap_LinkedHashMap$_literal([span, label], type$.FileSpan, type$.String), this.loadedUrls);
     },
     withTrace$1(trace) {
-      var _this = this,
-        t1 = A.SourceSpanException.prototype.get$span.call(_this, _this),
-        t2 = A.Set_Set$unmodifiable(_this.loadedUrls, type$.Uri);
-      return new A.SassRuntimeException0(trace, t2, _this._span_exception$_message, t1);
+      var t1 = A.SourceSpanException.prototype.get$span.call(this, 0),
+        t2 = A.Set_Set$unmodifiable(this.loadedUrls, type$.Uri);
+      return new A.SassRuntimeException0(trace, t2, this._span_exception$_message, t1);
     },
     withLoadedUrls$1(loadedUrls) {
-      var t1 = A.SourceSpanException.prototype.get$span.call(this, this),
+      var t1 = A.SourceSpanException.prototype.get$span.call(this, 0),
         t2 = A.Set_Set$unmodifiable(loadedUrls, type$.Uri);
       return new A.SassException0(t2, this._span_exception$_message, t1);
     },
@@ -97903,7 +98585,7 @@ self.util = _cliPkgRequires.util;
         buffer = new A.StringBuffer(""),
         t1 = "" + ("Error: " + _this._span_exception$_message + "\n");
       buffer._contents = t1;
-      buffer._contents = t1 + A.SourceSpanException.prototype.get$span.call(_this, _this).highlight$1$color(color);
+      buffer._contents = t1 + A.SourceSpanException.prototype.get$span.call(_this, 0).highlight$1$color(color);
       for (t1 = _this.get$trace(_this).toString$0(0).split("\n"), t2 = t1.length, _i = 0; _i < t2; ++_i) {
         frame = t1[_i];
         if (J.get$length$asx(frame) === 0)
@@ -97914,43 +98596,44 @@ self.util = _cliPkgRequires.util;
       t1 = buffer._contents;
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     },
-    toString$0($receiver) {
-      return this.toString$1$color($receiver, null);
+    toString$0(_) {
+      return this.toString$1$color(0, null);
     }
   };
   A.MultiSpanSassException0.prototype = {
     withAdditionalSpan$2(span, label) {
       var _this = this,
-        t1 = A.SourceSpanException.prototype.get$span.call(_this, _this),
+        t1 = A.SourceSpanException.prototype.get$span.call(_this, 0),
         t2 = A.LinkedHashMap_LinkedHashMap$of(_this.secondarySpans, type$.FileSpan, type$.String);
       t2.$indexSet(0, span, label);
       return A.MultiSpanSassException$0(_this._span_exception$_message, t1, _this.primaryLabel, t2, _this.loadedUrls);
     },
     withTrace$1(trace) {
       var _this = this;
-      return A.MultiSpanSassRuntimeException$0(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, _this), _this.primaryLabel, _this.secondarySpans, trace, _this.loadedUrls);
+      return A.MultiSpanSassRuntimeException$0(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, 0), _this.primaryLabel, _this.secondarySpans, trace, _this.loadedUrls);
     },
     withLoadedUrls$1(loadedUrls) {
       var _this = this;
-      return A.MultiSpanSassException$0(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, _this), _this.primaryLabel, _this.secondarySpans, loadedUrls);
+      return A.MultiSpanSassException$0(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, 0), _this.primaryLabel, _this.secondarySpans, loadedUrls);
     },
     toString$1$color(_, color) {
-      var t1, t2, _i, frame, _this = this,
-        useColor = color === true && true,
+      var t1, t2, _i, frame, t3, _this = this,
+        useColor = color === true,
         buffer = new A.StringBuffer("Error: " + _this._span_exception$_message + "\n");
-      A.NullableExtension_andThen0(A.Highlighter$multiple(A.SourceSpanException.prototype.get$span.call(_this, _this), _this.primaryLabel, _this.secondarySpans, useColor, null, null).highlight$0(), buffer.get$write(buffer));
+      A.NullableExtension_andThen0(A.Highlighter$multiple(A.SourceSpanException.prototype.get$span.call(_this, 0), _this.primaryLabel, _this.secondarySpans, useColor, null, null).highlight$0(), buffer.get$write(buffer));
       for (t1 = _this.get$trace(_this).toString$0(0).split("\n"), t2 = t1.length, _i = 0; _i < t2; ++_i) {
         frame = t1[_i];
         if (J.get$length$asx(frame) === 0)
           continue;
         buffer._contents += "\n";
-        buffer._contents += "  " + A.S(frame);
+        t3 = "  " + A.S(frame);
+        buffer._contents += t3;
       }
       t1 = buffer._contents;
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     },
-    toString$0($receiver) {
-      return this.toString$1$color($receiver, null);
+    toString$0(_) {
+      return this.toString$1$color(0, null);
     },
     get$primaryLabel() {
       return this.primaryLabel;
@@ -97962,13 +98645,12 @@ self.util = _cliPkgRequires.util;
   A.SassRuntimeException0.prototype = {
     withAdditionalSpan$2(span, label) {
       var _this = this;
-      return A.MultiSpanSassRuntimeException$0(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, _this), "", A.LinkedHashMap_LinkedHashMap$_literal([span, label], type$.FileSpan, type$.String), _this.trace, _this.loadedUrls);
+      return A.MultiSpanSassRuntimeException$0(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, 0), "", A.LinkedHashMap_LinkedHashMap$_literal([span, label], type$.FileSpan, type$.String), _this.trace, _this.loadedUrls);
     },
     withLoadedUrls$1(loadedUrls) {
-      var _this = this,
-        t1 = A.SourceSpanException.prototype.get$span.call(_this, _this),
+      var t1 = A.SourceSpanException.prototype.get$span.call(this, 0),
         t2 = A.Set_Set$unmodifiable(loadedUrls, type$.Uri);
-      return new A.SassRuntimeException0(_this.trace, t2, _this._span_exception$_message, t1);
+      return new A.SassRuntimeException0(this.trace, t2, this._span_exception$_message, t1);
     },
     get$trace(receiver) {
       return this.trace;
@@ -97977,14 +98659,14 @@ self.util = _cliPkgRequires.util;
   A.MultiSpanSassRuntimeException0.prototype = {
     withAdditionalSpan$2(span, label) {
       var _this = this,
-        t1 = A.SourceSpanException.prototype.get$span.call(_this, _this),
+        t1 = A.SourceSpanException.prototype.get$span.call(_this, 0),
         t2 = A.LinkedHashMap_LinkedHashMap$of(_this.secondarySpans, type$.FileSpan, type$.String);
       t2.$indexSet(0, span, label);
       return A.MultiSpanSassRuntimeException$0(_this._span_exception$_message, t1, _this.primaryLabel, t2, _this.trace, _this.loadedUrls);
     },
     withLoadedUrls$1(loadedUrls) {
       var _this = this;
-      return A.MultiSpanSassRuntimeException$0(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, _this), _this.primaryLabel, _this.secondarySpans, _this.trace, loadedUrls);
+      return A.MultiSpanSassRuntimeException$0(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, 0), _this.primaryLabel, _this.secondarySpans, _this.trace, loadedUrls);
     },
     $isSassRuntimeException0: 1,
     get$trace(receiver) {
@@ -97993,15 +98675,14 @@ self.util = _cliPkgRequires.util;
   };
   A.SassFormatException0.prototype = {
     get$source() {
-      var t1 = A.SourceSpanException.prototype.get$span.call(this, this);
+      var t1 = A.SourceSpanException.prototype.get$span.call(this, 0);
       return A.String_String$fromCharCodes(B.NativeUint32List_methods.sublist$2(t1.get$file(t1)._decodedChars, 0, null), 0, null);
     },
     withAdditionalSpan$2(span, label) {
-      var _this = this;
-      return A.MultiSpanSassFormatException$0(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, _this), "", A.LinkedHashMap_LinkedHashMap$_literal([span, label], type$.FileSpan, type$.String), _this.loadedUrls);
+      return A.MultiSpanSassFormatException$0(this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(this, 0), "", A.LinkedHashMap_LinkedHashMap$_literal([span, label], type$.FileSpan, type$.String), this.loadedUrls);
     },
     withLoadedUrls$1(loadedUrls) {
-      var t1 = A.SourceSpanException.prototype.get$span.call(this, this),
+      var t1 = A.SourceSpanException.prototype.get$span.call(this, 0),
         t2 = A.Set_Set$unmodifiable(loadedUrls, type$.Uri);
       return new A.SassFormatException0(t2, this._span_exception$_message, t1);
     },
@@ -98010,19 +98691,19 @@ self.util = _cliPkgRequires.util;
   };
   A.MultiSpanSassFormatException0.prototype = {
     get$source() {
-      var t1 = A.SourceSpanException.prototype.get$span.call(this, this);
+      var t1 = A.SourceSpanException.prototype.get$span.call(this, 0);
       return A.String_String$fromCharCodes(B.NativeUint32List_methods.sublist$2(t1.get$file(t1)._decodedChars, 0, null), 0, null);
     },
     withAdditionalSpan$2(span, label) {
       var _this = this,
-        t1 = A.SourceSpanException.prototype.get$span.call(_this, _this),
+        t1 = A.SourceSpanException.prototype.get$span.call(_this, 0),
         t2 = A.LinkedHashMap_LinkedHashMap$of(_this.secondarySpans, type$.FileSpan, type$.String);
       t2.$indexSet(0, span, label);
       return A.MultiSpanSassFormatException$0(_this._span_exception$_message, t1, _this.primaryLabel, t2, _this.loadedUrls);
     },
     withLoadedUrls$1(loadedUrls) {
       var _this = this;
-      return A.MultiSpanSassFormatException$0(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, _this), _this.primaryLabel, _this.secondarySpans, loadedUrls);
+      return A.MultiSpanSassFormatException$0(_this._span_exception$_message, A.SourceSpanException.prototype.get$span.call(_this, 0), _this.primaryLabel, _this.secondarySpans, loadedUrls);
     },
     $isFormatException: 1,
     $isSourceSpanFormatException: 1,
@@ -98050,7 +98731,7 @@ self.util = _cliPkgRequires.util;
   A._IsCalculationSafeVisitor0.prototype = {
     visitBinaryOperationExpression$1(node) {
       var t1;
-      if (B.Set_FIwG40.contains$1(0, node.operator))
+      if (B.Set_mqKz0.contains$1(0, node.operator))
         t1 = node.left.accept$1(this) || node.right.accept$1(this);
       else
         t1 = false;
@@ -98073,7 +98754,7 @@ self.util = _cliPkgRequires.util;
     },
     visitListExpression$1(node) {
       var t1;
-      if (node.separator === B.ListSeparator_EVt0)
+      if (node.separator === B.ListSeparator_nbm0)
         if (!node.hasBrackets) {
           t1 = node.contents;
           t1 = t1.length > 1 && B.JSArray_methods.every$1(t1, new A._IsCalculationSafeVisitor_visitListExpression_closure0(this));
@@ -98134,17 +98815,19 @@ self.util = _cliPkgRequires.util;
     call$1(expression) {
       return expression.accept$1(this.$this);
     },
-    $signature: 119
+    $signature: 132
   };
   A._MakeExpressionCalculationSafe0.prototype = {
     visitBinaryOperationExpression$1(node) {
-      var t1, t2, t3;
-      if (node.operator === B.BinaryOperator_OTG0) {
+      var t1, t2, t3, t4;
+      if (node.operator === B.BinaryOperator_KNx0) {
         t1 = A._setArrayType([node], type$.JSArray_Expression_2);
-        t2 = node.get$span(node);
+        t2 = node.get$span(0);
         t3 = type$.Expression_2;
-        t2 = new A.FunctionExpression0("math", "max", new A.ArgumentInvocation0(A.List_List$unmodifiable(t1, t3), A.ConstantMap_ConstantMap$from(B.Map_empty14, type$.String, t3), null, null, t2), node.get$span(node));
-        t1 = t2;
+        t1 = A.List_List$unmodifiable(t1, t3);
+        t3 = A.ConstantMap_ConstantMap$from(B.Map_empty14, type$.String, t3);
+        t4 = node.get$span(0);
+        t1 = new A.FunctionExpression0("math", A.stringReplaceAllUnchecked("max", "_", "-"), "max", new A.ArgumentInvocation0(t1, t3, null, null, t2), t4);
       } else
         t1 = this.super$ReplaceExpressionVisitor$visitBinaryOperationExpression0(node);
       return t1;
@@ -98156,12 +98839,12 @@ self.util = _cliPkgRequires.util;
       var t1,
         _0_0 = node.operator;
       $label0$0: {
-        if (B.UnaryOperator_gg40 === _0_0) {
+        if (B.UnaryOperator_cLp0 === _0_0) {
           t1 = node.operand;
           break $label0$0;
         }
-        if (B.UnaryOperator_TLI0 === _0_0) {
-          t1 = new A.BinaryOperationExpression0(B.BinaryOperator_qN20, new A.NumberExpression0(-1, null, node.span), node.operand, false);
+        if (B.UnaryOperator_AiQ0 === _0_0) {
+          t1 = new A.BinaryOperationExpression0(B.BinaryOperator_2No0, new A.NumberExpression0(-1, null, node.span), node.operand, false);
           break $label0$0;
         }
         t1 = this.super$ReplaceExpressionVisitor$visitUnaryOperationExpression0(node);
@@ -98341,31 +99024,28 @@ self.util = _cliPkgRequires.util;
       return new A.Box0(modifiableSelector, type$.Box_SelectorList_2);
     },
     _extension_store$_registerSelector$2(list, selector) {
-      var t1, t2, t3, _i, t4, t5, _i0, t6, t7, _i1, simple, _0_2, selectorInPseudo, t8;
-      for (t1 = list.components, t2 = t1.length, t3 = this._extension_store$_selectors, _i = 0; _i < t2; ++_i)
-        for (t4 = t1[_i].components, t5 = t4.length, _i0 = 0; _i0 < t5; ++_i0)
-          for (t6 = t4[_i0].selector.components, t7 = t6.length, _i1 = 0; _i1 < t7; ++_i1) {
-            simple = t6[_i1];
-            J.add$1$ax(t3.putIfAbsent$2(simple, new A.ExtensionStore__registerSelector_closure1()), selector);
-            _0_2 = A._InitializedCell$(new A.ExtensionStore__registerSelector_closure2(simple));
-            if (simple instanceof A.PseudoSelector0)
-              if (_0_2._readFinal$0() != null) {
-                selectorInPseudo = _0_2._readFinal$0();
-                t8 = true;
-              } else {
-                selectorInPseudo = null;
-                t8 = false;
-              }
-            else {
-              selectorInPseudo = null;
-              t8 = false;
+      var t1, t2, t3, t4, _i, t5, t6, _i0, t7, t8, _i1, simple, _0_2_isSet, _0_2, t9, selectorInPseudo;
+      for (t1 = list.components, t2 = t1.length, t3 = this._extension_store$_selectors, t4 = type$.SelectorList_2, _i = 0; _i < t2; ++_i)
+        for (t5 = t1[_i].components, t6 = t5.length, _i0 = 0; _i0 < t6; ++_i0)
+          for (t7 = t5[_i0].selector.components, t8 = t7.length, _i1 = 0; _i1 < t8; ++_i1) {
+            simple = t7[_i1];
+            J.add$1$ax(t3.putIfAbsent$2(simple, new A.ExtensionStore__registerSelector_closure0()), selector);
+            _0_2_isSet = simple instanceof A.PseudoSelector0;
+            if (_0_2_isSet) {
+              _0_2 = simple.selector;
+              t9 = _0_2 != null;
+            } else {
+              _0_2 = null;
+              t9 = false;
+            }
+            if (t9) {
+              selectorInPseudo = _0_2_isSet ? _0_2 : simple.selector;
+              this._extension_store$_registerSelector$2(selectorInPseudo == null ? t4._as(selectorInPseudo) : selectorInPseudo, selector);
             }
-            if (t8)
-              this._extension_store$_registerSelector$2(selectorInPseudo, selector);
           }
     },
     addExtension$4(extender, target, extend, mediaContext) {
-      var t2, t3, t4, t5, t6, t7, t8, t9, t10, newExtensions, _i, complex, t11, extension, _0_0, existingExtension, t12, newExtensionsByTarget, additionalExtensions, _this = this,
+      var t2, t3, t4, t5, t6, t7, t8, t9, t10, newExtensions, _i, complex, t11, extension, _0_0, t12, newExtensionsByTarget, additionalExtensions, _this = this,
         selectors = _this._extension_store$_selectors.$index(0, target),
         t1 = _this._extension_store$_extensionsByExtender,
         existingExtensions = t1.$index(0, target),
@@ -98379,14 +99059,7 @@ self.util = _cliPkgRequires.util;
         extension = t11._extension$_extension = new A.Extension0(t11, target, mediaContext, t7, t6);
         _0_0 = sources.$index(0, complex);
         if (_0_0 != null) {
-          existingExtension = _0_0;
-          t11 = true;
-        } else {
-          existingExtension = null;
-          t11 = false;
-        }
-        if (t11) {
-          sources.$indexSet(0, complex, A.MergedExtension_merge0(existingExtension, extension));
+          sources.$indexSet(0, complex, A.MergedExtension_merge0(_0_0, extension));
           continue;
         }
         sources.$indexSet(0, complex, extension);
@@ -98420,7 +99093,7 @@ self.util = _cliPkgRequires.util;
       var $async$self = this;
       return function() {
         var complex = $async$complex;
-        var $async$goto = 0, $async$handler = 1, $async$currentError, t1, t2, _i, t3, t4, _i0, simple, _0_2, selector, t5, t6, _i1;
+        var $async$goto = 0, $async$handler = 1, $async$currentError, t1, t2, t3, _i, t4, t5, _i0, simple, _0_2_isSet, _0_2, t6, selector, t7, _i1;
         return function $async$_extension_store$_simpleSelectors$1($async$iterator, $async$errorCode, $async$result) {
           if ($async$errorCode === 1) {
             $async$currentError = $async$result;
@@ -98430,7 +99103,7 @@ self.util = _cliPkgRequires.util;
             switch ($async$goto) {
               case 0:
                 // Function start
-                t1 = complex.components, t2 = t1.length, _i = 0;
+                t1 = complex.components, t2 = t1.length, t3 = type$.SelectorList_2, _i = 0;
               case 2:
                 // for condition
                 if (!(_i < t2)) {
@@ -98438,46 +99111,42 @@ self.util = _cliPkgRequires.util;
                   $async$goto = 4;
                   break;
                 }
-                t3 = t1[_i].selector.components, t4 = t3.length, _i0 = 0;
+                t4 = t1[_i].selector.components, t5 = t4.length, _i0 = 0;
               case 5:
                 // for condition
-                if (!(_i0 < t4)) {
+                if (!(_i0 < t5)) {
                   // goto after for
                   $async$goto = 7;
                   break;
                 }
-                simple = t3[_i0];
+                simple = t4[_i0];
                 $async$goto = 8;
                 return $async$iterator._async$_current = simple, 1;
               case 8:
                 // after yield
-                _0_2 = A._InitializedCell$(new A.ExtensionStore__simpleSelectors_closure0(simple));
-                if (simple instanceof A.PseudoSelector0)
-                  if (_0_2._readFinal$0() != null) {
-                    selector = _0_2._readFinal$0();
-                    t5 = true;
-                  } else {
-                    selector = null;
-                    t5 = false;
-                  }
-                else {
-                  selector = null;
-                  t5 = false;
+                _0_2_isSet = simple instanceof A.PseudoSelector0;
+                if (_0_2_isSet) {
+                  _0_2 = simple.selector;
+                  t6 = _0_2 != null;
+                } else {
+                  _0_2 = null;
+                  t6 = false;
                 }
-                $async$goto = t5 ? 9 : 10;
+                $async$goto = t6 ? 9 : 10;
                 break;
               case 9:
                 // then
-                t5 = selector.components, t6 = t5.length, _i1 = 0;
+                selector = _0_2_isSet ? _0_2 : simple.selector;
+                t6 = (selector == null ? t3._as(selector) : selector).components, t7 = t6.length, _i1 = 0;
               case 11:
                 // for condition
-                if (!(_i1 < t6)) {
+                if (!(_i1 < t7)) {
                   // goto after for
                   $async$goto = 13;
                   break;
                 }
                 $async$goto = 14;
-                return $async$iterator._yieldStar$1($async$self._extension_store$_simpleSelectors$1(t5[_i1]));
+                return $async$iterator._yieldStar$1($async$self._extension_store$_simpleSelectors$1(t6[_i1]));
               case 14:
                 // after yield
               case 12:
@@ -98516,8 +99185,8 @@ self.util = _cliPkgRequires.util;
       };
     },
     _extension_store$_extendExistingExtensions$2(extensions, newExtensions) {
-      var extension, selectors, error, stackTrace, t1, t2, t3, t4, t5, t6, additionalExtensions, _i, t7, exception, t8, t9, containsExtension, selectors0, t10, t11, t12, t13, t14, withExtender, _0_0, existingExtension, _i0, _i1, _null = null;
-      for (t1 = J.toList$0$ax(extensions), t2 = t1.length, t3 = this._extension_store$_extensionsByExtender, t4 = type$.SimpleSelector_2, t5 = type$.Map_ComplexSelector_Extension_2, t6 = this._extension_store$_extensions, additionalExtensions = _null, _i = 0; _i < t1.length; t1.length === t2 || (0, A.throwConcurrentModificationError)(t1), ++_i) {
+      var extension, selectors, error, stackTrace, t1, t2, t3, t4, t5, t6, additionalExtensions, _i, t7, exception, t8, t9, selectors0, t10, t11, t12, t13, t14, withExtender, _0_0, _i0, _i1;
+      for (t1 = J.toList$0$ax(extensions), t2 = t1.length, t3 = this._extension_store$_extensionsByExtender, t4 = type$.SimpleSelector_2, t5 = type$.Map_ComplexSelector_Extension_2, t6 = this._extension_store$_extensions, additionalExtensions = null, _i = 0; _i < t1.length; t1.length === t2 || (0, A.throwConcurrentModificationError)(t1), ++_i) {
         extension = t1[_i];
         t7 = t6.$index(0, extension.target);
         t7.toString;
@@ -98537,12 +99206,11 @@ self.util = _cliPkgRequires.util;
         }
         t8 = J.get$first$ax(selectors);
         t9 = extension.extender.selector;
-        containsExtension = B.C_ListEquality.equals$2(0, t8.leadingCombinators, t9.leadingCombinators) && B.C_ListEquality.equals$2(0, t8.components, t9.components);
-        if (containsExtension) {
+        if (B.C_ListEquality.equals$2(0, t8.leadingCombinators, t9.leadingCombinators) && B.C_ListEquality.equals$2(0, t8.components, t9.components)) {
           t8 = selectors;
-          t9 = A.instanceType(t8);
-          selectors0 = new A.SubListIterable(t8, 1, _null, t9._eval$1("SubListIterable<1>"));
-          selectors0.SubListIterable$3(t8, 1, _null, t9._precomputed1);
+          t9 = A._arrayInstanceType(t8);
+          selectors0 = new A.SubListIterable(t8, 1, null, t9._eval$1("SubListIterable<1>"));
+          selectors0.SubListIterable$3(t8, 1, null, t9._precomputed1);
           selectors = selectors0;
         }
         for (t8 = J.get$iterator$ax(selectors); t8.moveNext$0();) {
@@ -98556,15 +99224,8 @@ self.util = _cliPkgRequires.util;
           t14 = new A.Extender0(t9, false);
           withExtender = t14._extension$_extension = new A.Extension0(t14, t11, t13, t10, t12);
           _0_0 = t7.$index(0, t9);
-          if (_0_0 != null) {
-            existingExtension = _0_0;
-            t10 = true;
-          } else {
-            existingExtension = _null;
-            t10 = false;
-          }
-          if (t10)
-            t7.$indexSet(0, t9, A.MergedExtension_merge0(existingExtension, withExtender));
+          if (_0_0 != null)
+            t7.$indexSet(0, t9, A.MergedExtension_merge0(_0_0, withExtender));
           else {
             t7.$indexSet(0, t9, withExtender);
             for (t10 = t9.components, t11 = t10.length, _i0 = 0; _i0 < t11; ++_i0)
@@ -98577,8 +99238,6 @@ self.util = _cliPkgRequires.util;
             }
           }
         }
-        if (!containsExtension)
-          t7.remove$1(0, extension.extender);
       }
       return additionalExtensions;
     },
@@ -98609,7 +99268,7 @@ self.util = _cliPkgRequires.util;
       }
     },
     addExtensions$1(extensionStores) {
-      var t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, newExtensions, selectorsToExtend, extensionsToExtend, t12, t13, target, newSources, first, extensionsForTarget, t14, selectorsForTarget, t15, _2_0, existingSources, t16, extender, extension, _this = this, _null = null;
+      var t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, newExtensions, selectorsToExtend, extensionsToExtend, t12, t13, target, newSources, first, extensionsForTarget, t14, selectorsForTarget, t15, _2_0, t16, extender, extension, _this = this, _null = null;
       for (t1 = J.get$iterator$ax(extensionStores), t2 = type$.SimpleSelector_2, t3 = type$.Map_ComplexSelector_Extension_2, t4 = _this._extension_store$_extensions, t5 = type$.ComplexSelector_2, t6 = type$.Extension_2, t7 = _this._extension_store$_selectors, t8 = _this._extension_store$_extensionsByExtender, t9 = type$.JSArray_Extension_2, t10 = type$.ModifiableBox_SelectorList_2, t11 = _this._extension_store$_sourceSpecificity, newExtensions = _null, selectorsToExtend = newExtensions, extensionsToExtend = selectorsToExtend; t1.moveNext$0();) {
         t12 = t1.get$current(t1);
         if (t12.get$isEmpty(t12))
@@ -98647,24 +99306,17 @@ self.util = _cliPkgRequires.util;
             t15.addAll$1(0, selectorsForTarget);
           }
           _2_0 = t4.$index(0, target);
-          if (_2_0 != null) {
-            existingSources = _2_0;
-            t15 = true;
-          } else {
-            existingSources = _null;
-            t15 = false;
-          }
-          if (t15)
+          if (_2_0 != null)
             for (t15 = A.MapExtensions_get_pairs0(newSources, t5, t6), t15 = t15.get$iterator(t15); t15.moveNext$0();) {
               t16 = t15.get$current(t15);
               extender = t16._0;
               extension = t16._1;
-              if (existingSources.containsKey$1(extender)) {
-                t16 = existingSources.$index(0, extender);
-                extension = A.MergedExtension_merge0(t16, extension);
-                existingSources.$indexSet(0, extender, extension);
+              if (_2_0.containsKey$1(extender)) {
+                t16 = _2_0.$index(0, extender);
+                extension = A.MergedExtension_merge0(t16 == null ? t6._as(t16) : t16, extension);
+                _2_0.$indexSet(0, extender, extension);
               } else
-                existingSources.$indexSet(0, extender, extension);
+                _2_0.$indexSet(0, extender, extension);
               if (!t13 || t14) {
                 if (newExtensions == null) {
                   newExtensions = A.LinkedHashMap_LinkedHashMap$_empty(t2, t3);
@@ -98737,7 +99389,7 @@ self.util = _cliPkgRequires.util;
         extended = this._extension_store$_extendCompound$4$inOriginal(component, extensions, mediaQueryContext, isOriginal);
         if (extended == null) {
           if (extendedNotExpanded != null)
-            extendedNotExpanded.push(A._setArrayType([A.ComplexSelector$0(B.List_empty14, A._setArrayType([component], t10), t8, t6)], t9));
+            extendedNotExpanded.push(A._setArrayType([A.ComplexSelector$0(B.List_empty13, A._setArrayType([component], t10), t8, t6)], t9));
         } else if (extendedNotExpanded != null)
           extendedNotExpanded.push(extended);
         else if (i !== 0) {
@@ -98768,7 +99420,7 @@ self.util = _cliPkgRequires.util;
       return A.List_List$of(t1, true, t1.$ti._eval$1("Iterable.E"));
     },
     _extension_store$_extendCompound$4$inOriginal(component, extensions, mediaQueryContext, inOriginal) {
-      var t3, t4, t5, t6, t7, t8, t9, t10, t11, options, i, simple, extended, t12, result, compound, extenders, complex, extenderPaths, withCombinators, isOriginal, _this = this, _null = null,
+      var t3, t4, t5, t6, t7, t8, t9, t10, t11, options, i, simple, extended, t12, result, compound, complex, extenderPaths, withCombinators, isOriginal, _this = this, _null = null,
         t1 = _this._extension_store$_mode,
         targetsUsed = t1 === B.ExtendMode_normal_normal0 || extensions.__js_helper$_length < 2 ? _null : A.LinkedHashSet_LinkedHashSet$_empty(type$.SimpleSelector_2),
         t2 = component.selector,
@@ -98792,10 +99444,10 @@ self.util = _cliPkgRequires.util;
               compound = new A.CompoundSelector0(t12, t10);
               if (t12.length === 0)
                 A.throwExpression(A.ArgumentError$("components may not be empty.", _null));
-              result = A.List_List$from(B.List_empty14, false, t6);
+              result = A.List_List$from(B.List_empty13, false, t6);
               result.fixed$length = Array;
               result.immutable$list = Array;
-              t12 = A.ComplexSelector$0(B.List_empty14, A._setArrayType([new A.ComplexSelectorComponent0(compound, result, t10)], t7), t10, false);
+              t12 = A.ComplexSelector$0(B.List_empty13, A._setArrayType([new A.ComplexSelectorComponent0(compound, result, t10)], t7), t10, false);
               _this._extension_store$_sourceSpecificityFor$1(compound);
               options.push(A._setArrayType([new A.Extender0(t12, true)], t5));
             }
@@ -98808,14 +99460,7 @@ self.util = _cliPkgRequires.util;
       if (targetsUsed != null && targetsUsed._collection$_length !== extensions.__js_helper$_length)
         return _null;
       if (options.length === 1) {
-        extenders = options[0];
-        t3 = true;
-      } else {
-        extenders = _null;
-        t3 = false;
-      }
-      if (t3) {
-        for (t1 = J.get$iterator$ax(extenders), t2 = component.combinators, t3 = type$.JSArray_ComplexSelector_2, result = _null; t1.moveNext$0();) {
+        for (t1 = J.get$iterator$ax(options[0]), t2 = component.combinators, t3 = type$.JSArray_ComplexSelector_2, result = _null; t1.moveNext$0();) {
           t4 = t1.get$current(t1);
           t4.assertCompatibleMediaContext$1(mediaQueryContext);
           complex = t4.selector.withAdditionalCombinators$1(t2);
@@ -98832,18 +99477,19 @@ self.util = _cliPkgRequires.util;
       t1 = t1 === B.ExtendMode_replace_replace0;
       t4 = !t1;
       if (t4)
-        t3.push(A.ComplexSelector$0(B.List_empty14, A._setArrayType([new A.ComplexSelectorComponent0(A.CompoundSelector$0(J.expand$1$1$ax(J.get$first$ax(extenderPaths), new A.ExtensionStore__extendCompound_closure2(), t11), t2.span), A.List_List$unmodifiable(component.combinators, t6), t10)], t7), t10, false));
+        t3.push(A.ComplexSelector$0(B.List_empty13, A._setArrayType([new A.ComplexSelectorComponent0(A.CompoundSelector$0(J.expand$1$1$ax(J.get$first$ax(extenderPaths), new A.ExtensionStore__extendCompound_closure2(), t11), t2.span), A.List_List$unmodifiable(component.combinators, t6), t10)], t7), t10, false));
       t2 = J.skip$1$ax(extenderPaths, t1 ? 0 : 1);
-      t2 = new A.ListIterator(t2, t2.get$length(t2));
-      t5 = component.combinators;
-      t6 = A._instanceType(t2)._precomputed1;
+      t5 = t2.$ti;
+      t2 = new A.ListIterator(t2, t2.get$length(0), t5._eval$1("ListIterator<ListIterable.E>"));
+      t6 = component.combinators;
+      t5 = t5._eval$1("ListIterable.E");
       for (; t2.moveNext$0();) {
         t1 = t2.__internal$_current;
-        extended = _this._extension_store$_unifyExtenders$3(t1 == null ? t6._as(t1) : t1, mediaQueryContext, t10);
+        extended = _this._extension_store$_unifyExtenders$3(t1 == null ? t5._as(t1) : t1, mediaQueryContext, t10);
         if (extended == null)
           continue;
         for (t1 = J.get$iterator$ax(extended); t1.moveNext$0();) {
-          withCombinators = t1.get$current(t1).withAdditionalCombinators$1(t5);
+          withCombinators = t1.get$current(t1).withAdditionalCombinators$1(t6);
           if (!withCombinators.accept$1(B.C__IsUselessVisitor0))
             t3.push(withCombinators);
         }
@@ -98871,7 +99517,7 @@ self.util = _cliPkgRequires.util;
         }
       }
       if (originals != null)
-        toUnify.addFirst$1(A.ComplexSelector$0(B.List_empty14, A._setArrayType([new A.ComplexSelectorComponent0(A.CompoundSelector$0(originals, span), A.List_List$unmodifiable(B.List_empty14, type$.CssValue_Combinator_2), span)], type$.JSArray_ComplexSelectorComponent_2), span, originalsLineBreak));
+        toUnify.addFirst$1(A.ComplexSelector$0(B.List_empty13, A._setArrayType([new A.ComplexSelectorComponent0(A.CompoundSelector$0(originals, span), A.List_List$unmodifiable(B.List_empty13, type$.CssValue_Combinator_2), span)], type$.JSArray_ComplexSelectorComponent_2), span, originalsLineBreak));
       complexes = A.unifyComplex0(toUnify, span);
       if (complexes == null)
         return _null;
@@ -98880,25 +99526,22 @@ self.util = _cliPkgRequires.util;
       return complexes;
     },
     _extension_store$_extendSimple$4(simple, extensions, mediaQueryContext, targetsUsed) {
-      var _1_0, extended, t2,
+      var t2, _1_0,
         t1 = new A.ExtensionStore__extendSimple_withoutPseudo0(this, extensions, targetsUsed);
-      if (simple instanceof A.PseudoSelector0 && simple.selector != null && true) {
+      if (simple instanceof A.PseudoSelector0)
+        t2 = simple.selector != null;
+      else
+        t2 = false;
+      if (t2) {
         _1_0 = this._extension_store$_extendPseudo$3(simple, extensions, mediaQueryContext);
-        if (_1_0 != null) {
-          extended = _1_0;
-          t2 = true;
-        } else {
-          extended = null;
-          t2 = false;
-        }
-        if (t2)
-          return new A.MappedListIterable(extended, new A.ExtensionStore__extendSimple_closure1(this, t1), A.instanceType(extended)._eval$1("MappedListIterable<1,List<Extender0>>"));
+        if (_1_0 != null)
+          return new A.MappedListIterable(_1_0, new A.ExtensionStore__extendSimple_closure1(this, t1), A._arrayInstanceType(_1_0)._eval$1("MappedListIterable<1,List<Extender0>>"));
       }
       return A.NullableExtension_andThen0(t1.call$1(simple), new A.ExtensionStore__extendSimple_closure2());
     },
     _extension_store$_extenderForSimple$1(simple) {
       var t1 = simple.span;
-      t1 = A.ComplexSelector$0(B.List_empty14, A._setArrayType([new A.ComplexSelectorComponent0(A.CompoundSelector$0(A._setArrayType([simple], type$.JSArray_SimpleSelector_2), t1), A.List_List$unmodifiable(B.List_empty14, type$.CssValue_Combinator_2), t1)], type$.JSArray_ComplexSelectorComponent_2), t1, false);
+      t1 = A.ComplexSelector$0(B.List_empty13, A._setArrayType([new A.ComplexSelectorComponent0(A.CompoundSelector$0(A._setArrayType([simple], type$.JSArray_SimpleSelector_2), t1), A.List_List$unmodifiable(B.List_empty13, type$.CssValue_Combinator_2), t1)], type$.JSArray_ComplexSelectorComponent_2), t1, false);
       this._extension_store$_sourceSpecificity.$index(0, simple);
       return new A.Extender0(t1, true);
     },
@@ -98923,10 +99566,8 @@ self.util = _cliPkgRequires.util;
         return A._setArrayType([pseudo.withSelector$1(A.SelectorList$0(complexes, selector.span))], type$.JSArray_PseudoSelector_2);
     },
     _extension_store$_trim$2(selectors, isOriginal) {
-      var result, i, t1, t2, numOriginals, _box_0, complex1, j, t3, t4, _i, t5, maxSpecificity;
-      if (selectors.length > 100)
-        return selectors;
-      result = A.QueueList$(null, type$.ComplexSelector_2);
+      var i, t1, t2, numOriginals, _box_0, complex1, j, t3, t4, _i, t5, maxSpecificity,
+        result = A.QueueList$(null, type$.ComplexSelector_2);
       $label0$0:
         for (i = selectors.length - 1, t1 = A._arrayInstanceType(selectors), t2 = t1._precomputed1, t1 = t1._eval$1("SubListIterable<1>"), numOriginals = 0; i >= 0; --i) {
           _box_0 = {};
@@ -98991,68 +99632,56 @@ self.util = _cliPkgRequires.util;
     call$1(extension) {
       return !extension.isOptional;
     },
-    $signature: 451
+    $signature: 440
   };
-  A.ExtensionStore__registerSelector_closure1.prototype = {
+  A.ExtensionStore__registerSelector_closure0.prototype = {
     call$0() {
       return A.LinkedHashSet_LinkedHashSet$_empty(type$.ModifiableBox_SelectorList_2);
     },
-    $signature: 452
-  };
-  A.ExtensionStore__registerSelector_closure2.prototype = {
-    call$0() {
-      return type$.PseudoSelector_2._as(this._0_0).selector;
-    },
-    $signature: 78
+    $signature: 441
   };
   A.ExtensionStore_addExtension_closure2.prototype = {
     call$0() {
       return A.LinkedHashMap_LinkedHashMap$_empty(type$.ComplexSelector_2, type$.Extension_2);
     },
-    $signature: 140
+    $signature: 125
   };
   A.ExtensionStore_addExtension_closure3.prototype = {
     call$0() {
       return A._setArrayType([], type$.JSArray_Extension_2);
     },
-    $signature: 247
+    $signature: 255
   };
   A.ExtensionStore_addExtension_closure4.prototype = {
     call$0() {
       return this.complex.get$specificity();
     },
-    $signature: 3
-  };
-  A.ExtensionStore__simpleSelectors_closure0.prototype = {
-    call$0() {
-      return type$.PseudoSelector_2._as(this._0_0).selector;
-    },
-    $signature: 78
+    $signature: 10
   };
   A.ExtensionStore__extendExistingExtensions_closure1.prototype = {
     call$0() {
       return A._setArrayType([], type$.JSArray_Extension_2);
     },
-    $signature: 247
+    $signature: 255
   };
   A.ExtensionStore__extendExistingExtensions_closure2.prototype = {
     call$0() {
       return A.LinkedHashMap_LinkedHashMap$_empty(type$.ComplexSelector_2, type$.Extension_2);
     },
-    $signature: 140
+    $signature: 125
   };
   A.ExtensionStore_addExtensions_closure0.prototype = {
     call$0() {
       return A.LinkedHashMap_LinkedHashMap$_empty(type$.ComplexSelector_2, type$.Extension_2);
     },
-    $signature: 140
+    $signature: 125
   };
   A.ExtensionStore__extendComplex_closure0.prototype = {
     call$1(path) {
       var t1 = this.complex;
       return J.map$1$1$ax(A.weave0(path, t1.span, t1.lineBreak), new A.ExtensionStore__extendComplex__closure0(this._box_0, this.$this, t1), type$.ComplexSelector_2);
     },
-    $signature: 456
+    $signature: 444
   };
   A.ExtensionStore__extendComplex__closure0.prototype = {
     call$1(outputComplex) {
@@ -99063,13 +99692,13 @@ self.util = _cliPkgRequires.util;
       t1.first = false;
       return outputComplex;
     },
-    $signature: 61
+    $signature: 55
   };
   A.ExtensionStore__extendCompound_closure2.prototype = {
     call$1(extender) {
       return B.JSArray_methods.get$last(extender.selector.components).selector.components;
     },
-    $signature: 458
+    $signature: 446
   };
   A.ExtensionStore__extendCompound_closure3.prototype = {
     call$1(_) {
@@ -99100,20 +99729,20 @@ self.util = _cliPkgRequires.util;
         t1.push(t2.get$current(t2).extender);
       return t1;
     },
-    $signature: 459
+    $signature: 447
   };
   A.ExtensionStore__extendSimple_closure1.prototype = {
     call$1(pseudo) {
       var t1 = this.withoutPseudo.call$1(pseudo);
       return t1 == null ? A._setArrayType([this.$this._extension_store$_extenderForSimple$1(pseudo)], type$.JSArray_Extender_2) : t1;
     },
-    $signature: 460
+    $signature: 448
   };
   A.ExtensionStore__extendSimple_closure2.prototype = {
     call$1(result) {
       return A._setArrayType([result], type$.JSArray_List_Extender_2);
     },
-    $signature: 461
+    $signature: 449
   };
   A.ExtensionStore__extendPseudo_closure4.prototype = {
     call$1(complex) {
@@ -99151,7 +99780,7 @@ self.util = _cliPkgRequires.util;
       t1 = this.pseudo;
       switch (t1.normalizedName) {
         case "not":
-          if (!B.Set_aAXJu.contains$1(0, innerPseudo.normalizedName))
+          if (!B.Set_mlzm2.contains$1(0, innerPseudo.normalizedName))
             return A._setArrayType([], type$.JSArray_ComplexSelector_2);
           return innerSelector.components;
         case "is":
@@ -99175,13 +99804,13 @@ self.util = _cliPkgRequires.util;
           return A._setArrayType([], type$.JSArray_ComplexSelector_2);
       }
     },
-    $signature: 462
+    $signature: 450
   };
   A.ExtensionStore__extendPseudo_closure8.prototype = {
     call$1(complex) {
       return this.pseudo.withSelector$1(A.SelectorList$0(A._setArrayType([complex], type$.JSArray_ComplexSelector_2), this.selector.span));
     },
-    $signature: 463
+    $signature: 451
   };
   A.ExtensionStore__trim_closure1.prototype = {
     call$1(complex2) {
@@ -99197,7 +99826,7 @@ self.util = _cliPkgRequires.util;
   };
   A.ExtensionStore_clone_closure0.prototype = {
     call$2(simple, selectors) {
-      var t2, t3, t4, t5, t6, t7, newSelector, _0_0, mediaContext, _this = this,
+      var t2, t3, t4, t5, t6, t7, newSelector, _0_0, _this = this,
         t1 = type$.ModifiableBox_SelectorList_2,
         newSelectorSet = A.LinkedHashSet_LinkedHashSet$_empty(t1);
       _this.newSelectors.$indexSet(0, simple, newSelectorSet);
@@ -99207,18 +99836,11 @@ self.util = _cliPkgRequires.util;
         newSelectorSet.add$1(0, newSelector);
         t3.$indexSet(0, t7.value, new A.Box0(newSelector, t4));
         _0_0 = t5.$index(0, t7);
-        if (_0_0 != null) {
-          mediaContext = _0_0;
-          t7 = true;
-        } else {
-          mediaContext = null;
-          t7 = false;
-        }
-        if (t7)
-          t6.$indexSet(0, newSelector, mediaContext);
+        if (_0_0 != null)
+          t6.$indexSet(0, newSelector, _0_0);
       }
     },
-    $signature: 464
+    $signature: 452
   };
   A.FiberClass.prototype = {};
   A.Fiber.prototype = {};
@@ -99226,7 +99848,7 @@ self.util = _cliPkgRequires.util;
     canonicalize$1(_, url) {
       var result, t1, resultUrl;
       if (url.get$scheme() === "file")
-        return $.$get$_filesystemImporter0().canonicalize$1(0, url);
+        return $.$get$FilesystemImporter_cwd0().canonicalize$1(0, url);
       result = A.wrapJSExceptions(new A.JSToDartFileImporter_canonicalize_closure(this, url));
       if (result == null)
         return null;
@@ -99241,10 +99863,10 @@ self.util = _cliPkgRequires.util;
       resultUrl = A.Uri_parse(J.toString$0$(type$.JSUrl._as(result)));
       if (resultUrl.get$scheme() !== "file")
         A.jsThrow(new self.Error(string$.The_fiu + url.toString$0(0) + '".'));
-      return $.$get$_filesystemImporter0().canonicalize$1(0, resultUrl);
+      return $.$get$FilesystemImporter_cwd0().canonicalize$1(0, resultUrl);
     },
     load$1(_, url) {
-      return $.$get$_filesystemImporter0().load$1(0, url);
+      return $.$get$FilesystemImporter_cwd0().load$1(0, url);
     },
     isNonCanonicalScheme$1(scheme) {
       return scheme !== "file";
@@ -99252,15 +99874,23 @@ self.util = _cliPkgRequires.util;
   };
   A.JSToDartFileImporter_canonicalize_closure.prototype = {
     call$0() {
-      return this.$this._file0$_findFileUrl.call$2(this.url.toString$0(0), {fromImport: A.fromImport0(), containingUrl: A.NullableExtension_andThen0(A.containingUrl(), A.utils1__dartToJSUrl$closure())});
+      return this.$this._file0$_findFileUrl.call$2(this.url.toString$0(0), A.canonicalizeContext0());
     },
-    $signature: 28
+    $signature: 35
   };
   A.FilesystemImporter0.prototype = {
     canonicalize$1(_, url) {
-      if (url.get$scheme() !== "file" && url.get$scheme() !== "")
+      var resolved;
+      if (url.get$scheme() === "file")
+        resolved = A.resolveImportPath0($.$get$context().style.pathFromUri$1(A._parseUri(url)));
+      else if (url.get$scheme() !== "")
         return null;
-      return A.NullableExtension_andThen0(A.resolveImportPath0(A.join(this._filesystem$_loadPath, $.$get$context().style.pathFromUri$1(A._parseUri(url)), null)), new A.FilesystemImporter_canonicalize_closure0());
+      else {
+        resolved = A.resolveImportPath0(A.join(this._filesystem$_loadPath, $.$get$context().style.pathFromUri$1(A._parseUri(url)), null));
+        if (resolved != null && this._filesystem$_loadPathDeprecated)
+          A.warnForDeprecation0(string$.Using_t, B.Deprecation_kmo);
+      }
+      return A.NullableExtension_andThen0(resolved, new A.FilesystemImporter_canonicalize_closure0());
     },
     load$1(_, url) {
       var path = $.$get$context().style.pathFromUri$1(A._parseUri(url));
@@ -99294,7 +99924,7 @@ self.util = _cliPkgRequires.util;
       }
       return t2.toUri$1(t1);
     },
-    $signature: 164
+    $signature: 141
   };
   A.ForRule0.prototype = {
     accept$1$1(visitor) {
@@ -99331,18 +99961,11 @@ self.util = _cliPkgRequires.util;
         t2.toString;
         t2 = t1 + " show " + _this._forward_rule0$_memberList$2(shownMixinsAndFunctions, t2);
         t1 = t2;
-      } else {
-        if (hiddenMixinsAndFunctions != null) {
-          t2 = hiddenMixinsAndFunctions._base;
-          t2 = t2.get$isNotEmpty(t2);
-        } else
-          t2 = false;
-        if (t2) {
-          t2 = _this.hiddenVariables;
-          t2.toString;
-          t2 = t1 + " hide " + _this._forward_rule0$_memberList$2(hiddenMixinsAndFunctions, t2);
-          t1 = t2;
-        }
+      } else if (hiddenMixinsAndFunctions != null && hiddenMixinsAndFunctions._base.get$isNotEmpty(0)) {
+        t2 = _this.hiddenVariables;
+        t2.toString;
+        t2 = t1 + " hide " + _this._forward_rule0$_memberList$2(hiddenMixinsAndFunctions, t2);
+        t1 = t2;
       }
       prefix = _this.prefix;
       if (prefix != null)
@@ -99354,8 +99977,8 @@ self.util = _cliPkgRequires.util;
     _forward_rule0$_memberList$2(mixinsAndFunctions, variables) {
       var t2,
         t1 = A.List_List$of(mixinsAndFunctions, true, type$.String);
-      for (t2 = variables._base, t2 = t2.get$iterator(t2); t2.moveNext$0();)
-        t1.push("$" + t2.get$current(t2));
+      for (t2 = variables._base.get$iterator(0); t2.moveNext$0();)
+        t1.push("$" + t2.get$current(0));
       return B.JSArray_methods.join$1(t1, ", ");
     },
     $isAstNode0: 1,
@@ -99389,58 +100012,37 @@ self.util = _cliPkgRequires.util;
       return this._forwarded_view0$_inner.get$transitivelyContainsExtensions();
     },
     setVariable$3($name, value, nodeWithSpan) {
-      var shownVariables, t2, _1_0, hiddenVariables, _2_0, prefix, _null = null,
+      var t2, _1_0, _2_0,
         _s19_ = "Undefined variable.",
         t1 = this._forwarded_view0$_rule,
         _0_0 = t1.shownVariables;
-      if (_0_0 != null) {
-        shownVariables = _0_0;
-        t2 = true;
-      } else {
-        shownVariables = _null;
+      if (_0_0 != null)
+        t2 = !_0_0._base.contains$1(0, $name);
+      else
         t2 = false;
-      }
-      if (t2 && !shownVariables._base.contains$1(0, $name))
-        throw A.wrapException(A.SassScriptException$0(_s19_, _null));
+      if (t2)
+        throw A.wrapException(A.SassScriptException$0(_s19_, null));
       else {
         _1_0 = t1.hiddenVariables;
-        if (_1_0 != null) {
-          hiddenVariables = _1_0;
-          t2 = true;
-        } else {
-          hiddenVariables = _null;
+        if (_1_0 != null)
+          t2 = _1_0._base.contains$1(0, $name);
+        else
           t2 = false;
-        }
-        if (t2 && hiddenVariables._base.contains$1(0, $name))
-          throw A.wrapException(A.SassScriptException$0(_s19_, _null));
+        if (t2)
+          throw A.wrapException(A.SassScriptException$0(_s19_, null));
       }
       _2_0 = t1.prefix;
       if (_2_0 != null) {
-        prefix = _2_0;
-        t1 = true;
-      } else {
-        prefix = _null;
-        t1 = false;
-      }
-      if (t1) {
-        if (!B.JSString_methods.startsWith$1($name, prefix))
-          throw A.wrapException(A.SassScriptException$0(_s19_, _null));
-        $name = B.JSString_methods.substring$1($name, prefix.length);
+        if (!B.JSString_methods.startsWith$1($name, _2_0))
+          throw A.wrapException(A.SassScriptException$0(_s19_, null));
+        $name = B.JSString_methods.substring$1($name, _2_0.length);
       }
       return this._forwarded_view0$_inner.setVariable$3($name, value, nodeWithSpan);
     },
     variableIdentity$1($name) {
-      var prefix, t1,
-        _0_0 = this._forwarded_view0$_rule.prefix;
-      if (_0_0 != null) {
-        prefix = _0_0;
-        t1 = true;
-      } else {
-        prefix = null;
-        t1 = false;
-      }
-      if (t1)
-        $name = B.JSString_methods.substring$1($name, prefix.length);
+      var _0_0 = this._forwarded_view0$_rule.prefix;
+      if (_0_0 != null)
+        $name = B.JSString_methods.substring$1($name, _0_0.length);
       return this._forwarded_view0$_inner.variableIdentity$1($name);
     },
     $eq(_, other) {
@@ -99473,8 +100075,10 @@ self.util = _cliPkgRequires.util;
     }
   };
   A.FunctionExpression0.prototype = {
-    get$name(_) {
-      return A.stringReplaceAllUnchecked(this.originalName, "_", "-");
+    get$nameSpan() {
+      if (this.namespace == null)
+        return A.SpanExtensions_initialIdentifier0(this.span);
+      return A.SpanExtensions_initialIdentifier0(A.FileSpanExtension_subspan(A.SpanExtensions_withoutInitialIdentifier0(this.span), 1, null));
     },
     accept$1$1(visitor) {
       return visitor.visitFunctionExpression$1(this);
@@ -99511,7 +100115,7 @@ self.util = _cliPkgRequires.util;
       A.JSClassExtension_injectSuperclass(t1._as(new A.SassFunction0(A.BuiltInCallable$function0("f", "", new A.functionClass__closure0(), null)).constructor), jsClass);
       return jsClass;
     },
-    $signature: 24
+    $signature: 15
   };
   A.functionClass__closure.prototype = {
     call$3($self, signature, callback) {
@@ -99522,13 +100126,13 @@ self.util = _cliPkgRequires.util;
     },
     "call*": "call$3",
     $requiredArgCount: 3,
-    $signature: 465
+    $signature: 453
   };
   A.functionClass__closure0.prototype = {
     call$1(_) {
       return B.C__SassNull0;
     },
-    $signature: 5
+    $signature: 3
   };
   A.SassFunction0.prototype = {
     accept$1$1(visitor) {
@@ -99570,43 +100174,13 @@ self.util = _cliPkgRequires.util;
       return "@function " + this.name + "(" + this.$arguments.toString$0(0) + ") {" + (t1 && B.JSArray_methods).join$1(t1, " ") + "}";
     }
   };
-  A.unifyComplex_closure2.prototype = {
-    call$0() {
-      return this._0_0.leadingCombinators;
-    },
-    $signature: 249
-  };
-  A.unifyComplex_closure3.prototype = {
-    call$0() {
-      return this._1_0.combinators;
-    },
-    $signature: 249
-  };
-  A.unifyComplex_closure4.prototype = {
+  A.unifyComplex_closure0.prototype = {
     call$1(complex) {
       return complex.lineBreak;
     },
     $signature: 18
   };
-  A._namespaceAndName_closure0.prototype = {
-    call$0() {
-      return type$.TypeSelector_2._as(this._0_0).name;
-    },
-    $signature: 467
-  };
-  A._weaveParents_closure5.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature: 250
-  };
-  A._weaveParents_closure6.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 250
-  };
-  A._weaveParents_closure7.prototype = {
+  A._weaveParents_closure3.prototype = {
     call$2(group1, group2) {
       var t1, unified;
       if (B.C_ListEquality.equals$2(0, group1, group2))
@@ -99618,7 +100192,7 @@ self.util = _cliPkgRequires.util;
       if (!A._mustUnify0(group1, group2))
         return null;
       t1 = this.span;
-      unified = A.unifyComplex0(A._setArrayType([A.ComplexSelector$0(B.List_empty14, group1, t1, false), A.ComplexSelector$0(B.List_empty14, group2, t1, false)], type$.JSArray_ComplexSelector_2), t1);
+      unified = A.unifyComplex0(A._setArrayType([A.ComplexSelector$0(B.List_empty13, group1, t1, false), A.ComplexSelector$0(B.List_empty13, group2, t1, false)], type$.JSArray_ComplexSelector_2), t1);
       if (unified == null)
         t1 = null;
       else {
@@ -99627,119 +100201,31 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 469
+    $signature: 454
   };
-  A._weaveParents_closure8.prototype = {
+  A._weaveParents_closure4.prototype = {
     call$1(sequence) {
       return A._complexIsParentSuperselector0(sequence.get$first(sequence), this.group);
     },
-    $signature: 251
+    $signature: 250
   };
-  A._weaveParents_closure9.prototype = {
+  A._weaveParents_closure5.prototype = {
     call$1(sequence) {
-      return sequence.get$length(sequence) === 0;
+      return sequence.get$length(0) === 0;
     },
-    $signature: 251
+    $signature: 250
   };
-  A._weaveParents_closure10.prototype = {
+  A._weaveParents_closure6.prototype = {
     call$1(choice) {
       return J.get$isNotEmpty$asx(choice);
     },
-    $signature: 471
-  };
-  A._mergeLeadingCombinators_closure3.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature: 252
-  };
-  A._mergeLeadingCombinators_closure4.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 252
-  };
-  A._mergeLeadingCombinators_closure5.prototype = {
-    call$0() {
-      var t1 = this._0_1._readFinal$0();
-      return J.get$length$asx(t1 == null ? type$.List_CssValue_Combinator_2._as(t1) : t1);
-    },
-    $signature: 3
-  };
-  A._mergeLeadingCombinators_closure6.prototype = {
-    call$0() {
-      var t1 = this._0_4._readFinal$0();
-      return J.get$length$asx(t1 == null ? type$.List_CssValue_Combinator_2._as(t1) : t1);
-    },
-    $signature: 3
-  };
-  A._mergeTrailingCombinators_closure9.prototype = {
-    call$0() {
-      var t1 = this._0_0;
-      return t1.get$length(t1);
-    },
-    $signature: 3
-  };
-  A._mergeTrailingCombinators_closure10.prototype = {
-    call$0() {
-      var t1 = this._1_0;
-      return t1.get$length(t1);
-    },
-    $signature: 3
-  };
-  A._mergeTrailingCombinators_closure11.prototype = {
-    call$0() {
-      return this._4_0._values[0];
-    },
-    $signature: 253
-  };
-  A._mergeTrailingCombinators_closure12.prototype = {
-    call$0() {
-      return B.Combinator_Htt0 === this._4_1._readFinal$0();
-    },
-    $signature: 1
-  };
-  A._mergeTrailingCombinators_closure13.prototype = {
-    call$0() {
-      return this._4_0._values[1];
-    },
-    $signature: 253
-  };
-  A._mergeTrailingCombinators_closure14.prototype = {
-    call$0() {
-      return B.Combinator_Htt0 === this._4_4._readFinal$0();
-    },
-    $signature: 1
-  };
-  A._mergeTrailingCombinators_closure16.prototype = {
-    call$0() {
-      return this._4_0._values[2];
-    },
-    $signature: 254
-  };
-  A._mergeTrailingCombinators_closure17.prototype = {
-    call$0() {
-      return this._4_0._values[3];
-    },
-    $signature: 254
-  };
-  A._mergeTrailingCombinators_closure15.prototype = {
-    call$0() {
-      return B.Combinator_4QF0 === this._4_4._readFinal$0();
-    },
-    $signature: 1
-  };
-  A._mergeTrailingCombinators_closure18.prototype = {
-    call$0() {
-      return B.Combinator_4QF0 === this._4_1._readFinal$0();
-    },
-    $signature: 1
+    $signature: 456
   };
   A._mustUnify_closure0.prototype = {
     call$1(component) {
       return B.JSArray_methods.any$1(component.selector.components, new A._mustUnify__closure0(this.uniqueSelectors));
     },
-    $signature: 52
+    $signature: 50
   };
   A._mustUnify__closure0.prototype = {
     call$1(simple) {
@@ -99750,35 +100236,7 @@ self.util = _cliPkgRequires.util;
         t1 = true;
       return t1 && this.uniqueSelectors.contains$1(0, simple);
     },
-    $signature: 15
-  };
-  A._chunks_closure3.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature() {
-      return this.T._eval$1("List<0>()");
-    }
-  };
-  A._chunks_closure4.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_1._readFinal$0()) <= 0;
-    },
-    $signature: 1
-  };
-  A._chunks_closure5.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature() {
-      return this.T._eval$1("List<0>()");
-    }
-  };
-  A._chunks_closure6.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_5._readFinal$0()) <= 0;
-    },
-    $signature: 1
+    $signature: 14
   };
   A.paths_closure0.prototype = {
     call$2(paths, choice) {
@@ -99825,44 +100283,38 @@ self.util = _cliPkgRequires.util;
     call$1($parent) {
       return $parent.combinators.length > 1;
     },
-    $signature: 52
+    $signature: 50
   };
   A.complexIsSuperselector_closure2.prototype = {
     call$1(component) {
       return A._isSupercombinator0(this.combinator1, A.IterableExtension_get_firstOrNull(component.combinators));
     },
-    $signature: 52
+    $signature: 50
   };
   A._compatibleWithPreviousCombinator_closure0.prototype = {
     call$1(component) {
       var t1 = component.combinators,
         t2 = A.IterableExtension_get_firstOrNull(t1);
-      if (!J.$eq$(t2 == null ? null : t2.value, B.Combinator_Htt0)) {
+      if (!J.$eq$(t2 == null ? null : t2.value, B.Combinator_y180)) {
         t1 = A.IterableExtension_get_firstOrNull(t1);
-        t1 = J.$eq$(t1 == null ? null : t1.value, B.Combinator_4QF0);
+        t1 = J.$eq$(t1 == null ? null : t1.value, B.Combinator_gRV0);
       } else
         t1 = true;
       return t1;
     },
-    $signature: 52
+    $signature: 50
   };
-  A.compoundIsSuperselector_closure1.prototype = {
-    call$0() {
-      return this._0_0._0;
+  A.compoundIsSuperselector_closure0.prototype = {
+    call$1(simple1) {
+      return B.JSArray_methods.any$1(this.compound2.components, simple1.get$isSuperselector());
     },
-    $signature: 255
-  };
-  A.compoundIsSuperselector_closure2.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 255
+    $signature: 14
   };
   A._selectorPseudoIsSuperselector_closure6.prototype = {
     call$1(selector2) {
       return A.listIsSuperselector0(this.selector1.components, selector2.components);
     },
-    $signature: 72
+    $signature: 65
   };
   A._selectorPseudoIsSuperselector_closure7.prototype = {
     call$1(complex1) {
@@ -99873,7 +100325,7 @@ self.util = _cliPkgRequires.util;
         if (t2 != null)
           B.JSArray_methods.addAll$1(t1, t2);
         t2 = this.compound2;
-        t1.push(new A.ComplexSelectorComponent0(t2, A.List_List$unmodifiable(B.List_empty14, type$.CssValue_Combinator_2), t2.span));
+        t1.push(new A.ComplexSelectorComponent0(t2, A.List_List$unmodifiable(B.List_empty13, type$.CssValue_Combinator_2), t2.span));
         t1 = A.complexIsSuperselector0(complex1.components, t1);
       } else
         t1 = false;
@@ -99885,13 +100337,13 @@ self.util = _cliPkgRequires.util;
     call$1(selector2) {
       return A.listIsSuperselector0(this.selector1.components, selector2.components);
     },
-    $signature: 72
+    $signature: 65
   };
   A._selectorPseudoIsSuperselector_closure9.prototype = {
     call$1(selector2) {
       return A.listIsSuperselector0(this.selector1.components, selector2.components);
     },
-    $signature: 72
+    $signature: 65
   };
   A._selectorPseudoIsSuperselector_closure10.prototype = {
     call$1(complex) {
@@ -99903,26 +100355,25 @@ self.util = _cliPkgRequires.util;
   };
   A._selectorPseudoIsSuperselector__closure0.prototype = {
     call$1(simple2) {
-      var t1, selector2, _this = this,
-        _0_4 = A._InitializedCell$(new A._selectorPseudoIsSuperselector___closure2(simple2));
+      var t1, _0_4, selector2, _this = this;
       $label0$1: {
         if (simple2 instanceof A.TypeSelector0) {
-          t1 = B.JSArray_methods.any$1(B.JSArray_methods.get$last(_this.complex.components).selector.components, new A._selectorPseudoIsSuperselector___closure3(simple2));
+          t1 = B.JSArray_methods.any$1(B.JSArray_methods.get$last(_this.complex.components).selector.components, new A._selectorPseudoIsSuperselector___closure1(simple2));
           break $label0$1;
         }
         if (simple2 instanceof A.IDSelector0) {
-          t1 = B.JSArray_methods.any$1(B.JSArray_methods.get$last(_this.complex.components).selector.components, new A._selectorPseudoIsSuperselector___closure4(simple2));
+          t1 = B.JSArray_methods.any$1(B.JSArray_methods.get$last(_this.complex.components).selector.components, new A._selectorPseudoIsSuperselector___closure2(simple2));
           break $label0$1;
         }
         if (simple2 instanceof A.PseudoSelector0) {
-          if (_0_4._readFinal$0() != null) {
-            selector2 = _0_4._readFinal$0();
-            t1 = true;
+          _0_4 = simple2.selector;
+          if (_0_4 != null) {
+            selector2 = _0_4 == null ? type$.SelectorList_2._as(_0_4) : _0_4;
+            t1 = simple2.name === _this.pseudo1.name;
           } else {
             selector2 = null;
             t1 = false;
           }
-          t1 = t1 && simple2.name === _this.pseudo1.name;
         } else {
           selector2 = null;
           t1 = false;
@@ -99936,9 +100387,9 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 15
+    $signature: 14
   };
-  A._selectorPseudoIsSuperselector___closure3.prototype = {
+  A._selectorPseudoIsSuperselector___closure1.prototype = {
     call$1(simple1) {
       var t1;
       if (simple1 instanceof A.TypeSelector0) {
@@ -99948,9 +100399,9 @@ self.util = _cliPkgRequires.util;
         t1 = false;
       return t1;
     },
-    $signature: 15
+    $signature: 14
   };
-  A._selectorPseudoIsSuperselector___closure4.prototype = {
+  A._selectorPseudoIsSuperselector___closure2.prototype = {
     call$1(simple1) {
       var t1;
       if (simple1 instanceof A.IDSelector0) {
@@ -99960,20 +100411,14 @@ self.util = _cliPkgRequires.util;
         t1 = false;
       return t1;
     },
-    $signature: 15
-  };
-  A._selectorPseudoIsSuperselector___closure2.prototype = {
-    call$0() {
-      return type$.PseudoSelector_2._as(this._0_0).selector;
-    },
-    $signature: 78
+    $signature: 14
   };
   A._selectorPseudoIsSuperselector_closure11.prototype = {
     call$1(selector2) {
       var t1 = B.C_ListEquality.equals$2(0, this.selector1.components, selector2.components);
       return t1;
     },
-    $signature: 72
+    $signature: 65
   };
   A._selectorPseudoIsSuperselector_closure12.prototype = {
     call$1(pseudo2) {
@@ -99990,26 +100435,26 @@ self.util = _cliPkgRequires.util;
         return false;
       return A.listIsSuperselector0(this.selector1.components, selector2.components);
     },
-    $signature: 15
+    $signature: 14
   };
   A._selectorPseudoArgs_closure1.prototype = {
     call$1(pseudo) {
       return pseudo.isClass === this.isClass && pseudo.name === this.name;
     },
-    $signature: 477
+    $signature: 458
   };
   A._selectorPseudoArgs_closure2.prototype = {
     call$1(pseudo) {
       return pseudo.selector;
     },
-    $signature: 478
+    $signature: 459
   };
   A.globalFunctions_closure0.prototype = {
     call$1($arguments) {
       var t1 = J.getInterceptor$asx($arguments);
       return t1.$index($arguments, 0).get$isTruthy() ? t1.$index($arguments, 1) : t1.$index($arguments, 2);
     },
-    $signature: 5
+    $signature: 3
   };
   A.IDSelector0.prototype = {
     get$specificity() {
@@ -100047,7 +100492,7 @@ self.util = _cliPkgRequires.util;
         t1 = false;
       return t1;
     },
-    $signature: 15
+    $signature: 14
   };
   A.IfExpression0.prototype = {
     accept$1$1(visitor) {
@@ -100088,26 +100533,19 @@ self.util = _cliPkgRequires.util;
       var t1 = index === 0 ? "if" : "else if";
       return "@" + t1 + " " + clause.expression.toString$0(0) + " {" + B.JSArray_methods.join$1(clause.children, " ") + "}";
     },
-    $signature: 479
+    $signature: 460
   };
   A.IfRuleClause0.prototype = {};
   A.IfRuleClause$__closure0.prototype = {
     call$1(child) {
-      var t1, imports;
+      var t1;
       $label0$0: {
         if (child instanceof A.VariableDeclaration0 || child instanceof A.FunctionRule0 || child instanceof A.MixinRule0) {
           t1 = true;
           break $label0$0;
         }
         if (child instanceof A.ImportRule0) {
-          imports = child.imports;
-          t1 = true;
-        } else {
-          imports = null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = (imports && B.JSArray_methods).any$1(imports, new A.IfRuleClause$___closure0());
+          t1 = B.JSArray_methods.any$1(child.imports, new A.IfRuleClause$___closure0());
           break $label0$0;
         }
         t1 = false;
@@ -100115,13 +100553,13 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 257
+    $signature: 247
   };
   A.IfRuleClause$___closure0.prototype = {
     call$1($import) {
       return $import instanceof A.DynamicImport0;
     },
-    $signature: 258
+    $signature: 245
   };
   A.IfClause0.prototype = {
     toString$0(_) {
@@ -100141,7 +100579,7 @@ self.util = _cliPkgRequires.util;
     },
     "call*": "call$3",
     $requiredArgCount: 3,
-    $signature: 482
+    $signature: 463
   };
   A.NodeImporter.prototype = {
     loadRelative$3(url, previous, forImport) {
@@ -100154,23 +100592,17 @@ self.util = _cliPkgRequires.util;
       if ((previous == null ? _null : previous.get$scheme()) !== "file")
         return _null;
       t1 = $.$get$context();
+      previous.toString;
       t2 = t1.style;
       return this._tryPath$2(A.join(t1.dirname$1(t2.pathFromUri$1(A._parseUri(previous))), t2.pathFromUri$1(A._parseUri(url)), _null), forImport);
     },
     load$3(_, url, previous, forImport) {
-      var t1, t2, _i, _0_0, value, t3, _this = this,
+      var t1, t2, _i, _0_0, _this = this,
         previousString = _this._previousToString$1(previous);
       for (t1 = _this._implementation$_importers, t2 = t1.length, _i = 0; _i < t2; ++_i) {
         _0_0 = A.wrapJSExceptions(new A.NodeImporter_load_closure(_this, t1[_i], forImport, url, previousString));
-        if (_0_0 != null) {
-          value = _0_0;
-          t3 = true;
-        } else {
-          value = null;
-          t3 = false;
-        }
-        if (t3)
-          return _this._handleImportResult$4(url, previous, value, forImport);
+        if (_0_0 != null)
+          return _this._handleImportResult$4(url, previous, _0_0, forImport);
       }
       return _this._resolveLoadPathFromUrl$2(A.Uri_parse(url), forImport);
     },
@@ -100180,7 +100612,7 @@ self.util = _cliPkgRequires.util;
     loadAsync$body$NodeImporter(url, previous, forImport) {
       var $async$goto = 0,
         $async$completer = A._makeAsyncAwaitCompleter(type$.nullable_Record_2_String_and_String),
-        $async$returnValue, $async$self = this, t1, t2, _i, _0_0, value, t3, previousString;
+        $async$returnValue, $async$self = this, t1, t2, _i, _0_0, previousString;
       var $async$loadAsync$3 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
         if ($async$errorCode === 1)
           return A._asyncRethrow($async$result, $async$completer);
@@ -100203,14 +100635,7 @@ self.util = _cliPkgRequires.util;
               // returning from await.
               _0_0 = $async$result;
               if (_0_0 != null) {
-                value = _0_0;
-                t3 = true;
-              } else {
-                value = null;
-                t3 = false;
-              }
-              if (t3) {
-                $async$returnValue = $async$self._handleImportResult$4(url, previous, value, forImport);
+                $async$returnValue = $async$self._handleImportResult$4(url, previous, _0_0, forImport);
                 // goto return
                 $async$goto = 1;
                 break;
@@ -100254,39 +100679,20 @@ self.util = _cliPkgRequires.util;
       return url.get$scheme() === "" || url.get$scheme() === "file" ? this._resolveLoadPath$2($.$get$context().style.pathFromUri$1(A._parseUri(url)), forImport) : null;
     },
     _resolveLoadPath$2(path, forImport) {
-      var result, t1, t2, _i, t3, _1_0, _null = null,
+      var t1, t2, _i, t3, _1_0, _null = null,
         _0_0 = this._tryPath$2(A.absolute(path, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null), forImport);
-      if (_0_0 != null) {
-        result = _0_0;
-        t1 = true;
-      } else {
-        result = _null;
-        t1 = false;
-      }
-      if (t1)
-        return result;
+      if (_0_0 != null)
+        return _0_0;
       for (t1 = this._includePaths, t2 = t1.length, _i = 0; _i < t2; ++_i) {
         t3 = A.join(t1[_i], path, _null);
         _1_0 = this._tryPath$2($.$get$context().absolute$15(t3, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null), forImport);
-        if (_1_0 != null) {
-          result = _1_0;
-          t3 = true;
-        } else {
-          result = _null;
-          t3 = false;
-        }
-        if (t3)
-          return result;
+        if (_1_0 != null)
+          return _1_0;
       }
       return _null;
     },
     _tryPath$2(path, forImport) {
-      var t1;
-      if (forImport) {
-        t1 = type$.nullable_Object;
-        t1 = A.runZoned(new A.NodeImporter__tryPath_closure(path), A.LinkedHashMap_LinkedHashMap$_literal([B.Symbol__inImportRule, true], t1, t1), type$.nullable_String);
-      } else
-        t1 = A.resolveImportPath0(path);
+      var t1 = forImport ? A.inImportRule(new A.NodeImporter__tryPath_closure(path), type$.nullable_String) : A.resolveImportPath0(path);
       return A.NullableExtension_andThen0(t1, new A.NodeImporter__tryPath_closure0());
     },
     _handleImportResult$4(url, previous, value, forImport) {
@@ -100367,26 +100773,26 @@ self.util = _cliPkgRequires.util;
       var _this = this;
       return J.apply$2$x(_this.importer, _this.$this._renderContext$1(_this.forImport), A._setArrayType([_this.url, _this.previousString], type$.JSArray_Object));
     },
-    $signature: 28
+    $signature: 35
   };
   A.NodeImporter__tryPath_closure.prototype = {
     call$0() {
       return A.resolveImportPath0(this.path);
     },
-    $signature: 32
+    $signature: 44
   };
   A.NodeImporter__tryPath_closure0.prototype = {
     call$1(resolved) {
       return new A._Record_2(A.readFile0(resolved), $.$get$context().toUri$1(resolved).toString$0(0));
     },
-    $signature: 483
+    $signature: 464
   };
   A.NodeImporter__callImporterAsync_closure.prototype = {
     call$0() {
       var _this = this;
       return J.apply$2$x(_this.importer, _this.$this._renderContext$1(_this.forImport), A._setArrayType([_this.url, _this.previousString, A.allowInterop(_this.completer.get$complete())], type$.JSArray_Object));
     },
-    $signature: 28
+    $signature: 35
   };
   A.ModifiableCssImport0.prototype = {
     accept$1$1(visitor) {
@@ -100401,7 +100807,7 @@ self.util = _cliPkgRequires.util;
   };
   A.ImportCache0.prototype = {
     canonicalize$4$baseImporter$baseUrl$forImport(_, url, baseImporter, baseUrl, forImport) {
-      var t1, relativeResult, _this = this;
+      var t1, resolvedUrl, key, relativeResult, t2, t3, t4, t5, t6, cacheable, i, importer, perImporterKey, t7, _1_0, _1_2_isSet, _1_2, result, _2_0, _2_1, _2_5_isSet, _2_3, _2_5, _2_3_isSet, j, _this = this, _null = null;
       if (A.isBrowser())
         t1 = (baseImporter == null || baseImporter instanceof A.NoOpImporter0) && _this._import_cache$_importers.length === 0;
       else
@@ -100409,28 +100815,116 @@ self.util = _cliPkgRequires.util;
       if (t1)
         throw A.wrapException(string$.Custom);
       if (baseImporter != null && url.get$scheme() === "") {
-        relativeResult = _this._import_cache$_relativeCanonicalizeCache.putIfAbsent$2(new A._Record_4_baseImporter_baseUrl_forImport([url, baseImporter, baseUrl, forImport]), new A.ImportCache_canonicalize_closure1(_this, baseImporter, baseUrl, url, forImport));
+        resolvedUrl = baseUrl == null ? _null : baseUrl.resolveUri$1(url);
+        if (resolvedUrl == null)
+          resolvedUrl = url;
+        key = new A._Record_3_forImport(baseImporter, resolvedUrl, forImport);
+        relativeResult = _this._import_cache$_perImporterCanonicalizeCache.putIfAbsent$2(key, new A.ImportCache_canonicalize_closure0(_this, baseImporter, resolvedUrl, baseUrl, forImport, key, url));
         if (relativeResult != null)
           return relativeResult;
       }
-      return _this._import_cache$_canonicalizeCache.putIfAbsent$2(new A._Record_2_forImport(url, forImport), new A.ImportCache_canonicalize_closure2(_this, url, baseUrl, forImport));
+      key = new A._Record_2_forImport(url, forImport);
+      t1 = _this._import_cache$_canonicalizeCache;
+      if (t1.containsKey$1(key))
+        return t1.$index(0, key);
+      for (t2 = _this._import_cache$_importers, t3 = type$.Record_1_nullable_Object, t4 = _this._import_cache$_perImporterCanonicalizeCache, t5 = type$.nullable_Record_3_Importer_and_Uri_and_Uri_originalUrl_2, t6 = type$.Record_3_Importer_and_Uri_and_Uri_originalUrl_2, cacheable = true, i = 0; i < t2.length; ++i) {
+        importer = t2[i];
+        perImporterKey = new A._Record_3_forImport(importer, url, forImport);
+        if (t4.containsKey$1(perImporterKey)) {
+          t7 = t4.$index(0, perImporterKey);
+          _1_0 = new A._Record_1(t7 == null ? t5._as(t7) : t7);
+        } else
+          _1_0 = _null;
+        _1_2_isSet = t3._is(_1_0);
+        if (_1_2_isSet) {
+          _1_2 = _1_0._0;
+          t7 = _1_2 != null;
+          if (t7) {
+            t6._as(_1_2);
+            result = _1_2;
+          } else
+            result = _null;
+        } else {
+          result = _null;
+          _1_2 = result;
+          t7 = false;
+        }
+        if (t7)
+          return result;
+        if (_1_2_isSet)
+          t7 = _1_2 == null;
+        else
+          t7 = false;
+        if (t7)
+          continue;
+        $label0$1: {
+          _2_0 = _this._import_cache$_canonicalize$4(importer, url, baseUrl, forImport);
+          _2_1 = _2_0._0;
+          _2_5_isSet = _2_1 != null;
+          if (_2_5_isSet) {
+            result = _2_1 == null ? t6._as(_2_1) : _2_1;
+            _2_3 = _2_0._1;
+            t7 = _2_3;
+            _2_5 = t7;
+            t7 = t7 && cacheable;
+          } else {
+            result = _null;
+            _2_3 = result;
+            _2_5 = _2_3;
+            t7 = false;
+          }
+          if (t7) {
+            t1.$indexSet(0, key, result);
+            return result;
+          }
+          if (_2_5_isSet) {
+            t7 = _2_5;
+            _2_3_isSet = _2_5_isSet;
+          } else {
+            _2_3 = _2_0._1;
+            t7 = _2_3;
+            _2_3_isSet = true;
+          }
+          t7 = t7 && !cacheable;
+          if (t7) {
+            t4.$indexSet(0, perImporterKey, _2_1);
+            if (_2_1 != null)
+              return _2_1;
+            break $label0$1;
+          }
+          t7 = false === (_2_3_isSet ? _2_3 : _2_0._1);
+          if (t7) {
+            if (cacheable) {
+              for (j = 0; j < i; ++j)
+                t4.$indexSet(0, new A._Record_3_forImport(t2[j], url, forImport), _null);
+              cacheable = false;
+            }
+            if (_2_1 != null)
+              return _2_1;
+          }
+        }
+      }
+      if (cacheable)
+        t1.$indexSet(0, key, _null);
+      return _null;
     },
     _import_cache$_canonicalize$4(importer, url, baseUrl, forImport) {
-      var passContainingUrl, t1, result, _null = null,
-        canonicalize = forImport ? new A.ImportCache__canonicalize_closure1(importer, url) : new A.ImportCache__canonicalize_closure2(importer, url);
+      var passContainingUrl, canonicalizeContext, t1, result, cacheable, _null = null;
       if (baseUrl != null)
         passContainingUrl = url.get$scheme() === "" || importer.isNonCanonicalScheme$1(url.get$scheme());
       else
         passContainingUrl = false;
-      t1 = passContainingUrl ? baseUrl : _null;
-      result = A.withContainingUrl0(t1, canonicalize, type$.nullable_Uri);
+      canonicalizeContext = new A.CanonicalizeContext0(forImport, passContainingUrl ? baseUrl : _null);
+      t1 = type$.nullable_Object;
+      result = A.runZoned(new A.ImportCache__canonicalize_closure0(importer, url), A.LinkedHashMap_LinkedHashMap$_literal([B.Symbol__canonicalizeContext, canonicalizeContext], t1, t1), type$.nullable_Uri);
+      cacheable = !passContainingUrl || !canonicalizeContext._canonicalize_context$_wasContainingUrlAccessed;
       if (result == null)
-        return _null;
+        return new A._Record_2(_null, cacheable);
       if (result.get$scheme() === "")
-        A.WarnForDeprecation_warnForDeprecation0(this._import_cache$_logger, B.Deprecation_E5x, "Importer " + importer.toString$0(0) + " canonicalized " + url.toString$0(0) + " to " + result.toString$0(0) + string$.x2e_Rela, _null, _null);
+        A.WarnForDeprecation_warnForDeprecation0(this._import_cache$_logger, B.Deprecation_Ssf, "Importer " + importer.toString$0(0) + " canonicalized " + url.toString$0(0) + " to " + result.toString$0(0) + string$.x2e_Rela, _null, _null);
       else if (importer.isNonCanonicalScheme$1(result.get$scheme()))
         throw A.wrapException("Importer " + importer.toString$0(0) + " canonicalized " + url.toString$0(0) + " to " + result.toString$0(0) + string$.x2c_whicu);
-      return new A._Record_3_originalUrl(importer, result, url);
+      return new A._Record_2(new A._Record_3_originalUrl(importer, result, url), cacheable);
     },
     importCanonical$4$originalUrl$quiet(importer, canonicalUrl, originalUrl, quiet) {
       return this._import_cache$_importCache.putIfAbsent$2(canonicalUrl, new A.ImportCache_importCanonical_closure0(this, importer, canonicalUrl, originalUrl, quiet));
@@ -100439,67 +100933,34 @@ self.util = _cliPkgRequires.util;
       return this.importCanonical$4$originalUrl$quiet(importer, canonicalUrl, originalUrl, false);
     },
     humanize$1(canonicalUrl) {
-      var t2,
-        t1 = this._import_cache$_canonicalizeCache;
-      t1 = A.IterableNullableExtension_whereNotNull(t1.get$values(t1), type$.Record_3_Importer_and_Uri_and_Uri_originalUrl_2);
-      t2 = t1.$ti;
+      var t1 = A.IterableNullableExtension_whereNotNull(this._import_cache$_canonicalizeCache.get$values(0), type$.Record_3_Importer_and_Uri_and_Uri_originalUrl_2),
+        t2 = t1.$ti;
       t2 = A.NullableExtension_andThen0(A.minBy(new A.MappedIterable(new A.WhereIterable(t1, new A.ImportCache_humanize_closure3(canonicalUrl), t2._eval$1("WhereIterable<Iterable.E>")), new A.ImportCache_humanize_closure4(), t2._eval$1("MappedIterable<Iterable.E,Uri>")), new A.ImportCache_humanize_closure5()), new A.ImportCache_humanize_closure6(canonicalUrl));
       return t2 == null ? canonicalUrl : t2;
     },
     sourceMapUrl$1(_, canonicalUrl) {
       var t1 = this._import_cache$_resultsCache.$index(0, canonicalUrl);
-      t1 = t1 == null ? null : t1.get$sourceMapUrl(t1);
+      t1 = t1 == null ? null : t1.get$sourceMapUrl(0);
       return t1 == null ? canonicalUrl : t1;
     }
   };
-  A.ImportCache_canonicalize_closure1.prototype = {
+  A.ImportCache_canonicalize_closure0.prototype = {
     call$0() {
       var _this = this,
-        t1 = _this.baseUrl,
-        t2 = t1 == null ? null : t1.resolveUri$1(_this.url);
-      if (t2 == null)
-        t2 = _this.url;
-      return _this.$this._import_cache$_canonicalize$4(_this.baseImporter, t2, t1, _this.forImport);
+        t1 = _this.$this,
+        t2 = _this.baseUrl,
+        _0_0 = t1._import_cache$_canonicalize$4(_this.baseImporter, _this.resolvedUrl, t2, _this.forImport);
+      if (t2 != null)
+        t1._import_cache$_nonCanonicalRelativeUrls.$indexSet(0, _this.key, _this.url);
+      return _0_0._0;
     },
-    $signature: 259
+    $signature: 630
   };
-  A.ImportCache_canonicalize_closure2.prototype = {
+  A.ImportCache__canonicalize_closure0.prototype = {
     call$0() {
-      var t1, t2, t3, t4, t5, t6, _i, _0_0, result, t7, _this = this;
-      for (t1 = _this.$this, t2 = t1._import_cache$_importers, t3 = t2.length, t4 = _this.url, t5 = _this.baseUrl, t6 = _this.forImport, _i = 0; _i < t2.length; t2.length === t3 || (0, A.throwConcurrentModificationError)(t2), ++_i) {
-        _0_0 = t1._import_cache$_canonicalize$4(t2[_i], t4, t5, t6);
-        if (_0_0 != null) {
-          result = _0_0;
-          t7 = true;
-        } else {
-          result = null;
-          t7 = false;
-        }
-        if (t7)
-          return result;
-      }
-      return null;
+      return this.importer.canonicalize$1(0, this.url);
     },
-    $signature: 259
-  };
-  A.ImportCache__canonicalize_closure1.prototype = {
-    call$0() {
-      var t1 = type$.nullable_Object;
-      return A.runZoned(new A.ImportCache__canonicalize__closure0(this.importer, this.resolved), A.LinkedHashMap_LinkedHashMap$_literal([B.Symbol__inImportRule, true], t1, t1), type$.nullable_Uri);
-    },
-    $signature: 56
-  };
-  A.ImportCache__canonicalize__closure0.prototype = {
-    call$0() {
-      return this.importer.canonicalize$1(0, this.resolved);
-    },
-    $signature: 56
-  };
-  A.ImportCache__canonicalize_closure2.prototype = {
-    call$0() {
-      return this.importer.canonicalize$1(0, this.resolved);
-    },
-    $signature: 56
+    $signature: 140
   };
   A.ImportCache_importCanonical_closure0.prototype = {
     call$0() {
@@ -100515,33 +100976,33 @@ self.util = _cliPkgRequires.util;
       t1 = _this.originalUrl.resolveUri$1(t1);
       return A.Stylesheet_Stylesheet$parse0(t3, t4, _this.quiet ? $.$get$Logger_quiet0() : t2._import_cache$_logger, t1);
     },
-    $signature: 485
+    $signature: 466
   };
   A.ImportCache_humanize_closure3.prototype = {
     call$1(result) {
       return J.$eq$(result._1, this.canonicalUrl);
     },
-    $signature: 486
+    $signature: 467
   };
   A.ImportCache_humanize_closure4.prototype = {
     call$1(result) {
       return result._2;
     },
-    $signature: 487
+    $signature: 468
   };
   A.ImportCache_humanize_closure5.prototype = {
     call$1(url) {
       return url.get$path(url).length;
     },
-    $signature: 111
+    $signature: 87
   };
   A.ImportCache_humanize_closure6.prototype = {
     call$1(url) {
       var t1 = $.$get$url(),
         t2 = this.canonicalUrl;
-      return url.resolve$1(A.ParsedPath_ParsedPath$parse(t2.get$path(t2), t1.style).get$basename());
+      return url.resolve$1(0, A.ParsedPath_ParsedPath$parse(t2.get$path(t2), t1.style).get$basename());
     },
-    $signature: 48
+    $signature: 43
   };
   A.ImportRule0.prototype = {
     accept$1$1(visitor) {
@@ -100560,7 +101021,6 @@ self.util = _cliPkgRequires.util;
     }
   };
   A.JSImporter.prototype = {};
-  A.CanonicalizeContext.prototype = {};
   A.JSImporterResult.prototype = {};
   A.Importer0.prototype = {
     isNonCanonicalScheme$1(scheme) {
@@ -100580,6 +101040,22 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
+    get$nameSpan() {
+      var startSpan, scanner, _null = null,
+        t1 = this.span,
+        t2 = t1._file$_start,
+        t3 = t1._end,
+        t4 = t1.file._decodedChars;
+      if (B.JSString_methods.startsWith$1(A.String_String$fromCharCodes(B.NativeUint32List_methods.sublist$2(t4, t2, t3), 0, _null), "+"))
+        startSpan = A.SpanExtensions_trimLeft0(A.FileSpanExtension_subspan(t1, 1, _null));
+      else {
+        scanner = A.StringScanner$(A.String_String$fromCharCodes(B.NativeUint32List_methods.sublist$2(t4, t2, t3), 0, _null), _null, _null);
+        scanner.expectChar$1(64);
+        A._scanIdentifier0(scanner);
+        startSpan = A.SpanExtensions_trimLeft0(A.FileSpanExtension_subspan(t1, scanner._string_scanner$_position, _null));
+      }
+      return A.SpanExtensions_initialIdentifier0(this.namespace != null ? A.FileSpanExtension_subspan(A.SpanExtensions_withoutInitialIdentifier0(startSpan), 1, _null) : startSpan);
+    },
     accept$1$1(visitor) {
       return visitor.visitIncludeRule$1(this);
     },
@@ -100592,7 +101068,7 @@ self.util = _cliPkgRequires.util;
       t1 = t1 != null ? "@include " + (t1 + ".") : "@include ";
       t1 += _this.name;
       t2 = _this.$arguments;
-      if (!t2.get$isEmpty(t2))
+      if (!t2.get$isEmpty(0))
         t1 += "(" + t2.toString$0(0) + ")";
       t2 = _this.content;
       t1 += t2 == null ? ";" : " " + t2.toString$0(0);
@@ -100622,54 +101098,48 @@ self.util = _cliPkgRequires.util;
   };
   A.Interpolation0.prototype = {
     get$asPlain() {
-      var t1, first,
-        _0_0 = this.contents,
-        _0_1 = A._InitializedCell$(new A.Interpolation_asPlain_closure1(_0_0)),
-        _0_6 = A._InitializedCell$(new A.Interpolation_asPlain_closure2(_0_0));
+      var _0_1, t1, _0_6_isSet, _0_6, first, _null = null,
+        _0_0 = this.contents;
       $label0$0: {
-        if (_0_1._readFinal$0() <= 0) {
+        _0_1 = _0_0.length;
+        if (_0_1 <= 0) {
           t1 = "";
           break $label0$0;
         }
-        if (J.$eq$(_0_1._readFinal$0(), 1))
-          if (typeof _0_6._readFinal$0() == "string") {
-            first = _0_6._readFinal$0();
-            t1 = true;
-          } else {
-            first = null;
-            t1 = false;
-          }
-        else {
-          first = null;
+        _0_6_isSet = _0_1 === 1;
+        if (_0_6_isSet) {
+          _0_6 = _0_0[0];
+          t1 = _0_6;
+          t1 = typeof t1 == "string";
+        } else {
+          _0_6 = _null;
           t1 = false;
         }
         if (t1) {
+          first = A._asString(_0_6_isSet ? _0_6 : _0_0[0]);
           t1 = first;
           break $label0$0;
         }
-        t1 = null;
+        t1 = _null;
         break $label0$0;
       }
       return t1;
     },
     get$initialPlain() {
-      var first, t1,
-        _0_0 = this.contents,
-        _0_4 = A._InitializedCell$(new A.Interpolation_initialPlain_closure0(_0_0));
+      var _0_4_isSet, _0_4, t1, first,
+        _0_0 = this.contents;
       $label0$0: {
-        if (_0_0.length >= 1)
-          if (typeof _0_4._readFinal$0() == "string") {
-            first = _0_4._readFinal$0();
-            t1 = true;
-          } else {
-            first = null;
-            t1 = false;
-          }
-        else {
-          first = null;
+        _0_4_isSet = _0_0.length >= 1;
+        if (_0_4_isSet) {
+          _0_4 = _0_0[0];
+          t1 = _0_4;
+          t1 = typeof t1 == "string";
+        } else {
+          _0_4 = null;
           t1 = false;
         }
         if (t1) {
+          first = A._asString(_0_4_isSet ? _0_4 : _0_0[0]);
           t1 = first;
           break $label0$0;
         }
@@ -100699,29 +101169,11 @@ self.util = _cliPkgRequires.util;
       return this.span;
     }
   };
-  A.Interpolation_asPlain_closure1.prototype = {
-    call$0() {
-      return this._0_0.length;
-    },
-    $signature: 3
-  };
-  A.Interpolation_asPlain_closure2.prototype = {
-    call$0() {
-      return this._0_0[0];
-    },
-    $signature: 14
-  };
-  A.Interpolation_initialPlain_closure0.prototype = {
-    call$0() {
-      return this._0_0[0];
-    },
-    $signature: 14
-  };
   A.Interpolation_toString_closure0.prototype = {
     call$1(value) {
       return typeof value == "string" ? value : "#{" + A.S(value) + "}";
     },
-    $signature: 139
+    $signature: 134
   };
   A.SupportsInterpolation0.prototype = {
     toString$0(_) {
@@ -100734,40 +101186,41 @@ self.util = _cliPkgRequires.util;
   };
   A.InterpolationBuffer0.prototype = {
     writeCharCode$1(character) {
-      this._interpolation_buffer0$_text._contents += A.Primitives_stringFromCharCode(character);
+      var t1 = this._interpolation_buffer0$_text,
+        t2 = A.Primitives_stringFromCharCode(character);
+      t1._contents += t2;
       return null;
     },
     addInterpolation$1(interpolation) {
-      var _0_4, first, rest, _this = this, _null = null,
+      var _0_4_isSet, _0_4, first, rest, t2, _this = this,
         toAdd = interpolation.contents,
         t1 = toAdd.length;
       if (t1 === 0)
         return;
-      _0_4 = A._InitializedCell$(new A.InterpolationBuffer_addInterpolation_closure0(toAdd));
-      if (t1 >= 1)
-        if (typeof _0_4._readFinal$0() == "string") {
-          first = _0_4._readFinal$0();
-          rest = B.JSArray_methods.sublist$1(toAdd, 1);
-          t1 = true;
-        } else {
-          rest = _null;
-          first = rest;
-          t1 = false;
-        }
-      else {
-        rest = _null;
-        first = rest;
+      _0_4_isSet = t1 >= 1;
+      if (_0_4_isSet) {
+        _0_4 = toAdd[0];
+        t1 = _0_4;
+        t1 = typeof t1 == "string";
+      } else {
+        _0_4 = null;
         t1 = false;
       }
       if (t1) {
-        _this._interpolation_buffer0$_text._contents += A.S(first);
+        first = A._asString(_0_4_isSet ? _0_4 : toAdd[0]);
+        rest = B.JSArray_methods.sublist$1(toAdd, 1);
+        t1 = _this._interpolation_buffer0$_text;
+        t1._contents += first;
         toAdd = rest;
       }
       _this._interpolation_buffer0$_flushText$0();
       t1 = _this._interpolation_buffer0$_contents;
       B.JSArray_methods.addAll$1(t1, toAdd);
-      if (typeof B.JSArray_methods.get$last(t1) == "string")
-        _this._interpolation_buffer0$_text._contents += A.S(t1.pop());
+      if (typeof B.JSArray_methods.get$last(t1) == "string") {
+        t2 = _this._interpolation_buffer0$_text;
+        t1 = A.S(t1.pop());
+        t2._contents += t1;
+      }
     },
     _interpolation_buffer0$_flushText$0() {
       var t1 = this._interpolation_buffer0$_text,
@@ -100794,12 +101247,6 @@ self.util = _cliPkgRequires.util;
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     }
   };
-  A.InterpolationBuffer_addInterpolation_closure0.prototype = {
-    call$0() {
-      return this._0_0[0];
-    },
-    $signature: 14
-  };
   A.InterpolationMap0.prototype = {
     mapException$1(error) {
       var t3, t4, _this = this,
@@ -100815,90 +101262,93 @@ self.util = _cliPkgRequires.util;
         t1 = type$.SourceSpan;
         t3 = type$.String;
         t4 = A.LinkedHashMap_LinkedHashMap$_literal([target, "error in interpolated output"], t1, t3);
-        error.get$source();
-        return new A.MultiSourceSpanFormatException("", A.ConstantMap_ConstantMap$from(t4, t1, t3), t2, source);
+        return new A.MultiSourceSpanFormatException(error.get$source(), "", A.ConstantMap_ConstantMap$from(t4, t1, t3), t2, source);
       }
     },
     mapSpan$1(target) {
-      var t1, start, end, t2, _this = this, _null = null,
-        _0_0 = new A._Record_2(_this._interpolation_map$_mapLocation$1(target.get$start(target)), _this._interpolation_map$_mapLocation$1(target.get$end(target))),
-        _0_1 = A._InitializedCell$(new A.InterpolationMap_mapSpan_closure1(_0_0)),
-        _0_2 = A._InitializedCell$(new A.InterpolationMap_mapSpan_closure2(_0_0));
+      var _0_10, t1, _0_2_isSet, _0_20, t2, start, end, _this = this, _null = null,
+        _0_1 = _this._interpolation_map$_mapLocation$1(target.get$start(target)),
+        _0_2 = _this._interpolation_map$_mapLocation$1(target.get$end(target));
       $label0$0: {
+        _0_10 = _0_1;
         t1 = type$.FileSpan;
-        if (t1._is(_0_1._readFinal$0())) {
-          start = _0_1._readFinal$0();
-          if (t1._is(_0_2._readFinal$0())) {
-            end = _0_2._readFinal$0();
-            t2 = true;
-          } else {
-            end = _null;
-            t2 = false;
-          }
+        _0_2_isSet = t1._is(_0_1);
+        if (_0_2_isSet) {
+          t1._as(_0_10);
+          _0_20 = _0_2;
+          t2 = t1._is(_0_2);
+          start = _0_10;
+          _0_1 = start;
         } else {
-          end = _null;
-          start = end;
+          start = _null;
+          _0_20 = start;
+          _0_1 = _0_10;
           t2 = false;
         }
         if (t2) {
-          t1 = start.expand$1(0, end);
+          t1 = start.expand$1(0, t1._as(_0_2_isSet ? _0_20 : _0_2));
           break $label0$0;
         }
-        if (t1._is(_0_1._readFinal$0())) {
-          start = _0_1._readFinal$0();
-          if (_0_2._readFinal$0() instanceof A.FileLocation) {
-            end = _0_2._readFinal$0();
-            t2 = true;
-          } else {
-            end = _null;
-            t2 = false;
+        if (t1._is(_0_1)) {
+          if (_0_2_isSet)
+            t2 = _0_20;
+          else {
+            t2 = _0_2;
+            _0_20 = t2;
+            _0_2_isSet = true;
           }
+          t2 = t2 instanceof A.FileLocation;
+          start = _0_1;
         } else {
-          end = _null;
-          start = end;
+          start = _null;
           t2 = false;
         }
         if (t2) {
-          t1 = _this._interpolation_map$_interpolation.span;
-          t1 = t1.get$file(t1).span$2(0, _this._interpolation_map$_expandInterpolationSpanLeft$1(start.get$start(start)), end.offset);
+          t1 = _0_2_isSet ? _0_20 : _0_2;
+          type$.FileLocation._as(t1);
+          t2 = _this._interpolation_map$_interpolation.span;
+          t1 = t2.get$file(t2).span$2(0, _this._interpolation_map$_expandInterpolationSpanLeft$1(start.get$start(start)), t1.offset);
           break $label0$0;
         }
-        if (_0_1._readFinal$0() instanceof A.FileLocation) {
-          start = _0_1._readFinal$0();
-          if (t1._is(_0_2._readFinal$0())) {
-            end = _0_2._readFinal$0();
-            t1 = true;
-          } else {
-            end = _null;
-            t1 = false;
+        if (_0_1 instanceof A.FileLocation) {
+          if (_0_2_isSet)
+            t2 = _0_20;
+          else {
+            t2 = _0_2;
+            _0_20 = t2;
+            _0_2_isSet = true;
           }
+          t2 = t1._is(t2);
+          start = _0_1;
         } else {
-          end = _null;
-          start = end;
-          t1 = false;
+          start = _null;
+          t2 = false;
         }
-        if (t1) {
+        if (t2) {
+          end = t1._as(_0_2_isSet ? _0_20 : _0_2);
           t1 = _this._interpolation_map$_interpolation.span;
           t1 = t1.get$file(t1).span$2(0, start.offset, _this._interpolation_map$_expandInterpolationSpanRight$1(end.get$end(end)));
           break $label0$0;
         }
-        if (_0_1._readFinal$0() instanceof A.FileLocation) {
-          start = _0_1._readFinal$0();
-          if (_0_2._readFinal$0() instanceof A.FileLocation) {
-            end = _0_2._readFinal$0();
-            t1 = true;
-          } else {
-            end = _null;
-            t1 = false;
+        if (_0_1 instanceof A.FileLocation) {
+          if (_0_2_isSet)
+            t1 = _0_20;
+          else {
+            t1 = _0_2;
+            _0_20 = t1;
+            _0_2_isSet = true;
           }
+          t1 = t1 instanceof A.FileLocation;
+          start = _0_1;
         } else {
-          end = _null;
-          start = end;
+          start = _null;
           t1 = false;
         }
         if (t1) {
-          t1 = _this._interpolation_map$_interpolation.span;
-          t1 = t1.get$file(t1).span$2(0, start.offset, end.offset);
+          t1 = _0_2_isSet ? _0_20 : _0_2;
+          type$.FileLocation._as(t1);
+          t2 = _this._interpolation_map$_interpolation.span;
+          t1 = t2.get$file(t2).span$2(0, start.offset, t1.offset);
           break $label0$0;
         }
         t1 = A.throwExpression("[BUG] Unreachable");
@@ -100906,21 +101356,14 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     _interpolation_map$_mapLocation$1(target) {
-      var chunk, t4, previousLocation, _this = this,
+      var t4, previousLocation, _this = this,
         index = _this._interpolation_map$_indexInContents$1(target),
         t1 = _this._interpolation_map$_interpolation,
         t2 = t1.contents,
         _0_0 = t2[index],
         t3 = type$.Expression_2;
-      if (t3._is(_0_0)) {
-        chunk = _0_0;
-        t4 = true;
-      } else {
-        chunk = null;
-        t4 = false;
-      }
-      if (t4)
-        return chunk.get$span(chunk);
+      if (t3._is(_0_0))
+        return _0_0.get$span(_0_0);
       t4 = index === 0;
       t1 = t1.span;
       if (t4)
@@ -101040,19 +101483,7 @@ self.util = _cliPkgRequires.util;
     call$1($content) {
       return type$.Expression_2._is($content);
     },
-    $signature: 77
-  };
-  A.InterpolationMap_mapSpan_closure1.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature: 14
-  };
-  A.InterpolationMap_mapSpan_closure2.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 14
+    $signature: 75
   };
   A._realCasePath_helper0.prototype = {
     call$1(path) {
@@ -101061,11 +101492,11 @@ self.util = _cliPkgRequires.util;
         return path;
       return $._realCaseCache0.putIfAbsent$2(path, new A._realCasePath_helper_closure0(this, dirname, path));
     },
-    $signature: 7
+    $signature: 5
   };
   A._realCasePath_helper_closure0.prototype = {
     call$0() {
-      var matches, t1, _0_0, match, t3, exception,
+      var matches, t1, _0_0, match, exception,
         realDirname = this.helper.call$1(this.dirname),
         t2 = this.path,
         basename = A.ParsedPath_ParsedPath$parse(t2, $.$get$context().style).get$basename();
@@ -101077,10 +101508,6 @@ self.util = _cliPkgRequires.util;
           match = null;
           if (J.get$length$asx(_0_0) === 1) {
             match = J.$index$asx(_0_0, 0);
-            t3 = true;
-          } else
-            t3 = false;
-          if (t3) {
             t1 = match;
             break $label0$0;
           }
@@ -101096,13 +101523,13 @@ self.util = _cliPkgRequires.util;
           throw exception;
       }
     },
-    $signature: 22
+    $signature: 26
   };
   A._realCasePath_helper__closure0.prototype = {
     call$1(realPath) {
       return A.equalsIgnoreCase0(A.ParsedPath_ParsedPath$parse(realPath, $.$get$context().style).get$basename(), this.basename);
     },
-    $signature: 10
+    $signature: 4
   };
   A.FileSystemException0.prototype = {
     toString$0(_) {
@@ -101117,7 +101544,7 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return J.readFileSync$2$x(A.fs(), this.path, this.encoding);
     },
-    $signature: 58
+    $signature: 60
   };
   A.fileExists_closure0.prototype = {
     call$0() {
@@ -101136,7 +101563,7 @@ self.util = _cliPkgRequires.util;
         throw exception;
       }
     },
-    $signature: 1
+    $signature: 22
   };
   A.dirExists_closure0.prototype = {
     call$0() {
@@ -101155,7 +101582,7 @@ self.util = _cliPkgRequires.util;
         throw exception;
       }
     },
-    $signature: 1
+    $signature: 22
   };
   A.listDir_closure0.prototype = {
     call$0() {
@@ -101165,80 +101592,62 @@ self.util = _cliPkgRequires.util;
       else
         return new A.listDir_closure_list0().call$1(t1);
     },
-    $signature: 149
+    $signature: 145
   };
   A.listDir__closure1.prototype = {
     call$1(child) {
       return A.join(this.path, A._asString(child), null);
     },
-    $signature: 101
+    $signature: 108
   };
   A.listDir__closure2.prototype = {
     call$1(child) {
       return !A.dirExists0(child);
     },
-    $signature: 10
+    $signature: 4
   };
   A.listDir_closure_list0.prototype = {
     call$1($parent) {
       return J.expand$1$1$ax(J.readdirSync$1$x(A.fs(), $parent), new A.listDir__list_closure0($parent, this), type$.String);
     },
-    $signature: 174
+    $signature: 146
   };
   A.listDir__list_closure0.prototype = {
     call$1(child) {
       var path = A.join(this.parent, A._asString(child), null);
       return A.dirExists0(path) ? this.list.call$1(path) : A._setArrayType([path], type$.JSArray_String);
     },
-    $signature: 178
+    $signature: 147
   };
   A.main_closure.prototype = {
     call$2(_, __) {
     },
-    $signature: 488
+    $signature: 469
   };
   A.main_closure0.prototype = {
     call$2(_, __) {
     },
-    $signature: 489
+    $signature: 470
   };
   A.JSToDartLogger.prototype = {
-    warn$4$deprecation$span$trace(_, message, deprecation, span, trace) {
-      var warn,
+    internalWarn$4$deprecation$span$trace(message, deprecation, span, trace) {
+      var t2, t3, t4,
         t1 = this._node,
         _0_0 = t1 == null ? null : J.get$warn$x(t1);
       if (_0_0 != null) {
-        warn = _0_0;
-        t1 = true;
-      } else {
-        warn = null;
-        t1 = false;
-      }
-      if (t1) {
         t1 = span == null ? type$.nullable_SourceSpan._as(self.undefined) : span;
-        warn.call$2(message, {deprecation: deprecation, span: t1, stack: J.toString$0$(trace)});
+        t2 = J.toString$0$(trace);
+        t3 = deprecation == null;
+        t4 = $.$get$deprecations();
+        _0_0.call$2(message, {deprecation: !t3, deprecationType: t4.$index(0, t3 ? null : deprecation.id), span: t1, stack: t2});
       } else
-        this._withAscii$1(new A.JSToDartLogger_warn_closure(this, message, span, trace, deprecation));
-    },
-    warn$1($receiver, message) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, null, null);
-    },
-    warn$2$span($receiver, message, span) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, span, null);
+        this._withAscii$1(new A.JSToDartLogger_internalWarn_closure(this, message, span, trace, deprecation));
     },
     debug$2(_, message, span) {
-      var debug,
-        t1 = this._node,
+      var t1 = this._node,
         _0_0 = t1 == null ? null : J.get$debug$x(t1);
-      if (_0_0 != null) {
-        debug = _0_0;
-        t1 = true;
-      } else {
-        debug = null;
-        t1 = false;
-      }
-      if (t1)
-        debug.call$2(message, {span: span});
+      if (_0_0 != null)
+        _0_0.call$2(message, {span: span});
       else
         this._withAscii$1(new A.JSToDartLogger_debug_closure(this, message, span));
     },
@@ -101257,12 +101666,12 @@ self.util = _cliPkgRequires.util;
       return this._withAscii$1$1(callback, type$.dynamic);
     }
   };
-  A.JSToDartLogger_warn_closure.prototype = {
+  A.JSToDartLogger_internalWarn_closure.prototype = {
     call$0() {
       var _this = this;
-      _this.$this._fallback.warn$4$deprecation$span$trace(0, _this.message, _this.deprecation, _this.span, _this.trace);
+      _this.$this._fallback.warn$4$deprecation$span$trace(0, _this.message, _this.deprecation != null, _this.span, _this.trace);
     },
-    $signature: 2
+    $signature: 1
   };
   A.JSToDartLogger_debug_closure.prototype = {
     call$0() {
@@ -101352,7 +101761,7 @@ self.util = _cliPkgRequires.util;
       t2.expectDone$0();
       return selectors;
     },
-    $signature: 26
+    $signature: 124
   };
   A.LazyFileSpan0.prototype = {
     get$span(_) {
@@ -101360,46 +101769,46 @@ self.util = _cliPkgRequires.util;
       return t1 == null ? this._lazy_file_span0$_span = this._lazy_file_span0$_builder.call$0() : t1;
     },
     compareTo$1(_, other) {
-      return this.get$span(this).compareTo$1(0, other);
+      return this.get$span(0).compareTo$1(0, other);
     },
     get$context(_) {
-      var t1 = this.get$span(this);
+      var t1 = this.get$span(0);
       return t1.get$context(t1);
     },
     get$end(_) {
-      var t1 = this.get$span(this);
+      var t1 = this.get$span(0);
       return t1.get$end(t1);
     },
     expand$1(_, other) {
-      return this.get$span(this).expand$1(0, other);
+      return this.get$span(0).expand$1(0, other);
     },
     get$file(_) {
-      var t1 = this.get$span(this);
+      var t1 = this.get$span(0);
       return t1.get$file(t1);
     },
     highlight$1$color(color) {
-      return this.get$span(this).highlight$1$color(color);
+      return this.get$span(0).highlight$1$color(color);
     },
     get$length(_) {
-      var t1 = this.get$span(this);
+      var t1 = this.get$span(0);
       return t1.get$length(t1);
     },
     message$2$color(_, message, color) {
-      return this.get$span(this).message$2$color(0, message, color);
+      return this.get$span(0).message$2$color(0, message, color);
     },
-    message$1($receiver, message) {
-      return this.message$2$color($receiver, message, null);
+    message$1(_, message) {
+      return this.message$2$color(0, message, null);
     },
     get$sourceUrl(_) {
-      var t1 = this.get$span(this);
+      var t1 = this.get$span(0);
       return t1.get$sourceUrl(t1);
     },
     get$start(_) {
-      var t1 = this.get$span(this);
+      var t1 = this.get$span(0);
       return t1.get$start(t1);
     },
     get$text() {
-      return this.get$span(this).get$text();
+      return this.get$span(0).get$text();
     },
     $isComparable: 1,
     $isFileSpan: 1,
@@ -101417,13 +101826,13 @@ self.util = _cliPkgRequires.util;
       }
       return null;
     },
-    $signature: 2
+    $signature: 1
   };
   A.render_closure0.prototype = {
     call$1(result) {
       this.callback.call$2(null, result);
     },
-    $signature: 490
+    $signature: 471
   };
   A.render_closure1.prototype = {
     call$2(error, stackTrace) {
@@ -101437,7 +101846,7 @@ self.util = _cliPkgRequires.util;
         t1.call$2(A._newRenderError(t2, t3 == null ? stackTrace : t3, _null, _null, _null, 3), _null);
       }
     },
-    $signature: 62
+    $signature: 52
   };
   A._parseFunctions_closure.prototype = {
     call$2(signature, callback) {
@@ -101445,16 +101854,12 @@ self.util = _cliPkgRequires.util;
         t2 = _this.options,
         context = {options: A._contextOptions(t2, _this.start)};
       J.set$context$x(J.get$options$x(context), context);
-      t1.fiber = null;
       _0_0 = J.get$fiber$x(t2);
+      t1.fiber = null;
       if (_0_0 != null) {
         t1.fiber = _0_0;
-        t2 = true;
-      } else
-        t2 = false;
-      if (t2)
         _this.result.push(A.Callable_Callable$fromSignature(B.JSString_methods.trimLeft$0(signature), new A._parseFunctions__closure(t1, callback, context), false));
-      else {
+      } else {
         t1 = _this.result;
         if (!_this.asynch)
           t1.push(A.Callable_Callable$fromSignature(B.JSString_methods.trimLeft$0(signature), new A._parseFunctions__closure0(callback, context), false));
@@ -101462,7 +101867,7 @@ self.util = _cliPkgRequires.util;
           t1.push(A.AsyncCallable_AsyncCallable$fromSignature(B.JSString_methods.trimLeft$0(signature), new A._parseFunctions__closure1(callback, context), false));
       }
     },
-    $signature: 135
+    $signature: 120
   };
   A._parseFunctions__closure.prototype = {
     call$1($arguments) {
@@ -101475,7 +101880,7 @@ self.util = _cliPkgRequires.util;
       result = A.wrapJSExceptions(new A._parseFunctions___closure3(this.callback, this.context, t2));
       return A.unwrapValue(A._asBool($.$get$_isUndefined().call$1(result)) ? A.runZoned(new A._parseFunctions___closure4(t1), null, type$.nullable_Object) : result);
     },
-    $signature: 5
+    $signature: 3
   };
   A._parseFunctions___closure2.prototype = {
     call$1(result) {
@@ -101489,7 +101894,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 94
+    $signature: 93
   };
   A._parseFunctions____closure.prototype = {
     call$0() {
@@ -101501,27 +101906,27 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return J.apply$2$x(type$.JSFunction._as(this.callback), this.context, this.jsArguments);
     },
-    $signature: 28
+    $signature: 35
   };
   A._parseFunctions___closure4.prototype = {
     call$0() {
       return J.yield$0$x(this._box_0.fiber);
     },
-    $signature: 14
+    $signature: 79
   };
   A._parseFunctions__closure0.prototype = {
     call$1($arguments) {
       return A.unwrapValue(A.wrapJSExceptions(new A._parseFunctions___closure1(this.callback, this.context, $arguments)));
     },
-    $signature: 5
+    $signature: 3
   };
   A._parseFunctions___closure1.prototype = {
     call$0() {
       var t1 = type$.JSFunction._as(this.callback),
         t2 = J.map$1$1$ax(this.$arguments, A.value0__wrapValue$closure(), type$.Object);
-      return J.apply$2$x(t1, this.context, A.List_List$of(t2, true, A._instanceType(t2)._eval$1("ListIterable.E")));
+      return J.apply$2$x(t1, this.context, A.List_List$of(t2, true, t2.$ti._eval$1("ListIterable.E")));
     },
-    $signature: 28
+    $signature: 35
   };
   A._parseFunctions__closure1.prototype = {
     call$1($arguments) {
@@ -101571,7 +101976,7 @@ self.util = _cliPkgRequires.util;
       });
       return A._asyncStartSync($async$call$1, $async$completer);
     },
-    $signature: 99
+    $signature: 88
   };
   A._parseFunctions___closure.prototype = {
     call$1(result) {
@@ -101585,19 +101990,19 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 160
+    $signature: 166
   };
   A._parseFunctions___closure0.prototype = {
     call$0() {
       return J.apply$2$x(type$.JSFunction._as(this.callback), this.context, this.jsArguments);
     },
-    $signature: 28
+    $signature: 35
   };
   A._parseImporter_closure.prototype = {
     call$1(importer) {
       return type$.JSFunction._as(A.allowInteropCaptureThis(new A._parseImporter__closure(this._box_0, importer)));
     },
-    $signature: 491
+    $signature: 472
   };
   A._parseImporter__closure.prototype = {
     call$4(thisArg, url, previous, _) {
@@ -101615,13 +102020,13 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 492
+    $signature: 473
   };
   A._parseImporter___closure.prototype = {
     call$1(result) {
       A.scheduleMicrotask(new A._parseImporter____closure(this.currentFiber, result));
     },
-    $signature: 493
+    $signature: 474
   };
   A._parseImporter____closure.prototype = {
     call$0() {
@@ -101633,7 +102038,7 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return J.yield$0$x(this._box_0.fiber);
     },
-    $signature: 14
+    $signature: 79
   };
   A.LimitedMapView0.prototype = {
     get$keys(_) {
@@ -101673,13 +102078,13 @@ self.util = _cliPkgRequires.util;
       else {
         t2 = _this.contents.length;
         if (t2 !== 0)
-          t2 = t2 === 1 && _this.separator === B.ListSeparator_rXA0;
+          t2 = t2 === 1 && _this.separator === B.ListSeparator_ECn0;
         else
           t2 = true;
         t2 = t2 ? "" + A.Primitives_stringFromCharCode(40) : "";
       }
       t3 = _this.contents;
-      t4 = _this.separator === B.ListSeparator_rXA0;
+      t4 = _this.separator === B.ListSeparator_ECn0;
       t5 = t4 ? ", " : " ";
       t5 = t2 + new A.MappedListIterable(t3, new A.ListExpression_toString_closure0(_this), A._arrayInstanceType(t3)._eval$1("MappedListIterable<1,String>")).join$1(0, t5);
       if (t1)
@@ -101694,36 +102099,23 @@ self.util = _cliPkgRequires.util;
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     },
     _list3$_elementNeedsParens$1(expression) {
-      var childSeparator, t1,
-        _0_13 = A._InitializedCell$(new A.ListExpression__elementNeedsParens_closure0(expression));
+      var childSeparator, t1, _0_13;
       $label0$0: {
-        if (expression instanceof A.ListExpression0)
-          if (expression.contents.length >= 2)
-            if (!expression.hasBrackets) {
-              childSeparator = expression.separator;
-              t1 = true;
-            } else {
-              childSeparator = null;
-              t1 = false;
-            }
-          else {
-            childSeparator = null;
-            t1 = false;
-          }
-        else {
-          childSeparator = null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = this.separator === B.ListSeparator_rXA0 ? childSeparator === B.ListSeparator_rXA0 : childSeparator !== B.ListSeparator_undecided_null_undecided0;
+        if (expression instanceof A.ListExpression0 && expression.contents.length >= 2 && !expression.hasBrackets) {
+          childSeparator = expression.separator;
+          t1 = this.separator === B.ListSeparator_ECn0 ? childSeparator === B.ListSeparator_ECn0 : childSeparator !== B.ListSeparator_undecided_null_undecided0;
           break $label0$0;
         }
-        if (expression instanceof A.UnaryOperationExpression0)
-          t1 = B.UnaryOperator_gg40 === _0_13._readFinal$0() || B.UnaryOperator_TLI0 === _0_13._readFinal$0();
-        else
+        if (expression instanceof A.UnaryOperationExpression0) {
+          _0_13 = expression.operator;
+          if (B.UnaryOperator_cLp0 !== _0_13)
+            t1 = B.UnaryOperator_AiQ0 === _0_13;
+          else
+            t1 = true;
+        } else
           t1 = false;
         if (t1) {
-          t1 = this.separator === B.ListSeparator_EVt0;
+          t1 = this.separator === B.ListSeparator_nbm0;
           break $label0$0;
         }
         t1 = false;
@@ -101741,13 +102133,7 @@ self.util = _cliPkgRequires.util;
     call$1(element) {
       return this.$this._list3$_elementNeedsParens$1(element) ? "(" + element.toString$0(0) + ")" : element.toString$0(0);
     },
-    $signature: 118
-  };
-  A.ListExpression__elementNeedsParens_closure0.prototype = {
-    call$0() {
-      return type$.UnaryOperationExpression_2._as(this._0_0).operator;
-    },
-    $signature: 120
+    $signature: 107
   };
   A._length_closure2.prototype = {
     call$1($arguments) {
@@ -101762,7 +102148,7 @@ self.util = _cliPkgRequires.util;
         index = t1.$index($arguments, 1);
       return list.get$asList()[list.sassIndexToListIndex$2(index, "n")];
     },
-    $signature: 5
+    $signature: 3
   };
   A._setNth_closure0.prototype = {
     call$1($arguments) {
@@ -101776,11 +102162,11 @@ self.util = _cliPkgRequires.util;
       newList[list.sassIndexToListIndex$2(index, "n")] = value;
       return list.withListContents$1(newList);
     },
-    $signature: 27
+    $signature: 23
   };
   A._join_closure0.prototype = {
     call$1($arguments) {
-      var _0_0, _0_1, _0_3, _0_4, separator, bracketed, t2,
+      var _0_1, _0_4, _0_3, t2, _0_40, separator, bracketed, _null = null,
         t1 = J.getInterceptor$asx($arguments),
         list1 = t1.$index($arguments, 0),
         list2 = t1.$index($arguments, 1),
@@ -101789,67 +102175,53 @@ self.util = _cliPkgRequires.util;
         _1_0 = separatorParam._string0$_text;
       $label1$1: {
         if ("auto" === _1_0) {
-          _0_0 = new A._Record_2(list1.get$separator(list1), list2.get$separator(list2));
-          _0_1 = A._InitializedCell$(new A._join__closure2(_0_0));
-          _0_3 = A._InitializedCell$(new A._join__closure3(_0_1));
-          _0_4 = A._InitializedCell$(new A._join__closure4(_0_0));
+          _0_1 = list1.get$separator(list1);
+          _0_4 = list2.get$separator(list2);
           $label0$0: {
-            if (_0_3._readFinal$0() && B.ListSeparator_undecided_null_undecided0 === _0_4._readFinal$0()) {
-              t1 = B.ListSeparator_EVt0;
+            _0_3 = B.ListSeparator_undecided_null_undecided0 === _0_1;
+            t1 = _0_3;
+            if (t1) {
+              t2 = B.ListSeparator_undecided_null_undecided0 === _0_4;
+              _0_40 = _0_4;
+            } else {
+              _0_40 = _null;
+              t2 = false;
+            }
+            if (t2) {
+              t1 = B.ListSeparator_nbm0;
               break $label0$0;
             }
-            if (_0_3._readFinal$0()) {
-              separator = _0_4._readFinal$0();
-              t1 = true;
-            } else {
-              separator = null;
-              t1 = false;
-            }
-            if (!t1)
-              separator = _0_1._readFinal$0();
+            if (_0_3)
+              separator = t1 ? _0_40 : _0_4;
+            else
+              separator = _null;
+            if (!_0_3)
+              separator = _0_1;
             t1 = separator;
             break $label0$0;
           }
           break $label1$1;
         }
         if ("space" === _1_0) {
-          t1 = B.ListSeparator_EVt0;
+          t1 = B.ListSeparator_nbm0;
           break $label1$1;
         }
         if ("comma" === _1_0) {
-          t1 = B.ListSeparator_rXA0;
+          t1 = B.ListSeparator_ECn0;
           break $label1$1;
         }
         if ("slash" === _1_0) {
-          t1 = B.ListSeparator_zg90;
+          t1 = B.ListSeparator_cQA0;
           break $label1$1;
         }
-        t1 = A.throwExpression(A.SassScriptException$0(string$.x24separ, null));
+        t1 = A.throwExpression(A.SassScriptException$0(string$.x24separ, _null));
       }
       bracketed = bracketedParam instanceof A.SassString0 && bracketedParam._string0$_text === "auto" ? list1.get$hasBrackets() : bracketedParam.get$isTruthy();
       t2 = A.List_List$of(list1.get$asList(), true, type$.Value_2);
       B.JSArray_methods.addAll$1(t2, list2.get$asList());
       return A.SassList$0(t2, t1, bracketed);
     },
-    $signature: 27
-  };
-  A._join__closure2.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature: 261
-  };
-  A._join__closure3.prototype = {
-    call$0() {
-      return B.ListSeparator_undecided_null_undecided0 === this._0_1._readFinal$0();
-    },
-    $signature: 1
-  };
-  A._join__closure4.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 261
+    $signature: 23
   };
   A._append_closure2.prototype = {
     call$1($arguments) {
@@ -101860,19 +102232,19 @@ self.util = _cliPkgRequires.util;
         _0_0 = t1.$index($arguments, 2).assertString$1("separator")._string0$_text;
       $label0$0: {
         if ("auto" === _0_0) {
-          t1 = list.get$separator(list) === B.ListSeparator_undecided_null_undecided0 ? B.ListSeparator_EVt0 : list.get$separator(list);
+          t1 = list.get$separator(list) === B.ListSeparator_undecided_null_undecided0 ? B.ListSeparator_nbm0 : list.get$separator(list);
           break $label0$0;
         }
         if ("space" === _0_0) {
-          t1 = B.ListSeparator_EVt0;
+          t1 = B.ListSeparator_nbm0;
           break $label0$0;
         }
         if ("comma" === _0_0) {
-          t1 = B.ListSeparator_rXA0;
+          t1 = B.ListSeparator_ECn0;
           break $label0$0;
         }
         if ("slash" === _0_0) {
-          t1 = B.ListSeparator_zg90;
+          t1 = B.ListSeparator_cQA0;
           break $label0$0;
         }
         t1 = A.throwExpression(A.SassScriptException$0(string$.x24separ, null));
@@ -101881,7 +102253,7 @@ self.util = _cliPkgRequires.util;
       t2.push(value);
       return list.withListContents$2$separator(t2, t1);
     },
-    $signature: 27
+    $signature: 23
   };
   A._zip_closure0.prototype = {
     call$1($arguments) {
@@ -101890,37 +102262,37 @@ self.util = _cliPkgRequires.util;
         t2 = A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,List<Value0>>"),
         lists = A.List_List$of(new A.MappedListIterable(t1, new A._zip__closure2(), t2), true, t2._eval$1("ListIterable.E"));
       if (lists.length === 0)
-        return B.SassList_Sof1;
+        return B.SassList_bdS1;
       _box_0.i = 0;
       results = A._setArrayType([], type$.JSArray_SassList_2);
       for (t1 = A._arrayInstanceType(lists)._eval$1("MappedListIterable<1,Value0>"), t2 = type$.Value_2; B.JSArray_methods.every$1(lists, new A._zip__closure3(_box_0));) {
         result = A.List_List$from(new A.MappedListIterable(lists, new A._zip__closure4(_box_0), t1), false, t2);
         result.fixed$length = Array;
         result.immutable$list = Array;
-        results.push(new A.SassList0(result, B.ListSeparator_EVt0, false));
+        results.push(new A.SassList0(result, B.ListSeparator_nbm0, false));
         ++_box_0.i;
       }
-      return A.SassList$0(results, B.ListSeparator_rXA0, false);
+      return A.SassList$0(results, B.ListSeparator_ECn0, false);
     },
-    $signature: 27
+    $signature: 23
   };
   A._zip__closure2.prototype = {
     call$1(list) {
       return list.get$asList();
     },
-    $signature: 496
+    $signature: 476
   };
   A._zip__closure3.prototype = {
     call$1(list) {
       return this._box_0.i !== J.get$length$asx(list);
     },
-    $signature: 497
+    $signature: 477
   };
   A._zip__closure4.prototype = {
     call$1(list) {
       return J.$index$asx(list, this._box_0.i);
     },
-    $signature: 5
+    $signature: 3
   };
   A._index_closure2.prototype = {
     call$1($arguments) {
@@ -101928,18 +102300,18 @@ self.util = _cliPkgRequires.util;
         index = B.JSArray_methods.indexOf$1(t1.$index($arguments, 0).get$asList(), t1.$index($arguments, 1));
       return index === -1 ? B.C__SassNull0 : A.SassNumber_SassNumber0(index + 1, null);
     },
-    $signature: 5
+    $signature: 3
   };
   A._separator_closure0.prototype = {
     call$1($arguments) {
       var t1,
         _0_0 = J.get$separator$x(J.$index$asx($arguments, 0));
       $label0$0: {
-        if (B.ListSeparator_rXA0 === _0_0) {
+        if (B.ListSeparator_ECn0 === _0_0) {
           t1 = new A.SassString0("comma", false);
           break $label0$0;
         }
-        if (B.ListSeparator_zg90 === _0_0) {
+        if (B.ListSeparator_cQA0 === _0_0) {
           t1 = new A.SassString0("slash", false);
           break $label0$0;
         }
@@ -101948,7 +102320,7 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 17
+    $signature: 19
   };
   A._isBracketed_closure0.prototype = {
     call$1($arguments) {
@@ -101961,14 +102333,14 @@ self.util = _cliPkgRequires.util;
       var list = J.$index$asx($arguments, 0).get$asList();
       if (list.length < 2)
         throw A.wrapException(A.SassScriptException$0("At least two elements are required.", null));
-      return A.SassList$0(list, B.ListSeparator_zg90, false);
+      return A.SassList$0(list, B.ListSeparator_cQA0, false);
     },
-    $signature: 27
+    $signature: 23
   };
   A.SelectorList0.prototype = {
     get$asSassList() {
       var t1 = this.components;
-      return A.SassList$0(new A.MappedListIterable(t1, new A.SelectorList_asSassList_closure0(), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,Value0>")), B.ListSeparator_rXA0, false);
+      return A.SassList$0(new A.MappedListIterable(t1, new A.SelectorList_asSassList_closure0(), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,Value0>")), B.ListSeparator_ECn0, false);
     },
     accept$1$1(visitor) {
       return visitor.visitSelectorList$1(this);
@@ -101990,30 +102362,35 @@ self.util = _cliPkgRequires.util;
       }
       return t2.length === 0 ? null : A.SelectorList$0(t2, this.span);
     },
-    resolveParentSelectors$2$implicitParent($parent, implicitParent) {
+    nestWithin$3$implicitParent$preserveParentSelectors($parent, implicitParent, preserveParentSelectors) {
       var parentSelector, t1, _this = this;
       if ($parent == null) {
+        if (preserveParentSelectors)
+          return _this;
         parentSelector = B.C__ParentSelectorVisitor0.visitSelectorList$1(_this);
         if (parentSelector == null)
           return _this;
-        throw A.wrapException(A.SassException$0(string$.Top_le, parentSelector.span, null));
+        throw A.wrapException(A.SassException$0(string$.Top_les, parentSelector.span, null));
       }
       t1 = _this.components;
-      return A.SelectorList$0(A.flattenVertically0(new A.MappedListIterable(t1, new A.SelectorList_resolveParentSelectors_closure0(_this, implicitParent, $parent), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,Iterable<ComplexSelector0>>")), type$.ComplexSelector_2), _this.span);
+      return A.SelectorList$0(A.flattenVertically0(new A.MappedListIterable(t1, new A.SelectorList_nestWithin_closure0(_this, preserveParentSelectors, implicitParent, $parent), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,Iterable<ComplexSelector0>>")), type$.ComplexSelector_2), _this.span);
     },
-    resolveParentSelectors$1($parent) {
-      return this.resolveParentSelectors$2$implicitParent($parent, true);
+    nestWithin$1($parent) {
+      return this.nestWithin$3$implicitParent$preserveParentSelectors($parent, true, false);
     },
-    _list2$_resolveParentSelectorsCompound$2(component, $parent) {
+    nestWithin$2$implicitParent($parent, implicitParent) {
+      return this.nestWithin$3$implicitParent$preserveParentSelectors($parent, implicitParent, false);
+    },
+    _list2$_nestWithinCompound$2(component, $parent) {
       var resolvedSimples, parentSelector, error, stackTrace, t2, resolvedSimples0, exception,
         t1 = component.selector,
         simples = t1.components,
-        containsSelectorPseudo = J.any$1$ax(simples, new A.SelectorList__resolveParentSelectorsCompound_closure2());
+        containsSelectorPseudo = J.any$1$ax(simples, new A.SelectorList__nestWithinCompound_closure2());
       if (!containsSelectorPseudo && !(J.get$first$ax(simples) instanceof A.ParentSelector0))
         return null;
       if (containsSelectorPseudo) {
         t2 = simples;
-        resolvedSimples0 = new A.MappedListIterable(t2, new A.SelectorList__resolveParentSelectorsCompound_closure3($parent), A.instanceType(t2)._eval$1("MappedListIterable<1,SimpleSelector0>"));
+        resolvedSimples0 = new A.MappedListIterable(t2, new A.SelectorList__nestWithinCompound_closure3($parent), A._arrayInstanceType(t2)._eval$1("MappedListIterable<1,SimpleSelector0>"));
       } else
         resolvedSimples0 = simples;
       resolvedSimples = resolvedSimples0;
@@ -102021,7 +102398,7 @@ self.util = _cliPkgRequires.util;
       try {
         if (!(parentSelector instanceof A.ParentSelector0)) {
           t2 = component.span;
-          t2 = A._setArrayType([A.ComplexSelector$0(B.List_empty14, A._setArrayType([new A.ComplexSelectorComponent0(A.CompoundSelector$0(resolvedSimples, t1.span), A.List_List$unmodifiable(component.combinators, type$.CssValue_Combinator_2), t2)], type$.JSArray_ComplexSelectorComponent_2), t2, false)], type$.JSArray_ComplexSelector_2);
+          t2 = A._setArrayType([A.ComplexSelector$0(B.List_empty13, A._setArrayType([new A.ComplexSelectorComponent0(A.CompoundSelector$0(resolvedSimples, t1.span), A.List_List$unmodifiable(component.combinators, type$.CssValue_Combinator_2), t2)], type$.JSArray_ComplexSelectorComponent_2), t2, false)], type$.JSArray_ComplexSelector_2);
           return t2;
         } else if (J.get$length$asx(simples) === 1 && parentSelector.suffix == null) {
           t1 = $parent.withAdditionalCombinators$1(component.combinators);
@@ -102037,7 +102414,7 @@ self.util = _cliPkgRequires.util;
           throw exception;
       }
       t1 = $parent.components;
-      return new A.MappedListIterable(t1, new A.SelectorList__resolveParentSelectorsCompound_closure4(parentSelector, resolvedSimples, component), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,ComplexSelector0>"));
+      return new A.MappedListIterable(t1, new A.SelectorList__nestWithinCompound_closure4(parentSelector, resolvedSimples, component), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,ComplexSelector0>"));
     },
     isSuperselector$1(other) {
       return A.listIsSuperselector0(this.components, other.components);
@@ -102078,24 +102455,24 @@ self.util = _cliPkgRequires.util;
           t5.push(new A.SassString0(J.toString$0$(t6[_i0].value), false));
         B.JSArray_methods.addAll$1(t2, t5);
       }
-      return A.SassList$0(t2, B.ListSeparator_EVt0, false);
+      return A.SassList$0(t2, B.ListSeparator_nbm0, false);
     },
-    $signature: 498
+    $signature: 478
   };
-  A.SelectorList_resolveParentSelectors_closure0.prototype = {
+  A.SelectorList_nestWithin_closure0.prototype = {
     call$1(complex) {
       var t1, newComplexes, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, _i, component, resolved, i, t12, t13, t14, _i0, newComplex, t15, _this = this;
-      if (complex.accept$1(B.C__ParentSelectorVisitor0) == null) {
+      if (_this.preserveParentSelectors || complex.accept$1(B.C__ParentSelectorVisitor0) == null) {
         if (!_this.implicitParent)
           return A._setArrayType([complex], type$.JSArray_ComplexSelector_2);
         t1 = _this.parent.components;
-        return new A.MappedListIterable(t1, new A.SelectorList_resolveParentSelectors__closure1(complex), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,ComplexSelector0>"));
+        return new A.MappedListIterable(t1, new A.SelectorList_nestWithin__closure1(complex), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,ComplexSelector0>"));
       }
       t1 = type$.JSArray_ComplexSelector_2;
       newComplexes = A._setArrayType([], t1);
       for (t2 = complex.components, t3 = t2.length, t4 = _this.$this, t5 = _this.parent, t6 = type$.ComplexSelector_2, t7 = complex.leadingCombinators, t8 = t7.length === 0, t9 = complex.span, t10 = type$.ComplexSelectorComponent_2, t11 = type$.JSArray_ComplexSelectorComponent_2, _i = 0; _i < t3; ++_i) {
         component = t2[_i];
-        resolved = t4._list2$_resolveParentSelectorsCompound$2(component, t5);
+        resolved = t4._list2$_nestWithinCompound$2(component, t5);
         if (resolved == null)
           if (newComplexes.length === 0)
             newComplexes.push(A.ComplexSelector$0(t7, A._setArrayType([component], t11), t9, false));
@@ -102105,10 +102482,11 @@ self.util = _cliPkgRequires.util;
               t13 = t12.leadingCombinators;
               t14 = A.List_List$of(t12.components, true, t10);
               t14.push(component);
-              newComplexes[i] = A.ComplexSelector$0(t13, t14, t9, t12.lineBreak || false);
+              t12 = t12.lineBreak;
+              newComplexes[i] = A.ComplexSelector$0(t13, t14, t9, t12);
             }
         else if (newComplexes.length === 0)
-          B.JSArray_methods.addAll$1(newComplexes, t8 ? resolved : J.map$1$1$ax(resolved, new A.SelectorList_resolveParentSelectors__closure2(complex), t6));
+          B.JSArray_methods.addAll$1(newComplexes, t8 ? resolved : J.map$1$1$ax(resolved, new A.SelectorList_nestWithin__closure2(complex), t6));
         else {
           t12 = A._setArrayType([], t1);
           for (t13 = newComplexes.length, t14 = J.getInterceptor$ax(resolved), _i0 = 0; _i0 < newComplexes.length; newComplexes.length === t13 || (0, A.throwConcurrentModificationError)(newComplexes), ++_i0) {
@@ -102121,16 +102499,16 @@ self.util = _cliPkgRequires.util;
       }
       return newComplexes;
     },
-    $signature: 499
+    $signature: 479
   };
-  A.SelectorList_resolveParentSelectors__closure1.prototype = {
+  A.SelectorList_nestWithin__closure1.prototype = {
     call$1(parentComplex) {
       var t1 = this.complex;
       return parentComplex.concatenate$2(t1, t1.span);
     },
-    $signature: 61
+    $signature: 55
   };
-  A.SelectorList_resolveParentSelectors__closure2.prototype = {
+  A.SelectorList_nestWithin__closure2.prototype = {
     call$1(resolvedComplex) {
       var t1 = resolvedComplex.leadingCombinators,
         t2 = this.complex,
@@ -102144,9 +102522,9 @@ self.util = _cliPkgRequires.util;
       }
       return A.ComplexSelector$0(t1, resolvedComplex.components, t2.span, resolvedComplex.lineBreak);
     },
-    $signature: 61
+    $signature: 55
   };
-  A.SelectorList__resolveParentSelectorsCompound_closure2.prototype = {
+  A.SelectorList__nestWithinCompound_closure2.prototype = {
     call$1(simple) {
       var selector;
       if (!(simple instanceof A.PseudoSelector0))
@@ -102154,28 +102532,27 @@ self.util = _cliPkgRequires.util;
       selector = simple.selector;
       return selector != null && selector.accept$1(B.C__ParentSelectorVisitor0) != null;
     },
-    $signature: 15
+    $signature: 14
   };
-  A.SelectorList__resolveParentSelectorsCompound_closure3.prototype = {
+  A.SelectorList__nestWithinCompound_closure3.prototype = {
     call$1(simple) {
-      var selector, t1,
-        _0_2 = A._InitializedCell$(new A.SelectorList__resolveParentSelectorsCompound__closure0(simple));
+      var _0_2, selector, t1;
       $label0$0: {
         if (simple instanceof A.PseudoSelector0) {
-          if (_0_2._readFinal$0() != null) {
-            selector = _0_2._readFinal$0();
-            t1 = true;
+          _0_2 = simple.selector;
+          if (_0_2 != null) {
+            selector = _0_2 == null ? type$.SelectorList_2._as(_0_2) : _0_2;
+            t1 = selector.accept$1(B.C__ParentSelectorVisitor0) != null;
           } else {
             selector = null;
             t1 = false;
           }
-          t1 = t1 && selector.accept$1(B.C__ParentSelectorVisitor0) != null;
         } else {
           selector = null;
           t1 = false;
         }
         if (t1) {
-          t1 = simple.withSelector$1(selector.resolveParentSelectors$2$implicitParent(this.parent, false));
+          t1 = simple.withSelector$1(selector.nestWithin$2$implicitParent(this.parent, false));
           break $label0$0;
         }
         t1 = simple;
@@ -102183,15 +102560,9 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 500
+    $signature: 480
   };
-  A.SelectorList__resolveParentSelectorsCompound__closure0.prototype = {
-    call$0() {
-      return type$.PseudoSelector_2._as(this._0_0).selector;
-    },
-    $signature: 78
-  };
-  A.SelectorList__resolveParentSelectorsCompound_closure4.prototype = {
+  A.SelectorList__nestWithinCompound_closure4.prototype = {
     call$1(complex) {
       var lastComponent, suffix, lastSimples, t1, t2, last, t3, error, stackTrace, t4, t5, t6, t7, exception, _this = this;
       try {
@@ -102233,13 +102604,13 @@ self.util = _cliPkgRequires.util;
           throw exception;
       }
     },
-    $signature: 61
+    $signature: 55
   };
   A.SelectorList_withAdditionalCombinators_closure0.prototype = {
     call$1(complex) {
       return complex.withAdditionalCombinators$1(this.combinators);
     },
-    $signature: 61
+    $signature: 55
   };
   A._ParentSelectorVisitor0.prototype = {
     visitParentSelector$1(selector) {
@@ -102252,10 +102623,10 @@ self.util = _cliPkgRequires.util;
       var t1 = type$.JSClass,
         jsClass = t1._as(A.allowInteropCaptureThisNamed("sass.SassList", new A.listClass__closure()));
       J.get$$prototype$x(jsClass).get = A.allowInteropCaptureThisNamed("get", new A.listClass__closure0());
-      A.JSClassExtension_injectSuperclass(t1._as(B.SassList_nj9.constructor), jsClass);
+      A.JSClassExtension_injectSuperclass(t1._as(B.SassList_k8F.constructor), jsClass);
       return jsClass;
     },
-    $signature: 24
+    $signature: 15
   };
   A.listClass__closure.prototype = {
     call$3($self, contentsOrOptions, options) {
@@ -102275,7 +102646,7 @@ self.util = _cliPkgRequires.util;
         t2 = A._asBool($.$get$_isUndefined().call$1(t2));
       } else
         t2 = true;
-      t2 = t2 ? B.ListSeparator_rXA0 : A.jsToDartSeparator(J.get$separator$x(options));
+      t2 = t2 ? B.ListSeparator_ECn0 : A.jsToDartSeparator(J.get$separator$x(options));
       t1 = t1 ? null : J.get$brackets$x(options);
       return A.SassList$0(contents, t2, t1 == null ? false : t1);
     },
@@ -102290,7 +102661,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null, null];
     },
-    $signature: 501
+    $signature: 481
   };
   A.listClass__closure0.prototype = {
     call$2($self, indexFloat) {
@@ -102301,7 +102672,7 @@ self.util = _cliPkgRequires.util;
         return self.undefined;
       return $self.get$asList()[index];
     },
-    $signature: 262
+    $signature: 240
   };
   A._ConstructorOptions.prototype = {};
   A._NodeSassList.prototype = {};
@@ -102311,7 +102682,7 @@ self.util = _cliPkgRequires.util;
       if (dartValue == null) {
         $length.toString;
         t1 = A.Iterable_Iterable$generate($length, new A.legacyListClass__closure(), type$.Value_2);
-        t1 = A.SassList$0(t1, commaSeparator !== false ? B.ListSeparator_rXA0 : B.ListSeparator_EVt0, false);
+        t1 = A.SassList$0(t1, commaSeparator !== false ? B.ListSeparator_ECn0 : B.ListSeparator_nbm0, false);
       } else
         t1 = dartValue;
       J.set$dartValue$x(thisArg, t1);
@@ -102327,19 +102698,19 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null, null];
     },
-    $signature: 503
+    $signature: 483
   };
   A.legacyListClass__closure.prototype = {
     call$1(_) {
       return B.C__SassNull0;
     },
-    $signature: 263
+    $signature: 239
   };
   A.legacyListClass_closure0.prototype = {
     call$2(thisArg, index) {
       return A.wrapValue(J.get$dartValue$x(thisArg)._list1$_contents[index]);
     },
-    $signature: 505
+    $signature: 485
   };
   A.legacyListClass_closure1.prototype = {
     call$3(thisArg, index, value) {
@@ -102351,28 +102722,28 @@ self.util = _cliPkgRequires.util;
     },
     "call*": "call$3",
     $requiredArgCount: 3,
-    $signature: 506
+    $signature: 486
   };
   A.legacyListClass_closure2.prototype = {
     call$1(thisArg) {
-      return J.get$dartValue$x(thisArg)._list1$_separator === B.ListSeparator_rXA0;
+      return J.get$dartValue$x(thisArg)._list1$_separator === B.ListSeparator_ECn0;
     },
-    $signature: 507
+    $signature: 487
   };
   A.legacyListClass_closure3.prototype = {
     call$2(thisArg, isComma) {
       var t1 = J.getInterceptor$x(thisArg),
         t2 = t1.get$dartValue(thisArg)._list1$_contents,
-        t3 = isComma ? B.ListSeparator_rXA0 : B.ListSeparator_EVt0;
+        t3 = isComma ? B.ListSeparator_ECn0 : B.ListSeparator_nbm0;
       t1.set$dartValue(thisArg, A.SassList$0(t2, t3, t1.get$dartValue(thisArg)._list1$_hasBrackets));
     },
-    $signature: 508
+    $signature: 488
   };
   A.legacyListClass_closure4.prototype = {
     call$1(thisArg) {
       return J.get$dartValue$x(thisArg)._list1$_contents.length;
     },
-    $signature: 509
+    $signature: 489
   };
   A.SassList0.prototype = {
     get$separator(_) {
@@ -102424,7 +102795,7 @@ self.util = _cliPkgRequires.util;
     call$1(element) {
       return element.get$isBlank();
     },
-    $signature: 54
+    $signature: 53
   };
   A.ListSeparator0.prototype = {
     _enumToString$0() {
@@ -102437,11 +102808,28 @@ self.util = _cliPkgRequires.util;
   A.JSLogger.prototype = {};
   A.WarnOptions.prototype = {};
   A.DebugOptions.prototype = {};
+  A.LoggerWithDeprecationType.prototype = {
+    warn$4$deprecation$span$trace(_, message, deprecation, span, trace) {
+      this.internalWarn$4$deprecation$span$trace(message, deprecation ? B.Deprecation_oty : null, span, trace);
+    },
+    warn$1(_, message) {
+      return this.warn$4$deprecation$span$trace(0, message, false, null, null);
+    },
+    warn$3$span$trace(_, message, span, trace) {
+      return this.warn$4$deprecation$span$trace(0, message, false, span, trace);
+    },
+    warn$2$span(_, message, span) {
+      return this.warn$4$deprecation$span$trace(0, message, false, span, null);
+    },
+    warn$2$trace(_, message, trace) {
+      return this.warn$4$deprecation$span$trace(0, message, false, null, trace);
+    }
+  };
   A._QuietLogger0.prototype = {
     warn$4$deprecation$span$trace(_, message, deprecation, span, trace) {
     },
-    warn$2$span($receiver, message, span) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, span, null);
+    warn$2$span(_, message, span) {
+      return this.warn$4$deprecation$span$trace(0, message, false, span, null);
     }
   };
   A.LoudComment0.prototype = {
@@ -102499,57 +102887,50 @@ self.util = _cliPkgRequires.util;
       t1 = map._map0$_contents.$index(0, B.JSArray_methods.get$last(t2));
       return t1 == null ? B.C__SassNull0 : t1;
     },
-    $signature: 5
+    $signature: 3
   };
   A._set_closure1.prototype = {
     call$1($arguments) {
       var t1 = J.getInterceptor$asx($arguments);
-      return A._modify0(t1.$index($arguments, 0).assertMap$1("map"), A._setArrayType([t1.$index($arguments, 1)], type$.JSArray_Value_2), new A._set__closure4($arguments), true);
-    },
-    $signature: 5
-  };
-  A._set__closure4.prototype = {
-    call$1(_) {
-      return J.$index$asx(this.$arguments, 2);
-    },
-    $signature: 45
-  };
-  A._set_closure2.prototype = {
-    call$1($arguments) {
-      var keys, value, t1 = {},
-        t2 = J.getInterceptor$asx($arguments),
-        map = t2.$index($arguments, 0).assertMap$1("map"),
-        _0_0 = t2.$index($arguments, 1).get$asList(),
-        _0_1 = A._InitializedCell$(new A._set__closure2(_0_0));
-      if (_0_1._readFinal$0() <= 0)
-        throw A.wrapException(A.SassScriptException$0("Expected $args to contain a key.", null));
-      if (J.$eq$(_0_1._readFinal$0(), 1))
-        throw A.wrapException(A.SassScriptException$0("Expected $args to contain a value.", null));
-      keys = t1.value = null;
-      if (_0_1._readFinal$0() >= 1) {
-        keys = B.JSArray_methods.sublist$2(_0_0, 0, _0_1._readFinal$0() - 1);
-        value = _0_0[_0_1._readFinal$0() - 1];
-        t1.value = value;
-        t2 = true;
-      } else
-        t2 = false;
-      if (t2)
-        return A._modify0(map, keys, new A._set__closure3(t1), true);
-      throw A.wrapException("[BUG] Unreachable code");
-    },
-    $signature: 5
-  };
-  A._set__closure2.prototype = {
-    call$0() {
-      return this._0_0.length;
+      return A._modify0(t1.$index($arguments, 0).assertMap$1("map"), A._setArrayType([t1.$index($arguments, 1)], type$.JSArray_Value_2), new A._set__closure2($arguments), true);
     },
     $signature: 3
   };
-  A._set__closure3.prototype = {
+  A._set__closure2.prototype = {
+    call$1(_) {
+      return J.$index$asx(this.$arguments, 2);
+    },
+    $signature: 42
+  };
+  A._set_closure2.prototype = {
+    call$1($arguments) {
+      var keys, t3, t1 = {},
+        t2 = J.getInterceptor$asx($arguments),
+        map = t2.$index($arguments, 0).assertMap$1("map"),
+        _0_0 = t2.$index($arguments, 1).get$asList(),
+        _0_1 = _0_0.length;
+      if (_0_1 <= 0)
+        throw A.wrapException(A.SassScriptException$0("Expected $args to contain a key.", null));
+      if (_0_1 === 1)
+        throw A.wrapException(A.SassScriptException$0("Expected $args to contain a value.", null));
+      keys = t1.value = null;
+      t2 = _0_1 >= 1;
+      if (t2) {
+        t3 = _0_1 - 1;
+        keys = B.JSArray_methods.sublist$2(_0_0, 0, t3);
+        t1.value = _0_0[t3];
+      }
+      if (t2)
+        return A._modify0(map, keys, new A._set__closure1(t1), true);
+      throw A.wrapException("[BUG] Unreachable code");
+    },
+    $signature: 3
+  };
+  A._set__closure1.prototype = {
     call$1(_) {
       return this._box_0.value;
     },
-    $signature: 45
+    $signature: 42
   };
   A._merge_closure1.prototype = {
     call$1($arguments) {
@@ -102562,42 +102943,35 @@ self.util = _cliPkgRequires.util;
       t2.addAll$1(0, map2._map0$_contents);
       return new A.SassMap0(A.ConstantMap_ConstantMap$from(t2, t1, t1));
     },
-    $signature: 38
+    $signature: 36
   };
   A._merge_closure2.prototype = {
     call$1($arguments) {
-      var keys, last, _null = null,
+      var t2, keys, last, _null = null,
         t1 = J.getInterceptor$asx($arguments),
         map1 = t1.$index($arguments, 0).assertMap$1("map1"),
         _0_0 = t1.$index($arguments, 1).get$asList(),
-        _0_1 = A._InitializedCell$(new A._merge__closure1(_0_0));
-      if (_0_1._readFinal$0() <= 0)
+        _0_1 = _0_0.length;
+      if (_0_1 <= 0)
         throw A.wrapException(A.SassScriptException$0("Expected $args to contain a key.", _null));
-      if (J.$eq$(_0_1._readFinal$0(), 1))
+      if (_0_1 === 1)
         throw A.wrapException(A.SassScriptException$0("Expected $args to contain a map.", _null));
-      if (_0_1._readFinal$0() >= 1) {
-        keys = B.JSArray_methods.sublist$2(_0_0, 0, _0_1._readFinal$0() - 1);
-        last = _0_0[_0_1._readFinal$0() - 1];
-        last = last;
-        t1 = true;
+      t1 = _0_1 >= 1;
+      if (t1) {
+        t2 = _0_1 - 1;
+        keys = B.JSArray_methods.sublist$2(_0_0, 0, t2);
+        last = _0_0[t2];
       } else {
         last = _null;
         keys = last;
-        t1 = false;
       }
       if (t1)
-        return A._modify0(map1, keys, new A._merge__closure2(last.assertMap$1("map2")), true);
+        return A._modify0(map1, keys, new A._merge__closure0(last.assertMap$1("map2")), true);
       throw A.wrapException("[BUG] Unreachable code");
     },
-    $signature: 5
-  };
-  A._merge__closure1.prototype = {
-    call$0() {
-      return this._0_0.length;
-    },
     $signature: 3
   };
-  A._merge__closure2.prototype = {
+  A._merge__closure0.prototype = {
     call$1(oldValue) {
       var t1, t2,
         nestedMap = oldValue.tryMap$0();
@@ -102608,14 +102982,14 @@ self.util = _cliPkgRequires.util;
       t2.addAll$1(0, this.map2._map0$_contents);
       return new A.SassMap0(A.ConstantMap_ConstantMap$from(t2, t1, t1));
     },
-    $signature: 510
+    $signature: 490
   };
   A._deepMerge_closure0.prototype = {
     call$1($arguments) {
       var t1 = J.getInterceptor$asx($arguments);
       return A._deepMergeImpl0(t1.$index($arguments, 0).assertMap$1("map1"), t1.$index($arguments, 1).assertMap$1("map2"));
     },
-    $signature: 38
+    $signature: 36
   };
   A._deepRemove_closure0.prototype = {
     call$1($arguments) {
@@ -102625,20 +102999,20 @@ self.util = _cliPkgRequires.util;
       B.JSArray_methods.addAll$1(t2, t1.$index($arguments, 2).get$asList());
       return A._modify0(map, A.IterableExtension_get_exceptLast0(t2), new A._deepRemove__closure0(t2), false);
     },
-    $signature: 5
+    $signature: 3
   };
   A._deepRemove__closure0.prototype = {
     call$1(value) {
-      var nestedMap, t1, t2,
+      var t1, nestedMap, t2,
         _0_0 = value.tryMap$0();
       if (_0_0 != null) {
+        t1 = _0_0._map0$_contents.containsKey$1(B.JSArray_methods.get$last(this.keys));
         nestedMap = _0_0;
-        t1 = true;
       } else {
         nestedMap = null;
         t1 = false;
       }
-      if (t1 && nestedMap._map0$_contents.containsKey$1(B.JSArray_methods.get$last(this.keys))) {
+      if (t1) {
         t1 = type$.Value_2;
         t2 = A.LinkedHashMap_LinkedHashMap$of(nestedMap._map0$_contents, t1, t1);
         t2.remove$1(0, B.JSArray_methods.get$last(this.keys));
@@ -102646,13 +103020,13 @@ self.util = _cliPkgRequires.util;
       }
       return value;
     },
-    $signature: 45
+    $signature: 42
   };
   A._remove_closure1.prototype = {
     call$1($arguments) {
       return J.$index$asx($arguments, 0).assertMap$1("map");
     },
-    $signature: 38
+    $signature: 36
   };
   A._remove_closure2.prototype = {
     call$1($arguments) {
@@ -102667,21 +103041,21 @@ self.util = _cliPkgRequires.util;
         mutableMap.remove$1(0, t2[_i]);
       return new A.SassMap0(A.ConstantMap_ConstantMap$from(mutableMap, t1, t1));
     },
-    $signature: 38
+    $signature: 36
   };
   A._keys_closure0.prototype = {
     call$1($arguments) {
       var t1 = J.$index$asx($arguments, 0).assertMap$1("map")._map0$_contents;
-      return A.SassList$0(t1.get$keys(t1), B.ListSeparator_rXA0, false);
+      return A.SassList$0(t1.get$keys(t1), B.ListSeparator_ECn0, false);
     },
-    $signature: 27
+    $signature: 23
   };
   A._values_closure0.prototype = {
     call$1($arguments) {
       var t1 = J.$index$asx($arguments, 0).assertMap$1("map")._map0$_contents;
-      return A.SassList$0(t1.get$values(t1), B.ListSeparator_rXA0, false);
+      return A.SassList$0(t1.get$values(t1), B.ListSeparator_ECn0, false);
     },
-    $signature: 27
+    $signature: 23
   };
   A._hasKey_closure0.prototype = {
     call$1($arguments) {
@@ -102721,19 +103095,7 @@ self.util = _cliPkgRequires.util;
       mutableMap.$indexSet(0, key, _this.call$1(t2 ? B.SassMap_Map_empty0 : nestedMap));
       return new A.SassMap0(A.ConstantMap_ConstantMap$from(mutableMap, t1, t1));
     },
-    $signature: 511
-  };
-  A._deepMergeImpl_closure1.prototype = {
-    call$0() {
-      return this._1_0._0;
-    },
-    $signature: 264
-  };
-  A._deepMergeImpl_closure2.prototype = {
-    call$0() {
-      return this._1_0._1;
-    },
-    $signature: 264
+    $signature: 491
   };
   A.MapExtensions_get_pairs_closure0.prototype = {
     call$1(e) {
@@ -102753,7 +103115,7 @@ self.util = _cliPkgRequires.util;
       A.JSClassExtension_injectSuperclass(t1._as(B.SassMap_Map_empty0.constructor), jsClass);
       return jsClass;
     },
-    $signature: 24
+    $signature: 15
   };
   A.mapClass__closure.prototype = {
     call$2($self, contents) {
@@ -102774,17 +103136,17 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 513
+    $signature: 492
   };
   A.mapClass__closure0.prototype = {
     call$1($self) {
       return A.dartMapToImmutableMap($self._map0$_contents);
     },
-    $signature: 514
+    $signature: 493
   };
   A.mapClass__closure1.prototype = {
     call$2($self, indexOrKey) {
-      var index, t1, _0_0, key, value;
+      var index, t1, _0_0;
       if (typeof indexOrKey == "number") {
         index = B.JSNumber_methods.floor$0(indexOrKey);
         if (index < 0) {
@@ -102800,16 +103162,13 @@ self.util = _cliPkgRequires.util;
           return self.undefined;
         t1 = type$.Value_2;
         _0_0 = A.MapExtensions_get_pairs0($self._map0$_contents, t1, t1).elementAt$1(0, index);
-        key = _0_0._0;
-        value = _0_0._1;
-        value = value;
-        return A.SassList$0(A._setArrayType([key, value], type$.JSArray_Value_2), B.ListSeparator_EVt0, false);
+        return A.SassList$0(A._setArrayType([_0_0._0, _0_0._1], type$.JSArray_Value_2), B.ListSeparator_nbm0, false);
       } else {
         t1 = $self._map0$_contents.$index(0, indexOrKey);
         return t1 == null ? self.undefined : t1;
       }
     },
-    $signature: 515
+    $signature: 494
   };
   A._NodeSassMap.prototype = {};
   A.legacyMapClass_closure.prototype = {
@@ -102835,40 +103194,40 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 516
+    $signature: 495
   };
   A.legacyMapClass__closure.prototype = {
     call$1(i) {
       return A.SassNumber_SassNumber0(i, null);
     },
-    $signature: 517
+    $signature: 496
   };
   A.legacyMapClass__closure0.prototype = {
     call$1(_) {
       return B.C__SassNull0;
     },
-    $signature: 263
+    $signature: 239
   };
   A.legacyMapClass_closure0.prototype = {
     call$2(thisArg, index) {
       var t1 = J.get$dartValue$x(thisArg)._map0$_contents;
       return A.wrapValue(J.elementAt$1$ax(t1.get$keys(t1), index));
     },
-    $signature: 265
+    $signature: 236
   };
   A.legacyMapClass_closure1.prototype = {
     call$2(thisArg, index) {
       var t1 = J.get$dartValue$x(thisArg)._map0$_contents;
       return A.wrapValue(t1.get$values(t1).elementAt$1(0, index));
     },
-    $signature: 265
+    $signature: 236
   };
   A.legacyMapClass_closure2.prototype = {
     call$1(thisArg) {
       var t1 = J.get$dartValue$x(thisArg)._map0$_contents;
       return t1.get$length(t1);
     },
-    $signature: 519
+    $signature: 498
   };
   A.legacyMapClass_closure3.prototype = {
     call$3(thisArg, index, key) {
@@ -102884,7 +103243,6 @@ self.util = _cliPkgRequires.util;
         t4 = t3.get$current(t3);
         oldKey = t4._0;
         oldValue = t4._1;
-        oldValue = oldValue;
         if (i === index)
           newMap.$indexSet(0, newKey, oldValue);
         else {
@@ -102898,7 +103256,7 @@ self.util = _cliPkgRequires.util;
     },
     "call*": "call$3",
     $requiredArgCount: 3,
-    $signature: 266
+    $signature: 235
   };
   A.legacyMapClass_closure4.prototype = {
     call$3(thisArg, index, value) {
@@ -102913,25 +103271,23 @@ self.util = _cliPkgRequires.util;
     },
     "call*": "call$3",
     $requiredArgCount: 3,
-    $signature: 266
+    $signature: 235
   };
   A.SassMap0.prototype = {
     get$separator(_) {
       var t1 = this._map0$_contents;
-      return t1.get$isEmpty(t1) ? B.ListSeparator_undecided_null_undecided0 : B.ListSeparator_rXA0;
+      return t1.get$isEmpty(t1) ? B.ListSeparator_undecided_null_undecided0 : B.ListSeparator_ECn0;
     },
     get$asList() {
-      var t3, t4, t5, key, value, result,
+      var t3, t4, t5, result,
         t1 = type$.JSArray_Value_2,
         t2 = A._setArrayType([], t1);
       for (t3 = type$.Value_2, t4 = A.MapExtensions_get_pairs0(this._map0$_contents, t3, t3), t4 = t4.get$iterator(t4); t4.moveNext$0();) {
         t5 = t4.get$current(t4);
-        key = t5._0;
-        value = t5._1;
-        result = A.List_List$from(A._setArrayType([key, value], t1), false, t3);
+        result = A.List_List$from(A._setArrayType([t5._0, t5._1], t1), false, t3);
         result.fixed$length = Array;
         result.immutable$list = Array;
-        t2.push(new A.SassList0(result, B.ListSeparator_EVt0, false));
+        t2.push(new A.SassList0(result, B.ListSeparator_nbm0, false));
       }
       return t2;
     },
@@ -102969,13 +103325,10 @@ self.util = _cliPkgRequires.util;
   };
   A.global_closure31.prototype = {
     call$1($arguments) {
-      var t1, t2,
+      var t1,
         number = J.$index$asx($arguments, 0).assertNumber$1("number");
-      if (number.hasUnit$1("%")) {
-        t1 = number.toString$0(0);
-        t2 = number.toString$0(0);
-        A.EvaluationContext_current0().warn$2(0, string$.Passinp + t1 + ")\nTo emit a CSS abs() now: abs(#{" + t2 + string$.x7d__Mor, B.Deprecation_la6);
-      }
+      if (number.hasUnit$1("%"))
+        A.warnForDeprecation0(string$.Passinp + number.toString$0(0) + ")\nTo emit a CSS abs() now: abs(#{" + number.toString$0(0) + string$.x7d__Mor, B.Deprecation_jYb);
       t1 = number.get$numeratorUnits(number);
       return A.SassNumber_SassNumber$withUnits0(Math.abs(number._number1$_value), number.get$denominatorUnits(number), t1);
     },
@@ -102985,13 +103338,13 @@ self.util = _cliPkgRequires.util;
     call$1(value) {
       return Math.abs(value);
     },
-    $signature: 42
+    $signature: 37
   };
   A._ceil_closure0.prototype = {
     call$1(value) {
       return B.JSNumber_methods.ceil$0(value);
     },
-    $signature: 42
+    $signature: 37
   };
   A._clamp_closure0.prototype = {
     call$1($arguments) {
@@ -103015,7 +103368,7 @@ self.util = _cliPkgRequires.util;
     call$1(value) {
       return B.JSNumber_methods.floor$0(value);
     },
-    $signature: 42
+    $signature: 37
   };
   A._max_closure0.prototype = {
     call$1($arguments) {
@@ -103049,7 +103402,7 @@ self.util = _cliPkgRequires.util;
     call$1(number) {
       return B.JSNumber_methods.round$0(number);
     },
-    $signature: 42
+    $signature: 37
   };
   A._hypot_closure0.prototype = {
     call$1($arguments) {
@@ -103076,7 +103429,7 @@ self.util = _cliPkgRequires.util;
     call$1(argument) {
       return argument.assertNumber$0();
     },
-    $signature: 521
+    $signature: 500
   };
   A._log_closure0.prototype = {
     call$1($arguments) {
@@ -103129,7 +103482,7 @@ self.util = _cliPkgRequires.util;
     call$1($arguments) {
       return new A.SassString0(J.$index$asx($arguments, 0).assertNumber$1("number").get$unitString(), true);
     },
-    $signature: 17
+    $signature: 19
   };
   A._percentage_closure0.prototype = {
     call$1($arguments) {
@@ -103141,18 +103494,13 @@ self.util = _cliPkgRequires.util;
   };
   A._randomFunction_closure0.prototype = {
     call$1($arguments) {
-      var limit, t2, t3, t4, limitScalar,
+      var limit, limitScalar,
         t1 = J.getInterceptor$asx($arguments);
       if (J.$eq$(t1.$index($arguments, 0), B.C__SassNull0))
         return A.SassNumber_SassNumber0($.$get$_random2().nextDouble$0(), null);
       limit = t1.$index($arguments, 0).assertNumber$1("limit");
-      if (limit.get$hasUnits()) {
-        t1 = limit.toString$0(0);
-        t2 = limit.get$unitString();
-        t3 = limit.get$unitString();
-        t4 = limit.get$unitString();
-        A.EvaluationContext_current0().warn$2(0, string$.math_r + t1 + string$.x29x20in_a + t2 + ")) * 1" + t3 + string$.x0a_To_p + t4 + string$.x29x29__Mo, B.Deprecation_0bn);
-      }
+      if (limit.get$hasUnits())
+        A.warnForDeprecation0(string$.math_r + limit.toString$0(0) + string$.x29x20in_a + limit.get$unitString() + ")) * 1" + limit.get$unitString() + string$.x0a_To_p + limit.get$unitString() + string$.x29x29__Mo, B.Deprecation_oCX);
       limitScalar = limit.assertInt$1("limit");
       if (limitScalar < 1)
         throw A.wrapException(A.SassScriptException$0("$limit: Must be greater than 0, was " + limit.toString$0(0) + ".", null));
@@ -103165,13 +103513,11 @@ self.util = _cliPkgRequires.util;
       var t1 = J.getInterceptor$asx($arguments),
         number1 = t1.$index($arguments, 0),
         number2 = t1.$index($arguments, 1);
-      if (!(number1 instanceof A.SassNumber0) || !(number2 instanceof A.SassNumber0)) {
-        t1 = A.EvaluationContext_current0();
-        t1.warn$2(0, string$.math_d, null);
-      }
+      if (!(number1 instanceof A.SassNumber0) || !(number2 instanceof A.SassNumber0))
+        A.warn0(string$.math_d);
       return number1.dividedBy$1(number2);
     },
-    $signature: 5
+    $signature: 3
   };
   A._singleArgumentMathFunc_closure0.prototype = {
     call$1($arguments) {
@@ -103307,7 +103653,7 @@ self.util = _cliPkgRequires.util;
       return this.wrapSpanFormatException$1(new A.MediaQueryParser_parse_closure0(this));
     },
     _media_query$_mediaQuery$0() {
-      var conditions, conjunction, identifier1, identifier2, type, modifier, _this = this, _s3_ = "and", _null = null;
+      var conditions, conjunction, t1, identifier1, identifier2, type, modifier, _this = this, _s3_ = "and", _null = null;
       if (_this.scanner.peekChar$0() === 40) {
         conditions = A._setArrayType([_this._media_query$_mediaInParens$0()], type$.JSArray_String);
         _this.whitespace$0();
@@ -103315,12 +103661,14 @@ self.util = _cliPkgRequires.util;
           _this.expectWhitespace$0();
           B.JSArray_methods.addAll$1(conditions, _this._media_query$_mediaLogicSequence$1(_s3_));
           conjunction = true;
-        } else if (_this.scanIdentifier$1("or")) {
-          _this.expectWhitespace$0();
-          B.JSArray_methods.addAll$1(conditions, _this._media_query$_mediaLogicSequence$1("or"));
-          conjunction = false;
-        } else
-          conjunction = true;
+        } else {
+          t1 = _this.scanIdentifier$1("or");
+          if (t1) {
+            _this.expectWhitespace$0();
+            B.JSArray_methods.addAll$1(conditions, _this._media_query$_mediaLogicSequence$1("or"));
+          }
+          conjunction = !t1;
+        }
         return A.CssMediaQuery$condition0(conditions, conjunction);
       }
       identifier1 = _this.identifier$0();
@@ -103388,7 +103736,7 @@ self.util = _cliPkgRequires.util;
       t2.expectDone$0();
       return queries;
     },
-    $signature: 522
+    $signature: 501
   };
   A.ModifiableCssMediaRule0.prototype = {
     accept$1$1(visitor) {
@@ -103508,7 +103856,7 @@ self.util = _cliPkgRequires.util;
       for (t1 = maps.length, t2 = this._merged_map_view$_mapsByKey, t3 = $K._eval$1("@<0>")._bind$1($V)._eval$1("MergedMapView0<1,2>"), _i = 0; _i < maps.length; maps.length === t1 || (0, A.throwConcurrentModificationError)(maps), ++_i) {
         map = maps[_i];
         if (t3._is(map))
-          for (t4 = map._merged_map_view$_mapsByKey, t4 = t4.get$values(t4), t4 = new A.MappedIterator(J.get$iterator$ax(t4.__internal$_iterable), t4._f), t5 = A._instanceType(t4)._rest[1]; t4.moveNext$0();) {
+          for (t4 = map._merged_map_view$_mapsByKey.get$values(0), t5 = A._instanceType(t4), t5 = t5._eval$1("@<1>")._bind$1(t5._rest[1]), t4 = new A.MappedIterator(J.get$iterator$ax(t4.__internal$_iterable), t4._f, t5._eval$1("MappedIterator<1,2>")), t5 = t5._rest[1]; t4.moveNext$0();) {
             t6 = t4.__internal$_current;
             if (t6 == null)
               t6 = t5._as(t6);
@@ -103523,17 +103871,9 @@ self.util = _cliPkgRequires.util;
       return t1 == null ? null : t1.$index(0, key);
     },
     $indexSet(_, key, value) {
-      var child, t1,
-        _0_0 = this._merged_map_view$_mapsByKey.$index(0, key);
-      if (_0_0 != null) {
-        child = _0_0;
-        t1 = true;
-      } else {
-        child = null;
-        t1 = false;
-      }
-      if (t1)
-        child.$indexSet(0, key, value);
+      var _0_0 = this._merged_map_view$_mapsByKey.$index(0, key);
+      if (_0_0 != null)
+        _0_0.$indexSet(0, key, value);
       else
         throw A.wrapException(A.UnsupportedError$(string$.New_en));
     },
@@ -103554,7 +103894,7 @@ self.util = _cliPkgRequires.util;
     call$1($arguments) {
       return new A.SassString0(A.serializeValue0(J.get$first$ax($arguments), true, true), false);
     },
-    $signature: 17
+    $signature: 19
   };
   A.global_closure61.prototype = {
     call$1($arguments) {
@@ -103609,98 +103949,82 @@ self.util = _cliPkgRequires.util;
       }
       return new A.SassString0(t1, false);
     },
-    $signature: 17
+    $signature: 19
   };
   A.global_closure62.prototype = {
     call$1($arguments) {
-      var t2, keywords, t3, t4, key, value,
+      var t2, t3, t4,
         t1 = J.getInterceptor$asx($arguments),
         _1_0 = t1.$index($arguments, 0);
       if (_1_0 instanceof A.SassArgumentList0) {
-        t2 = _1_0._argument_list$_wereKeywordsAccessed = true;
-        keywords = _1_0._argument_list$_keywords;
-      } else {
-        keywords = null;
-        t2 = false;
-      }
-      if (t2) {
+        _1_0._argument_list$_wereKeywordsAccessed = true;
         t1 = type$.Value_2;
         t2 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1);
-        for (t3 = A.MapExtensions_get_pairs0(keywords, type$.String, t1), t3 = t3.get$iterator(t3); t3.moveNext$0();) {
+        for (t3 = A.MapExtensions_get_pairs0(_1_0._argument_list$_keywords, type$.String, t1), t3 = t3.get$iterator(t3); t3.moveNext$0();) {
           t4 = t3.get$current(t3);
-          key = t4._0;
-          value = t4._1;
-          value = value;
-          t2.$indexSet(0, new A.SassString0(key, false), value);
+          t2.$indexSet(0, new A.SassString0(t4._0, false), t4._1);
         }
         return new A.SassMap0(A.ConstantMap_ConstantMap$from(t2, t1, t1));
       } else
         throw A.wrapException("$args: " + A.S(t1.$index($arguments, 0)) + " is not an argument list.");
     },
-    $signature: 38
+    $signature: 36
   };
   A.local_closure2.prototype = {
     call$1($arguments) {
       return new A.SassString0(J.$index$asx($arguments, 0).assertCalculation$1("calc").name, true);
     },
-    $signature: 17
+    $signature: 19
   };
   A.local_closure3.prototype = {
     call$1($arguments) {
       var t1 = J.$index$asx($arguments, 0).assertCalculation$1("calc").$arguments;
-      return A.SassList$0(new A.MappedListIterable(t1, new A.local__closure2(), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,Value0>")), B.ListSeparator_rXA0, false);
+      return A.SassList$0(new A.MappedListIterable(t1, new A.local__closure0(), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,Value0>")), B.ListSeparator_ECn0, false);
     },
-    $signature: 27
+    $signature: 23
   };
-  A.local__closure2.prototype = {
+  A.local__closure0.prototype = {
     call$1(argument) {
       return argument instanceof A.Value0 ? argument : new A.SassString0(J.toString$0$(argument), false);
     },
-    $signature: 523
+    $signature: 502
   };
   A.local_closure4.prototype = {
     call$1($arguments) {
-      var _0_2, acceptsContent, _0_2_isSet, t1, hasContent, _null = null,
+      var _0_2_isSet, _0_2, acceptsContent, t1, _0_5_isSet, _0_5, hasContent,
         mixin = J.$index$asx($arguments, 0).assertMixin$1("mixin"),
-        _0_0 = mixin.callable,
-        _0_5 = A._InitializedCell$(new A.local__closure1(_0_0));
+        _0_0 = mixin.callable;
       $label0$0: {
-        if (type$.AsyncBuiltInCallable_2._is(_0_0)) {
+        _0_2_isSet = type$.AsyncBuiltInCallable_2._is(_0_0);
+        if (_0_2_isSet) {
           _0_2 = _0_0.get$acceptsContent();
           acceptsContent = _0_2;
-          _0_2_isSet = true;
-          t1 = true;
-        } else {
-          acceptsContent = _null;
-          _0_2 = acceptsContent;
-          _0_2_isSet = false;
-          t1 = false;
-        }
-        if (!t1)
-          if (_0_0 instanceof A.BuiltInCallable0) {
-            acceptsContent = _0_2_isSet ? _0_2 : _0_0.acceptsContent;
-            t1 = true;
-          } else
-            t1 = false;
-        else
+        } else
+          acceptsContent = null;
+        if (!_0_2_isSet) {
+          _0_2_isSet = _0_0 instanceof A.BuiltInCallable0;
+          if (_0_2_isSet) {
+            _0_2 = _0_0.acceptsContent;
+            acceptsContent = _0_2;
+          }
+          t1 = _0_2_isSet;
+        } else
           t1 = true;
         if (t1) {
           t1 = acceptsContent;
           break $label0$0;
         }
-        if (_0_0 instanceof A.UserDefinedCallable0)
-          if (_0_5._readFinal$0() instanceof A.MixinRule0) {
-            hasContent = _0_5._readFinal$0().get$hasContent();
-            t1 = true;
-          } else {
-            hasContent = _null;
-            t1 = false;
-          }
-        else {
-          hasContent = _null;
+        _0_5_isSet = _0_0 instanceof A.UserDefinedCallable0;
+        if (_0_5_isSet) {
+          _0_5 = _0_0.declaration;
+          t1 = _0_5 instanceof A.MixinRule0;
+        } else {
+          _0_5 = null;
           t1 = false;
         }
         if (t1) {
+          t1 = _0_5_isSet ? _0_5 : _0_0.declaration;
+          hasContent = type$.MixinRule_2._as(t1).get$hasContent();
           t1 = hasContent;
           break $label0$0;
         }
@@ -103710,12 +104034,6 @@ self.util = _cliPkgRequires.util;
     },
     $signature: 21
   };
-  A.local__closure1.prototype = {
-    call$0() {
-      return type$.UserDefinedCallable_dynamic_2._as(this._0_0).declaration;
-    },
-    $signature: 130
-  };
   A.mixinClass_closure.prototype = {
     call$0() {
       var t1 = type$.JSClass,
@@ -103723,19 +104041,19 @@ self.util = _cliPkgRequires.util;
       A.JSClassExtension_injectSuperclass(t1._as(new A.SassMixin0(A.BuiltInCallable$function0("f", "", new A.mixinClass__closure0(), null)).constructor), jsClass);
       return jsClass;
     },
-    $signature: 24
+    $signature: 15
   };
   A.mixinClass__closure.prototype = {
     call$1($self) {
       A.jsThrow(new self.Error("It is not possible to construct a SassMixin through the JavaScript API"));
     },
-    $signature: 524
+    $signature: 503
   };
   A.mixinClass__closure0.prototype = {
     call$1(_) {
       return B.C__SassNull0;
     },
-    $signature: 5
+    $signature: 3
   };
   A.SassMixin0.prototype = {
     accept$1$1(visitor) {
@@ -103807,6 +104125,8 @@ self.util = _cliPkgRequires.util;
       return this.name;
     }
   };
+  A.JSModule0.prototype = {};
+  A.JSModuleRequire0.prototype = {};
   A.MultiSpan0.prototype = {
     get$start(_) {
       var t1 = this._multi_span0$_primary;
@@ -103845,16 +104165,15 @@ self.util = _cliPkgRequires.util;
       return new A.MultiSpan0(this._multi_span0$_primary.expand$1(0, other), this.primaryLabel, this.secondarySpans);
     },
     highlight$1$color(color) {
-      var t1 = color === true || false;
-      return A.Highlighter$multiple(this._multi_span0$_primary, this.primaryLabel, this.secondarySpans, t1, null, null).highlight$0();
+      return A.Highlighter$multiple(this._multi_span0$_primary, this.primaryLabel, this.secondarySpans, color === true, null, null).highlight$0();
     },
     message$2$color(_, message, color) {
       var t1 = J.$eq$(color, true) || typeof color == "string",
         t2 = typeof color == "string" ? color : null;
       return A.SourceSpanExtension_messageMultiple(this._multi_span0$_primary, message, this.primaryLabel, this.secondarySpans, t1, t2, null);
     },
-    message$1($receiver, message) {
-      return this.message$2$color($receiver, message, null);
+    message$1(_, message) {
+      return this.message$2$color(0, message, null);
     },
     $isComparable: 1,
     $isFileSpan: 1,
@@ -103896,11 +104215,15 @@ self.util = _cliPkgRequires.util;
       return this.forSpan$1$2(span, callback, type$.dynamic);
     },
     write$1(_, object) {
-      this._no_source_map_buffer0$_buffer._contents += A.S(object);
+      var t1 = this._no_source_map_buffer0$_buffer,
+        t2 = A.S(object);
+      t1._contents += t2;
       return null;
     },
     writeCharCode$1(charCode) {
-      this._no_source_map_buffer0$_buffer._contents += A.Primitives_stringFromCharCode(charCode);
+      var t1 = this._no_source_map_buffer0$_buffer,
+        t2 = A.Primitives_stringFromCharCode(charCode);
+      t1._contents += t2;
       return null;
     },
     toString$0(_) {
@@ -103959,7 +104282,7 @@ self.util = _cliPkgRequires.util;
     call$1(sibling) {
       return !sibling.accept$1(B._IsInvisibleVisitor_true_false0);
     },
-    $signature: 148
+    $signature: 504
   };
   A.ModifiableCssParentNode0.prototype = {
     get$isChildless() {
@@ -103985,6 +104308,441 @@ self.util = _cliPkgRequires.util;
       return this.children;
     }
   };
+  A.NodePackageImporter0.prototype = {
+    isNonCanonicalScheme$1(scheme) {
+      return scheme === "pkg";
+    },
+    canonicalize$1(_, url) {
+      var packageName, jsonPath, jsonString, packageManifest, e, t1, t2, t3, t4, baseDirectory, parts, t5, $name, subpath, packageRoot, exception, _1_0, rootPath, subpathInRoot, _this = this, _null = null;
+      if (url.get$scheme() === "file")
+        return $.$get$FilesystemImporter_cwd0().canonicalize$1(0, url);
+      if (url.get$scheme() !== "pkg")
+        return _null;
+      if (url.get$hasAuthority())
+        throw A.wrapException(string$.A_pkg_h);
+      else {
+        t1 = $.$get$url();
+        t2 = t1.style;
+        if (t2.rootLength$1(url.get$path(url)) > 0)
+          throw A.wrapException("A pkg: URL's path must not begin with /.");
+        else if (url.get$path(url).length === 0)
+          throw A.wrapException("A pkg: URL must not have an empty path.");
+        else if (url.get$hasQuery() || url.get$hasFragment())
+          throw A.wrapException(string$.A_pkg_q);
+      }
+      t3 = A.canonicalizeContext0();
+      t3._canonicalize_context$_wasContainingUrlAccessed = true;
+      t3 = t3._canonicalize_context$_containingUrl;
+      if ((t3 == null ? _null : t3.get$scheme()) === "file") {
+        t3 = A.canonicalizeContext0();
+        t3._canonicalize_context$_wasContainingUrlAccessed = true;
+        t3 = t3._canonicalize_context$_containingUrl;
+        t3.toString;
+        t4 = $.$get$context();
+        baseDirectory = t4.dirname$1(t4.style.pathFromUri$1(A._parseUri(t3)));
+      } else {
+        t3 = _this._node_package$__NodePackageImporter__entryPointDirectory_F;
+        t3 === $ && A.throwUnnamedLateFieldNI();
+        baseDirectory = t3;
+      }
+      packageName = null;
+      parts = t1.split$1(0, url.get$path(url));
+      t3 = B.JSArray_methods.removeAt$1(parts, 0);
+      t4 = $.$get$context();
+      t3.toString;
+      t5 = t4.style;
+      $name = t5.pathFromUri$1(A._parseUri(t3));
+      if (B.JSString_methods.startsWith$1($name, "@"))
+        $name = parts.length !== 0 ? t1.join$2(0, $name, B.JSArray_methods.removeAt$1(parts, 0)) : $name;
+      subpath = parts.length !== 0 ? t5.pathFromUri$1(A._parseUri(t1.joinAll$1(parts))) : _null;
+      packageName = $name;
+      if (!J.startsWith$1$s(packageName, "."))
+        if (!J.contains$1$asx(packageName, "\\"))
+          if (!J.contains$1$asx(packageName, "%"))
+            t1 = J.startsWith$1$s(packageName, "@") && !J.contains$1$asx(packageName, t2.get$separator(t2));
+          else
+            t1 = true;
+        else
+          t1 = true;
+      else
+        t1 = true;
+      if (t1)
+        return _null;
+      packageRoot = _this._node_package$_resolvePackageRoot$2(packageName, baseDirectory);
+      if (packageRoot == null)
+        return _null;
+      jsonPath = A.join(packageRoot, "package.json", _null);
+      jsonString = A.readFile0(jsonPath);
+      packageManifest = null;
+      try {
+        packageManifest = type$.Map_String_dynamic._as(B.C_JsonCodec.decode$1(jsonString));
+      } catch (exception) {
+        e = A.unwrapException(exception);
+        t1 = A.S(jsonPath);
+        t2 = A.S(packageName);
+        t3 = A.S(e);
+        throw A.wrapException("Failed to parse " + t1 + ' for "pkg:' + t2 + '": ' + t3);
+      }
+      _1_0 = _this._node_package$_resolvePackageExports$4(packageRoot, subpath, packageManifest, packageName);
+      if (_1_0 != null)
+        if (B.Set_0.contains$1(0, A.ParsedPath_ParsedPath$parse(_1_0, t5)._splitExtension$1(1)[1]))
+          return t4.toUri$1(t4.canonicalize$1(0, _1_0));
+        else {
+          t1 = subpath == null ? "root" : subpath;
+          throw A.wrapException("The export for '" + t1 + "' in '" + A.S(packageName) + "' resolved to '" + _1_0 + string$.x27x2c_whi);
+        }
+      if (subpath == null) {
+        rootPath = _this._node_package$_resolvePackageRootValues$2(packageRoot, packageManifest);
+        return rootPath != null ? t4.toUri$1(t4.canonicalize$1(0, rootPath)) : _null;
+      }
+      subpathInRoot = A.join(packageRoot, subpath, _null);
+      return $.$get$FilesystemImporter_cwd0().canonicalize$1(0, t4.toUri$1(subpathInRoot));
+    },
+    load$1(_, url) {
+      return $.$get$FilesystemImporter_cwd0().load$1(0, url);
+    },
+    _node_package$_resolvePackageRoot$2(packageName, baseDirectory) {
+      var potentialPackage, t1;
+      for (; true;) {
+        potentialPackage = A.join(baseDirectory, "node_modules", packageName);
+        if (A.dirExists0(potentialPackage))
+          return potentialPackage;
+        t1 = $.$get$context();
+        if (t1.split$1(0, baseDirectory).length === 1)
+          return null;
+        baseDirectory = t1.dirname$1(baseDirectory);
+      }
+    },
+    _node_package$_resolvePackageRootValues$2(packageRoot, packageManifest) {
+      var t1, sassValue, _1_0, styleValue, _null = null,
+        _0_0 = packageManifest.$index(0, "sass");
+      if (typeof _0_0 == "string") {
+        t1 = B.Set_0.contains$1(0, A.ParsedPath_ParsedPath$parse(_0_0, $.$get$url().style)._splitExtension$1(1)[1]);
+        sassValue = _0_0;
+      } else {
+        sassValue = _null;
+        t1 = false;
+      }
+      if (t1)
+        return A.join(packageRoot, sassValue, _null);
+      else {
+        _1_0 = packageManifest.$index(0, "style");
+        if (typeof _1_0 == "string") {
+          t1 = B.Set_0.contains$1(0, A.ParsedPath_ParsedPath$parse(_1_0, $.$get$url().style)._splitExtension$1(1)[1]);
+          styleValue = _1_0;
+        } else {
+          styleValue = _null;
+          t1 = false;
+        }
+        if (t1)
+          return A.join(packageRoot, styleValue, _null);
+      }
+      return A.resolveImportPath0(A.join(packageRoot, "index", _null));
+    },
+    _node_package$_resolvePackageExports$4(packageRoot, subpath, packageManifest, packageName) {
+      var _0_0, _1_0, _this = this,
+        exports = packageManifest.$index(0, "exports");
+      if (exports == null)
+        return null;
+      _0_0 = _this._node_package$_nodePackageExportsResolve$5(packageRoot, _this._node_package$_exportsToCheck$1(subpath), exports, subpath, packageName);
+      if (_0_0 != null)
+        return _0_0;
+      if (subpath != null && A.ParsedPath_ParsedPath$parse(subpath, $.$get$url().style)._splitExtension$1(1)[1].length !== 0)
+        return null;
+      _1_0 = _this._node_package$_nodePackageExportsResolve$5(packageRoot, _this._node_package$_exportsToCheck$2$addIndex(subpath, true), exports, subpath, packageName);
+      if (_1_0 != null)
+        return _1_0;
+      return null;
+    },
+    _node_package$_nodePackageExportsResolve$5(packageRoot, subpathVariants, exports, subpath, packageName) {
+      var t1, matches, _1_1, path;
+      if (type$.Map_String_dynamic._is(exports) && J.any$1$ax(exports.get$keys(exports), new A.NodePackageImporter__nodePackageExportsResolve_closure3()) && J.any$1$ax(exports.get$keys(exports), new A.NodePackageImporter__nodePackageExportsResolve_closure4()))
+        throw A.wrapException("`exports` in " + packageName + string$.x20can_n + J.map$1$1$ax(J.get$keys$z(exports), new A.NodePackageImporter__nodePackageExportsResolve_closure5(), type$.String).join$1(0, ",") + " in " + A.join(packageRoot, "package.json", null) + ".");
+      t1 = A.IterableNullableExtension_whereNotNull(new A.MappedListIterable(subpathVariants, new A.NodePackageImporter__nodePackageExportsResolve_closure6(this, exports, packageRoot), A._arrayInstanceType(subpathVariants)._eval$1("MappedListIterable<1,String?>")), type$.String);
+      matches = A.List_List$of(t1, true, t1.$ti._eval$1("Iterable.E"));
+      $label0$1: {
+        _1_1 = matches.length;
+        if (_1_1 === 1) {
+          path = matches[0];
+          t1 = path;
+          break $label0$1;
+        }
+        if (_1_1 <= 0) {
+          t1 = null;
+          break $label0$1;
+        }
+        t1 = subpath == null ? "root" : subpath;
+        t1 = A.throwExpression(string$.Unable + t1 + " in " + packageName + " should be used. \n\nFound:\n" + B.JSArray_methods.join$1(matches, "\n"));
+      }
+      return t1;
+    },
+    _node_package$_compareExpansionKeys$2(keyA, keyB) {
+      var t1 = B.JSString_methods.contains$1(keyA, "*"),
+        baseLengthA = t1 ? B.JSString_methods.indexOf$1(keyA, "*") + 1 : keyA.length,
+        t2 = B.JSString_methods.contains$1(keyB, "*"),
+        baseLengthB = t2 ? B.JSString_methods.indexOf$1(keyB, "*") + 1 : keyB.length;
+      if (baseLengthA > baseLengthB)
+        return -1;
+      if (baseLengthB > baseLengthA)
+        return 1;
+      if (!t1)
+        return 1;
+      if (!t2)
+        return -1;
+      t1 = keyA.length;
+      t2 = keyB.length;
+      if (t1 > t2)
+        return -1;
+      if (t2 > t1)
+        return 1;
+      return 0;
+    },
+    _node_package$_packageTargetResolve$4(subpath, exports, packageRoot, patternMatch) {
+      var t2, string, path, map, key, value, _1_0, array, _2_0, _null = null,
+        t1 = typeof exports == "string";
+      if (t1) {
+        t2 = !B.JSString_methods.startsWith$1(exports, "./");
+        string = exports;
+      } else {
+        string = _null;
+        t2 = false;
+      }
+      if (t2)
+        throw A.wrapException("Export '" + A.S(string) + string$.x27x20must + packageRoot + "'.");
+      if (t1) {
+        t2 = patternMatch != null;
+        string = exports;
+      } else {
+        string = _null;
+        t2 = false;
+      }
+      if (t2) {
+        t1 = J.replaceFirst$2$s(string, "*", patternMatch);
+        t2 = $.$get$context();
+        path = t2.normalize$1(A.join(packageRoot, t2.style.pathFromUri$1(A._parseUri(t1)), _null));
+        return A.fileExists0(path) ? path : _null;
+      }
+      string = t1 ? exports : _null;
+      if (t1) {
+        t1 = $.$get$context();
+        string.toString;
+        return A.join(packageRoot, t1.style.pathFromUri$1(A._parseUri(string)), _null);
+      }
+      t1 = type$.Map_String_dynamic._is(exports);
+      map = t1 ? exports : _null;
+      if (t1) {
+        for (t1 = A.MapExtensions_get_pairs(map, type$.String, type$.dynamic), t1 = t1.get$iterator(t1); t1.moveNext$0();) {
+          t2 = t1.get$current(t1);
+          key = t2._0;
+          value = t2._1;
+          if (!B.Set_TnQrk.contains$1(0, key))
+            continue;
+          if (value == null)
+            continue;
+          _1_0 = this._node_package$_packageTargetResolve$4(subpath, value, packageRoot, patternMatch);
+          if (_1_0 != null)
+            return _1_0;
+        }
+        return _null;
+      }
+      if (type$.List_nullable_Object._is(exports) && J.get$length$asx(exports) <= 0)
+        return _null;
+      t1 = type$.List_dynamic._is(exports);
+      array = t1 ? exports : _null;
+      if (t1) {
+        for (t1 = J.get$iterator$ax(array); t1.moveNext$0();) {
+          value = t1.get$current(t1);
+          if (value == null)
+            continue;
+          _2_0 = this._node_package$_packageTargetResolve$4(subpath, value, packageRoot, patternMatch);
+          if (_2_0 != null)
+            return _2_0;
+        }
+        return _null;
+      }
+      throw A.wrapException("Invalid 'exports' value " + A.S(exports) + " in " + A.join(packageRoot, "package.json", _null) + ".");
+    },
+    _node_package$_packageTargetResolve$3(subpath, exports, packageRoot) {
+      return this._node_package$_packageTargetResolve$4(subpath, exports, packageRoot, null);
+    },
+    _node_package$_getMainExport$1(exports) {
+      var t1, t2, map, _0_4, $export;
+      $label0$0: {
+        if (typeof exports == "string") {
+          t1 = exports;
+          break $label0$0;
+        }
+        if (type$.List_String._is(exports)) {
+          t1 = exports;
+          break $label0$0;
+        }
+        t1 = type$.Map_String_dynamic._is(exports);
+        if (t1) {
+          t2 = !J.any$1$ax(exports.get$keys(exports), new A.NodePackageImporter__getMainExport_closure0());
+          map = exports;
+        } else {
+          map = null;
+          t2 = false;
+        }
+        if (t2) {
+          t1 = map;
+          break $label0$0;
+        }
+        if (t1) {
+          _0_4 = exports.$index(0, ".");
+          if (_0_4 == null)
+            t2 = exports.containsKey$1(".");
+          else
+            t2 = true;
+          if (t2)
+            t2 = _0_4 != null;
+          else
+            t2 = false;
+        } else {
+          _0_4 = null;
+          t2 = false;
+        }
+        if (t2) {
+          $export = t1 ? _0_4 : J.$index$asx(exports, ".");
+          t1 = $export;
+          break $label0$0;
+        }
+        t1 = null;
+        break $label0$0;
+      }
+      return t1;
+    },
+    _node_package$_exportsToCheck$2$addIndex(subpath, addIndex) {
+      var basename, dirname, t3, t4, _i, path,
+        t1 = type$.JSArray_String,
+        paths = A._setArrayType([], t1),
+        t2 = subpath == null;
+      if (t2 && addIndex)
+        subpath = "index";
+      else if (!t2 && addIndex)
+        subpath = A.join(subpath, "index", null);
+      if (subpath == null)
+        return A._setArrayType([null], type$.JSArray_nullable_String);
+      if (B.Set_0.contains$1(0, A.ParsedPath_ParsedPath$parse(subpath, $.$get$url().style)._splitExtension$1(1)[1]))
+        paths.push(subpath);
+      else
+        B.JSArray_methods.addAll$1(paths, A._setArrayType([subpath, subpath + ".scss", subpath + ".sass", subpath + ".css"], t1));
+      t1 = $.$get$context();
+      t2 = t1.style;
+      basename = A.ParsedPath_ParsedPath$parse(subpath, t2).get$basename();
+      dirname = t1.dirname$1(subpath);
+      if (B.JSString_methods.startsWith$1(basename, "_"))
+        return paths;
+      t1 = A.List_List$of(paths, true, type$.nullable_String);
+      for (t3 = paths.length, t4 = dirname === ".", _i = 0; _i < paths.length; paths.length === t3 || (0, A.throwConcurrentModificationError)(paths), ++_i) {
+        path = paths[_i];
+        if (t4)
+          t1.push("_" + A.ParsedPath_ParsedPath$parse(path, t2).get$basename());
+        else
+          t1.push(A.join(dirname, "_" + A.ParsedPath_ParsedPath$parse(path, t2).get$basename(), null));
+      }
+      return t1;
+    },
+    _node_package$_exportsToCheck$1(subpath) {
+      return this._node_package$_exportsToCheck$2$addIndex(subpath, false);
+    }
+  };
+  A.NodePackageImporter__nodePackageExportsResolve_closure3.prototype = {
+    call$1(key) {
+      return B.JSString_methods.startsWith$1(key, ".");
+    },
+    $signature: 4
+  };
+  A.NodePackageImporter__nodePackageExportsResolve_closure4.prototype = {
+    call$1(key) {
+      return !B.JSString_methods.startsWith$1(key, ".");
+    },
+    $signature: 4
+  };
+  A.NodePackageImporter__nodePackageExportsResolve_closure5.prototype = {
+    call$1(key) {
+      return '"' + key + '"';
+    },
+    $signature: 5
+  };
+  A.NodePackageImporter__nodePackageExportsResolve_closure6.prototype = {
+    call$1(variant) {
+      var t1, matchKey, t2, t3, t4, t5, t6, _i, expansionKey, _0_0, t7, patternBase, patternTrailer, t8, target, _this = this, _null = null;
+      if (variant == null) {
+        t1 = _this.$this;
+        return A.NullableExtension_andThen(t1._node_package$_getMainExport$1(_this.exports), new A.NodePackageImporter__nodePackageExportsResolve__closure1(t1, variant, _this.packageRoot));
+      } else {
+        t1 = _this.exports;
+        if (!type$.Map_String_dynamic._is(t1) || J.every$1$ax(t1.get$keys(t1), new A.NodePackageImporter__nodePackageExportsResolve__closure2()))
+          return _null;
+      }
+      matchKey = "./" + $.$get$context().toUri$1(variant).toString$0(0);
+      if (t1.containsKey$1(matchKey) && J.$index$asx(t1, matchKey) != null && !B.JSString_methods.contains$1(matchKey, "*")) {
+        t1 = J.$index$asx(t1, matchKey);
+        if (t1 == null)
+          t1 = type$.Object._as(t1);
+        return _this.$this._node_package$_packageTargetResolve$3(matchKey, t1, _this.packageRoot);
+      }
+      t2 = A._setArrayType([], type$.JSArray_String);
+      for (t3 = J.getInterceptor$z(t1), t4 = J.get$iterator$ax(t3.get$keys(t1)); t4.moveNext$0();) {
+        t5 = t4.get$current(t4);
+        if (B.JSString_methods.allMatches$1("*", t5).get$length(0) === 1)
+          t2.push(t5);
+      }
+      t4 = _this.$this;
+      B.JSArray_methods.sort$1(t2, t4.get$_node_package$_compareExpansionKeys());
+      for (t5 = t2.length, t6 = matchKey.length, _i = 0; _i < t2.length; t2.length === t5 || (0, A.throwConcurrentModificationError)(t2), ++_i) {
+        expansionKey = t2[_i];
+        _0_0 = expansionKey.split("*");
+        t7 = _0_0.length === 2;
+        if (t7) {
+          patternBase = _0_0[0];
+          patternTrailer = _0_0[1];
+          patternTrailer = patternTrailer;
+        } else {
+          patternTrailer = _null;
+          patternBase = patternTrailer;
+        }
+        if (!t7)
+          throw A.wrapException(A.StateError$("Pattern matching error"));
+        if (!B.JSString_methods.startsWith$1(matchKey, patternBase))
+          continue;
+        if (matchKey === patternBase)
+          continue;
+        t7 = patternTrailer.length;
+        if (t7 !== 0)
+          t8 = B.JSString_methods.endsWith$1(matchKey, patternTrailer) && t6 >= expansionKey.length;
+        else
+          t8 = true;
+        if (t8) {
+          target = t3.$index(t1, expansionKey);
+          if (target == null)
+            continue;
+          return t4._node_package$_packageTargetResolve$4(variant, target, _this.packageRoot, B.JSString_methods.substring$2(matchKey, patternBase.length, t6 - t7));
+        }
+      }
+      return _null;
+    },
+    $signature: 143
+  };
+  A.NodePackageImporter__nodePackageExportsResolve__closure1.prototype = {
+    call$1(mainExport) {
+      return this.$this._node_package$_packageTargetResolve$3(this.variant, mainExport, this.packageRoot);
+    },
+    $signature: 144
+  };
+  A.NodePackageImporter__nodePackageExportsResolve__closure2.prototype = {
+    call$1(key) {
+      return !B.JSString_methods.startsWith$1(key, ".");
+    },
+    $signature: 4
+  };
+  A.NodePackageImporter__getMainExport_closure0.prototype = {
+    call$1(key) {
+      return B.JSString_methods.startsWith$1(key, ".");
+    },
+    $signature: 4
+  };
   A.NullExpression0.prototype = {
     accept$1$1(visitor) {
       return visitor.visitNullExpression$1(this);
@@ -104009,7 +104767,7 @@ self.util = _cliPkgRequires.util;
       A.JSClassExtension_injectSuperclass(t1._as(B.C__SassNull0.constructor), jsClass);
       return jsClass;
     },
-    $signature: 24
+    $signature: 15
   };
   A.legacyNullClass__closure.prototype = {
     call$2(_, __) {
@@ -104023,7 +104781,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 216
+    $signature: 209
   };
   A._SassNull0.prototype = {
     get$isTruthy() {
@@ -104074,7 +104832,7 @@ self.util = _cliPkgRequires.util;
       A.JSClassExtension_injectSuperclass(t1._as(self.Object.getPrototypeOf(J.get$$prototype$x(t1._as(A.SassNumber_SassNumber0(0, null).constructor))).constructor), jsClass);
       return jsClass;
     },
-    $signature: 24
+    $signature: 15
   };
   A.numberClass__closure.prototype = {
     call$3($self, value, unitOrOptions) {
@@ -104105,43 +104863,43 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 525
+    $signature: 505
   };
   A.numberClass__closure0.prototype = {
     call$1($self) {
       return $self._number1$_value;
     },
-    $signature: 526
+    $signature: 506
   };
   A.numberClass__closure1.prototype = {
     call$1($self) {
       return A.fuzzyIsInt($self._number1$_value);
     },
-    $signature: 267
+    $signature: 233
   };
   A.numberClass__closure2.prototype = {
     call$1($self) {
       return A.fuzzyAsInt0($self._number1$_value);
     },
-    $signature: 528
+    $signature: 508
   };
   A.numberClass__closure3.prototype = {
     call$1($self) {
       return new self.immutable.List($self.get$numeratorUnits($self));
     },
-    $signature: 268
+    $signature: 230
   };
   A.numberClass__closure4.prototype = {
     call$1($self) {
       return new self.immutable.List($self.get$denominatorUnits($self));
     },
-    $signature: 268
+    $signature: 230
   };
   A.numberClass__closure5.prototype = {
     call$1($self) {
       return $self.get$hasUnits();
     },
-    $signature: 267
+    $signature: 233
   };
   A.numberClass__closure6.prototype = {
     call$2($self, $name) {
@@ -104155,7 +104913,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 530
+    $signature: 510
   };
   A.numberClass__closure7.prototype = {
     call$4($self, min, max, $name) {
@@ -104169,7 +104927,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 531
+    $signature: 511
   };
   A.numberClass__closure8.prototype = {
     call$2($self, $name) {
@@ -104184,7 +104942,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 532
+    $signature: 512
   };
   A.numberClass__closure9.prototype = {
     call$3($self, unit, $name) {
@@ -104199,19 +104957,19 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 533
+    $signature: 513
   };
   A.numberClass__closure10.prototype = {
     call$2($self, unit) {
       return $self.hasUnit$1(unit);
     },
-    $signature: 269
+    $signature: 225
   };
   A.numberClass__closure11.prototype = {
     call$2($self, unit) {
       return $self.get$hasUnits() && $self.compatibleWithUnit$1(unit);
     },
-    $signature: 269
+    $signature: 225
   };
   A.numberClass__closure12.prototype = {
     call$4($self, numeratorUnits, denominatorUnits, $name) {
@@ -104229,7 +104987,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 270
+    $signature: 224
   };
   A.numberClass__closure13.prototype = {
     call$4($self, other, $name, otherName) {
@@ -104246,7 +105004,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null, null];
     },
-    $signature: 271
+    $signature: 222
   };
   A.numberClass__closure14.prototype = {
     call$4($self, numeratorUnits, denominatorUnits, $name) {
@@ -104263,7 +105021,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 272
+    $signature: 218
   };
   A.numberClass__closure15.prototype = {
     call$4($self, other, $name, otherName) {
@@ -104280,7 +105038,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null, null];
     },
-    $signature: 273
+    $signature: 208
   };
   A.numberClass__closure16.prototype = {
     call$4($self, numeratorUnits, denominatorUnits, $name) {
@@ -104297,7 +105055,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 270
+    $signature: 224
   };
   A.numberClass__closure17.prototype = {
     call$4($self, other, $name, otherName) {
@@ -104314,7 +105072,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null, null];
     },
-    $signature: 271
+    $signature: 222
   };
   A.numberClass__closure18.prototype = {
     call$4($self, numeratorUnits, denominatorUnits, $name) {
@@ -104331,7 +105089,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 272
+    $signature: 218
   };
   A.numberClass__closure19.prototype = {
     call$4($self, other, $name, otherName) {
@@ -104348,7 +105106,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null, null];
     },
-    $signature: 273
+    $signature: 208
   };
   A._ConstructorOptions0.prototype = {};
   A._NodeSassNumber.prototype = {};
@@ -104373,13 +105131,13 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null, null];
     },
-    $signature: 539
+    $signature: 519
   };
   A.legacyNumberClass_closure0.prototype = {
     call$1(thisArg) {
       return J.get$dartValue$x(thisArg)._number1$_value;
     },
-    $signature: 540
+    $signature: 520
   };
   A.legacyNumberClass_closure1.prototype = {
     call$2(thisArg, value) {
@@ -104387,7 +105145,7 @@ self.util = _cliPkgRequires.util;
         t2 = J.get$numeratorUnits$x(t1.get$dartValue(thisArg));
       t1.set$dartValue(thisArg, A.SassNumber_SassNumber$withUnits0(value, J.get$denominatorUnits$x(t1.get$dartValue(thisArg)), t2));
     },
-    $signature: 541
+    $signature: 521
   };
   A.legacyNumberClass_closure2.prototype = {
     call$1(thisArg) {
@@ -104396,26 +105154,26 @@ self.util = _cliPkgRequires.util;
         t3 = J.get$denominatorUnits$x(t1.get$dartValue(thisArg)).length === 0 ? "" : "/";
       return t2 + t3 + B.JSArray_methods.join$1(J.get$denominatorUnits$x(t1.get$dartValue(thisArg)), "*");
     },
-    $signature: 542
+    $signature: 522
   };
   A.legacyNumberClass_closure3.prototype = {
     call$2(thisArg, unit) {
       var t1 = J.getInterceptor$x(thisArg);
       t1.set$dartValue(thisArg, A._parseNumber(t1.get$dartValue(thisArg)._number1$_value, unit));
     },
-    $signature: 543
+    $signature: 523
   };
   A._parseNumber_closure.prototype = {
     call$1(unit) {
       return unit.length === 0;
     },
-    $signature: 10
+    $signature: 4
   };
   A._parseNumber_closure0.prototype = {
     call$1(unit) {
       return unit.length === 0;
     },
-    $signature: 10
+    $signature: 4
   };
   A.SassNumber0.prototype = {
     get$unitString() {
@@ -104439,48 +105197,25 @@ self.util = _cliPkgRequires.util;
       return this.assertNumber$1(null);
     },
     assertInt$1($name) {
-      var integer, t1,
-        _0_0 = A.fuzzyAsInt0(this._number1$_value);
-      if (_0_0 != null) {
-        integer = _0_0;
-        t1 = true;
-      } else {
-        integer = null;
-        t1 = false;
-      }
-      if (t1)
-        return integer;
+      var _0_0 = A.fuzzyAsInt0(this._number1$_value);
+      if (_0_0 != null)
+        return _0_0;
       throw A.wrapException(A.SassScriptException$0(this.toString$0(0) + " is not an int.", $name));
     },
     assertInt$0() {
       return this.assertInt$1(null);
     },
     valueInRange$3(min, max, $name) {
-      var result, t1, _this = this,
+      var _this = this,
         _0_0 = A.fuzzyCheckRange0(_this._number1$_value, min, max);
-      if (_0_0 != null) {
-        result = _0_0;
-        t1 = true;
-      } else {
-        result = null;
-        t1 = false;
-      }
-      if (t1)
-        return result;
+      if (_0_0 != null)
+        return _0_0;
       throw A.wrapException(A.SassScriptException$0("Expected " + _this.toString$0(0) + " to be within " + A.S(min) + _this.get$unitString() + " and " + A.S(max) + _this.get$unitString() + ".", $name));
     },
     valueInRangeWithUnit$4(min, max, $name, unit) {
-      var result, t1,
-        _0_0 = A.fuzzyCheckRange0(this._number1$_value, min, max);
-      if (_0_0 != null) {
-        result = _0_0;
-        t1 = true;
-      } else {
-        result = null;
-        t1 = false;
-      }
-      if (t1)
-        return result;
+      var _0_0 = A.fuzzyCheckRange0(this._number1$_value, min, max);
+      if (_0_0 != null)
+        return _0_0;
       throw A.wrapException(A.SassScriptException$0("Expected " + this.toString$0(0) + " to be within " + min + unit + " and " + max + unit + ".", $name));
     },
     hasCompatibleUnits$1(other) {
@@ -104664,130 +105399,189 @@ self.util = _cliPkgRequires.util;
       return this._number1$_coerceUnits$1$2(other, operation, type$.dynamic);
     },
     multiplyUnits$3(value, otherNumerators, otherDenominators) {
-      var _0_0, _0_1, _0_2, _0_3, _0_6, _0_7, _0_9, _0_11, _0_13, numerators_case_0, denominators_case_0, t1, denominators_case_00, t2, t3, denominators_case_1, numerators_case_1, newNumerators, mutableOtherDenominators, _i, numerator, mutableDenominatorUnits, _this = this, _null = null, _box_0 = {};
+      var t1, _0_1, _0_2, _0_3, _0_6, _0_7_isSet, _0_7, _0_9, t2, _0_9_isSet, denominators_case_0, _0_11_isSet, _0_11, _0_13_isSet, _0_10, _0_13, numerators_case_0, t4, t3, numerators_case_1, denominators_case_1, t0, newNumerators, mutableOtherDenominators, _i, numerator, mutableDenominatorUnits, _this = this, _null = null, _box_0 = {};
       _box_0.value = value;
-      _0_0 = new A._Record_4([_this.get$numeratorUnits(_this), _this.get$denominatorUnits(_this), otherNumerators, otherDenominators]);
-      _0_1 = A._InitializedCell$(new A.SassNumber_multiplyUnits_closure11(_0_0));
-      _0_2 = A._InitializedCell$(new A.SassNumber_multiplyUnits_closure12(_0_0));
-      _0_3 = A._InitializedCell$(new A.SassNumber_multiplyUnits_closure13(_0_0));
-      _0_6 = A._InitializedCell$(new A.SassNumber_multiplyUnits_closure14(_0_3));
-      _0_7 = A._InitializedCell$(new A.SassNumber_multiplyUnits_closure15(_0_0));
-      _0_9 = A._InitializedCell$(new A.SassNumber_multiplyUnits_closure16(_0_7));
-      _0_11 = A._InitializedCell$(new A.SassNumber_multiplyUnits_closure17(_0_1));
-      _0_13 = A._InitializedCell$(new A.SassNumber_multiplyUnits_closure18(_0_2));
-      numerators_case_0 = _0_1._readFinal$0();
-      denominators_case_0 = _0_2._readFinal$0();
-      t1 = _0_6._readFinal$0() && _0_9._readFinal$0();
-      if (!t1)
-        if (_0_11._readFinal$0())
-          if (_0_13._readFinal$0()) {
-            numerators_case_0 = _0_3._readFinal$0();
-            denominators_case_00 = _0_7._readFinal$0();
-            denominators_case_0 = denominators_case_00;
-            t1 = true;
-          } else
-            t1 = false;
-        else
-          t1 = false;
-      else
-        t1 = true;
-      if (t1) {
-        t2 = denominators_case_0;
-        t1 = numerators_case_0;
-        t3 = true;
+      t1 = [_this.get$numeratorUnits(_this), _this.get$denominatorUnits(_this), otherNumerators, otherDenominators];
+      _0_1 = t1[0];
+      _0_2 = t1[1];
+      _0_3 = t1[2];
+      _0_6 = _0_3.length <= 0;
+      _0_7_isSet = _0_6;
+      if (_0_7_isSet) {
+        _0_7 = t1[3];
+        _0_9 = _0_7.length <= 0;
+        t2 = _0_9;
       } else {
-        t2 = _null;
-        t1 = t2;
-        t3 = false;
+        _0_7 = _null;
+        _0_9 = _0_7;
+        t2 = false;
       }
-      if (!t3) {
-        if (_0_11._readFinal$0()) {
-          denominators_case_1 = _0_2._readFinal$0();
-          numerators_case_1 = _0_3._readFinal$0();
-          t3 = _0_9._readFinal$0();
-          t3 = t3;
+      _0_9_isSet = _0_7_isSet;
+      denominators_case_0 = _0_2;
+      _0_11_isSet = !t2;
+      if (_0_11_isSet) {
+        _0_11 = _0_1.length <= 0;
+        _0_13_isSet = _0_11;
+        _0_10 = _0_1;
+        if (_0_13_isSet) {
+          _0_13 = _0_2.length <= 0;
+          t2 = _0_13;
+          if (t2) {
+            if (_0_7_isSet)
+              denominators_case_0 = _0_7;
+            else {
+              _0_7 = t1[3];
+              denominators_case_0 = _0_7;
+              _0_7_isSet = true;
+            }
+            numerators_case_0 = _0_3;
+          } else
+            numerators_case_0 = _0_1;
+        } else {
+          numerators_case_0 = _0_1;
+          _0_13 = _null;
+          t2 = false;
+        }
+        _0_1 = _0_10;
+      } else {
+        numerators_case_0 = _0_1;
+        _0_13 = _null;
+        _0_11 = _0_13;
+        _0_13_isSet = false;
+        t2 = true;
+      }
+      if (t2) {
+        t4 = denominators_case_0;
+        t3 = numerators_case_0;
+      } else {
+        t4 = _null;
+        t3 = t4;
+      }
+      if (!t2) {
+        if (_0_11_isSet)
+          t2 = _0_11;
+        else {
+          _0_11 = _0_1.length <= 0;
+          t2 = _0_11;
+        }
+        if (t2) {
+          if (_0_9_isSet)
+            t2 = _0_9;
+          else {
+            if (_0_7_isSet)
+              t2 = _0_7;
+            else {
+              _0_7 = t1[3];
+              t2 = _0_7;
+              _0_7_isSet = true;
+            }
+            _0_9 = t2.length <= 0;
+            t2 = _0_9;
+          }
+          numerators_case_1 = _0_3;
+          denominators_case_1 = _0_2;
         } else {
           numerators_case_1 = _null;
           denominators_case_1 = numerators_case_1;
+          t2 = false;
+        }
+        if (!t2) {
+          if (_0_13_isSet)
+            t2 = _0_13;
+          else {
+            _0_13 = _0_2.length <= 0;
+            t2 = _0_13;
+          }
+          if (t2) {
+            if (_0_6)
+              denominators_case_1 = _0_7_isSet ? _0_7 : t1[3];
+            t1 = _0_6;
+          } else
+            t1 = false;
+          numerators_case_1 = _0_1;
+        } else
+          t1 = true;
+        if (t1) {
+          t1 = !_this._number1$_areAnyConvertible$2(numerators_case_1, denominators_case_1);
+          if (t1) {
+            t3 = denominators_case_1;
+            t2 = numerators_case_1;
+          } else {
+            t2 = t3;
+            t3 = t4;
+          }
+          t0 = t3;
+          t3 = t1;
+          t1 = t2;
+          t2 = t0;
+        } else {
+          t2 = t4;
+          t1 = t3;
           t3 = false;
         }
-        if (!t3) {
-          numerators_case_1 = _0_1._readFinal$0();
-          if (_0_13._readFinal$0())
-            if (_0_6._readFinal$0()) {
-              denominators_case_1 = _0_7._readFinal$0();
-              t3 = true;
-            } else
-              t3 = false;
-          else
-            t3 = false;
-        } else
-          t3 = true;
-        if (t3)
-          if (!_this._number1$_areAnyConvertible$2(numerators_case_1, denominators_case_1)) {
-            t2 = denominators_case_1;
-            t1 = numerators_case_1;
-            t3 = true;
-          } else
-            t3 = false;
-        else
-          t3 = false;
-      } else
+      } else {
+        t2 = t4;
+        t1 = t3;
         t3 = true;
+      }
       if (t3)
         return A.SassNumber_SassNumber$withUnits0(value, t2, t1);
       newNumerators = A._setArrayType([], type$.JSArray_String);
       mutableOtherDenominators = A._setArrayType(otherDenominators.slice(0), A._arrayInstanceType(otherDenominators));
       for (t1 = _this.get$numeratorUnits(_this), t2 = t1.length, _i = 0; _i < t2; ++_i) {
         numerator = t1[_i];
-        A.removeFirstWhere0(mutableOtherDenominators, new A.SassNumber_multiplyUnits_closure19(_box_0, numerator), new A.SassNumber_multiplyUnits_closure20(newNumerators, numerator));
+        A.removeFirstWhere0(mutableOtherDenominators, new A.SassNumber_multiplyUnits_closure3(_box_0, numerator), new A.SassNumber_multiplyUnits_closure4(newNumerators, numerator));
       }
       t1 = _this.get$denominatorUnits(_this);
       mutableDenominatorUnits = A._setArrayType(t1.slice(0), A._arrayInstanceType(t1));
       for (t1 = otherNumerators.length, _i = 0; _i < t1; ++_i) {
         numerator = otherNumerators[_i];
-        A.removeFirstWhere0(mutableDenominatorUnits, new A.SassNumber_multiplyUnits_closure21(_box_0, numerator), new A.SassNumber_multiplyUnits_closure22(newNumerators, numerator));
+        A.removeFirstWhere0(mutableDenominatorUnits, new A.SassNumber_multiplyUnits_closure5(_box_0, numerator), new A.SassNumber_multiplyUnits_closure6(newNumerators, numerator));
       }
       t1 = _box_0.value;
       B.JSArray_methods.addAll$1(mutableDenominatorUnits, mutableOtherDenominators);
       return A.SassNumber_SassNumber$withUnits0(t1, mutableDenominatorUnits, newNumerators);
     },
     _number1$_areAnyConvertible$2(units1, units2) {
-      return J.any$1$ax(units1, new A.SassNumber__areAnyConvertible_closure0(units2));
+      return B.JSArray_methods.any$1(units1, new A.SassNumber__areAnyConvertible_closure0(units2));
     },
     _number1$_unitString$2(numerators, denominators) {
-      var t1, denominator,
-        _0_0 = new A._Record_2(numerators, denominators),
-        _0_4 = A._InitializedCell$(new A.SassNumber__unitString_closure3(_0_0)),
-        _0_5 = A._InitializedCell$(new A.SassNumber__unitString_closure4(_0_0)),
-        _0_6 = A._InitializedCell$(new A.SassNumber__unitString_closure5(_0_5)),
-        _0_7 = A._InitializedCell$(new A.SassNumber__unitString_closure6(_0_6));
+      var _0_4, _0_6, t1, _0_7, _0_5, _null = null;
       $label0$0: {
-        if (_0_4._readFinal$0() && _0_7._readFinal$0()) {
-          t1 = "no units";
-          break $label0$0;
-        }
-        if (_0_4._readFinal$0())
-          if (J.$eq$(_0_6._readFinal$0(), 1)) {
-            denominator = J.$index$asx(_0_5._readFinal$0(), 0);
-            t1 = true;
-          } else {
-            denominator = null;
-            t1 = false;
-          }
-        else {
-          denominator = null;
+        _0_4 = J.get$length$asx(numerators) <= 0;
+        if (_0_4) {
+          _0_6 = J.get$length$asx(denominators);
+          t1 = _0_6;
+          _0_7 = t1 <= 0;
+          t1 = _0_7;
+          _0_5 = denominators;
+        } else {
+          _0_5 = _null;
+          _0_6 = _0_5;
+          _0_7 = _0_6;
           t1 = false;
         }
         if (t1) {
-          t1 = A.S(denominator) + "^-1";
+          t1 = "no units";
           break $label0$0;
         }
-        if (_0_4._readFinal$0()) {
+        if (_0_4)
+          t1 = _0_6 === 1;
+        else
+          t1 = false;
+        if (t1) {
+          t1 = J.$index$asx(_0_4 ? _0_5 : denominators, 0) + "^-1";
+          break $label0$0;
+        }
+        if (_0_4) {
           t1 = "(" + J.join$1$ax(denominators, "*") + ")^-1";
           break $label0$0;
         }
-        if (_0_7._readFinal$0()) {
+        _0_6 = J.get$length$asx(denominators);
+        t1 = _0_6;
+        _0_7 = t1 <= 0;
+        t1 = _0_7;
+        if (t1) {
           t1 = J.join$1$ax(numerators, "*");
           break $label0$0;
         }
@@ -104825,7 +105619,7 @@ self.util = _cliPkgRequires.util;
         if (type == null)
           t1 = units;
         else {
-          t1 = B.Map_ws7dy.$index(0, type);
+          t1 = B.Map_397RH.$index(0, type);
           t1.toString;
           t1 = A._setArrayType([B.JSArray_methods.get$first(t1)], type$.JSArray_String);
         }
@@ -104841,7 +105635,7 @@ self.util = _cliPkgRequires.util;
     },
     canonicalMultiplierForUnit$1(unit) {
       var t1,
-        innerMap = B.Map_nfuzN.$index(0, unit);
+        innerMap = B.Map_gQqJO.$index(0, unit);
       if (innerMap == null)
         t1 = 1;
       else {
@@ -104864,67 +105658,6 @@ self.util = _cliPkgRequires.util;
       return this.unitSuggestion$2($name, null);
     }
   };
-  A.SassNumber_SassNumber$withUnits_closure10.prototype = {
-    call$0() {
-      return this._0_1._readFinal$0() == null;
-    },
-    $signature: 1
-  };
-  A.SassNumber_SassNumber$withUnits_closure9.prototype = {
-    call$0() {
-      return this._0_0._0;
-    },
-    $signature: 96
-  };
-  A.SassNumber_SassNumber$withUnits_closure11.prototype = {
-    call$0() {
-      var t1 = this._0_1._readFinal$0();
-      return J.get$length$asx(t1 == null ? type$.List_String._as(t1) : t1);
-    },
-    $signature: 3
-  };
-  A.SassNumber_SassNumber$withUnits_closure12.prototype = {
-    call$0() {
-      return this._0_4._readFinal$0() <= 0;
-    },
-    $signature: 1
-  };
-  A.SassNumber_SassNumber$withUnits_closure14.prototype = {
-    call$0() {
-      return this._0_7._readFinal$0() == null;
-    },
-    $signature: 1
-  };
-  A.SassNumber_SassNumber$withUnits_closure13.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 96
-  };
-  A.SassNumber_SassNumber$withUnits_closure15.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_7._readFinal$0()) <= 0;
-    },
-    $signature: 1
-  };
-  A.SassNumber_SassNumber$withUnits_closure16.prototype = {
-    call$0() {
-      return this._1_0._0;
-    },
-    $signature: 26
-  };
-  A.SassNumber_SassNumber$withUnits_closure17.prototype = {
-    call$0() {
-      return J.get$length$asx(this._1_1._readFinal$0());
-    },
-    $signature: 3
-  };
-  A.SassNumber_SassNumber$withUnits_closure18.prototype = {
-    call$0() {
-      return J.get$length$asx(this._1_0._1) <= 0;
-    },
-    $signature: 1
-  };
   A.SassNumber__coerceOrConvertValue_compatibilityException0.prototype = {
     call$0() {
       var t2, t3, message, t4, type, unit, _this = this,
@@ -104955,7 +105688,7 @@ self.util = _cliPkgRequires.util;
           if (type != null) {
             t1 = _this.$this.toString$0(0);
             t2 = B.JSArray_methods.contains$1(A._setArrayType([97, 101, 105, 111, 117], type$.JSArray_int), type.charCodeAt(0)) ? "an " + type : "a " + type;
-            t3 = B.Map_ws7dy.$index(0, type);
+            t3 = B.Map_397RH.$index(0, type);
             t3.toString;
             t3 = "Expected " + t1 + " to have " + t2 + " unit (" + B.JSArray_methods.join$1(t3, ", ") + ").";
             t2 = _this.name;
@@ -104970,7 +105703,7 @@ self.util = _cliPkgRequires.util;
         return new A.SassScriptException0(t1 == null ? t3 : "$" + t1 + ": " + t3);
       }
     },
-    $signature: 544
+    $signature: 524
   };
   A.SassNumber__coerceOrConvertValue_closure3.prototype = {
     call$1(oldNumerator) {
@@ -104980,7 +105713,7 @@ self.util = _cliPkgRequires.util;
       this._box_0.value *= factor;
       return true;
     },
-    $signature: 10
+    $signature: 4
   };
   A.SassNumber__coerceOrConvertValue_closure4.prototype = {
     call$0() {
@@ -104996,7 +105729,7 @@ self.util = _cliPkgRequires.util;
       this._box_0.value /= factor;
       return true;
     },
-    $signature: 10
+    $signature: 4
   };
   A.SassNumber__coerceOrConvertValue_closure6.prototype = {
     call$0() {
@@ -105008,63 +105741,15 @@ self.util = _cliPkgRequires.util;
     call$2(num1, num2) {
       return num1 + num2;
     },
-    $signature: 66
+    $signature: 56
   };
   A.SassNumber_minus_closure0.prototype = {
     call$2(num1, num2) {
       return num1 - num2;
     },
-    $signature: 66
+    $signature: 56
   };
-  A.SassNumber_multiplyUnits_closure11.prototype = {
-    call$0() {
-      return this._0_0._values[0];
-    },
-    $signature: 26
-  };
-  A.SassNumber_multiplyUnits_closure12.prototype = {
-    call$0() {
-      return this._0_0._values[1];
-    },
-    $signature: 26
-  };
-  A.SassNumber_multiplyUnits_closure13.prototype = {
-    call$0() {
-      return this._0_0._values[2];
-    },
-    $signature: 26
-  };
-  A.SassNumber_multiplyUnits_closure14.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_3._readFinal$0()) <= 0;
-    },
-    $signature: 1
-  };
-  A.SassNumber_multiplyUnits_closure15.prototype = {
-    call$0() {
-      return this._0_0._values[3];
-    },
-    $signature: 26
-  };
-  A.SassNumber_multiplyUnits_closure16.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_7._readFinal$0()) <= 0;
-    },
-    $signature: 1
-  };
-  A.SassNumber_multiplyUnits_closure17.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_1._readFinal$0()) <= 0;
-    },
-    $signature: 1
-  };
-  A.SassNumber_multiplyUnits_closure18.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_2._readFinal$0()) <= 0;
-    },
-    $signature: 1
-  };
-  A.SassNumber_multiplyUnits_closure19.prototype = {
+  A.SassNumber_multiplyUnits_closure3.prototype = {
     call$1(denominator) {
       var factor = A.conversionFactor0(this.numerator, denominator);
       if (factor == null)
@@ -105072,15 +105757,15 @@ self.util = _cliPkgRequires.util;
       this._box_0.value /= factor;
       return true;
     },
-    $signature: 10
+    $signature: 4
   };
-  A.SassNumber_multiplyUnits_closure20.prototype = {
+  A.SassNumber_multiplyUnits_closure4.prototype = {
     call$0() {
       return this.newNumerators.push(this.numerator);
     },
     $signature: 0
   };
-  A.SassNumber_multiplyUnits_closure21.prototype = {
+  A.SassNumber_multiplyUnits_closure5.prototype = {
     call$1(denominator) {
       var factor = A.conversionFactor0(this.numerator, denominator);
       if (factor == null)
@@ -105088,9 +105773,9 @@ self.util = _cliPkgRequires.util;
       this._box_0.value /= factor;
       return true;
     },
-    $signature: 10
+    $signature: 4
   };
-  A.SassNumber_multiplyUnits_closure22.prototype = {
+  A.SassNumber_multiplyUnits_closure6.prototype = {
     call$0() {
       return this.newNumerators.push(this.numerator);
     },
@@ -105098,50 +105783,19 @@ self.util = _cliPkgRequires.util;
   };
   A.SassNumber__areAnyConvertible_closure0.prototype = {
     call$1(unit1) {
-      var innerMap, t1,
-        _0_0 = B.Map_nfuzN.$index(0, unit1);
+      var t1,
+        _0_0 = B.Map_gQqJO.$index(0, unit1);
       $label0$0: {
         if (_0_0 != null) {
-          innerMap = _0_0;
-          t1 = true;
-        } else {
-          innerMap = null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = J.any$1$ax(this.units2, innerMap.get$containsKey());
+          t1 = B.JSArray_methods.any$1(this.units2, _0_0.get$containsKey());
           break $label0$0;
         }
-        t1 = J.contains$1$asx(this.units2, unit1);
+        t1 = B.JSArray_methods.contains$1(this.units2, unit1);
         break $label0$0;
       }
       return t1;
     },
-    $signature: 10
-  };
-  A.SassNumber__unitString_closure3.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_0._0) <= 0;
-    },
-    $signature: 1
-  };
-  A.SassNumber__unitString_closure4.prototype = {
-    call$0() {
-      return this._0_0._1;
-    },
-    $signature: 26
-  };
-  A.SassNumber__unitString_closure5.prototype = {
-    call$0() {
-      return J.get$length$asx(this._0_5._readFinal$0());
-    },
-    $signature: 3
-  };
-  A.SassNumber__unitString_closure6.prototype = {
-    call$0() {
-      return this._0_6._readFinal$0() <= 0;
-    },
-    $signature: 1
+    $signature: 4
   };
   A.SassNumber__canonicalizeUnitList_closure0.prototype = {
     call$1(unit) {
@@ -105150,31 +105804,31 @@ self.util = _cliPkgRequires.util;
       if (type == null)
         t1 = unit;
       else {
-        t1 = B.Map_ws7dy.$index(0, type);
+        t1 = B.Map_397RH.$index(0, type);
         t1.toString;
         t1 = B.JSArray_methods.get$first(t1);
       }
       return t1;
     },
-    $signature: 7
+    $signature: 5
   };
   A.SassNumber__canonicalMultiplier_closure0.prototype = {
     call$2(multiplier, unit) {
       return multiplier * this.$this.canonicalMultiplierForUnit$1(unit);
     },
-    $signature: 220
+    $signature: 160
   };
   A.SassNumber_unitSuggestion_closure1.prototype = {
     call$1(unit) {
       return " * 1" + unit;
     },
-    $signature: 7
+    $signature: 5
   };
   A.SassNumber_unitSuggestion_closure2.prototype = {
     call$1(unit) {
       return " / 1" + unit;
     },
-    $signature: 7
+    $signature: 5
   };
   A.SupportsOperation0.prototype = {
     toString$0(_) {
@@ -105208,21 +105862,14 @@ self.util = _cliPkgRequires.util;
   A.ParentStatement0.prototype = {$isAstNode0: 1, $isStatement0: 1};
   A.ParentStatement_closure0.prototype = {
     call$1(child) {
-      var t1, imports;
+      var t1;
       $label0$0: {
         if (child instanceof A.VariableDeclaration0 || child instanceof A.FunctionRule0 || child instanceof A.MixinRule0) {
           t1 = true;
           break $label0$0;
         }
         if (child instanceof A.ImportRule0) {
-          imports = child.imports;
-          t1 = true;
-        } else {
-          imports = null;
-          t1 = false;
-        }
-        if (t1) {
-          t1 = (imports && B.JSArray_methods).any$1(imports, new A.ParentStatement__closure0());
+          t1 = B.JSArray_methods.any$1(child.imports, new A.ParentStatement__closure0());
           break $label0$0;
         }
         t1 = false;
@@ -105230,13 +105877,13 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 257
+    $signature: 247
   };
   A.ParentStatement__closure0.prototype = {
     call$1($import) {
       return $import instanceof A.DynamicImport0;
     },
-    $signature: 258
+    $signature: 245
   };
   A.ParenthesizedExpression0.prototype = {
     accept$1$1(visitor) {
@@ -105299,10 +105946,8 @@ self.util = _cliPkgRequires.util;
       if (t1.peekChar$0() !== 47)
         return false;
       _0_0 = t1.peekChar$1(1);
-      if (47 === _0_0) {
-        this.silentComment$0();
-        return true;
-      }
+      if (47 === _0_0)
+        return this.silentComment$0();
       if (42 === _0_0) {
         this.loudComment$0();
         return true;
@@ -105337,6 +105982,7 @@ self.util = _cliPkgRequires.util;
           break;
         t1.readChar$0();
       }
+      return true;
     },
     loudComment$0() {
       var next,
@@ -105413,12 +106059,14 @@ self.util = _cliPkgRequires.util;
             t2 = true;
           if (t2)
             break;
-          text._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t2 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          text._contents += t2;
           continue;
         }
         if (95 === _1_0 && normalize) {
           t1.readChar$0();
-          text._contents += A.Primitives_stringFromCharCode(45);
+          t2 = A.Primitives_stringFromCharCode(45);
+          text._contents += t2;
           continue;
         }
         if (_1_0 !== 95) {
@@ -105434,11 +106082,13 @@ self.util = _cliPkgRequires.util;
         else
           t2 = true;
         if (t2) {
-          text._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t2 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          text._contents += t2;
           continue;
         }
         if (92 === _1_0) {
-          text._contents += this.escape$0();
+          t2 = this.escape$0();
+          text._contents += t2;
           continue;
         }
         break;
@@ -105467,17 +106117,20 @@ self.util = _cliPkgRequires.util;
           if (t2 === 10 || t2 === 13 || t2 === 12) {
             t1.readChar$0();
             t1.readChar$0();
-          } else
-            buffer._contents += A.Primitives_stringFromCharCode(A.consumeEscapedCharacter0(t1));
+          } else {
+            t2 = A.Primitives_stringFromCharCode(A.consumeEscapedCharacter0(t1));
+            buffer._contents += t2;
+          }
           continue;
         }
-        buffer._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+        t2 = A.Primitives_stringFromCharCode(t1.readChar$0());
+        buffer._contents += t2;
       }
       t1 = buffer._contents;
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     },
     declarationValue$1$allowEmpty(allowEmpty) {
-      var t1, t2, wroteNewline, next, start, end, t3, _0_0, url, _this = this,
+      var t1, t2, wroteNewline, next, t3, start, end, _0_0, _this = this,
         buffer = new A.StringBuffer(""),
         brackets = A._setArrayType([], type$.JSArray_int);
       for (t1 = _this.scanner, t2 = _this.get$string(), wroteNewline = false; true;) {
@@ -105485,7 +106138,8 @@ self.util = _cliPkgRequires.util;
         if (next == null)
           break;
         if (92 === next) {
-          buffer._contents += _this.escape$1$identifierStart(true);
+          t3 = _this.escape$1$identifierStart(true);
+          buffer._contents += t3;
           wroteNewline = false;
           continue;
         }
@@ -105504,8 +106158,10 @@ self.util = _cliPkgRequires.util;
             t3.call$0();
             end = t1._string_scanner$_position;
             buffer._contents += B.JSString_methods.substring$2(t1.string, start, end);
-          } else
-            buffer._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          } else {
+            t3 = A.Primitives_stringFromCharCode(t1.readChar$0());
+            buffer._contents += t3;
+          }
           wroteNewline = false;
           continue;
         }
@@ -105515,8 +106171,10 @@ self.util = _cliPkgRequires.util;
             t3 = !(t3 === 32 || t3 === 9 || t3 === 10 || t3 === 13 || t3 === 12);
           } else
             t3 = true;
-          if (t3)
-            buffer._contents += A.Primitives_stringFromCharCode(32);
+          if (t3) {
+            t3 = A.Primitives_stringFromCharCode(32);
+            buffer._contents += t3;
+          }
           t1.readChar$0();
           continue;
         }
@@ -105529,7 +106187,8 @@ self.util = _cliPkgRequires.util;
           continue;
         }
         if (40 === next || 123 === next || 91 === next) {
-          buffer._contents += A.Primitives_stringFromCharCode(next);
+          t3 = A.Primitives_stringFromCharCode(next);
+          buffer._contents += t3;
           brackets.push(A.opposite0(t1.readChar$0()));
           wroteNewline = false;
           continue;
@@ -105537,7 +106196,8 @@ self.util = _cliPkgRequires.util;
         if (41 === next || 125 === next || 93 === next) {
           if (brackets.length === 0)
             break;
-          buffer._contents += A.Primitives_stringFromCharCode(next);
+          t3 = A.Primitives_stringFromCharCode(next);
+          buffer._contents += t3;
           t1.expectChar$1(brackets.pop());
           wroteNewline = false;
           continue;
@@ -105545,29 +106205,28 @@ self.util = _cliPkgRequires.util;
         if (59 === next) {
           if (brackets.length === 0)
             break;
-          buffer._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t3 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          buffer._contents += t3;
           continue;
         }
         if (117 === next || 85 === next) {
           _0_0 = _this.tryUrl$0();
-          if (_0_0 != null) {
-            url = _0_0;
-            t3 = true;
-          } else {
-            url = null;
-            t3 = false;
+          if (_0_0 != null)
+            buffer._contents += _0_0;
+          else {
+            t3 = A.Primitives_stringFromCharCode(t1.readChar$0());
+            buffer._contents += t3;
           }
-          if (t3)
-            buffer._contents += A.S(url);
-          else
-            buffer._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
           wroteNewline = false;
           continue;
         }
-        if (_this.lookingAtIdentifier$0())
-          buffer._contents += _this.identifier$0();
-        else
-          buffer._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+        if (_this.lookingAtIdentifier$0()) {
+          t3 = _this.identifier$0();
+          buffer._contents += t3;
+        } else {
+          t3 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          buffer._contents += t3;
+        }
         wroteNewline = false;
       }
       if (brackets.length !== 0)
@@ -105598,7 +106257,8 @@ self.util = _cliPkgRequires.util;
         if (_0_0 == null)
           break;
         if (92 === _0_0) {
-          buffer._contents += _this.escape$0();
+          t2 = _this.escape$0();
+          buffer._contents += t2;
           continue;
         }
         if (37 !== _0_0)
@@ -105612,7 +106272,8 @@ self.util = _cliPkgRequires.util;
         else
           t2 = true;
         if (t2) {
-          buffer._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t2 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          buffer._contents += t2;
           continue;
         }
         if (_0_0 === 32 || _0_0 === 9 || _0_0 === 10 || _0_0 === 13 || _0_0 === 12) {
@@ -105622,7 +106283,8 @@ self.util = _cliPkgRequires.util;
           continue;
         }
         if (41 === _0_0) {
-          t2 = buffer._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t2 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          t2 = buffer._contents += t2;
           return t2.charCodeAt(0) == 0 ? t2 : t2;
         }
         break;
@@ -105724,18 +106386,16 @@ self.util = _cliPkgRequires.util;
       return true;
     },
     scanIdentChar$2$caseSensitive(char, caseSensitive) {
-      var next, t3,
+      var t3,
         t1 = new A.Parser_scanIdentChar_matches0(caseSensitive, char),
         t2 = this.scanner,
         _0_0 = t2.peekChar$0();
       if (_0_0 != null) {
-        next = _0_0;
-        t3 = true;
-      } else {
-        next = null;
+        t3 = t1.call$1(_0_0);
+        t3 = t3;
+      } else
         t3 = false;
-      }
-      if (t3 && t1.call$1(next)) {
+      if (t3) {
         t2.readChar$0();
         return true;
       }
@@ -105779,11 +106439,9 @@ self.util = _cliPkgRequires.util;
               t1 = _0_0 === 95 || A.CharacterExtension_get_isAlphabetic0(_0_0) || _0_0 >= 128;
             else
               t1 = false;
-            if (t1 || 92 === _0_0 || 45 === _0_0) {
-              t1 = true;
+            t1 = t1 || 92 === _0_0 || 45 === _0_0;
+            if (t1)
               break $label1$1;
-            }
-            t1 = false;
             break $label1$1;
           }
           break $label0$0;
@@ -105827,7 +106485,7 @@ self.util = _cliPkgRequires.util;
     },
     _parser0$_consumeIdentifier$2(text, caseSensitive) {
       var t1, t2, t3;
-      for (t1 = new A.CodeUnits(text), t1 = new A.ListIterator(t1, t1.get$length(t1)), t2 = A._instanceType(t1)._precomputed1; t1.moveNext$0();) {
+      for (t1 = new A.CodeUnits(text), t2 = type$.CodeUnits, t1 = new A.ListIterator(t1, t1.get$length(0), t2._eval$1("ListIterator<ListBase.E>")), t2 = t2._eval$1("ListBase.E"); t1.moveNext$0();) {
         t3 = t1.__internal$_current;
         if (!this.scanIdentChar$2$caseSensitive(t3 == null ? t2._as(t3) : t3, caseSensitive))
           return false;
@@ -105840,15 +106498,15 @@ self.util = _cliPkgRequires.util;
         $name = '"' + text + '"';
       t1 = this.scanner;
       start = t1._string_scanner$_position;
-      for (t2 = new A.CodeUnits(text), t2 = new A.ListIterator(t2, t2.get$length(t2)), t3 = "Expected " + $name, t4 = t3 + ".", t5 = A._instanceType(t2)._precomputed1; t2.moveNext$0();) {
+      for (t2 = new A.CodeUnits(text), t3 = type$.CodeUnits, t2 = new A.ListIterator(t2, t2.get$length(0), t3._eval$1("ListIterator<ListBase.E>")), t4 = "Expected " + $name, t5 = t4 + ".", t3 = t3._eval$1("ListBase.E"); t2.moveNext$0();) {
         t6 = t2.__internal$_current;
-        if (this.scanIdentChar$2$caseSensitive(t6 == null ? t5._as(t6) : t6, false))
+        if (this.scanIdentChar$2$caseSensitive(t6 == null ? t3._as(t6) : t6, false))
           continue;
-        t1.error$2$position(0, t4, start);
+        t1.error$2$position(0, t5, start);
       }
       if (!this.lookingAtIdentifierBody$0())
         return;
-      t1.error$2$position(0, t3, start);
+      t1.error$2$position(0, t4, start);
     },
     expectIdentifier$1(text) {
       return this.expectIdentifier$2$name(text, null);
@@ -105870,8 +106528,8 @@ self.util = _cliPkgRequires.util;
       else
         A.throwWithTrace0(exception, this.get$error(this), trace);
     },
-    error$2($receiver, message, span) {
-      return this.error$3($receiver, message, span, null);
+    error$2(_, message, span) {
+      return this.error$3(0, message, span, null);
     },
     withErrorMessage$1$2(message, callback) {
       var error, stackTrace, t1, exception;
@@ -105996,26 +106654,26 @@ self.util = _cliPkgRequires.util;
       t1.scanner.expectDone$0();
       return result;
     },
-    $signature: 22
+    $signature: 26
   };
   A.Parser_escape_closure0.prototype = {
     call$1(char) {
       return char === 32 || char === 9 || char === 10 || char === 13 || char === 12;
     },
-    $signature: 34
+    $signature: 30
   };
   A.Parser_scanIdentChar_matches0.prototype = {
     call$1(actual) {
       var t1 = this.char;
       return this.caseSensitive ? actual === t1 : A.characterEqualsIgnoreCase0(t1, actual);
     },
-    $signature: 47
+    $signature: 45
   };
   A.Parser_spanFrom_closure0.prototype = {
     call$0() {
       return this.$this._parser0$_interpolationMap.mapSpan$1(this.span);
     },
-    $signature: 33
+    $signature: 27
   };
   A.PlaceholderSelector0.prototype = {
     accept$1$1(visitor) {
@@ -106092,12 +106750,15 @@ self.util = _cliPkgRequires.util;
     call$1(key) {
       return this.$this._prefixed_map_view0$_view._prefixed_map_view0$_prefix + key;
     },
-    $signature: 7
+    $signature: 5
   };
   A.PseudoSelector0.prototype = {
     get$isHostContext() {
       return this.isClass && this.name === "host-context" && this.selector != null;
     },
+    get$hasComplicatedSuperselectorSemantics() {
+      return !this.isClass || this.selector != null;
+    },
     get$specificity() {
       var result, _this = this,
         value = _this._pseudo$__PseudoSelector_specificity_FI;
@@ -106220,19 +106881,19 @@ self.util = _cliPkgRequires.util;
           return A.SimpleSelector0.prototype.get$specificity.call(t1);
       }
     },
-    $signature: 3
+    $signature: 10
   };
   A.PseudoSelector_specificity__closure1.prototype = {
     call$1(component) {
       return component.get$specificity();
     },
-    $signature: 274
+    $signature: 205
   };
   A.PseudoSelector_specificity__closure2.prototype = {
     call$1(component) {
       return component.get$specificity();
     },
-    $signature: 274
+    $signature: 205
   };
   A.PseudoSelector_unify_closure0.prototype = {
     call$1(simple) {
@@ -106243,7 +106904,7 @@ self.util = _cliPkgRequires.util;
         t1 = false;
       return t1;
     },
-    $signature: 15
+    $signature: 14
   };
   A.PublicMemberMapView0.prototype = {
     get$keys(_) {
@@ -106287,28 +106948,28 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 546
+    $signature: 526
   };
   A.JSClassExtension_get_defineStaticMethod_closure.prototype = {
     call$2($name, body) {
       this._this[$name] = A.allowInteropNamed($name, body);
       return null;
     },
-    $signature: 144
+    $signature: 129
   };
   A.JSClassExtension_get_defineMethod_closure.prototype = {
     call$2($name, body) {
       J.get$$prototype$x(this._this)[$name] = A.allowInteropCaptureThisNamed($name, body);
       return null;
     },
-    $signature: 144
+    $signature: 129
   };
   A.JSClassExtension_get_defineGetter_closure.prototype = {
     call$2($name, body) {
       A.defineGetter(J.get$$prototype$x(this._this), $name, body, null);
       return null;
     },
-    $signature: 144
+    $signature: 129
   };
   A.RenderContext0.prototype = {};
   A.RenderContextOptions0.prototype = {};
@@ -106328,7 +106989,9 @@ self.util = _cliPkgRequires.util;
       return node;
     },
     visitFunctionExpression$1(node) {
-      return new A.FunctionExpression0(node.namespace, node.originalName, this.visitArgumentInvocation$1(node.$arguments), node.span);
+      var t1 = node.originalName,
+        t2 = this.visitArgumentInvocation$1(node.$arguments);
+      return new A.FunctionExpression0(node.namespace, A.stringReplaceAllUnchecked(t1, "_", "-"), t1, t2, node.span);
     },
     visitInterpolatedFunctionExpression$1(node) {
       return new A.InterpolatedFunctionExpression0(this.visitInterpolation$1(node.name), this.visitArgumentInvocation$1(node.$arguments), node.span);
@@ -106379,16 +107042,14 @@ self.util = _cliPkgRequires.util;
       return node;
     },
     visitArgumentInvocation$1(invocation) {
-      var t5, t6, $name, value, _this = this,
+      var t5, t6, _this = this,
         t1 = invocation.positional,
         t2 = type$.String,
         t3 = type$.Expression_2,
         t4 = A.LinkedHashMap_LinkedHashMap$_empty(t2, t3);
       for (t5 = A.MapExtensions_get_pairs0(invocation.named, t2, t3), t5 = t5.get$iterator(t5); t5.moveNext$0();) {
         t6 = t5.get$current(t5);
-        $name = t6._0;
-        value = t6._1;
-        t4.$indexSet(0, $name, value.accept$1(_this));
+        t4.$indexSet(0, t6._0, t6._1.accept$1(_this));
       }
       t5 = invocation.rest;
       t5 = t5 == null ? null : t5.accept$1(_this);
@@ -106418,19 +107079,19 @@ self.util = _cliPkgRequires.util;
     call$1(item) {
       return item.accept$1(this.$this);
     },
-    $signature: 276
+    $signature: 204
   };
   A.ReplaceExpressionVisitor_visitArgumentInvocation_closure0.prototype = {
     call$1(expression) {
       return expression.accept$1(this.$this);
     },
-    $signature: 276
+    $signature: 204
   };
   A.ReplaceExpressionVisitor_visitInterpolation_closure0.prototype = {
     call$1(node) {
       return type$.Expression_2._is(node) ? node.accept$1(this.$this) : node;
     },
-    $signature: 69
+    $signature: 67
   };
   A.ImporterResult0.prototype = {
     get$sourceMapUrl(_) {
@@ -106469,7 +107130,8 @@ self.util = _cliPkgRequires.util;
         buffer = new A.InterpolationBuffer0(t3, A._setArrayType([], type$.JSArray_Object));
       do {
         buffer.addInterpolation$1(this.almostAnyValue$1$omitComments(true));
-        t4 = t3._contents += A.Primitives_stringFromCharCode(10);
+        t4 = A.Primitives_stringFromCharCode(10);
+        t4 = t3._contents += t4;
       } while (B.JSString_methods.endsWith$1(B.JSString_methods.trimRight$0(t4.charCodeAt(0) == 0 ? t4 : t4), ",") && this.scanCharIf$1(new A.SassParser_styleRuleSelector_closure0()));
       return buffer.interpolation$1(t1.spanFrom$1(new A._SpanScannerState(t1, t2)));
     },
@@ -106574,7 +107236,7 @@ self.util = _cliPkgRequires.util;
       return children;
     },
     statements$1(statement) {
-      var statements, t2, _1_0, child, t3,
+      var statements, t2, _1_0,
         t1 = this.scanner,
         _0_0 = t1.peekChar$0();
       if (9 === _0_0 || 32 === _0_0)
@@ -106582,15 +107244,8 @@ self.util = _cliPkgRequires.util;
       statements = A._setArrayType([], type$.JSArray_Statement_2);
       for (t2 = t1.string.length; t1._string_scanner$_position !== t2;) {
         _1_0 = this._sass0$_child$1(statement);
-        if (_1_0 != null) {
-          child = _1_0;
-          t3 = true;
-        } else {
-          child = null;
-          t3 = false;
-        }
-        if (t3)
-          statements.push(child);
+        if (_1_0 != null)
+          statements.push(_1_0);
         this._sass0$_readIndentation$0();
       }
       return statements;
@@ -106690,7 +107345,8 @@ self.util = _cliPkgRequires.util;
           t7 = t1.peekChar$0();
           if (t7 === 10 || t7 === 13 || t7 === 12) {
             _this._sass0$_readIndentation$0();
-            t3._contents += A.Primitives_stringFromCharCode(32);
+            t7 = A.Primitives_stringFromCharCode(32);
+            t3._contents += t7;
           } else {
             end = t1._string_scanner$_position;
             t3._contents += B.JSString_methods.substring$2(t5, beginningOfComment, end);
@@ -106699,8 +107355,10 @@ self.util = _cliPkgRequires.util;
           t7 = t3._contents += "\n";
           t3._contents = t7 + " * ";
         }
-        for (i = 3; i < _this._sass0$_currentIndentation - parentIndentation; ++i)
-          t3._contents += A.Primitives_stringFromCharCode(32);
+        for (i = 3; i < _this._sass0$_currentIndentation - parentIndentation; ++i) {
+          t7 = A.Primitives_stringFromCharCode(32);
+          t3._contents += t7;
+        }
         for (; t1._string_scanner$_position !== t6;) {
           _0_0 = t1.peekChar$0();
           if (10 === _0_0 || 13 === _0_0 || 12 === _0_0)
@@ -106710,11 +107368,14 @@ self.util = _cliPkgRequires.util;
               t7 = _this.singleInterpolation$0();
               buffer._interpolation_buffer0$_flushText$0();
               t4.push(t7);
-            } else
-              t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+            } else {
+              t7 = A.Primitives_stringFromCharCode(t1.readChar$0());
+              t3._contents += t7;
+            }
             continue;
           }
-          t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t7 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          t3._contents += t7;
         }
         if (_this._sass0$_peekIndentation$0() <= parentIndentation)
           break;
@@ -106833,17 +107494,10 @@ self.util = _cliPkgRequires.util;
       return currentIndentation;
     },
     _sass0$_peekIndentation$0() {
-      var cached, t1, t2, t3, start, containsTab, containsSpace, nextIndentation, _1_0, t4, _this = this,
+      var t1, t2, t3, start, containsTab, containsSpace, nextIndentation, _1_0, t4, _this = this,
         _0_0 = _this._sass0$_nextIndentation;
-      if (_0_0 != null) {
-        cached = _0_0;
-        t1 = true;
-      } else {
-        cached = null;
-        t1 = false;
-      }
-      if (t1)
-        return cached;
+      if (_0_0 != null)
+        return _0_0;
       t1 = _this.scanner;
       t2 = t1._string_scanner$_position;
       t3 = t1.string.length;
@@ -106858,33 +107512,32 @@ self.util = _cliPkgRequires.util;
       containsTab = A._Cell$();
       containsSpace = A._Cell$();
       nextIndentation = A._Cell$();
-      t2 = nextIndentation.__late_helper$_name;
       do {
-        containsSpace._value = containsTab._value = false;
-        nextIndentation._value = 0;
+        containsSpace.__late_helper$_value = containsTab.__late_helper$_value = false;
+        nextIndentation.__late_helper$_value = 0;
         for (; true;) {
           $label0$0: {
             _1_0 = t1.peekChar$0();
             if (32 === _1_0) {
-              containsSpace._value = true;
+              containsSpace.__late_helper$_value = true;
               break $label0$0;
             }
             if (9 === _1_0) {
-              containsTab._value = true;
+              containsTab.__late_helper$_value = true;
               break $label0$0;
             }
             break;
           }
-          t4 = nextIndentation._value;
-          if (t4 === nextIndentation)
-            A.throwExpression(A.LateError$localNI(t2));
-          nextIndentation._value = t4 + 1;
+          t2 = nextIndentation.__late_helper$_value;
+          if (t2 === nextIndentation)
+            A.throwExpression(A.LateError$localNI(""));
+          nextIndentation.__late_helper$_value = t2 + 1;
           t1.readChar$0();
         }
-        t4 = t1._string_scanner$_position;
-        if (t4 === t3) {
+        t2 = t1._string_scanner$_position;
+        if (t2 === t3) {
           _this._sass0$_nextIndentation = 0;
-          _this._sass0$_nextIndentationEnd = new A._SpanScannerState(t1, t4);
+          _this._sass0$_nextIndentationEnd = new A._SpanScannerState(t1, t2);
           t1.set$state(start);
           return 0;
         }
@@ -106922,21 +107575,13 @@ self.util = _cliPkgRequires.util;
     call$1(char) {
       return char === 10 || char === 13 || char === 12;
     },
-    $signature: 34
+    $signature: 30
   };
   A.SassParser_children_closure0.prototype = {
     call$0() {
-      var parsedChild, t1,
-        _0_0 = this.$this._sass0$_child$1(this.child);
-      if (_0_0 != null) {
-        parsedChild = _0_0;
-        t1 = true;
-      } else {
-        parsedChild = null;
-        t1 = false;
-      }
-      if (t1)
-        this.children.push(parsedChild);
+      var _0_0 = this.$this._sass0$_child$1(this.child);
+      if (_0_0 != null)
+        this.children.push(_0_0);
     },
     $signature: 0
   };
@@ -106944,26 +107589,26 @@ self.util = _cliPkgRequires.util;
     call$1(char) {
       return char === 10 || char === 13 || char === 12;
     },
-    $signature: 34
+    $signature: 30
   };
   A.SassParser__peekIndentation_closure2.prototype = {
     call$1(char) {
       return char === 10 || char === 13 || char === 12;
     },
-    $signature: 34
+    $signature: 30
   };
   A._Exports.prototype = {};
   A._wrapMain_closure.prototype = {
     call$1(_) {
       return A._translateReturnValue(this.main.call$0());
     },
-    $signature: 88
+    $signature: 82
   };
   A._wrapMain_closure0.prototype = {
     call$1(args) {
       return A._translateReturnValue(this.main.call$1(A.List_List$from(type$.List_dynamic._as(args), true, type$.String)));
     },
-    $signature: 88
+    $signature: 82
   };
   A.ScssParser0.prototype = {
     get$indented() {
@@ -107006,7 +107651,7 @@ self.util = _cliPkgRequires.util;
         if (_this.scanIdentifier$2$caseSensitive("else", true))
           return true;
         if (_this.scanIdentifier$2$caseSensitive("elseif", true)) {
-          A.WarnForDeprecation_warnForDeprecation0(_this.logger, B.Deprecation_elseif_false_elseif, string$.x40elsei, t1.spanFrom$1(new A._SpanScannerState(t1, t3)), null);
+          A.WarnForDeprecation_warnForDeprecation0(_this.logger, B.Deprecation_xw8, string$.x40elsei, t1.spanFrom$1(new A._SpanScannerState(t1, t3)), null);
           t1.set$position(t1._string_scanner$_position - 2);
           return true;
         }
@@ -107051,7 +107696,7 @@ self.util = _cliPkgRequires.util;
         }
     },
     statements$1(statement) {
-      var t1, t2, _0_0, child, t3, _1_0, _this = this,
+      var t1, t2, _0_0, _1_0, _this = this,
         statements = A._setArrayType([], type$.JSArray_Statement_2);
       _this.whitespaceWithoutComments$0();
       for (t1 = _this.scanner, t2 = t1.string.length; t1._string_scanner$_position !== t2;)
@@ -107071,15 +107716,8 @@ self.util = _cliPkgRequires.util;
                 break;
               default:
                 _0_0 = statement.call$0();
-                if (_0_0 != null) {
-                  child = _0_0;
-                  t3 = true;
-                } else {
-                  child = null;
-                  t3 = false;
-                }
-                if (t3)
-                  statements.push(child);
+                if (_0_0 != null)
+                  statements.push(_0_0);
             }
             break;
           case 59:
@@ -107088,15 +107726,8 @@ self.util = _cliPkgRequires.util;
             break;
           default:
             _1_0 = statement.call$0();
-            if (_1_0 != null) {
-              child = _1_0;
-              t3 = true;
-            } else {
-              child = null;
-              t3 = false;
-            }
-            if (t3)
-              statements.push(child);
+            if (_1_0 != null)
+              statements.push(_1_0);
         }
       return statements;
     },
@@ -107141,14 +107772,18 @@ self.util = _cliPkgRequires.util;
                 t5 = this.singleInterpolation$0();
                 buffer._interpolation_buffer0$_flushText$0();
                 t4.push(t5);
-              } else
-                t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+              } else {
+                t5 = A.Primitives_stringFromCharCode(t1.readChar$0());
+                t3._contents += t5;
+              }
               break;
             case 42:
-              t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+              t5 = A.Primitives_stringFromCharCode(t1.readChar$0());
+              t3._contents += t5;
               if (t1.peekChar$0() !== 47)
                 continue $label0$1;
-              t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+              t5 = A.Primitives_stringFromCharCode(t1.readChar$0());
+              t3._contents += t5;
               endPosition = t1._string_scanner$_position;
               t5 = t1._sourceFile;
               t6 = new A._SpanScannerState(t1, t2).position;
@@ -107167,25 +107802,27 @@ self.util = _cliPkgRequires.util;
               return new A.LoudComment0(t2);
             case 13:
               t1.readChar$0();
-              if (t1.peekChar$0() !== 10)
-                t3._contents += A.Primitives_stringFromCharCode(10);
+              if (t1.peekChar$0() !== 10) {
+                t5 = A.Primitives_stringFromCharCode(10);
+                t3._contents += t5;
+              }
               break;
             case 12:
               t1.readChar$0();
-              t3._contents += A.Primitives_stringFromCharCode(10);
+              t5 = A.Primitives_stringFromCharCode(10);
+              t3._contents += t5;
               break;
             default:
-              t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+              t5 = A.Primitives_stringFromCharCode(t1.readChar$0());
+              t3._contents += t5;
           }
     }
   };
   A.Selector0.prototype = {
     assertNotBogus$1$name($name) {
-      var t1;
       if (!this.accept$1(B._IsBogusVisitor_true0))
         return;
-      t1 = this.toString$0(0);
-      A.EvaluationContext_current0().warn$2(0, "$" + $name + ": " + (t1 + string$.x20is_nov), B.Deprecation_XV6);
+      A.warnForDeprecation0("$" + $name + ": " + (this.toString$0(0) + string$.x20is_nov), B.Deprecation_5pG);
     },
     toString$0(_) {
       var visitor = A._SerializeVisitor$0(null, true, null, true, false, null, true);
@@ -107213,20 +107850,13 @@ self.util = _cliPkgRequires.util;
       return true;
     },
     visitPseudoSelector$1(pseudo) {
-      var selector, t1,
+      var t1,
         _0_0 = pseudo.selector;
       if (_0_0 != null) {
-        selector = _0_0;
-        t1 = true;
-      } else {
-        selector = null;
-        t1 = false;
-      }
-      if (t1) {
         if (pseudo.name === "not")
-          t1 = this.includeBogus && selector.accept$1(B._IsBogusVisitor_true0);
+          t1 = this.includeBogus && _0_0.accept$1(B._IsBogusVisitor_true0);
         else
-          t1 = this.visitSelectorList$1(selector);
+          t1 = this.visitSelectorList$1(_0_0);
         return t1;
       } else
         return false;
@@ -107254,7 +107884,7 @@ self.util = _cliPkgRequires.util;
     call$1(component) {
       return component.combinators.length > 1 || this.$this.visitCompoundSelector$1(component.selector);
     },
-    $signature: 52
+    $signature: 50
   };
   A._IsUselessVisitor0.prototype = {
     visitComplexSelector$1(complex) {
@@ -107268,7 +107898,7 @@ self.util = _cliPkgRequires.util;
     call$1(component) {
       return component.combinators.length > 1 || this.$this.visitCompoundSelector$1(component.selector);
     },
-    $signature: 52
+    $signature: 50
   };
   A.__IsBogusVisitor_Object_AnySelectorVisitor0.prototype = {};
   A.__IsInvisibleVisitor_Object_AnySelectorVisitor0.prototype = {};
@@ -107298,7 +107928,7 @@ self.util = _cliPkgRequires.util;
       t1.first = true;
       return new A.MappedListIterable(selectors, new A._nest__closure1(t1), A._arrayInstanceType(selectors)._eval$1("MappedListIterable<1,SelectorList0>")).reduce$1(0, new A._nest__closure2()).get$asSassList();
     },
-    $signature: 27
+    $signature: 23
   };
   A._nest__closure1.prototype = {
     call$1(selector) {
@@ -107307,51 +107937,52 @@ self.util = _cliPkgRequires.util;
       t1.first = false;
       return result;
     },
-    $signature: 277
+    $signature: 203
   };
   A._nest__closure2.prototype = {
     call$2($parent, child) {
-      return child.resolveParentSelectors$1($parent);
+      return child.nestWithin$1($parent);
     },
-    $signature: 278
+    $signature: 202
   };
   A._append_closure1.prototype = {
     call$1($arguments) {
-      var selectors = J.$index$asx($arguments, 0).get$asList();
+      var t1,
+        selectors = J.$index$asx($arguments, 0).get$asList();
       if (selectors.length === 0)
         throw A.wrapException(A.SassScriptException$0(string$.x24selec, null));
-      return new A.MappedListIterable(selectors, new A._append__closure1(), A._arrayInstanceType(selectors)._eval$1("MappedListIterable<1,SelectorList0>")).reduce$1(0, new A._append__closure2(A.EvaluationContext_current0().get$currentCallableSpan())).get$asSassList();
+      t1 = A.EvaluationContext_currentOrNull0();
+      return new A.MappedListIterable(selectors, new A._append__closure1(), A._arrayInstanceType(selectors)._eval$1("MappedListIterable<1,SelectorList0>")).reduce$1(0, new A._append__closure2((t1 == null ? A.throwExpression(A.StateError$(string$.No_Sass)) : t1).get$currentCallableSpan())).get$asSassList();
     },
-    $signature: 27
+    $signature: 23
   };
   A._append__closure1.prototype = {
     call$1(selector) {
       return A.SassApiValue_assertSelector0(selector, false, null);
     },
-    $signature: 277
+    $signature: 203
   };
   A._append__closure2.prototype = {
     call$2($parent, child) {
       var t1 = child.components,
         t2 = this.span;
-      return A.SelectorList$0(new A.MappedListIterable(t1, new A._append___closure0($parent, t2), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,ComplexSelector0>")), t2).resolveParentSelectors$1($parent);
+      return A.SelectorList$0(new A.MappedListIterable(t1, new A._append___closure0($parent, t2), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,ComplexSelector0>")), t2).nestWithin$1($parent);
     },
-    $signature: 278
+    $signature: 202
   };
   A._append___closure0.prototype = {
     call$1(complex) {
-      var _0_0, component, rest, t1, newCompound, t2, _null = null;
+      var _0_0, t1, component, rest, newCompound, t2, _null = null;
       if (complex.leadingCombinators.length !== 0)
         throw A.wrapException(A.SassScriptException$0("Can't append " + complex.toString$0(0) + " to " + this.parent.toString$0(0) + ".", _null));
       _0_0 = complex.components;
-      if (_0_0.length >= 1) {
+      t1 = _0_0.length >= 1;
+      if (t1) {
         component = _0_0[0];
         rest = B.JSArray_methods.sublist$1(_0_0, 1);
-        t1 = true;
       } else {
         rest = _null;
         component = rest;
-        t1 = false;
       }
       if (!t1)
         throw A.wrapException(A.StateError$("Pattern matching error"));
@@ -107361,9 +107992,9 @@ self.util = _cliPkgRequires.util;
       t1 = this.span;
       t2 = A._setArrayType([new A.ComplexSelectorComponent0(newCompound, A.List_List$unmodifiable(component.combinators, type$.CssValue_Combinator_2), t1)], type$.JSArray_ComplexSelectorComponent_2);
       B.JSArray_methods.addAll$1(t2, rest);
-      return A.ComplexSelector$0(B.List_empty14, t2, t1, false);
+      return A.ComplexSelector$0(B.List_empty13, t2, t1, false);
     },
-    $signature: 61
+    $signature: 55
   };
   A._extend_closure0.prototype = {
     call$1($arguments) {
@@ -107378,9 +108009,10 @@ self.util = _cliPkgRequires.util;
       target.assertNotBogus$1$name(_s8_0);
       source = A.SassApiValue_assertSelector0(t1.$index($arguments, 2), false, _s8_1);
       source.assertNotBogus$1$name(_s8_1);
-      return A.ExtensionStore__extendOrReplace0(selector, source, target, B.ExtendMode_allTargets_allTargets0, A.EvaluationContext_current0().get$currentCallableSpan()).get$asSassList();
+      t1 = A.EvaluationContext_currentOrNull0();
+      return A.ExtensionStore__extendOrReplace0(selector, source, target, B.ExtendMode_allTargets_allTargets0, (t1 == null ? A.throwExpression(A.StateError$(string$.No_Sass)) : t1).get$currentCallableSpan()).get$asSassList();
     },
-    $signature: 27
+    $signature: 23
   };
   A._replace_closure0.prototype = {
     call$1($arguments) {
@@ -107395,9 +108027,10 @@ self.util = _cliPkgRequires.util;
       target.assertNotBogus$1$name(_s8_0);
       source = A.SassApiValue_assertSelector0(t1.$index($arguments, 2), false, _s11_);
       source.assertNotBogus$1$name(_s11_);
-      return A.ExtensionStore__extendOrReplace0(selector, source, target, B.ExtendMode_replace_replace0, A.EvaluationContext_current0().get$currentCallableSpan()).get$asSassList();
+      t1 = A.EvaluationContext_currentOrNull0();
+      return A.ExtensionStore__extendOrReplace0(selector, source, target, B.ExtendMode_replace_replace0, (t1 == null ? A.throwExpression(A.StateError$(string$.No_Sass)) : t1).get$currentCallableSpan()).get$asSassList();
     },
-    $signature: 27
+    $signature: 23
   };
   A._unify_closure0.prototype = {
     call$1($arguments) {
@@ -107413,7 +108046,7 @@ self.util = _cliPkgRequires.util;
       t1 = t1 == null ? null : t1.get$asSassList();
       return t1 == null ? B.C__SassNull0 : t1;
     },
-    $signature: 5
+    $signature: 3
   };
   A._isSuperselector_closure0.prototype = {
     call$1($arguments) {
@@ -107430,33 +108063,21 @@ self.util = _cliPkgRequires.util;
   A._simpleSelectors_closure0.prototype = {
     call$1($arguments) {
       var t1 = A.SassApiValue_assertCompoundSelector0(J.$index$asx($arguments, 0), "selector").components;
-      return A.SassList$0(new A.MappedListIterable(t1, new A._simpleSelectors__closure0(), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,Value0>")), B.ListSeparator_rXA0, false);
+      return A.SassList$0(new A.MappedListIterable(t1, new A._simpleSelectors__closure0(), A._arrayInstanceType(t1)._eval$1("MappedListIterable<1,Value0>")), B.ListSeparator_ECn0, false);
     },
-    $signature: 27
+    $signature: 23
   };
   A._simpleSelectors__closure0.prototype = {
     call$1(simple) {
       return new A.SassString0(A.serializeSelector0(simple, true), false);
     },
-    $signature: 551
+    $signature: 531
   };
   A._parse_closure0.prototype = {
     call$1($arguments) {
       return A.SassApiValue_assertSelector0(J.$index$asx($arguments, 0), false, "selector").get$asSassList();
     },
-    $signature: 27
-  };
-  A._prependParent_closure1.prototype = {
-    call$0() {
-      return this._0_0.length >= 1;
-    },
-    $signature: 1
-  };
-  A._prependParent_closure2.prototype = {
-    call$0() {
-      return this._0_0[0];
-    },
-    $signature: 279
+    $signature: 23
   };
   A.SelectorParser0.prototype = {
     parse$0() {
@@ -107489,6 +108110,7 @@ self.util = _cliPkgRequires.util;
     },
     _selector$_complexSelector$1$lineBreak(lineBreak) {
       var t4, lastCompound, initialCombinators, _0_0, t5, result, _this = this,
+        _s18_ = "expected selector.",
         t1 = _this.scanner,
         t2 = t1._string_scanner$_position,
         componentStart = new A._SpanScannerState(t1, t2),
@@ -107501,19 +108123,19 @@ self.util = _cliPkgRequires.util;
         if (43 === _0_0) {
           t5 = t1._string_scanner$_position;
           t1.readChar$0();
-          combinators.push(new A.CssValue0(B.Combinator_4QF0, _this.spanFrom$1(new A._SpanScannerState(t1, t5)), t4));
+          combinators.push(new A.CssValue0(B.Combinator_gRV0, _this.spanFrom$1(new A._SpanScannerState(t1, t5)), t4));
           continue;
         }
         if (62 === _0_0) {
           t5 = t1._string_scanner$_position;
           t1.readChar$0();
-          combinators.push(new A.CssValue0(B.Combinator_Cht0, _this.spanFrom$1(new A._SpanScannerState(t1, t5)), t4));
+          combinators.push(new A.CssValue0(B.Combinator_8I80, _this.spanFrom$1(new A._SpanScannerState(t1, t5)), t4));
           continue;
         }
         if (126 === _0_0) {
           t5 = t1._string_scanner$_position;
           t1.readChar$0();
-          combinators.push(new A.CssValue0(B.Combinator_Htt0, _this.spanFrom$1(new A._SpanScannerState(t1, t5)), t4));
+          combinators.push(new A.CssValue0(B.Combinator_y180, _this.spanFrom$1(new A._SpanScannerState(t1, t5)), t4));
           continue;
         }
         if (_0_0 == null)
@@ -107562,14 +108184,17 @@ self.util = _cliPkgRequires.util;
         }
         break;
       }
-      if (lastCompound != null) {
+      t3 = combinators.length !== 0;
+      if (t3 && _this._selector$_plainCss)
+        t1.error$1(0, _s18_);
+      else if (lastCompound != null) {
         t3 = _this.spanFrom$1(componentStart);
         components.push(new A.ComplexSelectorComponent0(lastCompound, A.List_List$unmodifiable(combinators, t4), t3));
-      } else if (combinators.length !== 0)
+      } else if (t3)
         initialCombinators = combinators;
       else
-        t1.error$1(0, "expected selector.");
-      t3 = initialCombinators == null ? B.List_empty14 : initialCombinators;
+        t1.error$1(0, _s18_);
+      t3 = initialCombinators == null ? B.List_empty13 : initialCombinators;
       return A.ComplexSelector$0(t3, components, _this.spanFrom$1(new A._SpanScannerState(t1, t2)), lineBreak);
     },
     _selector$_complexSelector$0() {
@@ -107580,12 +108205,8 @@ self.util = _cliPkgRequires.util;
         t1 = _this.scanner,
         t2 = t1._string_scanner$_position,
         components = A._setArrayType([_this._selector$_simpleSelector$0()], type$.JSArray_SimpleSelector_2);
-      while (true) {
-        t3 = t1.peekChar$0();
-        if (!(t3 === 42 || t3 === 91 || t3 === 46 || t3 === 35 || t3 === 37 || t3 === 58))
-          break;
-        components.push(_this._selector$_simpleSelector$1$allowParent(false));
-      }
+      for (t3 = _this._selector$_plainCss; _this._selector$_isSimpleSelectorStart$1(t1.peekChar$0());)
+        components.push(_this._selector$_simpleSelector$1$allowParent(t3));
       return A.CompoundSelector$0(components, _this.spanFrom$1(new A._SpanScannerState(t1, t2)));
     },
     _selector$_simpleSelector$1$allowParent(allowParent) {
@@ -107610,7 +108231,7 @@ self.util = _cliPkgRequires.util;
           t1.expectChar$1(37);
           $name = _this.identifier$0();
           t2 = _this.spanFrom$1(new A._SpanScannerState(t1, t2));
-          if (!_this._selector$_allowPlaceholder)
+          if (_this._selector$_plainCss)
             _this.error$2(0, string$.Placeh, t1.spanFrom$1(start));
           return new A.PlaceholderSelector0($name, t2);
         case 58:
@@ -107627,6 +108248,8 @@ self.util = _cliPkgRequires.util;
             suffix = t3.charCodeAt(0) == 0 ? t3 : t3;
           } else
             suffix = null;
+          if (_this._selector$_plainCss && suffix != null)
+            t1.error$3$length$position(0, string$.Parent, t1._string_scanner$_position - t2, t2);
           t2 = _this.spanFrom$1(new A._SpanScannerState(t1, t2));
           if (!allowParent)
             _this.error$2(0, "Parent selectors aren't allowed here.", t1.spanFrom$1(start));
@@ -107678,22 +108301,22 @@ self.util = _cliPkgRequires.util;
         t2 = t1._string_scanner$_position;
       switch (t1.readChar$0()) {
         case 61:
-          return B.AttributeOperator_ES60;
+          return B.AttributeOperator_4QF0;
         case 126:
           t1.expectChar$1(61);
-          return B.AttributeOperator_r600;
+          return B.AttributeOperator_yT80;
         case 124:
           t1.expectChar$1(61);
-          return B.AttributeOperator_ivT0;
+          return B.AttributeOperator_jqB0;
         case 94:
           t1.expectChar$1(61);
-          return B.AttributeOperator_eot0;
+          return B.AttributeOperator_cMb0;
         case 36:
           t1.expectChar$1(61);
-          return B.AttributeOperator_BGd0;
+          return B.AttributeOperator_qhE0;
         case 42:
           t1.expectChar$1(61);
-          return B.AttributeOperator_8aB0;
+          return B.AttributeOperator_61T0;
         default:
           t1.error$2$position(0, 'Expected "]".', t2);
       }
@@ -107801,6 +108424,22 @@ self.util = _cliPkgRequires.util;
         return new A.UniversalSelector0(nameOrNamespace, _this.spanFrom$1(start));
       else
         return new A.TypeSelector0(new A.QualifiedName0(_this.identifier$0(), nameOrNamespace), _this.spanFrom$1(start));
+    },
+    _selector$_isSimpleSelectorStart$1(character) {
+      var t1;
+      $label0$0: {
+        if (42 === character || 91 === character || 46 === character || 35 === character || 37 === character || 58 === character) {
+          t1 = true;
+          break $label0$0;
+        }
+        if (38 === character) {
+          t1 = this._selector$_plainCss;
+          break $label0$0;
+        }
+        t1 = false;
+        break $label0$0;
+      }
+      return t1;
     }
   };
   A.SelectorParser_parse_closure0.prototype = {
@@ -107812,7 +108451,7 @@ self.util = _cliPkgRequires.util;
         t1.error$1(0, "expected selector.");
       return selector;
     },
-    $signature: 553
+    $signature: 532
   };
   A.SelectorParser_parseCompoundSelector_closure0.prototype = {
     call$0() {
@@ -107823,7 +108462,7 @@ self.util = _cliPkgRequires.util;
         t1.error$1(0, "expected selector.");
       return compound;
     },
-    $signature: 554
+    $signature: 533
   };
   A.SelectorSearchVisitor0.prototype = {
     visitAttributeSelector$1(attribute) {
@@ -107880,7 +108519,7 @@ self.util = _cliPkgRequires.util;
     call$1(codeUnit) {
       return codeUnit > 127;
     },
-    $signature: 47
+    $signature: 45
   };
   A._SerializeVisitor0.prototype = {
     visitCssStylesheet$1(node) {
@@ -107967,31 +108606,17 @@ self.util = _cliPkgRequires.util;
       _this._serialize0$_visitChildren$1(node);
     },
     _serialize0$_visitMediaQuery$1(query) {
-      var modifier, t1, _1_0, type, _2_0, condition, operator, t2, _this = this,
+      var t1, _1_0, _2_0, condition, operator, t2, _this = this,
         _0_0 = query.modifier;
       if (_0_0 != null) {
-        modifier = _0_0;
-        t1 = true;
-      } else {
-        modifier = null;
-        t1 = false;
-      }
-      if (t1) {
         t1 = _this._serialize0$_buffer;
-        t1.write$1(0, modifier);
+        t1.write$1(0, _0_0);
         t1.writeCharCode$1(32);
       }
       _1_0 = query.type;
       if (_1_0 != null) {
-        type = _1_0;
-        t1 = true;
-      } else {
-        type = null;
-        t1 = false;
-      }
-      if (t1) {
         t1 = _this._serialize0$_buffer;
-        t1.write$1(0, type);
+        t1.write$1(0, _1_0);
         if (query.conditions.length !== 0)
           t1.write$1(0, " and ");
       }
@@ -108193,67 +108818,67 @@ self.util = _cliPkgRequires.util;
       t1.writeCharCode$1(41);
     },
     _serialize0$_writeCalculationValue$1(value) {
-      var _2_5, t1, _0_0, _1_0, unit, t2, operator, left, right, parenthesizeLeft, operatorWhitespace, parenthesizeRight, _this = this, _null = null;
-      $label0$0: {
-        _2_5 = A._InitializedCell$(new A._SerializeVisitor__writeCalculationValue_closure0(value));
-        t1 = value instanceof A.SassNumber0;
-        if (t1 && _2_5._readFinal$0() && value.get$hasComplexUnits()) {
-          if (!_this._serialize0$_inspect)
-            throw A.wrapException(A.SassScriptException$0(A.S(value) + " isn't a valid CSS value.", _null));
-          _this._serialize0$_writeNumber$1(value._number1$_value);
-          _this._serialize0$_buffer.write$1(0, value.get$unitString());
-          break $label0$0;
+      var _2_4_isSet, _2_4, t1, _0_0, _1_0, first, rest, operator, left, right, parenthesizeLeft, operatorWhitespace, t2, parenthesizeRight, _this = this, _null = null;
+      $label1$1: {
+        _2_4_isSet = value instanceof A.SassNumber0;
+        if (_2_4_isSet) {
+          _2_4 = value.get$hasComplexUnits();
+          t1 = _2_4 && !_this._serialize0$_inspect;
+        } else {
+          _2_4 = _null;
+          t1 = false;
         }
-        if (t1 && _2_5._readFinal$0()) {
-          $label1$1: {
+        if (t1)
+          throw A.wrapException(A.SassScriptException$0(A.S(value) + " isn't a valid CSS value.", _null));
+        if (_2_4_isSet && !isFinite(value._number1$_value)) {
+          $label0$0: {
             _0_0 = value._number1$_value;
             if (1 / 0 === _0_0) {
               _this._serialize0$_buffer.write$1(0, "infinity");
-              break $label1$1;
+              break $label0$0;
             }
             if (-1 / 0 === _0_0) {
               _this._serialize0$_buffer.write$1(0, "-infinity");
-              break $label1$1;
+              break $label0$0;
             }
             if (isNaN(_0_0))
               _this._serialize0$_buffer.write$1(0, "NaN");
           }
-          _1_0 = A.IterableExtension_get_firstOrNull(J.get$numeratorUnits$x(value));
-          if (_1_0 != null) {
-            unit = _1_0;
-            t1 = true;
-          } else {
-            unit = _null;
-            t1 = false;
-          }
-          if (t1) {
-            t1 = _this._serialize0$_style !== B.OutputStyle_10;
-            if (t1)
-              _this._serialize0$_buffer.writeCharCode$1(32);
-            t2 = _this._serialize0$_buffer;
-            t2.writeCharCode$1(42);
-            if (t1)
-              t2.writeCharCode$1(32);
-            t2.writeCharCode$1(49);
-            t2.write$1(0, unit);
-          }
-          break $label0$0;
+          t1 = J.getInterceptor$x(value);
+          _this._serialize0$_writeCalculationUnits$2(t1.get$numeratorUnits(value), t1.get$denominatorUnits(value));
+          break $label1$1;
+        }
+        if (_2_4_isSet)
+          t1 = _2_4;
+        else
+          t1 = false;
+        if (t1) {
+          _this._serialize0$_writeNumber$1(value._number1$_value);
+          t1 = J.getInterceptor$x(value);
+          _1_0 = t1.get$numeratorUnits(value);
+          if (_1_0.length >= 1) {
+            first = _1_0[0];
+            rest = B.JSArray_methods.sublist$1(_1_0, 1);
+            _this._serialize0$_buffer.write$1(0, first);
+            _this._serialize0$_writeCalculationUnits$2(rest, t1.get$denominatorUnits(value));
+          } else
+            _this._serialize0$_writeCalculationUnits$2(A._setArrayType([], type$.JSArray_String), t1.get$denominatorUnits(value));
+          break $label1$1;
         }
         if (value instanceof A.Value0) {
           value.accept$1(_this);
-          break $label0$0;
+          break $label1$1;
         }
-        if (value instanceof A.CalculationOperation0) {
+        t1 = value instanceof A.CalculationOperation0;
+        if (t1) {
           operator = value._calculation0$_operator;
           left = value._calculation0$_left;
           right = value._calculation0$_right;
           right = right;
-          t1 = true;
         } else {
           right = _null;
           left = right;
           operator = left;
-          t1 = false;
         }
         if (t1) {
           parenthesizeLeft = left instanceof A.CalculationOperation0 && left._calculation0$_operator.precedence < operator.precedence;
@@ -108270,7 +108895,14 @@ self.util = _cliPkgRequires.util;
           if (operatorWhitespace)
             t1.writeCharCode$1(32);
           if (!(right instanceof A.CalculationOperation0 && _this._serialize0$_parenthesizeCalculationRhs$2(operator, right._calculation0$_operator)))
-            parenthesizeRight = operator === B.CalculationOperator_OvN0 && right instanceof A.SassNumber0 && !isFinite(right._number1$_value) && right.get$hasUnits();
+            if (operator === B.CalculationOperator_Qf10) {
+              if (right instanceof A.SassNumber0)
+                t2 = isFinite(right._number1$_value) ? right.get$hasComplexUnits() : right.get$hasUnits();
+              else
+                t2 = false;
+              parenthesizeRight = t2;
+            } else
+              parenthesizeRight = false;
           else
             parenthesizeRight = true;
           if (parenthesizeRight)
@@ -108281,24 +108913,47 @@ self.util = _cliPkgRequires.util;
         }
       }
     },
+    _serialize0$_writeCalculationUnits$2(numeratorUnits, denominatorUnits) {
+      var t1, t2, t3, t4;
+      for (t1 = J.get$iterator$ax(numeratorUnits), t2 = this._serialize0$_buffer, t3 = this._serialize0$_style !== B.OutputStyle_10; t1.moveNext$0();) {
+        t4 = t1.get$current(t1);
+        if (t3)
+          t2.writeCharCode$1(32);
+        t2.writeCharCode$1(42);
+        if (t3)
+          t2.writeCharCode$1(32);
+        t2.writeCharCode$1(49);
+        t2.write$1(0, t4);
+      }
+      for (t1 = J.get$iterator$ax(denominatorUnits); t1.moveNext$0();) {
+        t4 = t1.get$current(t1);
+        if (t3)
+          t2.writeCharCode$1(32);
+        t2.writeCharCode$1(47);
+        if (t3)
+          t2.writeCharCode$1(32);
+        t2.writeCharCode$1(49);
+        t2.write$1(0, t4);
+      }
+    },
     _serialize0$_parenthesizeCalculationRhs$2(outer, right) {
       var t1;
       $label0$0: {
-        if (B.CalculationOperator_OvN0 === outer) {
+        if (B.CalculationOperator_Qf10 === outer) {
           t1 = true;
           break $label0$0;
         }
-        if (B.CalculationOperator_IyK0 === outer) {
+        if (B.CalculationOperator_g2q0 === outer) {
           t1 = false;
           break $label0$0;
         }
-        t1 = right === B.CalculationOperator_IyK0 || right === B.CalculationOperator_2bx0;
+        t1 = right === B.CalculationOperator_g2q0 || right === B.CalculationOperator_CxF0;
         break $label0$0;
       }
       return t1;
     },
     visitColor$1(value) {
-      var hexLength, _0_0, $name, t1, _1_0, format, opaque, t2, _3_0, _this = this;
+      var hexLength, _0_0, t1, $name, _1_0, opaque, t2, _3_0, _this = this;
       if (_this._serialize0$_style === B.OutputStyle_10)
         if (!A.fuzzyEquals0(value._color1$_alpha, 1))
           _this._serialize0$_writeRgb$1(value);
@@ -108306,55 +108961,48 @@ self.util = _cliPkgRequires.util;
           hexLength = _this._serialize0$_canUseShortHex$1(value) ? 4 : 7;
           _0_0 = $.$get$namesByColor0().$index(0, value);
           if (_0_0 != null) {
+            t1 = _0_0.length <= hexLength;
             $name = _0_0;
-            t1 = true;
           } else {
             $name = null;
             t1 = false;
           }
-          if (t1 && $name.length <= hexLength)
+          if (t1)
             _this._serialize0$_buffer.write$1(0, $name);
           else {
             t1 = _this._serialize0$_buffer;
             if (_this._serialize0$_canUseShortHex$1(value)) {
               t1.writeCharCode$1(35);
-              t1.writeCharCode$1(A.hexCharFor0(value.get$red(value) & 15));
-              t1.writeCharCode$1(A.hexCharFor0(value.get$green(value) & 15));
-              t1.writeCharCode$1(A.hexCharFor0(value.get$blue(value) & 15));
+              t1.writeCharCode$1(A.hexCharFor0(value.get$red(0) & 15));
+              t1.writeCharCode$1(A.hexCharFor0(value.get$green(0) & 15));
+              t1.writeCharCode$1(A.hexCharFor0(value.get$blue(0) & 15));
             } else {
               t1.writeCharCode$1(35);
-              _this._serialize0$_writeHexComponent$1(value.get$red(value));
-              _this._serialize0$_writeHexComponent$1(value.get$green(value));
-              _this._serialize0$_writeHexComponent$1(value.get$blue(value));
+              _this._serialize0$_writeHexComponent$1(value.get$red(0));
+              _this._serialize0$_writeHexComponent$1(value.get$green(0));
+              _this._serialize0$_writeHexComponent$1(value.get$blue(0));
             }
           }
         }
       else {
         _1_0 = value.format;
-        if (_1_0 != null) {
-          format = _1_0;
-          t1 = true;
-        } else {
-          format = null;
-          t1 = false;
-        }
-        if (t1)
+        if (_1_0 != null)
           $label0$0: {
-            if (B._ColorFormatEnum_rgbFunction0 === format) {
+            if (B._ColorFormatEnum_rgbFunction0 === _1_0) {
               _this._serialize0$_writeRgb$1(value);
               break $label0$0;
             }
-            if (B._ColorFormatEnum_hslFunction0 === format) {
+            if (B._ColorFormatEnum_hslFunction0 === _1_0) {
               t1 = value._color1$_alpha;
               opaque = A.fuzzyEquals0(t1, 1);
               t2 = _this._serialize0$_buffer;
               t2.write$1(0, opaque ? "hsl(" : "hsla(");
-              _this._serialize0$_writeNumber$1(value.get$hue(value));
+              _this._serialize0$_writeNumber$1(value.get$hue(0));
               t2.write$1(0, ", ");
-              _this._serialize0$_writeNumber$1(value.get$saturation(value));
+              _this._serialize0$_writeNumber$1(value.get$saturation(0));
               t2.writeCharCode$1(37);
               t2.write$1(0, ", ");
-              _this._serialize0$_writeNumber$1(value.get$lightness(value));
+              _this._serialize0$_writeNumber$1(value.get$lightness(0));
               t2.writeCharCode$1(37);
               if (!opaque) {
                 t2.write$1(0, ", ");
@@ -108363,27 +109011,27 @@ self.util = _cliPkgRequires.util;
               t2.writeCharCode$1(41);
               break $label0$0;
             }
-            if (format instanceof A.SpanColorFormat0) {
-              _this._serialize0$_buffer.write$1(0, format._color1$_span.get$text());
+            if (_1_0 instanceof A.SpanColorFormat0) {
+              _this._serialize0$_buffer.write$1(0, _1_0._color1$_span.get$text());
               break $label0$0;
             }
           }
         else {
           _3_0 = $.$get$namesByColor0().$index(0, value);
           if (_3_0 != null) {
+            t1 = !A.fuzzyEquals0(value._color1$_alpha, 0);
             $name = _3_0;
-            t1 = true;
           } else {
             $name = null;
             t1 = false;
           }
-          if (t1 && !A.fuzzyEquals0(value._color1$_alpha, 0))
+          if (t1)
             _this._serialize0$_buffer.write$1(0, $name);
           else if (A.fuzzyEquals0(value._color1$_alpha, 1)) {
             _this._serialize0$_buffer.writeCharCode$1(35);
-            _this._serialize0$_writeHexComponent$1(value.get$red(value));
-            _this._serialize0$_writeHexComponent$1(value.get$green(value));
-            _this._serialize0$_writeHexComponent$1(value.get$blue(value));
+            _this._serialize0$_writeHexComponent$1(value.get$red(0));
+            _this._serialize0$_writeHexComponent$1(value.get$green(0));
+            _this._serialize0$_writeHexComponent$1(value.get$blue(0));
           } else
             _this._serialize0$_writeRgb$1(value);
         }
@@ -108395,12 +109043,12 @@ self.util = _cliPkgRequires.util;
         opaque = A.fuzzyEquals0(t1, 1),
         t2 = this._serialize0$_buffer;
       t2.write$1(0, opaque ? "rgb(" : "rgba(");
-      t2.write$1(0, value.get$red(value));
+      t2.write$1(0, value.get$red(0));
       t3 = this._serialize0$_style === B.OutputStyle_10;
       t2.write$1(0, t3 ? "," : ", ");
-      t2.write$1(0, value.get$green(value));
+      t2.write$1(0, value.get$green(0));
       t2.write$1(0, t3 ? "," : ", ");
-      t2.write$1(0, value.get$blue(value));
+      t2.write$1(0, value.get$blue(0));
       if (!opaque) {
         t2.write$1(0, t3 ? "," : ", ");
         this._serialize0$_writeNumber$1(t1);
@@ -108408,11 +109056,11 @@ self.util = _cliPkgRequires.util;
       t2.writeCharCode$1(41);
     },
     _serialize0$_canUseShortHex$1(color) {
-      var t1 = color.get$red(color);
+      var t1 = color.get$red(0);
       if ((t1 & 15) === B.JSInt_methods._shrOtherPositive$1(t1, 4)) {
-        t1 = color.get$green(color);
+        t1 = color.get$green(0);
         if ((t1 & 15) === B.JSInt_methods._shrOtherPositive$1(t1, 4)) {
-          t1 = color.get$blue(color);
+          t1 = color.get$blue(0);
           t1 = (t1 & 15) === B.JSInt_methods._shrOtherPositive$1(t1, 4);
         } else
           t1 = false;
@@ -108440,7 +109088,7 @@ self.util = _cliPkgRequires.util;
       if (t2)
         if (value._list1$_contents.length === 1) {
           t3 = value._list1$_separator;
-          t3 = t3 === B.ListSeparator_rXA0 || t3 === B.ListSeparator_zg90;
+          t3 = t3 === B.ListSeparator_ECn0 || t3 === B.ListSeparator_cQA0;
           singleton = t3;
         } else
           singleton = false;
@@ -108465,15 +109113,15 @@ self.util = _cliPkgRequires.util;
     _serialize0$_separatorString$1(separator) {
       var t1;
       $label0$0: {
-        if (B.ListSeparator_rXA0 === separator) {
+        if (B.ListSeparator_ECn0 === separator) {
           t1 = this._serialize0$_style === B.OutputStyle_10 ? "," : ", ";
           break $label0$0;
         }
-        if (B.ListSeparator_zg90 === separator) {
+        if (B.ListSeparator_cQA0 === separator) {
           t1 = this._serialize0$_style === B.OutputStyle_10 ? "/" : " / ";
           break $label0$0;
         }
-        if (B.ListSeparator_EVt0 === separator) {
+        if (B.ListSeparator_nbm0 === separator) {
           t1 = " ";
           break $label0$0;
         }
@@ -108487,13 +109135,13 @@ self.util = _cliPkgRequires.util;
       $label1$1: {
         if (value instanceof A.SassList0 && value._list1$_contents.length > 1 && !value._list1$_hasBrackets) {
           $label0$0: {
-            if (B.ListSeparator_rXA0 === separator) {
-              t1 = value._list1$_separator === B.ListSeparator_rXA0;
+            if (B.ListSeparator_ECn0 === separator) {
+              t1 = value._list1$_separator === B.ListSeparator_ECn0;
               break $label0$0;
             }
-            if (B.ListSeparator_zg90 === separator) {
+            if (B.ListSeparator_cQA0 === separator) {
               t1 = value._list1$_separator;
-              t1 = t1 === B.ListSeparator_rXA0 || t1 === B.ListSeparator_zg90;
+              t1 = t1 === B.ListSeparator_ECn0 || t1 === B.ListSeparator_cQA0;
               break $label0$0;
             }
             t1 = value._list1$_separator !== B.ListSeparator_undecided_null_undecided0;
@@ -108517,7 +109165,7 @@ self.util = _cliPkgRequires.util;
       t1.writeCharCode$1(41);
     },
     _serialize0$_writeMapElement$1(value) {
-      var needsParens = value instanceof A.SassList0 && value._list1$_separator === B.ListSeparator_rXA0 && !value._list1$_hasBrackets;
+      var needsParens = value instanceof A.SassList0 && value._list1$_separator === B.ListSeparator_ECn0 && !value._list1$_hasBrackets;
       if (needsParens)
         this._serialize0$_buffer.writeCharCode$1(40);
       value.accept$1(this);
@@ -108525,18 +109173,11 @@ self.util = _cliPkgRequires.util;
         this._serialize0$_buffer.writeCharCode$1(41);
     },
     visitNumber$1(value) {
-      var before, after, t1, _1_0, first, _this = this, _null = null,
+      var before, after, t1, _1_0, _this = this,
         _0_0 = value.asSlash;
       if (type$.Record_2_nullable_Object_and_nullable_Object._is(_0_0)) {
         before = _0_0._0;
         after = _0_0._1;
-        t1 = true;
-      } else {
-        after = _null;
-        before = after;
-        t1 = false;
-      }
-      if (t1) {
         _this.visitNumber$1(before);
         _this._serialize0$_buffer.writeCharCode$1(47);
         _this.visitNumber$1(after);
@@ -108547,35 +109188,22 @@ self.util = _cliPkgRequires.util;
         _this.visitCalculation$1(new A.SassCalculation0("calc", A.List_List$unmodifiable(A._setArrayType([value], type$.JSArray_Object), type$.Object)));
         return;
       }
-      _this._serialize0$_writeNumber$1(t1);
-      if (!_this._serialize0$_inspect) {
-        if (value.get$hasComplexUnits())
-          throw A.wrapException(A.SassScriptException$0(value.toString$0(0) + " isn't a valid CSS value.", _null));
+      if (value.get$hasComplexUnits()) {
+        if (!_this._serialize0$_inspect)
+          throw A.wrapException(A.SassScriptException$0(value.toString$0(0) + " isn't a valid CSS value.", null));
+        _this.visitCalculation$1(new A.SassCalculation0("calc", A.List_List$unmodifiable(A._setArrayType([value], type$.JSArray_Object), type$.Object)));
+      } else {
+        _this._serialize0$_writeNumber$1(t1);
         _1_0 = value.get$numeratorUnits(value);
-        if (_1_0.length === 1) {
-          first = _1_0[0];
-          t1 = true;
-        } else {
-          first = _null;
-          t1 = false;
-        }
-        if (t1)
-          _this._serialize0$_buffer.write$1(0, first);
-      } else
-        _this._serialize0$_buffer.write$1(0, value.get$unitString());
+        if (_1_0.length === 1)
+          _this._serialize0$_buffer.write$1(0, _1_0[0]);
+      }
     },
     _serialize0$_writeNumber$1(number) {
-      var integer, t1, text, _this = this,
+      var text, _this = this,
         _0_0 = A.fuzzyAsInt0(number);
       if (_0_0 != null) {
-        integer = _0_0;
-        t1 = true;
-      } else {
-        integer = null;
-        t1 = false;
-      }
-      if (t1) {
-        _this._serialize0$_buffer.write$1(0, _this._serialize0$_removeExponent$1(J.toString$0$(integer)));
+        _this._serialize0$_buffer.write$1(0, _this._serialize0$_removeExponent$1(B.JSInt_methods.toString$0(_0_0)));
         return;
       }
       text = _this._serialize0$_removeExponent$1(B.JSNumber_methods.toString$0(number));
@@ -108610,7 +109238,7 @@ self.util = _cliPkgRequires.util;
               buffer._contents = t2 + B.JSString_methods.substring$2(text, 3, i);
           } else if (i > 2)
             buffer._contents = t2 + B.JSString_methods.substring$2(text, 2, i);
-          exponent._value = A.int_parse(B.JSString_methods.substring$2(text, i + 1, t1), null);
+          exponent.__late_helper$_value = A.int_parse(B.JSString_methods.substring$2(text, i + 1, t1), null);
           break;
         }
         ++i;
@@ -108622,19 +109250,20 @@ self.util = _cliPkgRequires.util;
         t2 = buffer._contents;
         t3 = negative ? 1 : 0;
         additionalZeroes = t1 - (t2.length - 1 - t3);
-        for (t1 = t2, i = 0; i < additionalZeroes; ++i)
-          t1 = buffer._contents += A.Primitives_stringFromCharCode(48);
+        for (t1 = t2, i = 0; i < additionalZeroes; ++i) {
+          t1 = A.Primitives_stringFromCharCode(48);
+          t1 = buffer._contents += t1;
+        }
         return t1.charCodeAt(0) == 0 ? t1 : t1;
       } else {
         negative = text.charCodeAt(0) === 45;
         t1 = (negative ? "" + A.Primitives_stringFromCharCode(45) : "") + "0.";
-        t2 = exponent.__late_helper$_name;
         i = -1;
         while (true) {
-          t3 = exponent._value;
-          if (t3 === exponent)
-            A.throwExpression(A.LateError$localNI(t2));
-          if (!(i > t3))
+          t2 = exponent.__late_helper$_value;
+          if (t2 === exponent)
+            A.throwExpression(A.LateError$localNI(""));
+          if (!(i > t2))
             break;
           t1 += A.Primitives_stringFromCharCode(48);
           --i;
@@ -108717,42 +109346,42 @@ self.util = _cliPkgRequires.util;
       }
     },
     _serialize0$_visitQuotedString$2$forceDoubleQuote(string, forceDoubleQuote) {
-      var t1, includesSingleQuote, includesDoubleQuote, i, char, _1_2, _1_4, _0_0, newIndex, t2, quote, _this = this,
+      var t1, includesSingleQuote, includesDoubleQuote, i, char, _1_2, _1_4, _0_0, quote, _this = this,
         buffer = forceDoubleQuote ? _this._serialize0$_buffer : new A.StringBuffer("");
       if (forceDoubleQuote)
         buffer.writeCharCode$1(34);
       for (t1 = string.length, includesSingleQuote = false, includesDoubleQuote = false, i = 0; i < t1; ++i) {
         char = string.charCodeAt(i);
-        _1_2 = A._InitializedCell$(new A._SerializeVisitor__visitQuotedString_closure1(char));
-        _1_4 = A._InitializedCell$(new A._SerializeVisitor__visitQuotedString_closure2(char));
-        if (_1_2._readFinal$0() && forceDoubleQuote) {
+        _1_2 = 39 === char;
+        if (_1_2 && forceDoubleQuote) {
           buffer.writeCharCode$1(39);
           continue;
         }
-        if (_1_2._readFinal$0() && includesDoubleQuote) {
+        if (_1_2 && includesDoubleQuote) {
           _this._serialize0$_visitQuotedString$2$forceDoubleQuote(string, true);
           return;
         }
-        if (_1_2._readFinal$0()) {
+        if (_1_2) {
           buffer.writeCharCode$1(39);
           includesSingleQuote = true;
           continue;
         }
-        if (_1_4._readFinal$0() && forceDoubleQuote) {
+        _1_4 = 34 === char;
+        if (_1_4 && forceDoubleQuote) {
           buffer.writeCharCode$1(92);
           buffer.writeCharCode$1(34);
           continue;
         }
-        if (_1_4._readFinal$0() && includesSingleQuote) {
+        if (_1_4 && includesSingleQuote) {
           _this._serialize0$_visitQuotedString$2$forceDoubleQuote(string, true);
           return;
         }
-        if (_1_4._readFinal$0()) {
+        if (_1_4) {
           buffer.writeCharCode$1(34);
           includesDoubleQuote = true;
           continue;
         }
-        if (0 === char || 1 === char || 2 === char || 3 === char || 4 === char || 5 === char || 6 === char || 7 === char || 8 === char || 10 === char || 11 === char || 12 === char || 13 === char || 14 === char || 15 === char || 16 === char || 17 === char || 18 === char || 19 === char || 20 === char || 21 === char || 22 === char || 23 === char || 24 === char || 25 === char || 26 === char || 27 === char || 28 === char || 29 === char || 30 === char || 31 === char) {
+        if (0 === char || 1 === char || 2 === char || 3 === char || 4 === char || 5 === char || 6 === char || 7 === char || 8 === char || 10 === char || 11 === char || 12 === char || 13 === char || 14 === char || 15 === char || 16 === char || 17 === char || 18 === char || 19 === char || 20 === char || 21 === char || 22 === char || 23 === char || 24 === char || 25 === char || 26 === char || 27 === char || 28 === char || 29 === char || 30 === char || 31 === char || 127 === char) {
           _this._serialize0$_writeEscape$4(buffer, char, string, i);
           continue;
         }
@@ -108762,15 +109391,8 @@ self.util = _cliPkgRequires.util;
           continue;
         }
         _0_0 = _this._serialize0$_tryPrivateUseCharacter$4(buffer, char, string, i);
-        if (_0_0 != null) {
-          newIndex = _0_0;
-          t2 = true;
-        } else {
-          newIndex = null;
-          t2 = false;
-        }
-        if (t2)
-          i = newIndex;
+        if (_0_0 != null)
+          i = _0_0;
         else
           buffer.writeCharCode$1(char);
       }
@@ -108788,7 +109410,7 @@ self.util = _cliPkgRequires.util;
       return this._serialize0$_visitQuotedString$2$forceDoubleQuote(string, false);
     },
     _serialize0$_visitUnquotedString$1(string) {
-      var t1, t2, afterNewline, i, _1_0, _0_0, newIndex, t3;
+      var t1, t2, afterNewline, i, _1_0, _0_0;
       for (t1 = string.length, t2 = this._serialize0$_buffer, afterNewline = false, i = 0; i < t1; ++i) {
         _1_0 = string.charCodeAt(i);
         if (10 === _1_0) {
@@ -108802,15 +109424,8 @@ self.util = _cliPkgRequires.util;
           continue;
         }
         _0_0 = this._serialize0$_tryPrivateUseCharacter$4(t2, _1_0, string, i);
-        if (_0_0 != null) {
-          newIndex = _0_0;
-          t3 = true;
-        } else {
-          newIndex = null;
-          t3 = false;
-        }
-        if (t3)
-          i = newIndex;
+        if (_0_0 != null)
+          i = _0_0;
         else
           t2.writeCharCode$1(_1_0);
         afterNewline = false;
@@ -108843,27 +109458,20 @@ self.util = _cliPkgRequires.util;
         buffer.writeCharCode$1(32);
     },
     visitAttributeSelector$1(attribute) {
-      var _0_0, value, t2,
+      var _0_0, t2,
         t1 = this._serialize0$_buffer;
       t1.writeCharCode$1(91);
       t1.write$1(0, attribute.name);
       _0_0 = attribute.value;
       if (_0_0 != null) {
-        value = _0_0;
-        t2 = true;
-      } else {
-        value = null;
-        t2 = false;
-      }
-      if (t2) {
         t1.write$1(0, attribute.op);
-        if (A.Parser_isIdentifier0(value) && !J.startsWith$1$s(value, "--")) {
-          t1.write$1(0, value);
+        if (A.Parser_isIdentifier0(_0_0) && !B.JSString_methods.startsWith$1(_0_0, "--")) {
+          t1.write$1(0, _0_0);
           t2 = attribute.modifier;
           if (t2 != null)
             t1.writeCharCode$1(32);
         } else {
-          this._serialize0$_visitQuotedString$1(value);
+          this._serialize0$_visitQuotedString$1(_0_0);
           t2 = attribute.modifier;
           if (t2 != null)
             if (this._serialize0$_style !== B.OutputStyle_10)
@@ -108952,10 +109560,17 @@ self.util = _cliPkgRequires.util;
       t1.write$1(0, placeholder.name);
     },
     visitPseudoSelector$1(pseudo) {
-      var t2, t3,
-        _0_4 = A._InitializedCell$(new A._SerializeVisitor_visitPseudoSelector_closure0(pseudo)),
+      var _0_4, t2, t3,
         t1 = pseudo.name;
-      if ("not" === t1 && _0_4._readFinal$0() instanceof A.SelectorList0 && _0_4._readFinal$0().accept$1(B._IsInvisibleVisitor_true0))
+      if ("not" === t1) {
+        _0_4 = pseudo.selector;
+        if (_0_4 instanceof A.SelectorList0)
+          t2 = (_0_4 == null ? type$.SelectorList_2._as(_0_4) : _0_4).accept$1(B._IsInvisibleVisitor_true0);
+        else
+          t2 = false;
+      } else
+        t2 = false;
+      if (t2)
         return;
       t2 = this._serialize0$_buffer;
       t2.writeCharCode$1(58);
@@ -108995,28 +109610,28 @@ self.util = _cliPkgRequires.util;
       var t2, t3, t4, t5, t6, t7, t8, prePrevious, previous, t9, previous0, t10, savedIndentation, _this = this,
         t1 = _this._serialize0$_buffer;
       t1.writeCharCode$1(123);
-      for (t2 = $parent.children, t2 = new A.ListIterator(t2, t2.get$length(t2)), t3 = _this._serialize0$_style === B.OutputStyle_10, t4 = !t3, t5 = _this.get$_serialize0$_requiresSemicolon(), t6 = !_this._serialize0$_inspect, t7 = A._instanceType(t2)._precomputed1, t8 = _this._lineFeed.text, prePrevious = null, previous = null; t2.moveNext$0();) {
+      for (t2 = $parent.children, t3 = t2.$ti, t2 = new A.ListIterator(t2, t2.get$length(0), t3._eval$1("ListIterator<ListBase.E>")), t4 = _this._serialize0$_style === B.OutputStyle_10, t5 = !t4, t6 = _this.get$_serialize0$_requiresSemicolon(), t7 = !_this._serialize0$_inspect, t3 = t3._eval$1("ListBase.E"), t8 = _this._lineFeed.text, prePrevious = null, previous = null; t2.moveNext$0();) {
         t9 = t2.__internal$_current;
-        previous0 = t9 == null ? t7._as(t9) : t9;
-        if (t6)
-          t9 = t3 ? previous0.accept$1(B._IsInvisibleVisitor_true_true0) : previous0.accept$1(B._IsInvisibleVisitor_true_false0);
+        previous0 = t9 == null ? t3._as(t9) : t9;
+        if (t7)
+          t9 = t4 ? previous0.accept$1(B._IsInvisibleVisitor_true_true0) : previous0.accept$1(B._IsInvisibleVisitor_true_false0);
         else
           t9 = false;
         if (t9)
           continue;
         t9 = previous == null;
-        t10 = t9 ? null : t5.call$1(previous);
+        t10 = t9 ? null : t6.call$1(previous);
         if (t10 == null ? false : t10)
           t1.writeCharCode$1(59);
         if (_this._serialize0$_isTrailingComment$2(previous0, t9 ? $parent : previous)) {
-          if (t4)
+          if (t5)
             t1.writeCharCode$1(32);
           savedIndentation = _this._serialize0$_indentation;
           _this._serialize0$_indentation = 0;
           new A._SerializeVisitor__visitChildren_closure1(_this, previous0).call$0();
           _this._serialize0$_indentation = savedIndentation;
         } else {
-          if (t4)
+          if (t5)
             t1.write$1(0, t8);
           ++_this._serialize0$_indentation;
           new A._SerializeVisitor__visitChildren_closure2(_this, previous0).call$0();
@@ -109026,10 +109641,10 @@ self.util = _cliPkgRequires.util;
         previous = previous0;
       }
       if (previous != null) {
-        if ((type$.CssParentNode_2._is(previous) ? previous.get$isChildless() : !(previous instanceof A.ModifiableCssComment0)) && t4)
+        if ((type$.CssParentNode_2._is(previous) ? previous.get$isChildless() : !(previous instanceof A.ModifiableCssComment0)) && t5)
           t1.writeCharCode$1(59);
         if (prePrevious == null && _this._serialize0$_isTrailingComment$2(previous, $parent)) {
-          if (t4)
+          if (t5)
             t1.writeCharCode$1(32);
         } else {
           _this._serialize0$_writeLineFeed$0();
@@ -109109,7 +109724,7 @@ self.util = _cliPkgRequires.util;
   };
   A._SerializeVisitor_visitCssComment_closure0.prototype = {
     call$0() {
-      var t2, t3, _0_0, minimumIndentation, t4,
+      var t2, t3, _0_0, minimumIndentation,
         t1 = this.$this;
       if (t1._serialize0$_style === B.OutputStyle_10 && this.node.text.charCodeAt(2) !== 33)
         return;
@@ -109119,17 +109734,9 @@ self.util = _cliPkgRequires.util;
         return;
       _0_0 = t1._serialize0$_minimumIndentation$1(t3);
       if (_0_0 != null) {
-        minimumIndentation = _0_0;
-        t4 = true;
-      } else {
-        minimumIndentation = null;
-        t4 = false;
-      }
-      if (t4) {
         t2 = t2.span;
         t2 = t2.get$start(t2);
-        t2 = t2.file.getColumn$1(t2.offset);
-        minimumIndentation = Math.min(A.checkNum(minimumIndentation), t2);
+        minimumIndentation = Math.min(_0_0, t2.file.getColumn$1(t2.offset));
         t1._serialize0$_writeIndentation$0();
         t1._serialize0$_writeWithIndent$2(t3, minimumIndentation);
       } else {
@@ -109137,11 +109744,11 @@ self.util = _cliPkgRequires.util;
         t1._serialize0$_buffer.write$1(0, t3);
       }
     },
-    $signature: 2
+    $signature: 1
   };
   A._SerializeVisitor_visitCssAtRule_closure0.prototype = {
     call$0() {
-      var t3, _0_0, value,
+      var t3, _0_0,
         t1 = this.$this,
         t2 = t1._serialize0$_buffer;
       t2.writeCharCode$1(64);
@@ -109149,18 +109756,11 @@ self.util = _cliPkgRequires.util;
       t1._serialize0$_write$1(t3.name);
       _0_0 = t3.value;
       if (_0_0 != null) {
-        value = _0_0;
-        t3 = true;
-      } else {
-        value = null;
-        t3 = false;
-      }
-      if (t3) {
         t2.writeCharCode$1(32);
-        t1._serialize0$_write$1(value);
+        t1._serialize0$_write$1(_0_0);
       }
     },
-    $signature: 2
+    $signature: 1
   };
   A._SerializeVisitor_visitCssMediaRule_closure0.prototype = {
     call$0() {
@@ -109187,11 +109787,11 @@ self.util = _cliPkgRequires.util;
       t2 = t4 ? "," : ", ";
       t1._serialize0$_writeBetween$3(t3, t2, t1.get$_serialize0$_visitMediaQuery());
     },
-    $signature: 2
+    $signature: 1
   };
   A._SerializeVisitor_visitCssImport_closure0.prototype = {
     call$0() {
-      var t3, t4, _0_0, modifiers,
+      var t3, t4, _0_0,
         t1 = this.$this,
         t2 = t1._serialize0$_buffer;
       t2.write$1(0, "@import");
@@ -109202,19 +109802,12 @@ self.util = _cliPkgRequires.util;
       t2.forSpan$2(t4.url.span, new A._SerializeVisitor_visitCssImport__closure0(t1, t4));
       _0_0 = t4.modifiers;
       if (_0_0 != null) {
-        modifiers = _0_0;
-        t1 = true;
-      } else {
-        modifiers = null;
-        t1 = false;
-      }
-      if (t1) {
         if (t3)
           t2.writeCharCode$1(32);
-        t2.write$1(0, modifiers);
+        t2.write$1(0, _0_0);
       }
     },
-    $signature: 2
+    $signature: 1
   };
   A._SerializeVisitor_visitCssImport__closure0.prototype = {
     call$0() {
@@ -109246,7 +109839,7 @@ self.util = _cliPkgRequires.util;
         t2.writeCharCode$1(32);
       t1._serialize0$_write$1(this.node.condition);
     },
-    $signature: 2
+    $signature: 1
   };
   A._SerializeVisitor_visitCssDeclaration_closure1.prototype = {
     call$0() {
@@ -109257,7 +109850,7 @@ self.util = _cliPkgRequires.util;
       else
         t1._serialize0$_writeReindentedValue$1(t2);
     },
-    $signature: 2
+    $signature: 1
   };
   A._SerializeVisitor_visitCssDeclaration_closure2.prototype = {
     call$0() {
@@ -109265,17 +109858,11 @@ self.util = _cliPkgRequires.util;
     },
     $signature: 0
   };
-  A._SerializeVisitor__writeCalculationValue_closure0.prototype = {
-    call$0() {
-      return !isFinite(this._2_0._number1$_value);
-    },
-    $signature: 1
-  };
   A._SerializeVisitor_visitList_closure2.prototype = {
     call$1(element) {
       return !element.get$isBlank();
     },
-    $signature: 54
+    $signature: 53
   };
   A._SerializeVisitor_visitList_closure3.prototype = {
     call$1(element) {
@@ -109287,13 +109874,13 @@ self.util = _cliPkgRequires.util;
       if (needsParens)
         t1._serialize0$_buffer.writeCharCode$1(41);
     },
-    $signature: 57
+    $signature: 62
   };
   A._SerializeVisitor_visitList_closure4.prototype = {
     call$1(element) {
       element.accept$1(this.$this);
     },
-    $signature: 57
+    $signature: 62
   };
   A._SerializeVisitor_visitMap_closure0.prototype = {
     call$1(entry) {
@@ -109302,19 +109889,7 @@ self.util = _cliPkgRequires.util;
       t1._serialize0$_buffer.write$1(0, ": ");
       t1._serialize0$_writeMapElement$1(entry.value);
     },
-    $signature: 557
-  };
-  A._SerializeVisitor__visitQuotedString_closure1.prototype = {
-    call$0() {
-      return 39 === this._1_0;
-    },
-    $signature: 1
-  };
-  A._SerializeVisitor__visitQuotedString_closure2.prototype = {
-    call$0() {
-      return 34 === this._1_0;
-    },
-    $signature: 1
+    $signature: 536
   };
   A._SerializeVisitor_visitSelectorList_closure0.prototype = {
     call$1(complex) {
@@ -109322,12 +109897,6 @@ self.util = _cliPkgRequires.util;
     },
     $signature: 18
   };
-  A._SerializeVisitor_visitPseudoSelector_closure0.prototype = {
-    call$0() {
-      return this._0_0.selector;
-    },
-    $signature: 78
-  };
   A._SerializeVisitor__write_closure0.prototype = {
     call$0() {
       return this.$this._serialize0$_buffer.write$1(0, this.value.value);
@@ -109466,6 +110035,9 @@ self.util = _cliPkgRequires.util;
     get$specificity() {
       return 1000;
     },
+    get$hasComplicatedSuperselectorSemantics() {
+      return false;
+    },
     addSuffix$1(suffix) {
       return A.throwExpression(A.MultiSpanSassException$0('Selector "' + this.toString$0(0) + "\" can't have a suffix", this.span, "outer selector", A.LinkedHashMap_LinkedHashMap$_empty(type$.FileSpan, type$.String), null));
     },
@@ -109524,7 +110096,7 @@ self.util = _cliPkgRequires.util;
     call$1(simple) {
       return this.$this.isSuperselector$1(simple);
     },
-    $signature: 15
+    $signature: 14
   };
   A.SingleUnitSassNumber0.prototype = {
     get$numeratorUnits(_) {
@@ -109650,13 +110222,13 @@ self.util = _cliPkgRequires.util;
     call$1(factor) {
       return new A.SingleUnitSassNumber0(this.unit, this.$this._number1$_value * factor, null);
     },
-    $signature: 558
+    $signature: 537
   };
   A.SingleUnitSassNumber__coerceValueToUnit_closure0.prototype = {
     call$1(factor) {
       return this.$this._number1$_value * factor;
     },
-    $signature: 42
+    $signature: 37
   };
   A.SingleUnitSassNumber_multiplyUnits_closure1.prototype = {
     call$1(denominator) {
@@ -109666,7 +110238,7 @@ self.util = _cliPkgRequires.util;
       this._box_0.value *= factor;
       return true;
     },
-    $signature: 10
+    $signature: 4
   };
   A.SingleUnitSassNumber_multiplyUnits_closure2.prototype = {
     call$0() {
@@ -109725,7 +110297,9 @@ self.util = _cliPkgRequires.util;
           ++this._source_map_buffer0$_column;
     },
     writeCharCode$1(charCode) {
-      this._source_map_buffer0$_buffer._contents += A.Primitives_stringFromCharCode(charCode);
+      var t1 = this._source_map_buffer0$_buffer,
+        t2 = A.Primitives_stringFromCharCode(charCode);
+      t1._contents += t2;
       if (charCode === 10)
         this._source_map_buffer0$_writeLine$0();
       else
@@ -109774,49 +110348,55 @@ self.util = _cliPkgRequires.util;
       t3 = t2 === 0 ? t3.prefixColumn : 0;
       return new A.Entry(entry.source, A.SourceLocation$(t1.offset + this.prefixLength, t1.column + t3, t2 + t4, null), entry.identifierName);
     },
-    $signature: 206
+    $signature: 158
   };
   A.updateSourceSpanPrototype_closure.prototype = {
-    call$1(span) {
-      return span.get$start(span);
+    call$0() {
+      return this.span;
     },
-    $signature: 280
+    $signature: 27
   };
   A.updateSourceSpanPrototype_closure0.prototype = {
     call$1(span) {
-      return span.get$end(span);
+      return span.get$start(span);
     },
-    $signature: 280
+    $signature: 231
   };
   A.updateSourceSpanPrototype_closure1.prototype = {
     call$1(span) {
-      return A.NullableExtension_andThen0(span.get$sourceUrl(span), A.utils1__dartToJSUrl$closure());
+      return span.get$end(span);
     },
-    $signature: 560
+    $signature: 231
   };
   A.updateSourceSpanPrototype_closure2.prototype = {
     call$1(span) {
-      return span.get$text();
+      return A.NullableExtension_andThen0(span.get$sourceUrl(span), A.utils1__dartToJSUrl$closure());
     },
-    $signature: 281
+    $signature: 539
   };
   A.updateSourceSpanPrototype_closure3.prototype = {
     call$1(span) {
-      return span.get$context(span);
+      return span.get$text();
     },
-    $signature: 281
+    $signature: 223
   };
   A.updateSourceSpanPrototype_closure4.prototype = {
-    call$1($location) {
-      return $location.get$line();
+    call$1(span) {
+      return span.get$context(span);
     },
-    $signature: 282
+    $signature: 223
   };
   A.updateSourceSpanPrototype_closure5.prototype = {
+    call$1($location) {
+      return $location.get$line();
+    },
+    $signature: 215
+  };
+  A.updateSourceSpanPrototype_closure6.prototype = {
     call$1($location) {
       return $location.get$column();
     },
-    $signature: 282
+    $signature: 215
   };
   A.StatementSearchVisitor0.prototype = {
     visitAtRootRule$1(node) {
@@ -109980,27 +110560,29 @@ self.util = _cliPkgRequires.util;
         result._contents = t1 + (A.indent0(B.JSString_methods.trimRight$0(trace.toString$0(0)), 4) + "\n");
       A.printError0(result);
     },
-    warn$1($receiver, message) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, null, null);
+    warn$1(_, message) {
+      return this.warn$4$deprecation$span$trace(0, message, false, null, null);
     },
-    warn$3$span$trace($receiver, message, span, trace) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, span, trace);
+    warn$3$span$trace(_, message, span, trace) {
+      return this.warn$4$deprecation$span$trace(0, message, false, span, trace);
     },
-    warn$2$span($receiver, message, span) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, span, null);
+    warn$2$span(_, message, span) {
+      return this.warn$4$deprecation$span$trace(0, message, false, span, null);
     },
-    warn$2$trace($receiver, message, trace) {
-      return this.warn$4$deprecation$span$trace($receiver, message, false, null, trace);
+    warn$2$trace(_, message, trace) {
+      return this.warn$4$deprecation$span$trace(0, message, false, null, trace);
     },
     debug$2(_, message, span) {
-      var url, t3,
+      var url, t3, t4,
         t1 = span.file,
         t2 = span._file$_start;
       if (A.FileLocation$_(t1, t2).file.url == null)
         url = "-";
       else {
-        t3 = A.FileLocation$_(t1, t2);
-        url = $.$get$context().prettyUri$1(t3.file.url);
+        t3 = A.FileLocation$_(t1, t2).file.url;
+        t4 = $.$get$context();
+        t3.toString;
+        url = t4.prettyUri$1(t3);
       }
       t1 = A.FileLocation$_(t1, t2);
       t1 = t1.file.getLine$1(t1.offset);
@@ -110029,7 +110611,8 @@ self.util = _cliPkgRequires.util;
       t3 = new A.StringBuffer("");
       t4 = A._setArrayType([], type$.JSArray_Object);
       buffer = new A.InterpolationBuffer0(t3, t4);
-      t3._contents += A.Primitives_stringFromCharCode(quote);
+      t5 = A.Primitives_stringFromCharCode(quote);
+      t3._contents += t5;
       for (t5 = t2.length, t6 = type$.Expression_2, _i = 0; _i < t5; ++_i) {
         value = t2[_i];
         if (t6._is(value)) {
@@ -110040,7 +110623,8 @@ self.util = _cliPkgRequires.util;
         if (typeof value == "string")
           A.StringExpression__quoteInnerText0(value, quote, buffer, $static);
       }
-      t3._contents += A.Primitives_stringFromCharCode(quote);
+      t2 = A.Primitives_stringFromCharCode(quote);
+      t3._contents += t2;
       return buffer.interpolation$1(t1.span);
     },
     asInterpolation$0() {
@@ -110064,11 +110648,11 @@ self.util = _cliPkgRequires.util;
         throw A.wrapException(A.SassScriptException$0("$limit: Must be 1 or greater, was " + A.S(limit) + ".", null));
       t1 = string._string0$_text;
       if (t1.length === 0)
-        return B.SassList_Sof2;
+        return B.SassList_bdS2;
       else {
         t2 = separator._string0$_text;
         if (t2.length === 0)
-          return A.SassList$0(A.MappedIterable_MappedIterable(new A.Runes(t1), new A.module__closure2(string), type$.Runes._eval$1("Iterable.E"), type$.Value_2), B.ListSeparator_rXA0, true);
+          return A.SassList$0(A.MappedIterable_MappedIterable(new A.Runes(t1), new A.module__closure2(string), type$.Runes._eval$1("Iterable.E"), type$.Value_2), B.ListSeparator_ECn0, true);
       }
       chunks = A._setArrayType([], type$.JSArray_String);
       for (t2 = B.JSString_methods.allMatches$1(t2, t1), t2 = new A._StringAllMatchesIterator(t2._input, t2._pattern, t2.__js_helper$_index), i = 0, lastEnd = 0; t2.moveNext$0();) {
@@ -110081,21 +110665,21 @@ self.util = _cliPkgRequires.util;
           break;
       }
       chunks.push(B.JSString_methods.substring$1(t1, lastEnd));
-      return A.SassList$0(new A.MappedListIterable(chunks, new A.module__closure3(string), type$.MappedListIterable_String_Value_2), B.ListSeparator_rXA0, true);
+      return A.SassList$0(new A.MappedListIterable(chunks, new A.module__closure3(string), type$.MappedListIterable_String_Value_2), B.ListSeparator_ECn0, true);
     },
-    $signature: 27
+    $signature: 23
   };
   A.module__closure2.prototype = {
     call$1(rune) {
       return new A.SassString0(A.Primitives_stringFromCharCode(rune), this.string._string0$_hasQuotes);
     },
-    $signature: 563
+    $signature: 542
   };
   A.module__closure3.prototype = {
     call$1(chunk) {
       return new A.SassString0(chunk, this.string._string0$_hasQuotes);
     },
-    $signature: 564
+    $signature: 543
   };
   A._unquote_closure0.prototype = {
     call$1($arguments) {
@@ -110104,7 +110688,7 @@ self.util = _cliPkgRequires.util;
         return string;
       return new A.SassString0(string._string0$_text, false);
     },
-    $signature: 17
+    $signature: 19
   };
   A._quote_closure0.prototype = {
     call$1($arguments) {
@@ -110113,7 +110697,7 @@ self.util = _cliPkgRequires.util;
         return string;
       return new A.SassString0(string._string0$_text, true);
     },
-    $signature: 17
+    $signature: 19
   };
   A._length_closure1.prototype = {
     call$1($arguments) {
@@ -110136,7 +110720,7 @@ self.util = _cliPkgRequires.util;
       codeUnitIndex = A.codepointIndexToCodeUnitIndex0(t1, A._codepointForIndex0(indexInt, string.get$_string0$_sassLength(), false));
       return new A.SassString0(B.JSString_methods.replaceRange$3(t1, codeUnitIndex, codeUnitIndex, insert._string0$_text), string._string0$_hasQuotes);
     },
-    $signature: 17
+    $signature: 19
   };
   A._index_closure1.prototype = {
     call$1($arguments) {
@@ -110147,7 +110731,7 @@ self.util = _cliPkgRequires.util;
         return B.C__SassNull0;
       return A.SassNumber_SassNumber0(A.codeUnitIndexToCodepointIndex0(t2, codeUnitIndex) + 1, null);
     },
-    $signature: 5
+    $signature: 3
   };
   A._slice_closure0.prototype = {
     call$1($arguments) {
@@ -110172,7 +110756,7 @@ self.util = _cliPkgRequires.util;
       t1 = string._string0$_text;
       return new A.SassString0(B.JSString_methods.substring$2(t1, A.codepointIndexToCodeUnitIndex0(t1, startCodepoint), A.codepointIndexToCodeUnitIndex0(t1, endCodepoint + 1)), string._string0$_hasQuotes);
     },
-    $signature: 17
+    $signature: 19
   };
   A._toUpperCase_closure0.prototype = {
     call$1($arguments) {
@@ -110184,7 +110768,7 @@ self.util = _cliPkgRequires.util;
       }
       return new A.SassString0(t3.charCodeAt(0) == 0 ? t3 : t3, string._string0$_hasQuotes);
     },
-    $signature: 17
+    $signature: 19
   };
   A._toLowerCase_closure0.prototype = {
     call$1($arguments) {
@@ -110196,7 +110780,7 @@ self.util = _cliPkgRequires.util;
       }
       return new A.SassString0(t3.charCodeAt(0) == 0 ? t3 : t3, string._string0$_hasQuotes);
     },
-    $signature: 17
+    $signature: 19
   };
   A._uniqueId_closure0.prototype = {
     call$1($arguments) {
@@ -110206,7 +110790,7 @@ self.util = _cliPkgRequires.util;
         $._previousUniqueId0 = B.JSInt_methods.$mod($.$get$_previousUniqueId0(), A._asInt(Math.pow(36, 6)));
       return new A.SassString0("u" + B.JSString_methods.padLeft$2(B.JSInt_methods.toRadixString$1($.$get$_previousUniqueId0(), 36), 6, "0"), false);
     },
-    $signature: 17
+    $signature: 19
   };
   A.stringClass_closure.prototype = {
     call$0() {
@@ -110219,7 +110803,7 @@ self.util = _cliPkgRequires.util;
       A.JSClassExtension_injectSuperclass(t1._as(t2.constructor), jsClass);
       return jsClass;
     },
-    $signature: 24
+    $signature: 15
   };
   A.stringClass__closure.prototype = {
     call$3($self, textOrOptions, options) {
@@ -110245,25 +110829,25 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null, null];
     },
-    $signature: 565
+    $signature: 544
   };
   A.stringClass__closure0.prototype = {
     call$1($self) {
       return $self._string0$_text;
     },
-    $signature: 566
+    $signature: 545
   };
   A.stringClass__closure1.prototype = {
     call$1($self) {
       return $self._string0$_hasQuotes;
     },
-    $signature: 567
+    $signature: 546
   };
   A.stringClass__closure2.prototype = {
     call$1($self) {
       return $self.get$_string0$_sassLength();
     },
-    $signature: 568
+    $signature: 547
   };
   A.stringClass__closure3.prototype = {
     call$3($self, sassIndex, $name) {
@@ -110284,7 +110868,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 569
+    $signature: 548
   };
   A._ConstructorOptions1.prototype = {};
   A._NodeSassString.prototype = {};
@@ -110306,27 +110890,26 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 570
+    $signature: 549
   };
   A.legacyStringClass_closure0.prototype = {
     call$1(thisArg) {
       return J.get$dartValue$x(thisArg)._string0$_text;
     },
-    $signature: 571
+    $signature: 550
   };
   A.legacyStringClass_closure1.prototype = {
     call$2(thisArg, value) {
       J.set$dartValue$x(thisArg, new A.SassString0(value, false));
     },
-    $signature: 572
+    $signature: 551
   };
   A.SassString0.prototype = {
     get$_string0$_sassLength() {
-      var t1, result, _this = this,
+      var result, _this = this,
         value = _this._string0$__SassString__sassLength_FI;
       if (value === $) {
-        t1 = new A.Runes(_this._string0$_text);
-        result = t1.get$length(t1);
+        result = new A.Runes(_this._string0$_text).get$length(0);
         _this._string0$__SassString__sassLength_FI !== $ && A.throwUnnamedLateFieldADI();
         _this._string0$__SassString__sassLength_FI = result;
         value = result;
@@ -110444,7 +111027,7 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     copyWithoutChildren$0() {
-      return A.ModifiableCssStyleRule$0(this._style_rule0$_selector, this.span, this.originalSelector);
+      return A.ModifiableCssStyleRule$0(this._style_rule0$_selector, this.span, false, this.originalSelector);
     },
     get$span(receiver) {
       return this.span;
@@ -110560,7 +111143,7 @@ self.util = _cliPkgRequires.util;
       if (t1)
         _this._stylesheet0$_assertPublic$2($name, new A.StylesheetParser_variableDeclarationWithoutNamespace_closure1(_this, start));
       if (_this.get$plainCss())
-        _this.error$2(0, string$.Sass_v, _this.scanner.spanFrom$1(start));
+        _this.error$2(0, string$.Sassx20v, _this.scanner.spanFrom$1(start));
       _this.whitespace$0();
       t2 = _this.scanner;
       t2.expectChar$1(58);
@@ -110577,7 +111160,7 @@ self.util = _cliPkgRequires.util;
               t5 = flagStart.position;
               t6 = new A._FileSpan(t4, t5, endPosition);
               t6._FileSpan$3(t4, t5, endPosition);
-              A.WarnForDeprecation_warnForDeprecation0(t3, B.Deprecation_ynv, string$.x21defau, t6, null);
+              A.WarnForDeprecation_warnForDeprecation0(t3, B.Deprecation_iXE, string$.x21defau, t6, null);
             }
             guarded = true;
             break $label0$0;
@@ -110596,7 +111179,7 @@ self.util = _cliPkgRequires.util;
               t5 = flagStart.position;
               t6 = new A._FileSpan(t4, t5, endPosition);
               t6._FileSpan$3(t4, t5, endPosition);
-              A.WarnForDeprecation_warnForDeprecation0(t3, B.Deprecation_ynv, string$.x21globas, t6, null);
+              A.WarnForDeprecation_warnForDeprecation0(t3, B.Deprecation_iXE, string$.x21globas, t6, null);
             }
             global = true;
             break $label0$0;
@@ -110643,8 +111226,6 @@ self.util = _cliPkgRequires.util;
     },
     _stylesheet0$_declarationOrStyleRule$0() {
       var t1, t2, declarationOrBuffer, _this = this;
-      if (_this.get$plainCss() && _this._stylesheet0$_inStyleRule && !_this._stylesheet0$_inUnknownAtRule)
-        return _this._stylesheet0$_propertyOrVariableDeclaration$0();
       if (_this.get$indented() && _this.scanner.scanChar$1(92))
         return _this._stylesheet0$_styleRule$0();
       t1 = _this.scanner;
@@ -110653,18 +111234,20 @@ self.util = _cliPkgRequires.util;
       return type$.Statement_2._is(declarationOrBuffer) ? declarationOrBuffer : _this._stylesheet0$_styleRule$2(type$.InterpolationBuffer_2._as(declarationOrBuffer), new A._SpanScannerState(t1, t2));
     },
     _stylesheet0$_declarationOrBuffer$0() {
-      var midBuffer, couldBeSelector, beforeDeclaration, additional, t3, startsWithPunctuation, variableOrInterpolation, t4, $name, postColonWhitespace, exception, _this = this, t1 = {},
-        t2 = _this.scanner,
-        start = new A._SpanScannerState(t2, t2._string_scanner$_position),
-        nameBuffer = new A.InterpolationBuffer0(new A.StringBuffer(""), A._setArrayType([], type$.JSArray_Object));
-      if (_this._stylesheet0$_lookingAtPotentialPropertyHack$0()) {
-        t3 = t2.readChar$0();
-        nameBuffer._interpolation_buffer0$_text._contents += A.Primitives_stringFromCharCode(t3);
-        t3 = _this.rawText$1(_this.get$whitespace());
-        nameBuffer._interpolation_buffer0$_text._contents += t3;
-        startsWithPunctuation = true;
-      } else
-        startsWithPunctuation = false;
+      var midBuffer, couldBeSelector, beforeDeclaration, value, additional, t2, t3, variableOrInterpolation, t4, t5, $name, postColonWhitespace, _0_0, exception, _1_0, _this = this,
+        t1 = _this.scanner,
+        start = new A._SpanScannerState(t1, t1._string_scanner$_position),
+        nameBuffer = new A.InterpolationBuffer0(new A.StringBuffer(""), A._setArrayType([], type$.JSArray_Object)),
+        startsWithPunctuation = _this._stylesheet0$_lookingAtPotentialPropertyHack$0();
+      if (startsWithPunctuation) {
+        t2 = t1.readChar$0();
+        t3 = nameBuffer._interpolation_buffer0$_text;
+        t2 = A.Primitives_stringFromCharCode(t2);
+        t3._contents += t2;
+        t2 = _this.rawText$1(_this.get$whitespace());
+        t3 = nameBuffer._interpolation_buffer0$_text;
+        t3._contents += t2;
+      }
       if (!_this._stylesheet0$_lookingAtInterpolatedIdentifier$0())
         return nameBuffer;
       variableOrInterpolation = startsWithPunctuation ? _this.interpolatedIdentifier$0() : _this._stylesheet0$_variableDeclarationOrInterpolation$0();
@@ -110673,46 +111256,59 @@ self.util = _cliPkgRequires.util;
       else
         nameBuffer.addInterpolation$1(type$.Interpolation_2._as(variableOrInterpolation));
       _this._stylesheet0$_isUseAllowed = false;
-      if (t2.matches$1("/*")) {
-        t3 = _this.rawText$1(_this.get$loudComment());
-        nameBuffer._interpolation_buffer0$_text._contents += t3;
+      if (t1.matches$1("/*")) {
+        t2 = _this.rawText$1(_this.get$loudComment());
+        t3 = nameBuffer._interpolation_buffer0$_text;
+        t3._contents += t2;
       }
       midBuffer = new A.StringBuffer("");
+      t2 = midBuffer;
       t3 = _this.get$whitespace();
-      midBuffer._contents += _this.rawText$1(t3);
-      t4 = t2._string_scanner$_position;
-      if (!t2.scanChar$1(58)) {
-        if (midBuffer._contents.length !== 0)
-          nameBuffer._interpolation_buffer0$_text._contents += A.Primitives_stringFromCharCode(32);
+      t4 = _this.rawText$1(t3);
+      t2._contents += t4;
+      t4 = t1._string_scanner$_position;
+      if (!t1.scanChar$1(58)) {
+        if (midBuffer._contents.length !== 0) {
+          t1 = nameBuffer._interpolation_buffer0$_text;
+          t2 = A.Primitives_stringFromCharCode(32);
+          t1._contents += t2;
+        }
         return nameBuffer;
       }
-      midBuffer._contents += A.Primitives_stringFromCharCode(58);
-      $name = nameBuffer.interpolation$1(t2.spanFrom$2(start, new A._SpanScannerState(t2, t4)));
+      t2 = midBuffer;
+      t5 = A.Primitives_stringFromCharCode(58);
+      t2._contents += t5;
+      $name = nameBuffer.interpolation$1(t1.spanFrom$2(start, new A._SpanScannerState(t1, t4)));
       if (B.JSString_methods.startsWith$1($name.get$initialPlain(), "--")) {
-        t1 = _this._stylesheet0$_interpolatedDeclarationValue$0();
+        t2 = _this._stylesheet0$_interpolatedDeclarationValue$1$silentComments(false);
         _this.expectStatementSeparator$1("custom property");
-        return A.Declaration$0($name, new A.StringExpression0(t1, false), t2.spanFrom$1(start));
+        return A.Declaration$0($name, new A.StringExpression0(t2, false), t1.spanFrom$1(start));
       }
-      if (t2.scanChar$1(58)) {
+      if (t1.scanChar$1(58)) {
         t1 = nameBuffer;
         t2 = t1._interpolation_buffer0$_text;
-        t2._contents += A.S(midBuffer);
-        t2._contents += A.Primitives_stringFromCharCode(58);
+        t3 = A.S(midBuffer);
+        t2._contents += t3;
+        t3 = A.Primitives_stringFromCharCode(58);
+        t2._contents += t3;
         return t1;
       } else if (_this.get$indented() && _this._stylesheet0$_lookingAtInterpolatedIdentifier$0()) {
         t1 = nameBuffer;
-        t1._interpolation_buffer0$_text._contents += A.S(midBuffer);
+        t2 = t1._interpolation_buffer0$_text;
+        t3 = A.S(midBuffer);
+        t2._contents += t3;
         return t1;
       }
       postColonWhitespace = _this.rawText$1(t3);
-      if (_this.lookingAtChildren$0())
-        return _this._stylesheet0$_withChildren$3(_this.get$_stylesheet0$_declarationChild(), start, new A.StylesheetParser__declarationOrBuffer_closure1($name));
+      _0_0 = _this._stylesheet0$_tryDeclarationChildren$2($name, start);
+      if (_0_0 != null)
+        return _0_0;
       midBuffer._contents += postColonWhitespace;
       couldBeSelector = postColonWhitespace.length === 0 && _this._stylesheet0$_lookingAtInterpolatedIdentifier$0();
-      beforeDeclaration = new A._SpanScannerState(t2, t2._string_scanner$_position);
-      t3 = t1.value = null;
+      beforeDeclaration = new A._SpanScannerState(t1, t1._string_scanner$_position);
+      value = null;
       try {
-        t3 = t1.value = _this._stylesheet0$_expression$0();
+        value = _this._stylesheet0$_expression$0();
         if (_this.lookingAtChildren$0()) {
           if (couldBeSelector)
             _this.expectStatementSeparator$0();
@@ -110722,21 +111318,24 @@ self.util = _cliPkgRequires.util;
         if (type$.FormatException._is(A.unwrapException(exception))) {
           if (!couldBeSelector)
             throw exception;
-          t2.set$state(beforeDeclaration);
+          t1.set$state(beforeDeclaration);
           additional = _this.almostAnyValue$0();
-          if (!_this.get$indented() && t2.peekChar$0() === 59)
+          if (!_this.get$indented() && t1.peekChar$0() === 59)
             throw exception;
-          nameBuffer._interpolation_buffer0$_text._contents += A.S(midBuffer);
+          t1 = nameBuffer._interpolation_buffer0$_text;
+          t2 = A.S(midBuffer);
+          t1._contents += t2;
           nameBuffer.addInterpolation$1(additional);
           return nameBuffer;
         } else
           throw exception;
       }
-      if (_this.lookingAtChildren$0())
-        return _this._stylesheet0$_withChildren$3(_this.get$_stylesheet0$_declarationChild(), start, new A.StylesheetParser__declarationOrBuffer_closure2(t1, $name));
+      _1_0 = _this._stylesheet0$_tryDeclarationChildren$3$value($name, start, value);
+      if (_1_0 != null)
+        return _1_0;
       else {
         _this.expectStatementSeparator$0();
-        return A.Declaration$0($name, t3, t2.spanFrom$1(start));
+        return A.Declaration$0($name, value, t1.spanFrom$1(start));
       }
     },
     _stylesheet0$_variableDeclarationOrInterpolation$0() {
@@ -110782,65 +111381,58 @@ self.util = _cliPkgRequires.util;
       return this._stylesheet0$_styleRule$2(null, null);
     },
     _stylesheet0$_propertyOrVariableDeclaration$1$parseCustomProperties(parseCustomProperties) {
-      var t3, nameBuffer, variableOrInterpolation, $name, value, _this = this,
-        _s48_ = string$.Nested,
-        t1 = {},
-        t2 = _this.scanner,
-        start = new A._SpanScannerState(t2, t2._string_scanner$_position);
-      t1.name = null;
+      var t2, nameBuffer, t3, $name, variableOrInterpolation, _0_0, value, _1_0, _this = this,
+        t1 = _this.scanner,
+        start = new A._SpanScannerState(t1, t1._string_scanner$_position);
       if (_this._stylesheet0$_lookingAtPotentialPropertyHack$0()) {
-        t3 = new A.StringBuffer("");
-        nameBuffer = new A.InterpolationBuffer0(t3, A._setArrayType([], type$.JSArray_Object));
-        t3._contents += A.Primitives_stringFromCharCode(t2.readChar$0());
-        t3._contents += _this.rawText$1(_this.get$whitespace());
+        t2 = new A.StringBuffer("");
+        nameBuffer = new A.InterpolationBuffer0(t2, A._setArrayType([], type$.JSArray_Object));
+        t3 = A.Primitives_stringFromCharCode(t1.readChar$0());
+        t2._contents += t3;
+        t3 = _this.rawText$1(_this.get$whitespace());
+        t2._contents += t3;
         nameBuffer.addInterpolation$1(_this.interpolatedIdentifier$0());
-        t3 = t1.name = nameBuffer.interpolation$1(t2.spanFrom$1(start));
+        $name = nameBuffer.interpolation$1(t1.spanFrom$1(start));
       } else if (!_this.get$plainCss()) {
         variableOrInterpolation = _this._stylesheet0$_variableDeclarationOrInterpolation$0();
         if (variableOrInterpolation instanceof A.VariableDeclaration0)
           return variableOrInterpolation;
-        else {
+        else
           type$.Interpolation_2._as(variableOrInterpolation);
-          t1.name = variableOrInterpolation;
-        }
-        t3 = variableOrInterpolation;
-      } else {
+        $name = variableOrInterpolation;
+      } else
         $name = _this.interpolatedIdentifier$0();
-        t1.name = $name;
-        t3 = $name;
-      }
       _this.whitespace$0();
-      t2.expectChar$1(58);
-      if (parseCustomProperties && B.JSString_methods.startsWith$1(t3.get$initialPlain(), "--")) {
-        t1 = _this._stylesheet0$_interpolatedDeclarationValue$0();
-        _this.expectStatementSeparator$1("custom property");
-        return A.Declaration$0(t3, new A.StringExpression0(t1, false), t2.spanFrom$1(start));
-      }
+      t1.expectChar$1(58);
       _this.whitespace$0();
-      if (_this.lookingAtChildren$0()) {
-        if (_this.get$plainCss())
-          t2.error$1(0, _s48_);
-        return _this._stylesheet0$_withChildren$3(_this.get$_stylesheet0$_declarationChild(), start, new A.StylesheetParser__propertyOrVariableDeclaration_closure1(t1));
-      }
+      _0_0 = _this._stylesheet0$_tryDeclarationChildren$2($name, start);
+      if (_0_0 != null)
+        return _0_0;
       value = _this._stylesheet0$_expression$0();
-      if (_this.lookingAtChildren$0()) {
-        if (_this.get$plainCss())
-          t2.error$1(0, _s48_);
-        return _this._stylesheet0$_withChildren$3(_this.get$_stylesheet0$_declarationChild(), start, new A.StylesheetParser__propertyOrVariableDeclaration_closure2(t1, value));
-      } else {
+      _1_0 = _this._stylesheet0$_tryDeclarationChildren$3$value($name, start, value);
+      if (_1_0 != null)
+        return _1_0;
+      else {
         _this.expectStatementSeparator$0();
-        return A.Declaration$0(t3, value, t2.spanFrom$1(start));
+        return A.Declaration$0($name, value, t1.spanFrom$1(start));
       }
     },
-    _stylesheet0$_propertyOrVariableDeclaration$0() {
-      return this._stylesheet0$_propertyOrVariableDeclaration$1$parseCustomProperties(true);
+    _stylesheet0$_tryDeclarationChildren$3$value($name, start, value) {
+      var _this = this;
+      if (!_this.lookingAtChildren$0())
+        return null;
+      if (_this.get$plainCss())
+        _this.scanner.error$1(0, string$.Nested);
+      return _this._stylesheet0$_withChildren$3(_this.get$_stylesheet0$_declarationChild(), start, new A.StylesheetParser__tryDeclarationChildren_closure0($name, value));
+    },
+    _stylesheet0$_tryDeclarationChildren$2($name, start) {
+      return this._stylesheet0$_tryDeclarationChildren$3$value($name, start, null);
     },
     _stylesheet0$_declarationChild$0() {
       return this.scanner.peekChar$0() === 64 ? this._stylesheet0$_declarationAtRule$0() : this._stylesheet0$_propertyOrVariableDeclaration$1$parseCustomProperties(false);
     },
     atRule$2$root(child, root) {
       var $name, wasUseAllowed, value, optional, url, namespace, configuration, span, _this = this,
-        _s9_ = "@use rule",
         t1 = _this.scanner,
         start = new A._SpanScannerState(t1, t1._string_scanner$_position);
       t1.expectChar$2$name(64, "@-rule");
@@ -110866,8 +111458,10 @@ self.util = _cliPkgRequires.util;
             _this.error$2(0, string$.x40exten, t1.spanFrom$1(start));
           value = _this.almostAnyValue$0();
           optional = t1.scanChar$1(33);
-          if (optional)
+          if (optional) {
             _this.expectIdentifier$1("optional");
+            _this.whitespace$0();
+          }
           _this.expectStatementSeparator$1("@extend rule");
           return new A.ExtendRule0(value, optional, t1.spanFrom$1(start));
         case "for":
@@ -110904,11 +111498,11 @@ self.util = _cliPkgRequires.util;
           namespace = _this._stylesheet0$_useNamespace$2(url, start);
           _this.whitespace$0();
           configuration = _this._stylesheet0$_configuration$0();
-          _this.expectStatementSeparator$1(_s9_);
+          _this.whitespace$0();
           span = t1.spanFrom$1(start);
           if (!_this._stylesheet0$_isUseAllowed)
             _this.error$2(0, string$.x40use_r, span);
-          _this.expectStatementSeparator$1(_s9_);
+          _this.expectStatementSeparator$1("@use rule");
           t1 = new A.UseRule0(url, namespace, configuration == null ? B.List_empty21 : A.List_List$unmodifiable(configuration, type$.ConfiguredVariable_2), span);
           t1.UseRule$4$configuration0(url, namespace, span, configuration);
           return t1;
@@ -111059,22 +111653,26 @@ self.util = _cliPkgRequires.util;
         t4 = A._setArrayType([], type$.JSArray_Object);
         buffer = new A.InterpolationBuffer0(t3, t4);
         t1.expectChar$1(40);
-        t3._contents += A.Primitives_stringFromCharCode(40);
+        t5 = A.Primitives_stringFromCharCode(40);
+        t3._contents += t5;
         _this.whitespace$0();
         t5 = _this._stylesheet0$_expression$0();
         buffer._interpolation_buffer0$_flushText$0();
         t4.push(t5);
         if (t1.scanChar$1(58)) {
           _this.whitespace$0();
-          t3._contents += A.Primitives_stringFromCharCode(58);
-          t3._contents += A.Primitives_stringFromCharCode(32);
+          t5 = A.Primitives_stringFromCharCode(58);
+          t3._contents += t5;
+          t5 = A.Primitives_stringFromCharCode(32);
+          t3._contents += t5;
           t5 = _this._stylesheet0$_expression$0();
           buffer._interpolation_buffer0$_flushText$0();
           t4.push(t5);
         }
         t1.expectChar$1(41);
         _this.whitespace$0();
-        t3._contents += A.Primitives_stringFromCharCode(41);
+        t4 = A.Primitives_stringFromCharCode(41);
+        t3._contents += t4;
         query = buffer.interpolation$1(t1.spanFrom$1(new A._SpanScannerState(t1, t2)));
         _this.whitespace$0();
         return _this._stylesheet0$_withChildren$3(_this.get$_stylesheet0$_statement(), start, new A.StylesheetParser__atRootRule_closure1(query));
@@ -111084,17 +111682,18 @@ self.util = _cliPkgRequires.util;
         return A.AtRootRule$0(A._setArrayType([_this._stylesheet0$_styleRule$0()], type$.JSArray_Statement_2), t1.spanFrom$1(start), null);
     },
     _stylesheet0$_contentRule$1(start) {
-      var t1, $arguments, t2, t3, _this = this;
+      var t1, beforeWhitespace, $arguments, t2, _this = this;
       if (!_this._stylesheet0$_inMixin)
         _this.error$2(0, string$.x40conte, _this.scanner.spanFrom$1(start));
-      _this.whitespace$0();
       t1 = _this.scanner;
-      if (t1.peekChar$0() === 40)
+      beforeWhitespace = A.FileLocation$_(t1._sourceFile, t1._string_scanner$_position);
+      _this.whitespace$0();
+      if (t1.peekChar$0() === 40) {
         $arguments = _this._stylesheet0$_argumentInvocation$1$mixin(true);
-      else {
-        t2 = A.FileLocation$_(t1._sourceFile, t1._string_scanner$_position);
-        t3 = t2.offset;
-        $arguments = A.ArgumentInvocation$empty0(A._FileSpan$(t2.file, t3, t3));
+        _this.whitespace$0();
+      } else {
+        t2 = beforeWhitespace.offset;
+        $arguments = A.ArgumentInvocation$empty0(A._FileSpan$(beforeWhitespace.file, t2, t2));
       }
       _this.expectStatementSeparator$1("@content rule");
       return new A.ContentRule0($arguments, t1.spanFrom$1(start));
@@ -111126,19 +111725,23 @@ self.util = _cliPkgRequires.util;
       return new A.ErrorRule0(value, this.scanner.spanFrom$1(start));
     },
     _stylesheet0$_functionRule$1(start) {
-      var $name, $arguments, _0_0, _this = this,
+      var t1, t2, $name, $arguments, _0_0, _this = this,
         precedingComment = _this.lastSilentComment;
       _this.lastSilentComment = null;
-      $name = _this.identifier$1$normalize(true);
+      t1 = _this.scanner;
+      t2 = t1._string_scanner$_position;
+      $name = _this.identifier$0();
+      if (B.JSString_methods.startsWith$1($name, "--"))
+        A.WarnForDeprecation_warnForDeprecation0(_this.logger, B.Deprecation_qBS, string$.Sassx20_fm, t1.spanFrom$1(new A._SpanScannerState(t1, t2)), null);
       _this.whitespace$0();
       $arguments = _this._stylesheet0$_argumentDeclaration$0();
       if (_this._stylesheet0$_inMixin || _this._stylesheet0$_inContentBlock)
-        _this.error$2(0, string$.Mixinscf, _this.scanner.spanFrom$1(start));
+        _this.error$2(0, string$.Mixinscf, t1.spanFrom$1(start));
       else if (_this._stylesheet0$_inControlDirective)
-        _this.error$2(0, string$.Functi, _this.scanner.spanFrom$1(start));
+        _this.error$2(0, string$.Functi, t1.spanFrom$1(start));
       _0_0 = A.unvendor0($name);
       if ("calc" === _0_0 || "element" === _0_0 || "expression" === _0_0 || "url" === _0_0 || "and" === _0_0 || "or" === _0_0 || "not" === _0_0 || "clamp" === _0_0)
-        _this.error$2(0, "Invalid function name.", _this.scanner.spanFrom$1(start));
+        _this.error$2(0, "Invalid function name.", t1.spanFrom$1(start));
       _this.whitespace$0();
       return _this._stylesheet0$_withChildren$3(_this.get$_stylesheet0$_functionChild(), start, new A.StylesheetParser__functionRule_closure0($name, $arguments, precedingComment));
     },
@@ -111158,7 +111761,7 @@ self.util = _cliPkgRequires.util;
       return _this._stylesheet0$_withChildren$3(child, start, new A.StylesheetParser__forRule_closure2(t1, _this, wasInControlDirective, variable, from, _this._stylesheet0$_expression$0()));
     },
     _stylesheet0$_forwardRule$1(start) {
-      var prefix, _0_0, t1, t2, hiddenVariables, hiddenMixinsAndFunctions, shownVariables, shownMixinsAndFunctions, _1_0, configuration, span, t3, t4, _this = this, _null = null,
+      var prefix, _0_0, shownMixinsAndFunctions, shownVariables, hiddenVariables, hiddenMixinsAndFunctions, _1_0, configuration, span, t1, t2, t3, t4, _this = this, _null = null,
         url = _this._stylesheet0$_urlString$0();
       _this.whitespace$0();
       if (_this.scanIdentifier$1("as")) {
@@ -111170,19 +111773,15 @@ self.util = _cliPkgRequires.util;
         prefix = _null;
       if (_this.scanIdentifier$1("show")) {
         _0_0 = _this._stylesheet0$_memberList$0();
-        t1 = _0_0._0;
-        t2 = _0_0._1;
+        shownMixinsAndFunctions = _0_0._0;
+        shownVariables = _0_0._1;
         hiddenVariables = _null;
         hiddenMixinsAndFunctions = hiddenVariables;
-        shownVariables = t2;
-        shownMixinsAndFunctions = t1;
       } else {
         if (_this.scanIdentifier$1("hide")) {
           _1_0 = _this._stylesheet0$_memberList$0();
-          t1 = _1_0._0;
-          t2 = _1_0._1;
-          hiddenVariables = t2;
-          hiddenMixinsAndFunctions = t1;
+          hiddenMixinsAndFunctions = _1_0._0;
+          hiddenVariables = _1_0._1;
         } else {
           hiddenVariables = _null;
           hiddenMixinsAndFunctions = hiddenVariables;
@@ -111191,6 +111790,7 @@ self.util = _cliPkgRequires.util;
         shownMixinsAndFunctions = shownVariables;
       }
       configuration = _this._stylesheet0$_configuration$1$allowGuarded(true);
+      _this.whitespace$0();
       _this.expectStatementSeparator$1("@forward rule");
       span = _this.scanner.spanFrom$1(start);
       if (!_this._stylesheet0$_isUseAllowed)
@@ -111265,7 +111865,7 @@ self.util = _cliPkgRequires.util;
         argument = _this.importArgument$0();
         t3 = argument instanceof A.DynamicImport0;
         if (t3)
-          A.WarnForDeprecation_warnForDeprecation0(t2, B.Deprecation_import_true_import, string$.Sass__, argument.span, null);
+          A.WarnForDeprecation_warnForDeprecation0(t2, B.Deprecation_qd9, string$.Sassx20_i, argument.span, null);
         if ((_this._stylesheet0$_inControlDirective || _this._stylesheet0$_inMixin) && t3)
           _this._stylesheet0$_disallowedAtRule$1(start);
         imports.push(argument);
@@ -111336,7 +111936,7 @@ self.util = _cliPkgRequires.util;
       return t1;
     },
     tryImportModifiers$0() {
-      var t1, start, t2, t3, buffer, identifier, t4, $name, query, endPosition, t5, result, _this = this;
+      var t1, start, t2, t3, buffer, t4, identifier, $name, query, t5, endPosition, result, _this = this;
       if (!_this._stylesheet0$_lookingAtInterpolatedIdentifier$0() && _this.scanner.peekChar$0() !== 40)
         return null;
       t1 = _this.scanner;
@@ -111346,8 +111946,10 @@ self.util = _cliPkgRequires.util;
       buffer = new A.InterpolationBuffer0(t2, t3);
       for (; true;)
         if (_this._stylesheet0$_lookingAtInterpolatedIdentifier$0()) {
-          if (!(t3.length === 0 && t2._contents.length === 0))
-            t2._contents += A.Primitives_stringFromCharCode(32);
+          if (!(t3.length === 0 && t2._contents.length === 0)) {
+            t4 = A.Primitives_stringFromCharCode(32);
+            t2._contents += t4;
+          }
           identifier = _this.interpolatedIdentifier$0();
           buffer.addInterpolation$1(identifier);
           t4 = identifier.get$asPlain();
@@ -111356,16 +111958,22 @@ self.util = _cliPkgRequires.util;
             if ($name === "supports") {
               query = _this._stylesheet0$_importSupportsQuery$0();
               t4 = !(query instanceof A.SupportsDeclaration0);
-              if (t4)
-                t2._contents += A.Primitives_stringFromCharCode(40);
+              if (t4) {
+                t5 = A.Primitives_stringFromCharCode(40);
+                t2._contents += t5;
+              }
               buffer._interpolation_buffer0$_flushText$0();
               t3.push(new A.SupportsExpression0(query));
-              if (t4)
-                t2._contents += A.Primitives_stringFromCharCode(41);
+              if (t4) {
+                t4 = A.Primitives_stringFromCharCode(41);
+                t2._contents += t4;
+              }
             } else {
-              t2._contents += A.Primitives_stringFromCharCode(40);
+              t4 = A.Primitives_stringFromCharCode(40);
+              t2._contents += t4;
               buffer.addInterpolation$1(_this._stylesheet0$_interpolatedDeclarationValue$2$allowEmpty$allowSemicolon(true, true));
-              t2._contents += A.Primitives_stringFromCharCode(41);
+              t4 = A.Primitives_stringFromCharCode(41);
+              t2._contents += t4;
             }
             t1.expectChar$1(41);
             _this.whitespace$0();
@@ -111393,8 +112001,10 @@ self.util = _cliPkgRequires.util;
             }
           }
         } else if (t1.peekChar$0() === 40) {
-          if (!(t3.length === 0 && t2._contents.length === 0))
-            t2._contents += A.Primitives_stringFromCharCode(32);
+          if (!(t3.length === 0 && t2._contents.length === 0)) {
+            t4 = A.Primitives_stringFromCharCode(32);
+            t2._contents += t4;
+          }
           buffer.addInterpolation$1(_this._stylesheet0$_mediaQueryList$0());
           endPosition = t1._string_scanner$_position;
           t1 = t1._sourceFile;
@@ -111432,7 +112042,7 @@ self.util = _cliPkgRequires.util;
         }
     },
     _stylesheet0$_importSupportsQuery$0() {
-      var t1, t2, _0_0, $function, $name, _this = this;
+      var t1, t2, _0_0, $name, _this = this;
       if (_this.scanIdentifier$1("not")) {
         _this.whitespace$0();
         t1 = _this.scanner;
@@ -111444,15 +112054,8 @@ self.util = _cliPkgRequires.util;
           return _this._stylesheet0$_supportsCondition$0();
         else {
           _0_0 = _this._stylesheet0$_tryImportSupportsFunction$0();
-          if (_0_0 != null) {
-            $function = _0_0;
-            t2 = true;
-          } else {
-            $function = null;
-            t2 = false;
-          }
-          if (t2)
-            return $function;
+          if (_0_0 != null)
+            return _0_0;
           t2 = t1._string_scanner$_position;
           $name = _this._stylesheet0$_expression$0();
           t1.expectChar$1(58);
@@ -111476,17 +112079,15 @@ self.util = _cliPkgRequires.util;
       return new A.SupportsFunction0($name, value, t1.spanFrom$1(start));
     },
     _stylesheet0$_includeRule$1(start) {
-      var name0, namespace, $arguments, t2, t3, contentArguments, contentArguments_, wasInContentBlock, $content, _this = this, _null = null,
+      var name0, namespace, $arguments, t2, t3, contentArguments, contentArguments_, wasInContentBlock, $content, span, _this = this, _null = null,
         $name = _this.identifier$0(),
         t1 = _this.scanner;
       if (t1.scanChar$1(46)) {
         name0 = _this._stylesheet0$_publicIdentifier$0();
         namespace = $name;
         $name = name0;
-      } else {
-        $name = A.stringReplaceAllUnchecked($name, "_", "-");
+      } else
         namespace = _null;
-      }
       _this.whitespace$0();
       if (t1.peekChar$0() === 40)
         $arguments = _this._stylesheet0$_argumentInvocation$1$mixin(true);
@@ -111520,18 +112121,22 @@ self.util = _cliPkgRequires.util;
       }
       t1 = t1.spanFrom$2(start, start);
       t2 = $content == null ? $arguments : $content;
-      return new A.IncludeRule0(namespace, $name, $arguments, $content, t1.expand$1(0, t2.get$span(t2)));
+      span = t1.expand$1(0, t2.get$span(t2));
+      return new A.IncludeRule0(namespace, A.stringReplaceAllUnchecked($name, "_", "-"), $name, $arguments, $content, span);
     },
     mediaRule$1(start) {
       return this._stylesheet0$_withChildren$3(this.get$_stylesheet0$_statement(), start, new A.StylesheetParser_mediaRule_closure0(this._stylesheet0$_mediaQueryList$0()));
     },
     _stylesheet0$_mixinRule$1(start) {
-      var $name, t1, $arguments, t2, t3, _this = this,
+      var t1, t2, $name, $arguments, t3, _this = this,
         precedingComment = _this.lastSilentComment;
       _this.lastSilentComment = null;
-      $name = _this.identifier$1$normalize(true);
-      _this.whitespace$0();
       t1 = _this.scanner;
+      t2 = t1._string_scanner$_position;
+      $name = _this.identifier$0();
+      if (B.JSString_methods.startsWith$1($name, "--"))
+        A.WarnForDeprecation_warnForDeprecation0(_this.logger, B.Deprecation_qBS, string$.Sassx20_m, t1.spanFrom$1(new A._SpanScannerState(t1, t2)), null);
+      _this.whitespace$0();
       if (t1.peekChar$0() === 40)
         $arguments = _this._stylesheet0$_argumentDeclaration$0();
       else {
@@ -111548,7 +112153,7 @@ self.util = _cliPkgRequires.util;
       return _this._stylesheet0$_withChildren$3(_this.get$_stylesheet0$_statement(), start, new A.StylesheetParser__mixinRule_closure0(_this, $name, $arguments, precedingComment));
     },
     mozDocumentRule$2(start, $name) {
-      var t5, t6, identifier, _0_0, contents, argument, trailing, endPosition, t7, t8, start0, end, _this = this, _box_0 = {},
+      var t5, t6, identifier, _0_0, argument, trailing, endPosition, t7, t8, start0, end, _this = this, _box_0 = {},
         t1 = _this.scanner,
         t2 = t1._string_scanner$_position,
         t3 = new A.StringBuffer(""),
@@ -111567,24 +112172,19 @@ self.util = _cliPkgRequires.util;
           $label0$0: {
             if ("url" === identifier || "url-prefix" === identifier || "domain" === identifier) {
               _0_0 = _this._stylesheet0$_tryUrlContents$2$name(new A._SpanScannerState(t1, t6), identifier);
-              if (_0_0 != null) {
-                contents = _0_0;
-                t6 = true;
-              } else {
-                contents = null;
-                t6 = false;
-              }
-              if (t6)
-                buffer.addInterpolation$1(contents);
+              if (_0_0 != null)
+                buffer.addInterpolation$1(_0_0);
               else {
                 t1.expectChar$1(40);
                 _this.whitespace$0();
                 argument = _this.interpolatedString$0();
                 t1.expectChar$1(41);
                 t3._contents += identifier;
-                t3._contents += A.Primitives_stringFromCharCode(40);
+                t6 = A.Primitives_stringFromCharCode(40);
+                t3._contents += t6;
                 buffer.addInterpolation$1(argument.asInterpolation$0());
-                t3._contents += A.Primitives_stringFromCharCode(41);
+                t6 = A.Primitives_stringFromCharCode(41);
+                t3._contents += t6;
               }
               t6 = t3._contents;
               trailing = t6.charCodeAt(0) == 0 ? t6 : t6;
@@ -111597,7 +112197,8 @@ self.util = _cliPkgRequires.util;
               t1.expectChar$1(40);
               buffer.addInterpolation$1(_this.interpolatedString$0().asInterpolation$0());
               t1.expectChar$1(41);
-              t3._contents += A.Primitives_stringFromCharCode(41);
+              t6 = A.Primitives_stringFromCharCode(41);
+              t3._contents += t6;
               _box_0.needsDeprecationWarning = true;
               break $label0$0;
             }
@@ -111611,7 +112212,8 @@ self.util = _cliPkgRequires.util;
         _this.whitespace$0();
         if (!t1.scanChar$1(44))
           break;
-        t3._contents += A.Primitives_stringFromCharCode(44);
+        t6 = A.Primitives_stringFromCharCode(44);
+        t3._contents += t6;
         start0 = t1._string_scanner$_position;
         t5.call$0();
         end = t1._string_scanner$_position;
@@ -111665,19 +112267,18 @@ self.util = _cliPkgRequires.util;
         _this.whitespace$0();
         expression = _this.expressionUntilComma$0();
         t3 = t1._string_scanner$_position;
-        if (allowGuarded && t1.scanChar$1(33))
-          if (_this.identifier$0() === "default") {
+        if (allowGuarded && t1.scanChar$1(33)) {
+          guarded = _this.identifier$0() === "default";
+          if (guarded)
             _this.whitespace$0();
-            guarded = true;
-          } else {
+          else {
             endPosition = t1._string_scanner$_position;
             t4 = t1._sourceFile;
             t5 = new A._FileSpan(t4, t3, endPosition);
             t5._FileSpan$3(t4, t3, endPosition);
             _this.error$2(0, "Invalid flag name.", t5);
-            guarded = false;
           }
-        else
+        } else
           guarded = false;
         endPosition = t1._string_scanner$_position;
         t3 = t1._sourceFile;
@@ -111716,7 +112317,7 @@ self.util = _cliPkgRequires.util;
       _this._stylesheet0$_inUnknownAtRule = true;
       t1.value = null;
       t2 = _this.scanner;
-      t3 = t2.peekChar$0() !== 33 && !_this.atEndOfStatement$0() ? t1.value = _this.almostAnyValue$0() : null;
+      t3 = t2.peekChar$0() !== 33 && !_this.atEndOfStatement$0() ? t1.value = _this._stylesheet0$_interpolatedDeclarationValue$1$allowOpenBrace(false) : null;
       if (_this.lookingAtChildren$0())
         rule = _this._stylesheet0$_withChildren$3(_this.get$_stylesheet0$_statement(), start, new A.StylesheetParser_unknownAtRule_closure0(t1, $name));
       else {
@@ -111727,7 +112328,7 @@ self.util = _cliPkgRequires.util;
       return rule;
     },
     _stylesheet0$_disallowedAtRule$1(start) {
-      this.almostAnyValue$0();
+      this._stylesheet0$_interpolatedDeclarationValue$2$allowEmpty$allowOpenBrace(true, false);
       this.error$2(0, "This at-rule is not allowed here.", this.scanner.spanFrom$1(start));
     },
     _stylesheet0$_argumentDeclaration$0() {
@@ -111852,7 +112453,7 @@ self.util = _cliPkgRequires.util;
       return this._stylesheet0$_argumentInvocation$2$allowEmptySecondArg$mixin(false, mixin);
     },
     _stylesheet0$_expression$3$bracketList$singleEquals$until(bracketList, singleEquals, until) {
-      var t2, beforeBracket, start, wasInParentheses, resetState, resolveOneOperation, resolveOperations, addSingleExpression, addOperator, resolveSpaceExpressions, t3, _3_0, _3_28, _3_32, _3_40, _1_0, t4, _2_0, commaExpressions, spaceExpressions, singleExpression, _this = this,
+      var t2, beforeBracket, start, wasInExpression, wasInParentheses, resetState, resolveOneOperation, resolveOperations, addSingleExpression, addOperator, resolveSpaceExpressions, t3, _3_0, _1_0, t4, _3_28, _2_0, _3_32, _3_40, commaExpressions, spaceExpressions, singleExpression, _this = this,
         _s20_ = "Expected expression.",
         _box_0 = {},
         t1 = until != null;
@@ -111872,7 +112473,9 @@ self.util = _cliPkgRequires.util;
         beforeBracket = null;
       t2 = _this.scanner;
       start = new A._SpanScannerState(t2, t2._string_scanner$_position);
+      wasInExpression = _this._stylesheet0$_inExpression;
       wasInParentheses = _this._stylesheet0$_inParentheses;
+      _this._stylesheet0$_inExpression = true;
       _box_0.operands_ = _box_0.operators_ = _box_0.spaceExpressions_ = _box_0.commaExpressions_ = null;
       _box_0.allowSlash = true;
       _box_0.singleExpression_ = _this._stylesheet0$_singleExpression$0();
@@ -111887,9 +112490,6 @@ self.util = _cliPkgRequires.util;
         if (t1 && until.call$0())
           break;
         _3_0 = t2.peekChar$0();
-        _3_28 = A._InitializedCell$(new A.StylesheetParser__expression_closure2(_3_0));
-        _3_32 = A._InitializedCell$(new A.StylesheetParser__expression_closure3(_3_0));
-        _3_40 = A._InitializedCell$(new A.StylesheetParser__expression_closure4(_3_0));
         if (_3_0 == null)
           break;
         if (40 === _3_0) {
@@ -111919,10 +112519,10 @@ self.util = _cliPkgRequires.util;
         if (61 === _3_0) {
           t2.readChar$0();
           if (singleEquals && t2.peekChar$0() !== 61)
-            addOperator.call$1(B.BinaryOperator_2jN0);
+            addOperator.call$1(B.BinaryOperator_wdM0);
           else {
             t2.expectChar$1(61);
-            addOperator.call$1(B.BinaryOperator_ql50);
+            addOperator.call$1(B.BinaryOperator_g8k0);
           }
           continue;
         }
@@ -111932,7 +112532,7 @@ self.util = _cliPkgRequires.util;
             if (61 === _1_0) {
               t2.readChar$0();
               t2.readChar$0();
-              addOperator.call$1(B.BinaryOperator_ViB0);
+              addOperator.call$1(B.BinaryOperator_icU0);
               break $label0$1;
             }
             if (_1_0 != null)
@@ -111955,26 +112555,27 @@ self.util = _cliPkgRequires.util;
         }
         if (60 === _3_0) {
           t2.readChar$0();
-          addOperator.call$1(t2.scanChar$1(61) ? B.BinaryOperator_kpg0 : B.BinaryOperator_U8c0);
+          addOperator.call$1(t2.scanChar$1(61) ? B.BinaryOperator_SPQ0 : B.BinaryOperator_miq0);
           continue;
         }
         if (62 === _3_0) {
           t2.readChar$0();
-          addOperator.call$1(t2.scanChar$1(61) ? B.BinaryOperator_7Tg0 : B.BinaryOperator_cIH0);
+          addOperator.call$1(t2.scanChar$1(61) ? B.BinaryOperator_oEm0 : B.BinaryOperator_bEa0);
           continue;
         }
         if (42 === _3_0) {
           t2.readChar$0();
-          addOperator.call$1(B.BinaryOperator_qN20);
+          addOperator.call$1(B.BinaryOperator_2No0);
           continue;
         }
-        if (_3_28._readFinal$0() && _box_0.singleExpression_ == null) {
+        _3_28 = 43 === _3_0;
+        if (_3_28 && _box_0.singleExpression_ == null) {
           addSingleExpression.call$1(_this._stylesheet0$_unaryOperation$0());
           continue;
         }
-        if (_3_28._readFinal$0()) {
+        if (_3_28) {
           t2.readChar$0();
-          addOperator.call$1(B.BinaryOperator_anB0);
+          addOperator.call$1(B.BinaryOperator_u150);
           continue;
         }
         if (45 === _3_0) {
@@ -111995,40 +112596,42 @@ self.util = _cliPkgRequires.util;
             addSingleExpression.call$1(_this._stylesheet0$_unaryOperation$0());
           else {
             t2.readChar$0();
-            addOperator.call$1(B.BinaryOperator_olz0);
+            addOperator.call$1(B.BinaryOperator_SjO0);
           }
           continue;
         }
-        if (_3_32._readFinal$0() && _box_0.singleExpression_ == null) {
+        _3_32 = 47 === _3_0;
+        if (_3_32 && _box_0.singleExpression_ == null) {
           addSingleExpression.call$1(_this._stylesheet0$_unaryOperation$0());
           continue;
         }
-        if (_3_32._readFinal$0()) {
+        if (_3_32) {
           t2.readChar$0();
-          addOperator.call$1(B.BinaryOperator_t8B0);
+          addOperator.call$1(B.BinaryOperator_U770);
           continue;
         }
         if (37 === _3_0) {
           t2.readChar$0();
-          addOperator.call$1(B.BinaryOperator_OTG0);
+          addOperator.call$1(B.BinaryOperator_KNx0);
           continue;
         }
         if (_3_0 >= 48 && _3_0 <= 57) {
           addSingleExpression.call$1(_this._stylesheet0$_number$0());
           continue;
         }
-        if (_3_40._readFinal$0() && t2.peekChar$1(1) === 46)
+        _3_40 = 46 === _3_0;
+        if (_3_40 && t2.peekChar$1(1) === 46)
           break;
-        if (_3_40._readFinal$0()) {
+        if (_3_40) {
           addSingleExpression.call$1(_this._stylesheet0$_number$0());
           continue;
         }
         if (97 === _3_0 && !_this.get$plainCss() && _this.scanIdentifier$1("and")) {
-          addOperator.call$1(B.BinaryOperator_SNp0);
+          addOperator.call$1(B.BinaryOperator_eDt0);
           continue;
         }
         if (111 === _3_0 && !_this.get$plainCss() && _this.scanIdentifier$1("or")) {
-          addOperator.call$1(B.BinaryOperator_M6L0);
+          addOperator.call$1(B.BinaryOperator_qNM0);
           continue;
         }
         if ((117 === _3_0 || 85 === _3_0) && t2.peekChar$1(1) === 43) {
@@ -112077,16 +112680,18 @@ self.util = _cliPkgRequires.util;
         singleExpression = _box_0.singleExpression_;
         if (singleExpression != null)
           commaExpressions.push(singleExpression);
+        _this._stylesheet0$_inExpression = wasInExpression;
         t1 = t2.spanFrom$1(beforeBracket == null ? start : beforeBracket);
-        return new A.ListExpression0(A.List_List$unmodifiable(commaExpressions, type$.Expression_2), B.ListSeparator_rXA0, bracketList, t1);
+        return new A.ListExpression0(A.List_List$unmodifiable(commaExpressions, type$.Expression_2), B.ListSeparator_ECn0, bracketList, t1);
       } else if (bracketList && spaceExpressions != null) {
         resolveOperations.call$0();
+        _this._stylesheet0$_inExpression = wasInExpression;
         t1 = _box_0.singleExpression_;
         t1.toString;
         spaceExpressions.push(t1);
         beforeBracket.toString;
         t2 = t2.spanFrom$1(beforeBracket);
-        return new A.ListExpression0(A.List_List$unmodifiable(spaceExpressions, type$.Expression_2), B.ListSeparator_EVt0, true, t2);
+        return new A.ListExpression0(A.List_List$unmodifiable(spaceExpressions, type$.Expression_2), B.ListSeparator_nbm0, true, t2);
       } else {
         resolveSpaceExpressions.call$0();
         if (bracketList) {
@@ -112097,6 +112702,7 @@ self.util = _cliPkgRequires.util;
           t2 = t2.spanFrom$1(beforeBracket);
           _box_0.singleExpression_ = new A.ListExpression0(A.List_List$unmodifiable(t3, type$.Expression_2), B.ListSeparator_undecided_null_undecided0, true, t2);
         }
+        _this._stylesheet0$_inExpression = wasInExpression;
         t1 = _box_0.singleExpression_;
         t1.toString;
         return t1;
@@ -112244,7 +112850,7 @@ self.util = _cliPkgRequires.util;
         t1.expectChar$1(41);
         t1 = t1.spanFrom$1(start);
         t2 = A.List_List$unmodifiable(expressions, type$.Expression_2);
-        return new A.ListExpression0(t2, B.ListSeparator_rXA0, false, t1);
+        return new A.ListExpression0(t2, B.ListSeparator_ECn0, false, t1);
       } finally {
         _this._stylesheet0$_inParentheses = wasInParentheses;
       }
@@ -112266,7 +112872,7 @@ self.util = _cliPkgRequires.util;
       return new A.MapExpression0(A.List_List$unmodifiable(pairs, type$.Record_2_Expression_and_Expression_2), t1);
     },
     _stylesheet0$_hashExpression$0() {
-      var start, t2, identifier, buffer, _this = this,
+      var start, t2, identifier, buffer, t3, _this = this,
         t1 = _this.scanner;
       if (t1.peekChar$1(1) === 123)
         return _this.identifierLike$0();
@@ -112287,7 +112893,8 @@ self.util = _cliPkgRequires.util;
       }
       t2 = new A.StringBuffer("");
       buffer = new A.InterpolationBuffer0(t2, A._setArrayType([], type$.JSArray_Object));
-      t2._contents += A.Primitives_stringFromCharCode(35);
+      t3 = A.Primitives_stringFromCharCode(35);
+      t2._contents += t3;
       buffer.addInterpolation$1(identifier);
       return new A.StringExpression0(buffer.interpolation$1(t1.spanFrom$1(start)), false);
     },
@@ -112327,16 +112934,25 @@ self.util = _cliPkgRequires.util;
       return A.SassColor$rgbInternal0(red, green, blue, t3, t2 ? new A.SpanColorFormat0(t1.spanFrom$1(start)) : null);
     },
     _stylesheet0$_isHexColor$1(interpolation) {
-      var t1,
-        plain = interpolation.get$asPlain(),
-        _0_2 = A._InitializedCell$(new A.StylesheetParser__isHexColor_closure1(plain));
-      if (typeof plain == "string")
-        t1 = 3 === _0_2._readFinal$0() || 4 === _0_2._readFinal$0() || 6 === _0_2._readFinal$0() || 8 === _0_2._readFinal$0();
-      else
+      var _0_2, t1,
+        plain = interpolation.get$asPlain();
+      if (typeof plain == "string") {
+        _0_2 = plain.length;
+        if (3 !== _0_2)
+          if (4 !== _0_2)
+            if (6 !== _0_2)
+              t1 = 8 === _0_2;
+            else
+              t1 = true;
+          else
+            t1 = true;
+        else
+          t1 = true;
+      } else
         t1 = false;
       if (t1) {
         t1 = new A.CodeUnits(plain);
-        return t1.every$1(t1, new A.StylesheetParser__isHexColor_closure2());
+        return t1.every$1(t1, new A.StylesheetParser__isHexColor_closure0());
       } else
         return false;
     },
@@ -112371,7 +112987,7 @@ self.util = _cliPkgRequires.util;
         operator = _this._stylesheet0$_unaryOperatorFor$1(t1.readChar$0());
       if (operator == null)
         t1.error$2$position(0, "Expected unary operator.", t1._string_scanner$_position - 1);
-      else if (_this.get$plainCss() && operator !== B.UnaryOperator_Ix10)
+      else if (_this.get$plainCss() && operator !== B.UnaryOperator_SJr0)
         t1.error$3$length$position(0, "Operators aren't allowed in plain CSS.", 1, t1._string_scanner$_position - 1);
       _this.whitespace$0();
       return new A.UnaryOperationExpression0(operator, _this._stylesheet0$_singleExpression$0(), t1.spanFrom$1(new A._SpanScannerState(t1, t2)));
@@ -112380,15 +112996,15 @@ self.util = _cliPkgRequires.util;
       var t1;
       $label0$0: {
         if (43 === character) {
-          t1 = B.UnaryOperator_gg40;
+          t1 = B.UnaryOperator_cLp0;
           break $label0$0;
         }
         if (45 === character) {
-          t1 = B.UnaryOperator_TLI0;
+          t1 = B.UnaryOperator_AiQ0;
           break $label0$0;
         }
         if (47 === character) {
-          t1 = B.UnaryOperator_Ix10;
+          t1 = B.UnaryOperator_SJr0;
           break $label0$0;
         }
         t1 = null;
@@ -112515,7 +113131,7 @@ self.util = _cliPkgRequires.util;
         start = new A._SpanScannerState(t1, t1._string_scanner$_position),
         $name = _this.variableName$0();
       if (_this.get$plainCss())
-        _this.error$2(0, string$.Sass_v, t1.spanFrom$1(start));
+        _this.error$2(0, string$.Sassx20v, t1.spanFrom$1(start));
       return new A.VariableExpression0(null, $name, t1.spanFrom$1(start));
     },
     _stylesheet0$_selector$0() {
@@ -112556,8 +113172,10 @@ self.util = _cliPkgRequires.util;
             t1.readChar$0();
             if (second === 13)
               t1.scanChar$1(10);
-          } else
-            t3._contents += A.Primitives_stringFromCharCode(A.consumeEscapedCharacter0(t1));
+          } else {
+            t5 = A.Primitives_stringFromCharCode(A.consumeEscapedCharacter0(t1));
+            t3._contents += t5;
+          }
           continue;
         }
         if (35 === _0_0 && t1.peekChar$1(1) === 123) {
@@ -112566,12 +113184,13 @@ self.util = _cliPkgRequires.util;
           t4.push(t5);
           continue;
         }
-        t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+        t5 = A.Primitives_stringFromCharCode(t1.readChar$0());
+        t3._contents += t5;
       }
       return new A.StringExpression0(buffer.interpolation$1(t1.spanFrom$1(new A._SpanScannerState(t1, t2))), true);
     },
     identifierLike$0() {
-      var invocation, expression, _0_0, color, t3, _1_0, specialFunction, _2_0, _2_2, _2_4, _this = this,
+      var invocation, expression, _0_0, _1_0, _2_0, _2_2, _2_4, _this = this,
         t1 = _this.scanner,
         start = new A._SpanScannerState(t1, t1._string_scanner$_position),
         identifier = _this.interpolatedIdentifier$0(),
@@ -112587,7 +113206,7 @@ self.util = _cliPkgRequires.util;
           expression = _this._stylesheet0$_singleExpression$0();
           return new A.UnaryOperationExpression0(B.UnaryOperator_not_not_not0, expression, identifier.span.expand$1(0, expression.get$span(expression)));
         }
-        lower._value = plain.toLowerCase();
+        lower.__late_helper$_value = plain.toLowerCase();
         if (t1.peekChar$0() !== 40) {
           switch (plain) {
             case "false":
@@ -112599,54 +113218,46 @@ self.util = _cliPkgRequires.util;
           }
           _0_0 = $.$get$colorsByName0().$index(0, lower._readLocal$0());
           if (_0_0 != null) {
-            color = _0_0;
-            t3 = true;
-          } else {
-            color = null;
-            t3 = false;
-          }
-          if (t3) {
             t1 = identifier.span;
-            return new A.ColorExpression0(A.SassColor$rgbInternal0(color.get$red(color), color.get$green(color), color.get$blue(color), color._color1$_alpha, new A.SpanColorFormat0(t1)), t1);
+            return new A.ColorExpression0(A.SassColor$rgbInternal0(_0_0.get$red(0), _0_0.get$green(0), _0_0.get$blue(0), _0_0._color1$_alpha, new A.SpanColorFormat0(t1)), t1);
           }
         }
         _1_0 = _this.trySpecialFunction$2(lower._readLocal$0(), start);
-        if (_1_0 != null) {
-          specialFunction = _1_0;
-          t3 = true;
-        } else {
-          specialFunction = null;
-          t3 = false;
-        }
-        if (t3)
-          return specialFunction;
+        if (_1_0 != null)
+          return _1_0;
       }
       _2_0 = t1.peekChar$0();
-      _2_2 = A._InitializedCell$(new A.StylesheetParser_identifierLike_closure1(_2_0));
-      _2_4 = A._InitializedCell$(new A.StylesheetParser_identifierLike_closure2(_2_0));
-      if (_2_2._readFinal$0() && t1.peekChar$1(1) === 46)
+      _2_2 = 46 === _2_0;
+      if (_2_2 && t1.peekChar$1(1) === 46)
         return new A.StringExpression0(identifier, false);
-      if (_2_2._readFinal$0()) {
+      if (_2_2) {
         t1.readChar$0();
         if (t2)
           return _this.namespacedExpression$2(plain, start);
         _this.error$2(0, string$.Interpn, identifier.span);
       }
-      if (_2_4._readFinal$0() && t2)
-        return new A.FunctionExpression0(null, plain, _this._stylesheet0$_argumentInvocation$1$allowEmptySecondArg(J.$eq$(lower._readLocal$0(), "var")), t1.spanFrom$1(start));
-      if (_2_4._readFinal$0())
+      _2_4 = 40 === _2_0;
+      if (_2_4 && t2) {
+        t2 = _this._stylesheet0$_argumentInvocation$1$allowEmptySecondArg(J.$eq$(lower._readLocal$0(), "var"));
+        t1 = t1.spanFrom$1(start);
+        return new A.FunctionExpression0(null, A.stringReplaceAllUnchecked(plain, "_", "-"), plain, t2, t1);
+      }
+      if (_2_4)
         return new A.InterpolatedFunctionExpression0(identifier, _this._stylesheet0$_argumentInvocation$0(), t1.spanFrom$1(start));
       return new A.StringExpression0(identifier, false);
     },
     namespacedExpression$2(namespace, start) {
-      var $name, _this = this,
+      var $name, t2, t3, _this = this,
         t1 = _this.scanner;
       if (t1.peekChar$0() === 36) {
         $name = _this.variableName$0();
         _this._stylesheet0$_assertPublic$2($name, new A.StylesheetParser_namespacedExpression_closure0(_this, start));
         return new A.VariableExpression0(namespace, $name, t1.spanFrom$1(start));
       }
-      return new A.FunctionExpression0(namespace, _this._stylesheet0$_publicIdentifier$0(), _this._stylesheet0$_argumentInvocation$0(), t1.spanFrom$1(start));
+      t2 = _this._stylesheet0$_publicIdentifier$0();
+      t3 = _this._stylesheet0$_argumentInvocation$0();
+      t1 = t1.spanFrom$1(start);
+      return new A.FunctionExpression0(namespace, A.stringReplaceAllUnchecked(t2, "_", "-"), t2, t3, t1);
     },
     trySpecialFunction$2($name, start) {
       var t1, buffer, t2, next, t3, _this = this,
@@ -112660,14 +113271,16 @@ self.util = _cliPkgRequires.util;
           t1 = new A.StringBuffer("");
           buffer = new A.InterpolationBuffer0(t1, A._setArrayType([], type$.JSArray_Object));
           t1._contents = "" + $name;
-          t1._contents += A.Primitives_stringFromCharCode(40);
+          t2 = A.Primitives_stringFromCharCode(40);
+          t1._contents += t2;
           break $label0$0;
         }
         if ("progid" === normalized && _this.scanner.scanChar$1(58)) {
           t1 = new A.StringBuffer("");
           buffer = new A.InterpolationBuffer0(t1, A._setArrayType([], type$.JSArray_Object));
           t1._contents = "" + $name;
-          t1._contents += A.Primitives_stringFromCharCode(58);
+          t2 = A.Primitives_stringFromCharCode(58);
+          t1._contents += t2;
           t2 = _this.scanner;
           next = t2.peekChar$0();
           while (true) {
@@ -112681,11 +113294,13 @@ self.util = _cliPkgRequires.util;
               t3 = false;
             if (!t3)
               break;
-            t1._contents += A.Primitives_stringFromCharCode(t2.readChar$0());
+            t3 = A.Primitives_stringFromCharCode(t2.readChar$0());
+            t1._contents += t3;
             next = t2.peekChar$0();
           }
           t2.expectChar$1(40);
-          t1._contents += A.Primitives_stringFromCharCode(40);
+          t2 = A.Primitives_stringFromCharCode(40);
+          t1._contents += t2;
           break $label0$0;
         }
         if ("url" === normalized)
@@ -112695,11 +113310,13 @@ self.util = _cliPkgRequires.util;
       buffer.addInterpolation$1(_this._stylesheet0$_interpolatedDeclarationValue$1$allowEmpty(true));
       t1 = _this.scanner;
       t1.expectChar$1(41);
-      buffer._interpolation_buffer0$_text._contents += A.Primitives_stringFromCharCode(41);
+      t2 = buffer._interpolation_buffer0$_text;
+      t3 = A.Primitives_stringFromCharCode(41);
+      t2._contents += t3;
       return new A.StringExpression0(buffer.interpolation$1(t1.spanFrom$1(start)), false);
     },
     _stylesheet0$_tryUrlContents$2$name(start, $name) {
-      var t3, t4, buffer, _0_0, _0_6, t5, endPosition, result, _this = this,
+      var t3, t4, buffer, t5, _0_0, _0_6, endPosition, result, _this = this,
         t1 = _this.scanner,
         t2 = t1._string_scanner$_position;
       if (!t1.scanChar$1(40))
@@ -112709,17 +113326,19 @@ self.util = _cliPkgRequires.util;
       t4 = A._setArrayType([], type$.JSArray_Object);
       buffer = new A.InterpolationBuffer0(t3, t4);
       t3._contents = "" + ($name == null ? "url" : $name);
-      t3._contents += A.Primitives_stringFromCharCode(40);
+      t5 = A.Primitives_stringFromCharCode(40);
+      t3._contents += t5;
       for (; true;) {
         _0_0 = t1.peekChar$0();
-        _0_6 = A._InitializedCell$(new A.StylesheetParser__tryUrlContents_closure0(_0_0));
         if (_0_0 == null)
           break;
         if (92 === _0_0) {
-          t3._contents += _this.escape$0();
+          t5 = _this.escape$0();
+          t3._contents += t5;
           continue;
         }
-        if (_0_6._readFinal$0() && t1.peekChar$1(1) === 123) {
+        _0_6 = 35 === _0_0;
+        if (_0_6 && t1.peekChar$1(1) === 123) {
           t5 = _this.singleInterpolation$0();
           buffer._interpolation_buffer0$_flushText$0();
           t4.push(t5);
@@ -112728,7 +113347,7 @@ self.util = _cliPkgRequires.util;
         if (33 !== _0_0)
           if (37 !== _0_0)
             if (38 !== _0_0)
-              if (!_0_6._readFinal$0())
+              if (!_0_6)
                 t5 = _0_0 >= 42 && _0_0 <= 126 || _0_0 >= 128;
               else
                 t5 = true;
@@ -112739,7 +113358,8 @@ self.util = _cliPkgRequires.util;
         else
           t5 = true;
         if (t5) {
-          t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t5 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          t3._contents += t5;
           continue;
         }
         if (_0_0 === 32 || _0_0 === 9 || _0_0 === 10 || _0_0 === 13 || _0_0 === 12) {
@@ -112749,7 +113369,8 @@ self.util = _cliPkgRequires.util;
           continue;
         }
         if (41 === _0_0) {
-          t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t2 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          t3._contents += t2;
           endPosition = t1._string_scanner$_position;
           t2 = t1._sourceFile;
           t5 = start.position;
@@ -112776,233 +113397,302 @@ self.util = _cliPkgRequires.util;
       return this._stylesheet0$_tryUrlContents$2$name(start, null);
     },
     dynamicUrl$0() {
-      var _0_0, contents, t2, _this = this,
+      var _0_0, _this = this,
         t1 = _this.scanner,
         start = new A._SpanScannerState(t1, t1._string_scanner$_position);
       _this.expectIdentifier$1("url");
       _0_0 = _this._stylesheet0$_tryUrlContents$1(start);
-      if (_0_0 != null) {
-        contents = _0_0;
-        t2 = true;
-      } else {
-        contents = null;
-        t2 = false;
-      }
-      if (t2)
-        return new A.StringExpression0(contents, false);
+      if (_0_0 != null)
+        return new A.StringExpression0(_0_0, false);
       return new A.InterpolatedFunctionExpression0(A.Interpolation$0(A._setArrayType(["url"], type$.JSArray_Object), t1.spanFrom$1(start)), _this._stylesheet0$_argumentInvocation$0(), t1.spanFrom$1(start));
     },
     almostAnyValue$1$omitComments(omitComments) {
-      var t4, t5, t6, _1_0, commentStart, end, t7, _0_0, contents, t8, _this = this,
+      var t4, t5, t6, _2_0, t7, _0_0, _0_2, start, end, _0_4, identifier, _1_0, _this = this,
         t1 = _this.scanner,
         t2 = t1._string_scanner$_position,
         t3 = new A.StringBuffer(""),
         buffer = new A.InterpolationBuffer0(t3, A._setArrayType([], type$.JSArray_Object));
       for (t4 = t1.string, t5 = t4.length, t6 = !omitComments; true;)
         $label0$0: {
-          _1_0 = t1.peekChar$0();
-          if (92 === _1_0) {
-            t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
-            t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          _2_0 = t1.peekChar$0();
+          if (92 === _2_0) {
+            t7 = A.Primitives_stringFromCharCode(t1.readChar$0());
+            t3._contents += t7;
+            t7 = A.Primitives_stringFromCharCode(t1.readChar$0());
+            t3._contents += t7;
             break $label0$0;
           }
-          if (34 === _1_0 || 39 === _1_0) {
+          if (34 === _2_0 || 39 === _2_0) {
             buffer.addInterpolation$1(_this.interpolatedString$0().asInterpolation$0());
             break $label0$0;
           }
-          if (47 === _1_0) {
-            commentStart = t1._string_scanner$_position;
-            if (_this.scanComment$0()) {
-              if (t6) {
+          if (47 === _2_0) {
+            $label1$1: {
+              _0_0 = t1.peekChar$1(1);
+              _0_2 = 42 === _0_0;
+              if (_0_2 && t6) {
+                t7 = _this.get$loudComment();
+                start = t1._string_scanner$_position;
+                t7.call$0();
                 end = t1._string_scanner$_position;
-                t3._contents += B.JSString_methods.substring$2(t4, commentStart, end);
+                t3._contents += B.JSString_methods.substring$2(t4, start, end);
+                break $label1$1;
               }
-            } else
-              t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+              if (_0_2) {
+                _this.loudComment$0();
+                break $label1$1;
+              }
+              _0_4 = 47 === _0_0;
+              if (_0_4 && t6) {
+                t7 = _this.get$silentComment();
+                start = t1._string_scanner$_position;
+                t7.call$0();
+                end = t1._string_scanner$_position;
+                t3._contents += B.JSString_methods.substring$2(t4, start, end);
+                break $label1$1;
+              }
+              if (_0_4) {
+                _this.silentComment$0();
+                break $label1$1;
+              }
+              t7 = A.Primitives_stringFromCharCode(t1.readChar$0());
+              t3._contents += t7;
+            }
             break $label0$0;
           }
-          if (35 === _1_0 && t1.peekChar$1(1) === 123) {
+          if (35 === _2_0 && t1.peekChar$1(1) === 123) {
             buffer.addInterpolation$1(_this.interpolatedIdentifier$0());
             break $label0$0;
           }
-          if (13 === _1_0 || 10 === _1_0 || 12 === _1_0) {
+          if (13 === _2_0 || 10 === _2_0 || 12 === _2_0) {
             if (_this.get$indented())
               break;
-            t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+            t7 = A.Primitives_stringFromCharCode(t1.readChar$0());
+            t3._contents += t7;
             break $label0$0;
           }
-          if (33 === _1_0 || 59 === _1_0 || 123 === _1_0 || 125 === _1_0)
+          if (33 === _2_0 || 59 === _2_0 || 123 === _2_0 || 125 === _2_0)
             break;
-          if (117 === _1_0 || 85 === _1_0) {
+          if (117 === _2_0 || 85 === _2_0) {
             t7 = t1._string_scanner$_position;
-            if (!_this.scanIdentifier$1("url")) {
-              t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+            identifier = _this.identifier$0();
+            if (identifier !== "url" && identifier !== "url-prefix") {
+              t3._contents += identifier;
               continue;
             }
-            _0_0 = _this._stylesheet0$_tryUrlContents$1(new A._SpanScannerState(t1, t7));
-            if (_0_0 != null) {
-              contents = _0_0;
-              t8 = true;
-            } else {
-              contents = null;
-              t8 = false;
-            }
-            if (t8)
-              buffer.addInterpolation$1(contents);
+            _1_0 = _this._stylesheet0$_tryUrlContents$2$name(new A._SpanScannerState(t1, t7), identifier);
+            if (_1_0 != null)
+              buffer.addInterpolation$1(_1_0);
             else {
               if ((t7 === 0 ? 1 / t7 < 0 : t7 < 0) || t7 > t5)
                 A.throwExpression(A.ArgumentError$("Invalid position " + t7, null));
               t1._string_scanner$_position = t7;
               t1._lastMatch = null;
-              t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+              t7 = A.Primitives_stringFromCharCode(t1.readChar$0());
+              t3._contents += t7;
             }
             break $label0$0;
           }
-          if (_1_0 == null)
+          if (_2_0 == null)
             break;
           t7 = _this.lookingAtIdentifier$0();
           if (t7) {
-            t3._contents += _this.identifier$0();
+            t7 = _this.identifier$0();
+            t3._contents += t7;
             break $label0$0;
           }
-          t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t7 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          t3._contents += t7;
         }
       return buffer.interpolation$1(t1.spanFrom$1(new A._SpanScannerState(t1, t2)));
     },
     almostAnyValue$0() {
       return this.almostAnyValue$1$omitComments(false);
     },
-    _stylesheet0$_interpolatedDeclarationValue$3$allowColon$allowEmpty$allowSemicolon(allowColon, allowEmpty, allowSemicolon) {
-      var t4, t5, t6, t7, wroteNewline, _1_0, _1_12, _1_14, _1_16, _1_18, _1_20, t8, start, end, bracket, _0_0, contents, t9, _this = this,
+    _stylesheet0$_interpolatedDeclarationValue$5$allowColon$allowEmpty$allowOpenBrace$allowSemicolon$silentComments(allowColon, allowEmpty, allowOpenBrace, allowSemicolon, silentComments) {
+      var t4, t5, t6, t7, t8, wroteNewline, _2_0, t9, _0_0, start, end, _2_14_isSet, _2_14, _2_18_isSet, _2_18, _2_20_isSet, _2_20, _2_22, bracket, identifier, _1_0, _this = this, _null = null,
         t1 = _this.scanner,
         t2 = t1._string_scanner$_position,
         t3 = new A.StringBuffer(""),
         buffer = new A.InterpolationBuffer0(t3, A._setArrayType([], type$.JSArray_Object)),
         brackets = A._setArrayType([], type$.JSArray_int);
-      for (t4 = t1.string, t5 = t4.length, t6 = !allowColon, t7 = !allowSemicolon, wroteNewline = false; true;)
+      for (t4 = !allowOpenBrace, t5 = t1.string, t6 = t5.length, t7 = !allowColon, t8 = !allowSemicolon, wroteNewline = false; true;)
         $label0$0: {
-          _1_0 = t1.peekChar$0();
-          _1_12 = A._InitializedCell$(new A.StylesheetParser__interpolatedDeclarationValue_closure4(_1_0));
-          _1_14 = A._InitializedCell$(new A.StylesheetParser__interpolatedDeclarationValue_closure5(_1_0));
-          _1_16 = A._InitializedCell$(new A.StylesheetParser__interpolatedDeclarationValue_closure6(_1_0));
-          _1_18 = A._InitializedCell$(new A.StylesheetParser__interpolatedDeclarationValue_closure7(_1_0));
-          _1_20 = A._InitializedCell$(new A.StylesheetParser__interpolatedDeclarationValue_closure8(_1_0));
-          if (92 === _1_0) {
-            t3._contents += _this.escape$1$identifierStart(true);
+          _2_0 = t1.peekChar$0();
+          if (92 === _2_0) {
+            t9 = _this.escape$1$identifierStart(true);
+            t3._contents += t9;
             wroteNewline = false;
             break $label0$0;
           }
-          if (34 === _1_0 || 39 === _1_0) {
+          if (34 === _2_0 || 39 === _2_0) {
             buffer.addInterpolation$1(_this.interpolatedString$0().asInterpolation$0());
             wroteNewline = false;
             break $label0$0;
           }
-          if (47 === _1_0 && t1.peekChar$1(1) === 42) {
-            t8 = _this.get$loudComment();
-            start = t1._string_scanner$_position;
-            t8.call$0();
-            end = t1._string_scanner$_position;
-            t3._contents += B.JSString_methods.substring$2(t4, start, end);
+          if (47 === _2_0) {
+            $label1$1: {
+              _0_0 = t1.peekChar$1(1);
+              if (42 === _0_0) {
+                t9 = _this.get$loudComment();
+                start = t1._string_scanner$_position;
+                t9.call$0();
+                end = t1._string_scanner$_position;
+                t3._contents += B.JSString_methods.substring$2(t5, start, end);
+                break $label1$1;
+              }
+              if (47 === _0_0 && silentComments) {
+                _this.silentComment$0();
+                break $label1$1;
+              }
+              t9 = A.Primitives_stringFromCharCode(t1.readChar$0());
+              t3._contents += t9;
+            }
             wroteNewline = false;
             break $label0$0;
           }
-          if (35 === _1_0 && t1.peekChar$1(1) === 123) {
+          if (35 === _2_0 && t1.peekChar$1(1) === 123) {
             buffer.addInterpolation$1(_this.interpolatedIdentifier$0());
             wroteNewline = false;
             break $label0$0;
           }
-          if (_1_12._readFinal$0() || _1_14._readFinal$0())
+          _2_14_isSet = 32 !== _2_0;
+          if (_2_14_isSet) {
+            _2_14 = 9 === _2_0;
+            t9 = _2_14;
+          } else {
+            _2_14 = _null;
+            t9 = true;
+          }
+          if (t9)
             if (!wroteNewline) {
-              t8 = t1.peekChar$1(1);
-              t8 = t8 === 32 || t8 === 9 || t8 === 10 || t8 === 13 || t8 === 12;
+              t9 = t1.peekChar$1(1);
+              t9 = t9 === 32 || t9 === 9 || t9 === 10 || t9 === 13 || t9 === 12;
             } else
-              t8 = false;
+              t9 = false;
           else
-            t8 = false;
-          if (t8) {
+            t9 = false;
+          if (t9) {
             t1.readChar$0();
             break $label0$0;
           }
-          if (_1_12._readFinal$0() || _1_14._readFinal$0()) {
-            t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          if (_2_14_isSet)
+            t9 = _2_14;
+          else
+            t9 = true;
+          if (t9) {
+            t9 = A.Primitives_stringFromCharCode(t1.readChar$0());
+            t3._contents += t9;
             break $label0$0;
           }
-          if ((_1_16._readFinal$0() || _1_18._readFinal$0() || _1_20._readFinal$0()) && _this.get$indented())
+          _2_18_isSet = 10 !== _2_0;
+          if (_2_18_isSet) {
+            _2_18 = 13 === _2_0;
+            _2_20_isSet = !_2_18;
+            if (_2_20_isSet) {
+              _2_20 = 12 === _2_0;
+              t9 = _2_20;
+            } else {
+              _2_20 = _null;
+              t9 = true;
+            }
+          } else {
+            _2_20 = _null;
+            _2_18 = _2_20;
+            _2_20_isSet = false;
+            t9 = true;
+          }
+          if (t9 && _this.get$indented())
             break;
-          if (_1_16._readFinal$0() || _1_18._readFinal$0() || _1_20._readFinal$0()) {
-            t8 = t1.peekChar$1(-1);
-            if (!(t8 === 10 || t8 === 13 || t8 === 12))
+          if (_2_18_isSet)
+            if (!_2_18)
+              t9 = _2_20_isSet ? _2_20 : 12 === _2_0;
+            else
+              t9 = true;
+          else
+            t9 = true;
+          if (t9) {
+            t9 = t1.peekChar$1(-1);
+            if (!(t9 === 10 || t9 === 13 || t9 === 12))
               t3._contents += "\n";
             t1.readChar$0();
             wroteNewline = true;
             break $label0$0;
           }
-          if (40 === _1_0 || 123 === _1_0 || 91 === _1_0) {
+          _2_22 = 123 === _2_0;
+          if (_2_22 && t4)
+            break;
+          if (40 !== _2_0)
+            t9 = _2_22 || 91 === _2_0;
+          else
+            t9 = true;
+          if (t9) {
             bracket = t1.readChar$0();
-            t3._contents += A.Primitives_stringFromCharCode(bracket);
+            t9 = A.Primitives_stringFromCharCode(bracket);
+            t3._contents += t9;
             brackets.push(A.opposite0(bracket));
             wroteNewline = false;
             break $label0$0;
           }
-          if (41 === _1_0 || 125 === _1_0 || 93 === _1_0) {
+          if (41 === _2_0 || 125 === _2_0 || 93 === _2_0) {
             if (brackets.length === 0)
               break;
             bracket = brackets.pop();
             t1.expectChar$1(bracket);
-            t3._contents += A.Primitives_stringFromCharCode(bracket);
+            t9 = A.Primitives_stringFromCharCode(bracket);
+            t3._contents += t9;
             wroteNewline = false;
             break $label0$0;
           }
-          if (59 === _1_0) {
+          if (59 === _2_0) {
+            if (t8 && brackets.length === 0)
+              break;
+            t9 = A.Primitives_stringFromCharCode(t1.readChar$0());
+            t3._contents += t9;
+            wroteNewline = false;
+            break $label0$0;
+          }
+          if (58 === _2_0) {
             if (t7 && brackets.length === 0)
               break;
-            t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+            t9 = A.Primitives_stringFromCharCode(t1.readChar$0());
+            t3._contents += t9;
             wroteNewline = false;
             break $label0$0;
           }
-          if (58 === _1_0) {
-            if (t6 && brackets.length === 0)
-              break;
-            t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
-            wroteNewline = false;
-            break $label0$0;
-          }
-          if (117 === _1_0 || 85 === _1_0) {
-            t8 = t1._string_scanner$_position;
-            if (!_this.scanIdentifier$1("url")) {
-              t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          if (117 === _2_0 || 85 === _2_0) {
+            t9 = t1._string_scanner$_position;
+            identifier = _this.identifier$0();
+            if (identifier !== "url" && identifier !== "url-prefix") {
+              t3._contents += identifier;
               wroteNewline = false;
               continue;
             }
-            _0_0 = _this._stylesheet0$_tryUrlContents$1(new A._SpanScannerState(t1, t8));
-            if (_0_0 != null) {
-              contents = _0_0;
-              t9 = true;
-            } else {
-              contents = null;
-              t9 = false;
-            }
-            if (t9)
-              buffer.addInterpolation$1(contents);
+            _1_0 = _this._stylesheet0$_tryUrlContents$2$name(new A._SpanScannerState(t1, t9), identifier);
+            if (_1_0 != null)
+              buffer.addInterpolation$1(_1_0);
             else {
-              if ((t8 === 0 ? 1 / t8 < 0 : t8 < 0) || t8 > t5)
-                A.throwExpression(A.ArgumentError$("Invalid position " + t8, null));
-              t1._string_scanner$_position = t8;
+              if ((t9 === 0 ? 1 / t9 < 0 : t9 < 0) || t9 > t6)
+                A.throwExpression(A.ArgumentError$("Invalid position " + t9, _null));
+              t1._string_scanner$_position = t9;
               t1._lastMatch = null;
-              t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+              t9 = A.Primitives_stringFromCharCode(t1.readChar$0());
+              t3._contents += t9;
             }
             wroteNewline = false;
             break $label0$0;
           }
-          if (_1_0 == null)
+          if (_2_0 == null)
             break;
-          t8 = _this.lookingAtIdentifier$0();
-          if (t8) {
-            t3._contents += _this.identifier$0();
+          t9 = _this.lookingAtIdentifier$0();
+          if (t9) {
+            t9 = _this.identifier$0();
+            t3._contents += t9;
             wroteNewline = false;
             break $label0$0;
           }
-          t3._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t9 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          t3._contents += t9;
           wroteNewline = false;
         }
       if (brackets.length !== 0)
@@ -113012,16 +113702,28 @@ self.util = _cliPkgRequires.util;
       return buffer.interpolation$1(t1.spanFrom$1(new A._SpanScannerState(t1, t2)));
     },
     _stylesheet0$_interpolatedDeclarationValue$1$allowEmpty(allowEmpty) {
-      return this._stylesheet0$_interpolatedDeclarationValue$3$allowColon$allowEmpty$allowSemicolon(true, allowEmpty, false);
+      return this._stylesheet0$_interpolatedDeclarationValue$5$allowColon$allowEmpty$allowOpenBrace$allowSemicolon$silentComments(true, allowEmpty, true, false, true);
+    },
+    _stylesheet0$_interpolatedDeclarationValue$1$allowOpenBrace(allowOpenBrace) {
+      return this._stylesheet0$_interpolatedDeclarationValue$5$allowColon$allowEmpty$allowOpenBrace$allowSemicolon$silentComments(true, false, allowOpenBrace, false, true);
     },
     _stylesheet0$_interpolatedDeclarationValue$2$allowEmpty$allowSemicolon(allowEmpty, allowSemicolon) {
-      return this._stylesheet0$_interpolatedDeclarationValue$3$allowColon$allowEmpty$allowSemicolon(true, allowEmpty, allowSemicolon);
+      return this._stylesheet0$_interpolatedDeclarationValue$5$allowColon$allowEmpty$allowOpenBrace$allowSemicolon$silentComments(true, allowEmpty, true, allowSemicolon, true);
+    },
+    _stylesheet0$_interpolatedDeclarationValue$3$allowColon$allowEmpty$allowSemicolon(allowColon, allowEmpty, allowSemicolon) {
+      return this._stylesheet0$_interpolatedDeclarationValue$5$allowColon$allowEmpty$allowOpenBrace$allowSemicolon$silentComments(allowColon, allowEmpty, true, allowSemicolon, true);
     },
     _stylesheet0$_interpolatedDeclarationValue$0() {
-      return this._stylesheet0$_interpolatedDeclarationValue$3$allowColon$allowEmpty$allowSemicolon(true, false, false);
+      return this._stylesheet0$_interpolatedDeclarationValue$5$allowColon$allowEmpty$allowOpenBrace$allowSemicolon$silentComments(true, false, true, false, true);
+    },
+    _stylesheet0$_interpolatedDeclarationValue$2$allowEmpty$allowOpenBrace(allowEmpty, allowOpenBrace) {
+      return this._stylesheet0$_interpolatedDeclarationValue$5$allowColon$allowEmpty$allowOpenBrace$allowSemicolon$silentComments(true, allowEmpty, allowOpenBrace, false, true);
+    },
+    _stylesheet0$_interpolatedDeclarationValue$1$silentComments(silentComments) {
+      return this._stylesheet0$_interpolatedDeclarationValue$5$allowColon$allowEmpty$allowOpenBrace$allowSemicolon$silentComments(true, false, true, false, silentComments);
     },
     interpolatedIdentifier$0() {
-      var _0_0, _this = this,
+      var t4, _0_0, _this = this,
         _s20_ = "Expected identifier.",
         t1 = _this.scanner,
         start = new A._SpanScannerState(t1, t1._string_scanner$_position),
@@ -113029,9 +113731,11 @@ self.util = _cliPkgRequires.util;
         t3 = A._setArrayType([], type$.JSArray_Object),
         buffer = new A.InterpolationBuffer0(t2, t3);
       if (t1.scanChar$1(45)) {
-        t2._contents += A.Primitives_stringFromCharCode(45);
+        t4 = A.Primitives_stringFromCharCode(45);
+        t2._contents += t4;
         if (t1.scanChar$1(45)) {
-          t2._contents += A.Primitives_stringFromCharCode(45);
+          t3 = A.Primitives_stringFromCharCode(45);
+          t2._contents += t3;
           _this._stylesheet0$_interpolatedIdentifierBody$1(buffer);
           return buffer.interpolation$1(t1.spanFrom$1(start));
         }
@@ -113041,11 +113745,13 @@ self.util = _cliPkgRequires.util;
         if (_0_0 == null)
           t1.error$1(0, _s20_);
         if (_0_0 === 95 || A.CharacterExtension_get_isAlphabetic0(_0_0) || _0_0 >= 128) {
-          t2._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
+          t3 = A.Primitives_stringFromCharCode(t1.readChar$0());
+          t2._contents += t3;
           break $label0$0;
         }
         if (92 === _0_0) {
-          t2._contents += _this.escape$1$identifierStart(true);
+          t3 = _this.escape$1$identifierStart(true);
+          t2._contents += t3;
           break $label0$0;
         }
         if (35 === _0_0 && t1.peekChar$1(1) === 123) {
@@ -113081,11 +113787,13 @@ self.util = _cliPkgRequires.util;
         else
           t4 = true;
         if (t4) {
-          t3._contents += A.Primitives_stringFromCharCode(t2.readChar$0());
+          t4 = A.Primitives_stringFromCharCode(t2.readChar$0());
+          t3._contents += t4;
           continue;
         }
         if (92 === _0_0) {
-          t3._contents += this.escape$0();
+          t4 = this.escape$0();
+          t3._contents += t4;
           continue;
         }
         if (35 === _0_0 && t2.peekChar$1(1) === 123) {
@@ -113110,7 +113818,7 @@ self.util = _cliPkgRequires.util;
       return contents;
     },
     _stylesheet0$_mediaQueryList$0() {
-      var _this = this,
+      var t4, _this = this,
         t1 = _this.scanner,
         t2 = t1._string_scanner$_position,
         t3 = new A.StringBuffer(""),
@@ -113121,13 +113829,15 @@ self.util = _cliPkgRequires.util;
         _this.whitespace$0();
         if (!t1.scanChar$1(44))
           break;
-        t3._contents += A.Primitives_stringFromCharCode(44);
-        t3._contents += A.Primitives_stringFromCharCode(32);
+        t4 = A.Primitives_stringFromCharCode(44);
+        t3._contents += t4;
+        t4 = A.Primitives_stringFromCharCode(32);
+        t3._contents += t4;
       }
       return buffer.interpolation$1(t1.spanFrom$1(new A._SpanScannerState(t1, t2)));
     },
     _stylesheet0$_mediaQuery$1(buffer) {
-      var identifier1, t1, identifier2, _this = this, _s3_ = "and";
+      var identifier1, t1, t2, identifier2, _this = this, _s3_ = "and";
       if (_this.scanner.peekChar$0() === 40) {
         _this._stylesheet0$_mediaInParens$1(buffer);
         _this.whitespace$0();
@@ -113156,7 +113866,8 @@ self.util = _cliPkgRequires.util;
       if (!_this._stylesheet0$_lookingAtInterpolatedIdentifier$0())
         return;
       t1 = buffer._interpolation_buffer0$_text;
-      t1._contents += A.Primitives_stringFromCharCode(32);
+      t2 = A.Primitives_stringFromCharCode(32);
+      t1._contents += t2;
       identifier2 = _this.interpolatedIdentifier$0();
       if (A.equalsIgnoreCase0(identifier2.get$asPlain(), _s3_)) {
         _this.expectWhitespace$0();
@@ -113187,9 +113898,11 @@ self.util = _cliPkgRequires.util;
         if (!_this.scanIdentifier$1(operator))
           return;
         _this.expectWhitespace$0();
-        t2 = t1._contents += A.Primitives_stringFromCharCode(32);
+        t2 = A.Primitives_stringFromCharCode(32);
+        t2 = t1._contents += t2;
         t1._contents = t2 + operator;
-        t1._contents += A.Primitives_stringFromCharCode(32);
+        t2 = A.Primitives_stringFromCharCode(32);
+        t1._contents += t2;
       }
     },
     _stylesheet0$_mediaOrInterp$1(buffer) {
@@ -113205,7 +113918,8 @@ self.util = _cliPkgRequires.util;
         t1 = _this.scanner;
       t1.expectChar$2$name(40, "media condition in parentheses");
       t2 = buffer._interpolation_buffer0$_text;
-      t2._contents += A.Primitives_stringFromCharCode(40);
+      t3 = A.Primitives_stringFromCharCode(40);
+      t2._contents += t3;
       _this.whitespace$0();
       if (t1.peekChar$0() === 40) {
         _this._stylesheet0$_mediaInParens$1(buffer);
@@ -113230,8 +113944,10 @@ self.util = _cliPkgRequires.util;
         t4.push(t3);
         if (t1.scanChar$1(58)) {
           _this.whitespace$0();
-          t2._contents += A.Primitives_stringFromCharCode(58);
-          t2._contents += A.Primitives_stringFromCharCode(32);
+          t3 = A.Primitives_stringFromCharCode(58);
+          t2._contents += t3;
+          t3 = A.Primitives_stringFromCharCode(32);
+          t2._contents += t3;
           t3 = _this._stylesheet0$_expression$0();
           buffer._interpolation_buffer0$_flushText$0();
           t4.push(t3);
@@ -113239,11 +113955,16 @@ self.util = _cliPkgRequires.util;
           next = t1.peekChar$0();
           t3 = 60 !== next;
           if (!t3 || 62 === next || 61 === next) {
-            t2._contents += A.Primitives_stringFromCharCode(32);
-            t2._contents += A.Primitives_stringFromCharCode(t1.readChar$0());
-            if ((!t3 || 62 === next) && t1.scanChar$1(61))
-              t2._contents += A.Primitives_stringFromCharCode(61);
-            t2._contents += A.Primitives_stringFromCharCode(32);
+            t5 = A.Primitives_stringFromCharCode(32);
+            t2._contents += t5;
+            t5 = A.Primitives_stringFromCharCode(t1.readChar$0());
+            t2._contents += t5;
+            if ((!t3 || 62 === next) && t1.scanChar$1(61)) {
+              t5 = A.Primitives_stringFromCharCode(61);
+              t2._contents += t5;
+            }
+            t5 = A.Primitives_stringFromCharCode(32);
+            t2._contents += t5;
             _this.whitespace$0();
             t5 = _this._stylesheet0$_expressionUntilComparison$0();
             buffer._interpolation_buffer0$_flushText$0();
@@ -113254,11 +113975,16 @@ self.util = _cliPkgRequires.util;
             } else
               t3 = false;
             if (t3) {
-              t2._contents += A.Primitives_stringFromCharCode(32);
-              t2._contents += A.Primitives_stringFromCharCode(next);
-              if (t1.scanChar$1(61))
-                t2._contents += A.Primitives_stringFromCharCode(61);
-              t2._contents += A.Primitives_stringFromCharCode(32);
+              t3 = A.Primitives_stringFromCharCode(32);
+              t2._contents += t3;
+              t3 = A.Primitives_stringFromCharCode(next);
+              t2._contents += t3;
+              if (t1.scanChar$1(61)) {
+                t3 = A.Primitives_stringFromCharCode(61);
+                t2._contents += t3;
+              }
+              t3 = A.Primitives_stringFromCharCode(32);
+              t2._contents += t3;
               _this.whitespace$0();
               t3 = _this._stylesheet0$_expressionUntilComparison$0();
               buffer._interpolation_buffer0$_flushText$0();
@@ -113269,7 +113995,8 @@ self.util = _cliPkgRequires.util;
       }
       t1.expectChar$1(41);
       _this.whitespace$0();
-      t2._contents += A.Primitives_stringFromCharCode(41);
+      t1 = A.Primitives_stringFromCharCode(41);
+      t2._contents += t1;
     },
     _stylesheet0$_expressionUntilComparison$0() {
       return this._stylesheet0$_expression$1$until(new A.StylesheetParser__expressionUntilComparison_closure0(this));
@@ -113308,13 +114035,13 @@ self.util = _cliPkgRequires.util;
       return condition;
     },
     _stylesheet0$_supportsConditionInParens$0() {
-      var $name, nameStart, wasInParentheses, identifier, operation, _1_0, contents, identifier0, t2, $arguments, _0_0, _0_4, expression, condition, exception, declaration, _this = this,
+      var $name, nameStart, wasInParentheses, identifier, _1_0, operation, contents, identifier0, t2, $arguments, _0_0, _0_4_isSet, _0_4, condition, exception, declaration, _this = this, _null = null,
         t1 = _this.scanner,
         start = new A._SpanScannerState(t1, t1._string_scanner$_position);
       if (_this._stylesheet0$_lookingAtInterpolatedIdentifier$0()) {
         identifier0 = _this.interpolatedIdentifier$0();
         t2 = identifier0.get$asPlain();
-        if ((t2 == null ? null : t2.toLowerCase()) === "not")
+        if ((t2 == null ? _null : t2.toLowerCase()) === "not")
           _this.error$2(0, '"not" is not a valid identifier here.', identifier0.span);
         if (t1.scanChar$1(40)) {
           $arguments = _this._stylesheet0$_interpolatedDeclarationValue$2$allowEmpty$allowSemicolon(true, true);
@@ -113322,22 +114049,19 @@ self.util = _cliPkgRequires.util;
           return new A.SupportsFunction0(identifier0, $arguments, t1.spanFrom$1(start));
         } else {
           _0_0 = identifier0.contents;
-          _0_4 = A._InitializedCell$(new A.StylesheetParser__supportsConditionInParens_closure0(_0_0));
-          if (_0_0.length === 1)
-            if (type$.Expression_2._is(_0_4._readFinal$0())) {
-              expression = _0_4._readFinal$0();
-              t2 = true;
-            } else {
-              expression = null;
-              t2 = false;
-            }
-          else {
-            expression = null;
+          _0_4_isSet = _0_0.length === 1;
+          if (_0_4_isSet) {
+            _0_4 = _0_0[0];
+            t2 = _0_4;
+            t2 = type$.Expression_2._is(t2);
+          } else {
+            _0_4 = _null;
             t2 = false;
           }
-          if (t2)
-            return new A.SupportsInterpolation0(expression, t1.spanFrom$1(start));
-          else
+          if (t2) {
+            t2 = _0_4_isSet ? _0_4 : _0_0[0];
+            return new A.SupportsInterpolation0(type$.Expression_2._as(t2), t1.spanFrom$1(start));
+          } else
             _this.error$2(0, "Expected @supports condition.", identifier0.span);
         }
       }
@@ -113364,14 +114088,10 @@ self.util = _cliPkgRequires.util;
           t1.set$state(nameStart);
           _this._stylesheet0$_inParentheses = wasInParentheses;
           identifier = _this.interpolatedIdentifier$0();
-          operation = null;
           _1_0 = _this._stylesheet0$_trySupportsOperation$2(identifier, nameStart);
+          operation = null;
           if (_1_0 != null) {
             operation = _1_0;
-            t2 = true;
-          } else
-            t2 = false;
-          if (t2) {
             t1.expectChar$1(41);
             return operation;
           }
@@ -113561,11 +114281,8 @@ self.util = _cliPkgRequires.util;
                 t1 = true;
             else
               t1 = true;
-            if (t1) {
-              t1 = true;
+            if (t1)
               break $label1$1;
-            }
-            t1 = false;
             break $label1$1;
           }
           break $label0$0;
@@ -113646,7 +114363,7 @@ self.util = _cliPkgRequires.util;
       var _this = this,
         t1 = _this.scanner,
         t2 = t1._string_scanner$_position,
-        result = _this.identifier$1$normalize(true);
+        result = _this.identifier$0();
       _this._stylesheet0$_assertPublic$2(result, new A.StylesheetParser__publicIdentifier_closure0(_this, new A._SpanScannerState(t1, t2)));
       return result;
     },
@@ -113669,12 +114386,11 @@ self.util = _cliPkgRequires.util;
       t2.scanChar$1(65279);
       statements = t1.statements$1(new A.StylesheetParser_parse__closure1(t1));
       t2.expectDone$0();
-      t4 = t1._stylesheet0$_globalVariables;
-      t4 = t4.get$values(t4);
+      t4 = t1._stylesheet0$_globalVariables.get$values(0);
       B.JSArray_methods.addAll$1(statements, A.MappedIterable_MappedIterable(t4, new A.StylesheetParser_parse__closure2(), A._instanceType(t4)._eval$1("Iterable.E"), type$.Statement_2));
       return A.Stylesheet$internal0(statements, t2.spanFrom$1(new A._SpanScannerState(t2, t3)), t1.get$plainCss());
     },
-    $signature: 575
+    $signature: 554
   };
   A.StylesheetParser_parse__closure1.prototype = {
     call$0() {
@@ -113686,14 +114402,14 @@ self.util = _cliPkgRequires.util;
       }
       return t1._stylesheet0$_statement$1$root(true);
     },
-    $signature: 576
+    $signature: 555
   };
   A.StylesheetParser_parse__closure2.prototype = {
     call$1(declaration) {
       var t1 = declaration.expression;
       return A.VariableDeclaration$0(declaration.name, new A.NullExpression0(t1.get$span(t1)), declaration.span, null, false, true, null);
     },
-    $signature: 577
+    $signature: 556
   };
   A.StylesheetParser_parseArgumentDeclaration_closure0.prototype = {
     call$0() {
@@ -113709,7 +114425,7 @@ self.util = _cliPkgRequires.util;
       t2.expectChar$1(123);
       return $arguments;
     },
-    $signature: 578
+    $signature: 557
   };
   A.StylesheetParser__parseSingleProduction_closure0.prototype = {
     call$0() {
@@ -113737,37 +114453,25 @@ self.util = _cliPkgRequires.util;
       t1.scanner.expectDone$0();
       return new A._Record_2($name, $arguments);
     },
-    $signature: 579
+    $signature: 558
   };
   A.StylesheetParser__statement_closure0.prototype = {
     call$0() {
       return this.$this._stylesheet0$_statement$0();
     },
-    $signature: 145
+    $signature: 130
   };
   A.StylesheetParser_variableDeclarationWithoutNamespace_closure1.prototype = {
     call$0() {
       return this.$this.scanner.spanFrom$1(this.start);
     },
-    $signature: 33
+    $signature: 27
   };
   A.StylesheetParser_variableDeclarationWithoutNamespace_closure2.prototype = {
     call$0() {
       return this.declaration;
     },
-    $signature: 580
-  };
-  A.StylesheetParser__declarationOrBuffer_closure1.prototype = {
-    call$2(children, span) {
-      return A.Declaration$nested0(this.name, children, span, null);
-    },
-    $signature: 82
-  };
-  A.StylesheetParser__declarationOrBuffer_closure2.prototype = {
-    call$2(children, span) {
-      return A.Declaration$nested0(this.name, children, span, this._box_0.value);
-    },
-    $signature: 82
+    $signature: 559
   };
   A.StylesheetParser__styleRule_closure0.prototype = {
     call$2(children, span) {
@@ -113778,31 +114482,25 @@ self.util = _cliPkgRequires.util;
       t1._stylesheet0$_inStyleRule = _this.wasInStyleRule;
       return A.StyleRule$0(_this._box_0.interpolation, children, t1.scanner.spanFrom$1(_this.start));
     },
-    $signature: 582
+    $signature: 560
   };
-  A.StylesheetParser__propertyOrVariableDeclaration_closure1.prototype = {
+  A.StylesheetParser__tryDeclarationChildren_closure0.prototype = {
     call$2(children, span) {
-      return A.Declaration$nested0(this._box_0.name, children, span, null);
+      return A.Declaration$nested0(this.name, children, span, this.value);
     },
-    $signature: 82
-  };
-  A.StylesheetParser__propertyOrVariableDeclaration_closure2.prototype = {
-    call$2(children, span) {
-      return A.Declaration$nested0(this._box_0.name, children, span, this.value);
-    },
-    $signature: 82
+    $signature: 561
   };
   A.StylesheetParser__atRootRule_closure1.prototype = {
     call$2(children, span) {
       return A.AtRootRule$0(children, span, this.query);
     },
-    $signature: 285
+    $signature: 210
   };
   A.StylesheetParser__atRootRule_closure2.prototype = {
     call$2(children, span) {
       return A.AtRootRule$0(children, span, null);
     },
-    $signature: 285
+    $signature: 210
   };
   A.StylesheetParser__eachRule_closure0.prototype = {
     call$2(children, span) {
@@ -113810,13 +114508,13 @@ self.util = _cliPkgRequires.util;
       _this.$this._stylesheet0$_inControlDirective = _this.wasInControlDirective;
       return A.EachRule$0(_this.variables, _this.list, children, span);
     },
-    $signature: 584
+    $signature: 563
   };
   A.StylesheetParser__functionRule_closure0.prototype = {
     call$2(children, span) {
       return A.FunctionRule$0(this.name, this.$arguments, children, span, this.precedingComment);
     },
-    $signature: 585
+    $signature: 564
   };
   A.StylesheetParser__forRule_closure1.prototype = {
     call$0() {
@@ -113831,7 +114529,7 @@ self.util = _cliPkgRequires.util;
       } else
         return false;
     },
-    $signature: 1
+    $signature: 22
   };
   A.StylesheetParser__forRule_closure2.prototype = {
     call$2(children, span) {
@@ -113841,7 +114539,7 @@ self.util = _cliPkgRequires.util;
       t1.toString;
       return A.ForRule$0(_this.variable, _this.from, _this.to, children, span, t1);
     },
-    $signature: 586
+    $signature: 565
   };
   A.StylesheetParser__memberList_closure0.prototype = {
     call$0() {
@@ -113851,19 +114549,19 @@ self.util = _cliPkgRequires.util;
       else
         this.identifiers.add$1(0, t1.identifier$1$normalize(true));
     },
-    $signature: 2
+    $signature: 1
   };
   A.StylesheetParser__includeRule_closure0.prototype = {
     call$2(children, span) {
       return A.ContentBlock$0(this.contentArguments_, children, span);
     },
-    $signature: 587
+    $signature: 566
   };
   A.StylesheetParser_mediaRule_closure0.prototype = {
     call$2(children, span) {
       return A.MediaRule$0(this.query, children, span);
     },
-    $signature: 588
+    $signature: 567
   };
   A.StylesheetParser__mixinRule_closure0.prototype = {
     call$2(children, span) {
@@ -113871,35 +114569,35 @@ self.util = _cliPkgRequires.util;
       _this.$this._stylesheet0$_inMixin = false;
       return A.MixinRule$0(_this.name, _this.$arguments, children, span, _this.precedingComment);
     },
-    $signature: 589
+    $signature: 568
   };
   A.StylesheetParser_mozDocumentRule_closure0.prototype = {
     call$2(children, span) {
       var _this = this;
       if (_this._box_0.needsDeprecationWarning)
-        A.WarnForDeprecation_warnForDeprecation0(_this.$this.logger, B.Deprecation_GbU, string$.x40_moz_, span, null);
+        A.WarnForDeprecation_warnForDeprecation0(_this.$this.logger, B.Deprecation_Iit, string$.x40_moz_, span, null);
       return A.AtRule$0(_this.name, span, children, _this.value);
     },
-    $signature: 286
+    $signature: 195
   };
   A.StylesheetParser_supportsRule_closure0.prototype = {
     call$2(children, span) {
       return A.SupportsRule$0(this.condition, children, span);
     },
-    $signature: 591
+    $signature: 570
   };
   A.StylesheetParser__whileRule_closure0.prototype = {
     call$2(children, span) {
       this.$this._stylesheet0$_inControlDirective = this.wasInControlDirective;
       return A.WhileRule$0(this.condition, children, span);
     },
-    $signature: 592
+    $signature: 571
   };
   A.StylesheetParser_unknownAtRule_closure0.prototype = {
     call$2(children, span) {
       return A.AtRule$0(this.name, span, children, this._box_0.value);
     },
-    $signature: 286
+    $signature: 195
   };
   A.StylesheetParser__expression_resetState0.prototype = {
     call$0() {
@@ -113927,15 +114625,15 @@ self.util = _cliPkgRequires.util;
       }
       if (t1.allowSlash) {
         t2 = _this.$this;
-        t2 = !t2._stylesheet0$_inParentheses && operator === B.BinaryOperator_t8B0 && t2._stylesheet0$_isSlashOperand$1(left) && t2._stylesheet0$_isSlashOperand$1(right);
+        t2 = !t2._stylesheet0$_inParentheses && operator === B.BinaryOperator_U770 && t2._stylesheet0$_isSlashOperand$1(left) && t2._stylesheet0$_isSlashOperand$1(right);
       } else
         t2 = false;
       if (t2)
-        t1.singleExpression_ = new A.BinaryOperationExpression0(B.BinaryOperator_t8B0, left, right, true);
+        t1.singleExpression_ = new A.BinaryOperationExpression0(B.BinaryOperator_U770, left, right, true);
       else {
         t1.singleExpression_ = new A.BinaryOperationExpression0(operator, left, right, false);
         t2 = t1.allowSlash = false;
-        if (B.BinaryOperator_anB0 === operator || B.BinaryOperator_olz0 === operator) {
+        if (B.BinaryOperator_u150 === operator || B.BinaryOperator_SjO0 === operator) {
           t3 = _this.$this;
           t4 = t3.scanner.string;
           t5 = right.get$span(right);
@@ -113953,7 +114651,7 @@ self.util = _cliPkgRequires.util;
             t5 = left.toString$0(0);
             t6 = right.toString$0(0);
             t1 = t1.singleExpression_;
-            A.WarnForDeprecation_warnForDeprecation0(t3.logger, B.Deprecation_EsU, "This operation is parsed as:\n\n    " + t2 + " " + t7 + " " + t4 + string$.x0a_but_ + t5 + " (" + t7 + t6 + ")\n\nAdd a space after " + t7 + string$.x20to_cl, t1.get$span(t1), null);
+            A.WarnForDeprecation_warnForDeprecation0(t3.logger, B.Deprecation_woc, "This operation is parsed as:\n\n    " + t2 + " " + t7 + " " + t4 + string$.x0a_but_ + t5 + " (" + t7 + t6 + ")\n\nAdd a space after " + t7 + string$.x20to_cl, t1.get$span(t1), null);
           }
         }
       }
@@ -113995,19 +114693,19 @@ self.util = _cliPkgRequires.util;
       }
       t1.singleExpression_ = expression;
     },
-    $signature: 593
+    $signature: 572
   };
   A.StylesheetParser__expression_addOperator0.prototype = {
     call$1(operator) {
       var t2, t3, operators, operands, t4, singleExpression,
         t1 = this.$this;
-      if (t1.get$plainCss() && operator !== B.BinaryOperator_2jN0 && operator !== B.BinaryOperator_anB0 && operator !== B.BinaryOperator_olz0 && operator !== B.BinaryOperator_qN20 && operator !== B.BinaryOperator_t8B0) {
+      if (t1.get$plainCss() && operator !== B.BinaryOperator_wdM0 && operator !== B.BinaryOperator_u150 && operator !== B.BinaryOperator_SjO0 && operator !== B.BinaryOperator_2No0 && operator !== B.BinaryOperator_U770) {
         t2 = t1.scanner;
         t3 = operator.operator.length;
         t2.error$3$length$position(0, "Operators aren't allowed in plain CSS.", t3, t2._string_scanner$_position - t3);
       }
       t2 = this._box_0;
-      t2.allowSlash = t2.allowSlash && operator === B.BinaryOperator_t8B0;
+      t2.allowSlash = t2.allowSlash && operator === B.BinaryOperator_U770;
       operators = t2.operators_;
       if (operators == null)
         operators = t2.operators_ = A._setArrayType([], type$.JSArray_BinaryOperator_2);
@@ -114032,7 +114730,7 @@ self.util = _cliPkgRequires.util;
       t1.whitespace$0();
       t2.singleExpression_ = t1._stylesheet0$_singleExpression$0();
     },
-    $signature: 594
+    $signature: 573
   };
   A.StylesheetParser__expression_resolveSpaceExpressions0.prototype = {
     call$0() {
@@ -114048,119 +114746,46 @@ self.util = _cliPkgRequires.util;
       spaceExpressions.push(singleExpression);
       t2 = B.JSArray_methods.get$first(spaceExpressions);
       t2 = t2.get$span(t2).expand$1(0, singleExpression.get$span(singleExpression));
-      t1.singleExpression_ = new A.ListExpression0(A.List_List$unmodifiable(spaceExpressions, type$.Expression_2), B.ListSeparator_EVt0, false, t2);
+      t1.singleExpression_ = new A.ListExpression0(A.List_List$unmodifiable(spaceExpressions, type$.Expression_2), B.ListSeparator_nbm0, false, t2);
       t1.spaceExpressions_ = null;
     },
     $signature: 0
   };
-  A.StylesheetParser__expression_closure2.prototype = {
-    call$0() {
-      return 43 === this._3_0;
-    },
-    $signature: 1
-  };
-  A.StylesheetParser__expression_closure3.prototype = {
-    call$0() {
-      return 47 === this._3_0;
-    },
-    $signature: 1
-  };
-  A.StylesheetParser__expression_closure4.prototype = {
-    call$0() {
-      return 46 === this._3_0;
-    },
-    $signature: 1
-  };
   A.StylesheetParser_expressionUntilComma_closure0.prototype = {
     call$0() {
       return this.$this.scanner.peekChar$0() === 44;
     },
-    $signature: 1
+    $signature: 22
   };
-  A.StylesheetParser__isHexColor_closure1.prototype = {
-    call$0() {
-      var t1 = this._0_0;
-      return (t1 == null ? A._asString(t1) : t1).length;
-    },
-    $signature: 3
-  };
-  A.StylesheetParser__isHexColor_closure2.prototype = {
+  A.StylesheetParser__isHexColor_closure0.prototype = {
     call$1(char) {
       return A.CharacterExtension_get_isHex0(char);
     },
-    $signature: 47
+    $signature: 45
   };
   A.StylesheetParser__unicodeRange_closure1.prototype = {
     call$1(char) {
       return char != null && A.CharacterExtension_get_isHex0(char);
     },
-    $signature: 34
+    $signature: 30
   };
   A.StylesheetParser__unicodeRange_closure2.prototype = {
     call$1(char) {
       return char != null && A.CharacterExtension_get_isHex0(char);
     },
-    $signature: 34
-  };
-  A.StylesheetParser_identifierLike_closure1.prototype = {
-    call$0() {
-      return 46 === this._2_0;
-    },
-    $signature: 1
-  };
-  A.StylesheetParser_identifierLike_closure2.prototype = {
-    call$0() {
-      return 40 === this._2_0;
-    },
-    $signature: 1
+    $signature: 30
   };
   A.StylesheetParser_namespacedExpression_closure0.prototype = {
     call$0() {
       return this.$this.scanner.spanFrom$1(this.start);
     },
-    $signature: 33
+    $signature: 27
   };
   A.StylesheetParser_trySpecialFunction_closure0.prototype = {
     call$1(contents) {
       return new A.StringExpression0(contents, false);
     },
-    $signature: 595
-  };
-  A.StylesheetParser__tryUrlContents_closure0.prototype = {
-    call$0() {
-      return 35 === this._0_0;
-    },
-    $signature: 1
-  };
-  A.StylesheetParser__interpolatedDeclarationValue_closure4.prototype = {
-    call$0() {
-      return 32 === this._1_0;
-    },
-    $signature: 1
-  };
-  A.StylesheetParser__interpolatedDeclarationValue_closure5.prototype = {
-    call$0() {
-      return 9 === this._1_0;
-    },
-    $signature: 1
-  };
-  A.StylesheetParser__interpolatedDeclarationValue_closure6.prototype = {
-    call$0() {
-      return 10 === this._1_0;
-    },
-    $signature: 1
-  };
-  A.StylesheetParser__interpolatedDeclarationValue_closure7.prototype = {
-    call$0() {
-      return 13 === this._1_0;
-    },
-    $signature: 1
-  };
-  A.StylesheetParser__interpolatedDeclarationValue_closure8.prototype = {
-    call$0() {
-      return 12 === this._1_0;
-    },
-    $signature: 1
+    $signature: 574
   };
   A.StylesheetParser__expressionUntilComparison_closure0.prototype = {
     call$0() {
@@ -114180,19 +114805,13 @@ self.util = _cliPkgRequires.util;
       }
       return t1;
     },
-    $signature: 1
-  };
-  A.StylesheetParser__supportsConditionInParens_closure0.prototype = {
-    call$0() {
-      return this._0_0[0];
-    },
-    $signature: 14
+    $signature: 22
   };
   A.StylesheetParser__publicIdentifier_closure0.prototype = {
     call$0() {
       return this.$this.scanner.spanFrom$1(this.start);
     },
-    $signature: 33
+    $signature: 27
   };
   A.Stylesheet0.prototype = {
     Stylesheet$internal$3$plainCss0(children, span, plainCss) {
@@ -114322,15 +114941,15 @@ self.util = _cliPkgRequires.util;
   };
   A.JSToDartImporter_canonicalize_closure.prototype = {
     call$0() {
-      return this.$this._sync$_canonicalize.call$2(this.url.toString$0(0), {fromImport: A.fromImport0(), containingUrl: A.NullableExtension_andThen0(A.containingUrl(), A.utils1__dartToJSUrl$closure())});
+      return this.$this._sync$_canonicalize.call$2(this.url.toString$0(0), A.canonicalizeContext0());
     },
-    $signature: 28
+    $signature: 35
   };
   A.JSToDartImporter_load_closure.prototype = {
     call$0() {
       return this.$this._sync$_load.call$1(new self.URL(this.url.toString$0(0)));
     },
-    $signature: 28
+    $signature: 35
   };
   A.Syntax0.prototype = {
     _enumToString$0() {
@@ -114419,11 +115038,8 @@ self.util = _cliPkgRequires.util;
             t2 = true;
         else
           t2 = true;
-        if (t2) {
-          t2 = true;
+        if (t2)
           break $label0$0;
-        }
-        t2 = false;
         break $label0$0;
       }
       if (t2)
@@ -114608,19 +115224,20 @@ self.util = _cliPkgRequires.util;
       return this.accept$1$1(visitor, type$.dynamic);
     },
     unify$1(compound) {
-      var rest, t1, unified, first, _this = this, _null = null,
-        _0_1 = A._InitializedCell$(new A.UniversalSelector_unify_closure1(compound)),
-        _0_4 = A._InitializedCell$(new A.UniversalSelector_unify_closure2(compound));
-      if (_0_1._readFinal$0() >= 1)
-        if (_0_4._readFinal$0() instanceof A.UniversalSelector0 || _0_4._readFinal$0() instanceof A.TypeSelector0) {
-          rest = B.JSArray_methods.sublist$1(compound, 1);
+      var _0_4, t1, rest, unified, _this = this, _null = null,
+        _0_1 = compound.length,
+        _0_4_isSet = _0_1 >= 1;
+      if (_0_4_isSet) {
+        _0_4 = compound[0];
+        t1 = _0_4;
+        if (!(t1 instanceof A.UniversalSelector0))
+          t1 = _0_4 instanceof A.TypeSelector0;
+        else
           t1 = true;
-        } else {
-          rest = _null;
-          t1 = false;
-        }
-      else {
+        rest = t1 ? B.JSArray_methods.sublist$1(compound, 1) : _null;
+      } else {
         rest = _null;
+        _0_4 = rest;
         t1 = false;
       }
       if (t1) {
@@ -114631,17 +115248,25 @@ self.util = _cliPkgRequires.util;
         B.JSArray_methods.addAll$1(t1, rest);
         return t1;
       }
-      if (J.$eq$(_0_1._readFinal$0(), 1))
-        if (_0_4._readFinal$0() instanceof A.PseudoSelector0) {
-          first = _0_4._readFinal$0();
-          t1 = first.isClass && first.name === "host" || first.get$isHostContext();
+      if (_0_1 === 1) {
+        if (_0_4_isSet)
+          t1 = _0_4;
+        else {
+          _0_4 = compound[0];
+          t1 = _0_4;
+          _0_4_isSet = true;
+        }
+        if (t1 instanceof A.PseudoSelector0) {
+          t1 = _0_4_isSet ? _0_4 : compound[0];
+          type$.PseudoSelector_2._as(t1);
+          t1 = t1.isClass && t1.name === "host" || t1.get$isHostContext();
         } else
           t1 = false;
-      else
+      } else
         t1 = false;
       if (t1)
         return _null;
-      if (_0_1._readFinal$0() <= 0)
+      if (_0_1 <= 0)
         return A._setArrayType([_this], type$.JSArray_SimpleSelector_2);
       t1 = _this.namespace;
       if (t1 == null || t1 === "*")
@@ -114671,18 +115296,6 @@ self.util = _cliPkgRequires.util;
       return J.get$hashCode$(this.namespace);
     }
   };
-  A.UniversalSelector_unify_closure1.prototype = {
-    call$0() {
-      return this._0_0.length;
-    },
-    $signature: 3
-  };
-  A.UniversalSelector_unify_closure2.prototype = {
-    call$0() {
-      return this._0_0[0];
-    },
-    $signature: 279
-  };
   A.UnprefixedMapView0.prototype = {
     get$keys(_) {
       return new A._UnprefixedKeys0(this);
@@ -114711,13 +115324,13 @@ self.util = _cliPkgRequires.util;
     call$1(key) {
       return B.JSString_methods.startsWith$1(key, this.$this._unprefixed_map_view0$_view._unprefixed_map_view0$_prefix);
     },
-    $signature: 10
+    $signature: 4
   };
   A._UnprefixedKeys_iterator_closure2.prototype = {
     call$1(key) {
       return B.JSString_methods.substring$1(key, this.$this._unprefixed_map_view0$_view._unprefixed_map_view0$_prefix.length);
     },
-    $signature: 7
+    $signature: 5
   };
   A.JSUrl0.prototype = {};
   A.UseRule0.prototype = {
@@ -114766,65 +115379,60 @@ self.util = _cliPkgRequires.util;
     call$0() {
       return A._exactlyOne0(A._tryPath0($.$get$context().withoutExtension$1(this.path) + ".import" + this.extension));
     },
-    $signature: 32
+    $signature: 44
   };
   A.resolveImportPath_closure2.prototype = {
     call$0() {
       return A._exactlyOne0(A._tryPathWithExtensions0(this.path + ".import"));
     },
-    $signature: 32
+    $signature: 44
   };
   A._tryPathAsDirectory_closure0.prototype = {
     call$0() {
       return A._exactlyOne0(A._tryPathWithExtensions0(A.join(this.path, "index.import", null)));
     },
-    $signature: 32
+    $signature: 44
   };
-  A._exactlyOne_closure1.prototype = {
-    call$0() {
-      return this._0_0.length;
-    },
-    $signature: 3
-  };
-  A._exactlyOne_closure2.prototype = {
+  A._exactlyOne_closure0.prototype = {
     call$1(path) {
       var t1 = $.$get$context();
       return "  " + t1.prettyUri$1(t1.toUri$1(path));
     },
-    $signature: 7
+    $signature: 5
   };
   A._PropertyDescriptor0.prototype = {};
   A.futureToPromise_closure0.prototype = {
     call$2(resolve, reject) {
       this.future.then$1$2$onError(0, new A.futureToPromise__closure0(resolve), new A.futureToPromise__closure1(reject), type$.void);
     },
-    $signature: 596
+    $signature: 575
   };
   A.futureToPromise__closure0.prototype = {
     call$1(result) {
       return this.resolve.call$1(result);
     },
-    $signature: 37
+    $signature: 31
   };
   A.futureToPromise__closure1.prototype = {
     call$2(error, stackTrace) {
       A.attachTrace0(error, stackTrace);
       this.reject.call$1(error);
     },
-    $signature: 62
+    $signature: 52
   };
   A.objectToMap_closure.prototype = {
     call$2(key, value) {
       this.map.$indexSet(0, key, value);
       return value;
     },
-    $signature: 135
+    $signature: 120
   };
+  A._RequireMain0.prototype = {};
   A.indent_closure0.prototype = {
     call$1(line) {
       return B.JSString_methods.$mul(" ", this.indentation) + line;
     },
-    $signature: 7
+    $signature: 5
   };
   A.flattenVertically_closure1.prototype = {
     call$1(inner) {
@@ -114837,7 +115445,7 @@ self.util = _cliPkgRequires.util;
   A.flattenVertically_closure2.prototype = {
     call$1(queue) {
       this.result.push(queue.removeFirst$0());
-      return queue.get$length(queue) === 0;
+      return queue.get$length(0) === 0;
     },
     $signature() {
       return this.T._eval$1("bool(QueueList<0>)");
@@ -114863,18 +115471,10 @@ self.util = _cliPkgRequires.util;
   };
   A.mapAddAll2_closure0.prototype = {
     call$2(key, inner) {
-      var innerDestination, t2,
-        t1 = this.destination,
+      var t1 = this.destination,
         _0_0 = t1.$index(0, key);
-      if (_0_0 != null) {
-        innerDestination = _0_0;
-        t2 = true;
-      } else {
-        innerDestination = null;
-        t2 = false;
-      }
-      if (t2)
-        innerDestination.addAll$1(0, inner);
+      if (_0_0 != null)
+        _0_0.addAll$1(0, inner);
       else
         t1.$indexSet(0, key, inner);
     },
@@ -114927,43 +115527,43 @@ self.util = _cliPkgRequires.util;
       A.LinkedHashMap_LinkedHashMap$_literal(["sassIndexToListIndex", new A.valueClass__closure5(), "get", new A.valueClass__closure6(), "assertBoolean", new A.valueClass__closure7(), "assertCalculation", new A.valueClass__closure8(), "assertColor", new A.valueClass__closure9(), "assertFunction", new A.valueClass__closure10(), "assertMap", new A.valueClass__closure11(), "assertMixin", new A.valueClass__closure12(), "assertNumber", new A.valueClass__closure13(), "assertString", new A.valueClass__closure14(), "tryMap", new A.valueClass__closure15(), "equals", new A.valueClass__closure16(), "hashCode", new A.valueClass__closure17(), "toString", new A.valueClass__closure18()], t1, t2).forEach$1(0, A.JSClassExtension_get_defineMethod(jsClass));
       return jsClass;
     },
-    $signature: 24
+    $signature: 15
   };
   A.valueClass__closure.prototype = {
     call$1($self) {
       return J.toString$0$($self);
     },
-    $signature: 139
+    $signature: 134
   };
   A.valueClass__closure0.prototype = {
     call$1($self) {
       return new self.immutable.List($self.get$asList());
     },
-    $signature: 597
+    $signature: 576
   };
   A.valueClass__closure1.prototype = {
     call$1($self) {
       return $self.get$hasBrackets();
     },
-    $signature: 54
+    $signature: 53
   };
   A.valueClass__closure2.prototype = {
     call$1($self) {
       return $self.get$isTruthy();
     },
-    $signature: 54
+    $signature: 53
   };
   A.valueClass__closure3.prototype = {
     call$1($self) {
       return $self.get$realNull();
     },
-    $signature: 241
+    $signature: 190
   };
   A.valueClass__closure4.prototype = {
     call$1($self) {
       return $self.get$separator($self).separator;
     },
-    $signature: 598
+    $signature: 577
   };
   A.valueClass__closure5.prototype = {
     call$3($self, sassIndex, $name) {
@@ -114977,13 +115577,13 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 599
+    $signature: 578
   };
   A.valueClass__closure6.prototype = {
     call$2($self, index) {
       return index < 1 && index >= -1 ? $self : self.undefined;
     },
-    $signature: 262
+    $signature: 240
   };
   A.valueClass__closure7.prototype = {
     call$2($self, $name) {
@@ -114997,7 +115597,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 600
+    $signature: 579
   };
   A.valueClass__closure8.prototype = {
     call$2($self, $name) {
@@ -115011,7 +115611,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 601
+    $signature: 580
   };
   A.valueClass__closure9.prototype = {
     call$2($self, $name) {
@@ -115025,7 +115625,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 602
+    $signature: 581
   };
   A.valueClass__closure10.prototype = {
     call$2($self, $name) {
@@ -115039,7 +115639,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 603
+    $signature: 582
   };
   A.valueClass__closure11.prototype = {
     call$2($self, $name) {
@@ -115053,7 +115653,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 604
+    $signature: 583
   };
   A.valueClass__closure12.prototype = {
     call$2($self, $name) {
@@ -115067,7 +115667,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 605
+    $signature: 584
   };
   A.valueClass__closure13.prototype = {
     call$2($self, $name) {
@@ -115081,7 +115681,7 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 606
+    $signature: 585
   };
   A.valueClass__closure14.prototype = {
     call$2($self, $name) {
@@ -115095,19 +115695,19 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 607
+    $signature: 586
   };
   A.valueClass__closure15.prototype = {
     call$1($self) {
       return $self.tryMap$0();
     },
-    $signature: 608
+    $signature: 587
   };
   A.valueClass__closure16.prototype = {
     call$2($self, other) {
       return $self.$eq(0, other);
     },
-    $signature: 609
+    $signature: 588
   };
   A.valueClass__closure17.prototype = {
     call$2($self, _) {
@@ -115121,13 +115721,13 @@ self.util = _cliPkgRequires.util;
     $defaultValues() {
       return [null];
     },
-    $signature: 610
+    $signature: 589
   };
   A.valueClass__closure18.prototype = {
     call$1($self) {
       return A.serializeValue0($self, true, true);
     },
-    $signature: 225
+    $signature: 136
   };
   A.Value0.prototype = {
     get$isTruthy() {
@@ -115158,12 +115758,11 @@ self.util = _cliPkgRequires.util;
       return this;
     },
     sassIndexToListIndex$2(sassIndex, $name) {
-      var t1, t2, index,
+      var t1, index,
         indexValue = sassIndex.assertNumber$1($name);
       if (indexValue.get$hasUnits()) {
         t1 = indexValue.get$unitString();
-        t2 = indexValue.unitSuggestion$1($name == null ? "index" : $name);
-        A.EvaluationContext_current0().warn$2(0, "$" + A.S($name) + ": Passing a number with unit " + t1 + string$.x20is_de + t2 + string$.x0a_Morex3a, B.Deprecation_0bn);
+        A.warnForDeprecation0("$" + A.S($name) + ": Passing a number with unit " + t1 + string$.x20is_de + indexValue.unitSuggestion$1($name == null ? "index" : $name) + string$.x0a_Morex3a, B.Deprecation_oCX);
       }
       index = indexValue.assertInt$1($name);
       if (index === 0)
@@ -115203,18 +115802,10 @@ self.util = _cliPkgRequires.util;
       return A.throwExpression(A.SassScriptException$0(this.toString$0(0) + " is not a string.", $name));
     },
     _value$_selectorString$1($name) {
-      var string, t1,
-        _0_0 = this._value$_selectorStringOrNull$0();
-      if (_0_0 != null) {
-        string = _0_0;
-        t1 = true;
-      } else {
-        string = null;
-        t1 = false;
-      }
-      if (t1)
-        return string;
-      throw A.wrapException(A.SassScriptException$0(this.toString$0(0) + string$.x20is_noa, $name));
+      var _0_0 = this._value$_selectorStringOrNull$0();
+      if (_0_0 != null)
+        return _0_0;
+      throw A.wrapException(A.SassScriptException$0(this.toString$0(0) + string$.x20is_noav, $name));
     },
     _value$_selectorStringOrNull$0() {
       var t1, t2, result, _1_0, _i, complex, string, compound, _this = this, _null = null;
@@ -115229,14 +115820,14 @@ self.util = _cliPkgRequires.util;
       result = A._setArrayType([], type$.JSArray_String);
       $label0$1: {
         _1_0 = _this._list1$_separator;
-        if (B.ListSeparator_rXA0 === _1_0) {
+        if (B.ListSeparator_ECn0 === _1_0) {
           for (_i = 0; _i < t2; ++_i) {
             complex = t1[_i];
             if (complex instanceof A.SassString0) {
               result.push(complex._string0$_text);
               continue;
             }
-            if (complex instanceof A.SassList0 && B.ListSeparator_EVt0 === complex._list1$_separator) {
+            if (complex instanceof A.SassList0 && B.ListSeparator_nbm0 === complex._list1$_separator) {
               string = complex._value$_selectorStringOrNull$0();
               if (string == null)
                 return _null;
@@ -115247,7 +115838,7 @@ self.util = _cliPkgRequires.util;
           }
           break $label0$1;
         }
-        if (B.ListSeparator_zg90 === _1_0)
+        if (B.ListSeparator_cQA0 === _1_0)
           return _null;
         for (_i = 0; _i < t2; ++_i) {
           compound = t1[_i];
@@ -115255,8 +115846,9 @@ self.util = _cliPkgRequires.util;
             return _null;
           result.push(compound._string0$_text);
         }
+        break $label0$1;
       }
-      return B.JSArray_methods.join$1(result, _1_0 === B.ListSeparator_rXA0 ? ", " : " ");
+      return B.JSArray_methods.join$1(result, _1_0 === B.ListSeparator_ECn0 ? ", " : " ");
     },
     withListContents$2$separator(contents, separator) {
       var t1 = separator == null ? this.get$separator(this) : separator,
@@ -115328,9 +115920,8 @@ self.util = _cliPkgRequires.util;
       return this.accept$1$1(visitor, type$.dynamic);
     },
     toString$0(_) {
-      var t1 = this.namespace,
-        t2 = this.name;
-      return t1 == null ? "$" + t2 : t1 + ".$" + t2;
+      var t1 = this.span;
+      return A.String_String$fromCharCodes(B.NativeUint32List_methods.sublist$2(t1.file._decodedChars, t1._file$_start, t1._end), 0, null);
     },
     $isExpression0: 1,
     $isAstNode0: 1,
@@ -115503,337 +116094,358 @@ self.util = _cliPkgRequires.util;
       _instance_2_u = hunkHelpers._instance_2u,
       _instance_0_i = hunkHelpers._instance_0i,
       _instance_0_u = hunkHelpers._instance_0u;
-    _static_2(J, "_interceptors_JSArray__compareAny$closure", "JSArray__compareAny", 287);
-    _instance_1_i(J.JSArray.prototype, "get$contains", "contains$1", 11);
-    _instance_1_i(A._CastIterableBase.prototype, "get$contains", "contains$1", 11);
-    _instance_1_u(A.CastMap.prototype, "get$containsKey", "containsKey$1", 11);
-    _instance_1_u(A.ConstantStringMap.prototype, "get$containsKey", "containsKey$1", 11);
-    _instance_1_i(A.ConstantStringSet.prototype, "get$contains", "contains$1", 11);
-    _instance_1_i(A.GeneralConstantSet.prototype, "get$contains", "contains$1", 11);
-    _instance_1_u(A.JsLinkedHashMap.prototype, "get$containsKey", "containsKey$1", 11);
-    _static_1(A, "async__AsyncRun__scheduleImmediateJsOverride$closure", "_AsyncRun__scheduleImmediateJsOverride", 147);
-    _static_1(A, "async__AsyncRun__scheduleImmediateWithSetImmediate$closure", "_AsyncRun__scheduleImmediateWithSetImmediate", 147);
-    _static_1(A, "async__AsyncRun__scheduleImmediateWithTimer$closure", "_AsyncRun__scheduleImmediateWithTimer", 147);
+    _static_2(J, "_interceptors_JSArray__compareAny$closure", "JSArray__compareAny", 188);
+    _instance_1_i(J.JSArray.prototype, "get$contains", "contains$1", 9);
+    _instance_1_i(A._CastIterableBase.prototype, "get$contains", "contains$1", 9);
+    _instance_1_u(A.CastMap.prototype, "get$containsKey", "containsKey$1", 9);
+    _instance_1_u(A.ConstantStringMap.prototype, "get$containsKey", "containsKey$1", 9);
+    _instance_1_i(A.ConstantStringSet.prototype, "get$contains", "contains$1", 9);
+    _instance_1_i(A.GeneralConstantSet.prototype, "get$contains", "contains$1", 9);
+    _instance_1_u(A.JsLinkedHashMap.prototype, "get$containsKey", "containsKey$1", 9);
+    _static_1(A, "async__AsyncRun__scheduleImmediateJsOverride$closure", "_AsyncRun__scheduleImmediateJsOverride", 131);
+    _static_1(A, "async__AsyncRun__scheduleImmediateWithSetImmediate$closure", "_AsyncRun__scheduleImmediateWithSetImmediate", 131);
+    _static_1(A, "async__AsyncRun__scheduleImmediateWithTimer$closure", "_AsyncRun__scheduleImmediateWithTimer", 131);
     _static_0(A, "async___startMicrotaskLoop$closure", "_startMicrotaskLoop", 0);
-    _static_1(A, "async___nullDataHandler$closure", "_nullDataHandler", 127);
-    _static_2(A, "async___nullErrorHandler$closure", "_nullErrorHandler", 71);
+    _static_1(A, "async___nullDataHandler$closure", "_nullDataHandler", 71);
+    _static_2(A, "async___nullErrorHandler$closure", "_nullErrorHandler", 73);
     _static_0(A, "async___nullDoneHandler$closure", "_nullDoneHandler", 0);
-    _static(A, "async___rootHandleUncaughtError$closure", 5, null, ["call$5"], ["_rootHandleUncaughtError"], 613, 0);
+    _static(A, "async___rootHandleUncaughtError$closure", 5, null, ["call$5"], ["_rootHandleUncaughtError"], 592, 0);
     _static(A, "async___rootRun$closure", 4, null, ["call$1$4", "call$4"], ["_rootRun", function($self, $parent, zone, f) {
       return A._rootRun($self, $parent, zone, f, type$.dynamic);
-    }], 614, 1);
+    }], 593, 1);
     _static(A, "async___rootRunUnary$closure", 5, null, ["call$2$5", "call$5"], ["_rootRunUnary", function($self, $parent, zone, f, arg) {
-      return A._rootRunUnary($self, $parent, zone, f, arg, type$.dynamic, type$.dynamic);
-    }], 615, 1);
+      var t1 = type$.dynamic;
+      return A._rootRunUnary($self, $parent, zone, f, arg, t1, t1);
+    }], 594, 1);
     _static(A, "async___rootRunBinary$closure", 6, null, ["call$3$6", "call$6"], ["_rootRunBinary", function($self, $parent, zone, f, arg1, arg2) {
-      return A._rootRunBinary($self, $parent, zone, f, arg1, arg2, type$.dynamic, type$.dynamic, type$.dynamic);
-    }], 616, 1);
+      var t1 = type$.dynamic;
+      return A._rootRunBinary($self, $parent, zone, f, arg1, arg2, t1, t1, t1);
+    }], 595, 1);
     _static(A, "async___rootRegisterCallback$closure", 4, null, ["call$1$4", "call$4"], ["_rootRegisterCallback", function($self, $parent, zone, f) {
       return A._rootRegisterCallback($self, $parent, zone, f, type$.dynamic);
-    }], 617, 0);
+    }], 596, 0);
     _static(A, "async___rootRegisterUnaryCallback$closure", 4, null, ["call$2$4", "call$4"], ["_rootRegisterUnaryCallback", function($self, $parent, zone, f) {
-      return A._rootRegisterUnaryCallback($self, $parent, zone, f, type$.dynamic, type$.dynamic);
-    }], 618, 0);
+      var t1 = type$.dynamic;
+      return A._rootRegisterUnaryCallback($self, $parent, zone, f, t1, t1);
+    }], 597, 0);
     _static(A, "async___rootRegisterBinaryCallback$closure", 4, null, ["call$3$4", "call$4"], ["_rootRegisterBinaryCallback", function($self, $parent, zone, f) {
-      return A._rootRegisterBinaryCallback($self, $parent, zone, f, type$.dynamic, type$.dynamic, type$.dynamic);
-    }], 619, 0);
-    _static(A, "async___rootErrorCallback$closure", 5, null, ["call$5"], ["_rootErrorCallback"], 620, 0);
-    _static(A, "async___rootScheduleMicrotask$closure", 4, null, ["call$4"], ["_rootScheduleMicrotask"], 621, 0);
-    _static(A, "async___rootCreateTimer$closure", 5, null, ["call$5"], ["_rootCreateTimer"], 622, 0);
-    _static(A, "async___rootCreatePeriodicTimer$closure", 5, null, ["call$5"], ["_rootCreatePeriodicTimer"], 623, 0);
-    _static(A, "async___rootPrint$closure", 4, null, ["call$4"], ["_rootPrint"], 624, 0);
-    _static_1(A, "async___printToZone$closure", "_printToZone", 85);
-    _static(A, "async___rootFork$closure", 5, null, ["call$5"], ["_rootFork"], 625, 0);
+      var t1 = type$.dynamic;
+      return A._rootRegisterBinaryCallback($self, $parent, zone, f, t1, t1, t1);
+    }], 598, 0);
+    _static(A, "async___rootErrorCallback$closure", 5, null, ["call$5"], ["_rootErrorCallback"], 599, 0);
+    _static(A, "async___rootScheduleMicrotask$closure", 4, null, ["call$4"], ["_rootScheduleMicrotask"], 600, 0);
+    _static(A, "async___rootCreateTimer$closure", 5, null, ["call$5"], ["_rootCreateTimer"], 601, 0);
+    _static(A, "async___rootCreatePeriodicTimer$closure", 5, null, ["call$5"], ["_rootCreatePeriodicTimer"], 602, 0);
+    _static(A, "async___rootPrint$closure", 4, null, ["call$4"], ["_rootPrint"], 603, 0);
+    _static_1(A, "async___printToZone$closure", "_printToZone", 104);
+    _static(A, "async___rootFork$closure", 5, null, ["call$5"], ["_rootFork"], 604, 0);
     _instance(A._AsyncCompleter.prototype, "get$complete", 0, 0, function() {
       return [null];
-    }, ["call$1", "call$0"], ["complete$1", "complete$0"], 160, 0, 0);
-    _instance_2_u(A._Future.prototype, "get$_completeError", "_completeError$2", 71);
+    }, ["call$1", "call$0"], ["complete$1", "complete$0"], 166, 0, 0);
+    _instance_2_u(A._Future.prototype, "get$_completeError", "_completeError$2", 73);
     var _;
-    _instance_1_i(_ = A._StreamController.prototype, "get$add", "add$1", 37);
+    _instance_1_i(_ = A._StreamController.prototype, "get$add", "add$1", 31);
     _instance(_, "get$addError", 0, 1, function() {
       return [null];
-    }, ["call$2", "call$1"], ["addError$2", "addError$1"], 172, 0, 0);
-    _instance_0_i(_, "get$close", "close$0", 334);
-    _instance_1_u(_, "get$_async$_add", "_async$_add$1", 37);
-    _instance_2_u(_, "get$_addError", "_addError$2", 71);
+    }, ["call$2", "call$1"], ["addError$2", "addError$1"], 244, 0, 0);
+    _instance_0_i(_, "get$close", "close$0", 517);
+    _instance_1_u(_, "get$_async$_add", "_async$_add$1", 31);
+    _instance_2_u(_, "get$_addError", "_addError$2", 73);
     _instance_0_u(_, "get$_close", "_close$0", 0);
     _instance_0_u(_ = A._ControllerSubscription.prototype, "get$_async$_onPause", "_async$_onPause$0", 0);
     _instance_0_u(_, "get$_async$_onResume", "_async$_onResume$0", 0);
-    _instance(_ = A._BufferingStreamSubscription.prototype, "get$pause", 1, 0, null, ["call$1", "call$0"], ["pause$1", "pause$0"], 353, 0, 0);
+    _instance(_ = A._BufferingStreamSubscription.prototype, "get$pause", 1, 0, null, ["call$1", "call$0"], ["pause$1", "pause$0"], 516, 0, 0);
     _instance_0_i(_, "get$resume", "resume$0", 0);
     _instance_0_u(_, "get$_async$_onPause", "_async$_onPause$0", 0);
     _instance_0_u(_, "get$_async$_onResume", "_async$_onResume$0", 0);
-    _instance_1_u(_ = A._StreamIterator.prototype, "get$_onData", "_onData$1", 37);
-    _instance_2_u(_, "get$_onError", "_onError$2", 71);
+    _instance_1_u(_ = A._StreamIterator.prototype, "get$_onData", "_onData$1", 31);
+    _instance_2_u(_, "get$_onError", "_onError$2", 73);
     _instance_0_u(_, "get$_onDone", "_onDone$0", 0);
     _instance_0_u(_ = A._ForwardingStreamSubscription.prototype, "get$_async$_onPause", "_async$_onPause$0", 0);
     _instance_0_u(_, "get$_async$_onResume", "_async$_onResume$0", 0);
-    _instance_1_u(_, "get$_handleData", "_handleData$1", 37);
-    _instance_2_u(_, "get$_handleError", "_handleError$2", 370);
+    _instance_1_u(_, "get$_handleData", "_handleData$1", 31);
+    _instance_2_u(_, "get$_handleError", "_handleError$2", 507);
     _instance_0_u(_, "get$_handleDone", "_handleDone$0", 0);
-    _static_2(A, "collection___defaultEquals$closure", "_defaultEquals", 289);
-    _static_1(A, "collection___defaultHashCode$closure", "_defaultHashCode", 290);
-    _static_2(A, "collection_ListBase__compareAny$closure", "ListBase__compareAny", 287);
-    _instance_1_u(A._HashMap.prototype, "get$containsKey", "containsKey$1", 11);
-    _instance_1_u(A._LinkedCustomHashMap.prototype, "get$containsKey", "containsKey$1", 11);
-    _instance(_ = A._LinkedHashSet.prototype, "get$_newSimilarSet", 0, 0, null, ["call$1$0", "call$0"], ["_newSimilarSet$1$0", "_newSimilarSet$0"], 209, 0, 0);
-    _instance_1_i(_, "get$contains", "contains$1", 11);
-    _instance_1_i(_, "get$add", "add$1", 11);
-    _instance(A._LinkedIdentityHashSet.prototype, "get$_newSimilarSet", 0, 0, null, ["call$1$0", "call$0"], ["_newSimilarSet$1$0", "_newSimilarSet$0"], 209, 0, 0);
-    _instance_1_u(A.MapBase.prototype, "get$containsKey", "containsKey$1", 11);
-    _instance_1_u(A.MapView.prototype, "get$containsKey", "containsKey$1", 11);
-    _instance_1_i(A.UnmodifiableSetView.prototype, "get$contains", "contains$1", 11);
-    _static_1(A, "convert___defaultToEncodable$closure", "_defaultToEncodable", 88);
-    _static_1(A, "core__identityHashCode$closure", "identityHashCode", 290);
-    _static_2(A, "core__identical$closure", "identical", 289);
-    _static_1(A, "core_Uri_decodeComponent$closure", "Uri_decodeComponent", 7);
-    _instance_1_i(A.Iterable.prototype, "get$contains", "contains$1", 11);
-    _instance_1_i(A.StringBuffer.prototype, "get$write", "write$1", 37);
+    _static_2(A, "collection___defaultEquals$closure", "_defaultEquals", 187);
+    _static_1(A, "collection___defaultHashCode$closure", "_defaultHashCode", 211);
+    _static_2(A, "collection_ListBase__compareAny$closure", "ListBase__compareAny", 188);
+    _instance_1_u(A._HashMap.prototype, "get$containsKey", "containsKey$1", 9);
+    _instance_1_u(A._LinkedCustomHashMap.prototype, "get$containsKey", "containsKey$1", 9);
+    _instance(_ = A._LinkedHashSet.prototype, "get$_newSimilarSet", 0, 0, null, ["call$1$0", "call$0"], ["_newSimilarSet$1$0", "_newSimilarSet$0"], 161, 0, 0);
+    _instance_1_i(_, "get$contains", "contains$1", 9);
+    _instance_1_i(_, "get$add", "add$1", 9);
+    _instance(A._LinkedIdentityHashSet.prototype, "get$_newSimilarSet", 0, 0, null, ["call$1$0", "call$0"], ["_newSimilarSet$1$0", "_newSimilarSet$0"], 161, 0, 0);
+    _instance_1_u(A.MapBase.prototype, "get$containsKey", "containsKey$1", 9);
+    _instance_1_u(A.MapView.prototype, "get$containsKey", "containsKey$1", 9);
+    _instance_1_i(A.UnmodifiableSetView.prototype, "get$contains", "contains$1", 9);
+    _static_1(A, "convert___defaultToEncodable$closure", "_defaultToEncodable", 82);
+    _instance_1_u(A._JsonMap.prototype, "get$containsKey", "containsKey$1", 9);
+    _static_1(A, "core__identityHashCode$closure", "identityHashCode", 211);
+    _static_2(A, "core__identical$closure", "identical", 187);
+    _static_1(A, "core_Uri_decodeComponent$closure", "Uri_decodeComponent", 5);
+    _instance_1_i(A.Iterable.prototype, "get$contains", "contains$1", 9);
+    _instance_1_i(A.StringBuffer.prototype, "get$write", "write$1", 31);
     _static(A, "math0__max$closure", 2, null, ["call$1$2", "call$2"], ["max", function(a, b) {
       return A.max(a, b, type$.num);
-    }], 628, 1);
-    _instance_1_u(A.ArgResults.prototype, "get$wasParsed", "wasParsed$1", 10);
-    _instance_1_u(_ = A.StreamCompleter.prototype, "get$setSourceStream", "setSourceStream$1", 37);
+    }], 607, 1);
+    _instance_1_u(A.ArgResults.prototype, "get$wasParsed", "wasParsed$1", 4);
+    _instance_1_u(_ = A.StreamCompleter.prototype, "get$setSourceStream", "setSourceStream$1", 31);
     _instance(_, "get$setError", 0, 1, function() {
       return [null];
-    }, ["call$2", "call$1"], ["setError$2", "setError$1"], 172, 0, 0);
+    }, ["call$2", "call$1"], ["setError$2", "setError$1"], 244, 0, 0);
     _instance_0_u(_ = A.StreamGroup.prototype, "get$_onListen", "_onListen$0", 0);
     _instance_0_u(_, "get$_onPause", "_onPause$0", 0);
     _instance_0_u(_, "get$_onResume", "_onResume$0", 0);
-    _instance_0_u(_, "get$_onCancel", "_onCancel$0", 284);
+    _instance_0_u(_, "get$_onCancel", "_onCancel$0", 214);
     _instance_0_i(A.ReplAdapter.prototype, "get$exit", "exit$0", 0);
-    _instance_1_i(A.EmptyUnmodifiableSet.prototype, "get$contains", "contains$1", 11);
-    _instance_1_i(A.UnionSet.prototype, "get$contains", "contains$1", 11);
-    _instance_1_i(A._DelegatingIterableBase.prototype, "get$contains", "contains$1", 11);
-    _instance_1_i(A.MapKeySet.prototype, "get$contains", "contains$1", 11);
-    _instance_1_u(A.VersionRange.prototype, "get$allows", "allows$1", 536);
-    _instance_1_u(A._IsInvisibleVisitor0.prototype, "get$visitComplexSelector", "visitComplexSelector$1", 19);
-    _instance_1_u(A._IsBogusVisitor.prototype, "get$visitComplexSelector", "visitComplexSelector$1", 19);
-    _instance_1_u(A._IsUselessVisitor.prototype, "get$visitComplexSelector", "visitComplexSelector$1", 19);
-    _instance_1_u(A.SelectorList.prototype, "get$isSuperselector", "isSuperselector$1", 73);
-    _instance_1_u(A.PseudoSelector.prototype, "get$isSuperselector", "isSuperselector$1", 16);
-    _instance_1_u(A.SimpleSelector.prototype, "get$isSuperselector", "isSuperselector$1", 16);
-    _instance_1_u(A.TypeSelector.prototype, "get$isSuperselector", "isSuperselector$1", 16);
-    _instance_1_u(A.UniversalSelector.prototype, "get$isSuperselector", "isSuperselector$1", 16);
-    _instance_1_u(A.EmptyExtensionStore.prototype, "get$addExtensions", "addExtensions$1", 173);
-    _instance_1_u(A.ExtensionStore.prototype, "get$addExtensions", "addExtensions$1", 173);
-    _static_1(A, "functions___isUnique$closure", "_isUnique", 16);
-    _static_1(A, "color0___opacify$closure", "_opacify", 35);
-    _static_1(A, "color0___transparentize$closure", "_transparentize", 35);
+    _instance_1_i(A.EmptyUnmodifiableSet.prototype, "get$contains", "contains$1", 9);
+    _instance_1_i(A.UnionSet.prototype, "get$contains", "contains$1", 9);
+    _instance_1_i(A._DelegatingIterableBase.prototype, "get$contains", "contains$1", 9);
+    _instance_1_i(A.MapKeySet.prototype, "get$contains", "contains$1", 9);
+    _static_1(A, "version_Version___parse_tearOff$closure", "Version___parse_tearOff", 198);
+    _instance_1_u(A.VersionRange.prototype, "get$allows", "allows$1", 528);
+    _instance_1_u(A._IsInvisibleVisitor0.prototype, "get$visitComplexSelector", "visitComplexSelector$1", 16);
+    _instance_1_u(A._IsBogusVisitor.prototype, "get$visitComplexSelector", "visitComplexSelector$1", 16);
+    _instance_1_u(A._IsUselessVisitor.prototype, "get$visitComplexSelector", "visitComplexSelector$1", 16);
+    _instance_1_u(A.SelectorList.prototype, "get$isSuperselector", "isSuperselector$1", 70);
+    _instance_1_u(A.PseudoSelector.prototype, "get$isSuperselector", "isSuperselector$1", 13);
+    _instance_1_u(A.SimpleSelector.prototype, "get$isSuperselector", "isSuperselector$1", 13);
+    _instance_1_u(A.TypeSelector.prototype, "get$isSuperselector", "isSuperselector$1", 13);
+    _instance_1_u(A.UniversalSelector.prototype, "get$isSuperselector", "isSuperselector$1", 13);
+    _instance_1_u(A.EmptyExtensionStore.prototype, "get$addExtensions", "addExtensions$1", 226);
+    _instance_1_u(A.ExtensionStore.prototype, "get$addExtensions", "addExtensions$1", 226);
+    _static_1(A, "functions___isUnique$closure", "_isUnique", 13);
+    _static_1(A, "color0___opacify$closure", "_opacify", 29);
+    _static_1(A, "color0___transparentize$closure", "_transparentize", 29);
+    _instance_2_u(A.NodePackageImporter.prototype, "get$_compareExpansionKeys", "_compareExpansionKeys$2", 142);
+    _instance_0_u(A.CssParser.prototype, "get$silentComment", "silentComment$0", 22);
     _instance_0_u(_ = A.Parser.prototype, "get$whitespace", "whitespace$0", 0);
+    _instance_0_u(_, "get$silentComment", "silentComment$0", 22);
     _instance_0_u(_, "get$loudComment", "loudComment$0", 0);
-    _instance_0_u(_, "get$string", "string$0", 22);
+    _instance_0_u(_, "get$string", "string$0", 26);
     _instance(_, "get$error", 1, 2, function() {
       return [null];
-    }, ["call$3", "call$2"], ["error$3", "error$2"], 192, 0, 0);
+    }, ["call$3", "call$2"], ["error$3", "error$2"], 151, 0, 0);
     _instance_0_u(A.SassParser.prototype, "get$loudComment", "loudComment$0", 0);
-    _instance(_ = A.StylesheetParser.prototype, "get$_statement", 0, 0, null, ["call$1$root", "call$0"], ["_statement$1$root", "_statement$0"], 356, 0, 0);
-    _instance_0_u(_, "get$_declarationChild", "_declarationChild$0", 142);
-    _instance_0_u(_, "get$_functionChild", "_functionChild$0", 142);
-    _instance(_, "get$_expression", 0, 0, null, ["call$3$bracketList$singleEquals$until", "call$0", "call$2$singleEquals$until", "call$1$bracketList", "call$1$until"], ["_expression$3$bracketList$singleEquals$until", "_expression$0", "_expression$2$singleEquals$until", "_expression$1$bracketList", "_expression$1$until"], 359, 0, 0);
+    _instance(_ = A.StylesheetParser.prototype, "get$_statement", 0, 0, null, ["call$1$root", "call$0"], ["_statement$1$root", "_statement$0"], 482, 0, 0);
+    _instance_0_u(_, "get$_declarationChild", "_declarationChild$0", 127);
+    _instance_0_u(_, "get$_functionChild", "_functionChild$0", 127);
+    _instance(_, "get$_expression", 0, 0, null, ["call$3$bracketList$singleEquals$until", "call$0", "call$2$singleEquals$until", "call$1$bracketList", "call$1$until"], ["_expression$3$bracketList$singleEquals$until", "_expression$0", "_expression$2$singleEquals$until", "_expression$1$bracketList", "_expression$1$until"], 462, 0, 0);
     _instance(A.LazyFileSpan.prototype, "get$message", 1, 1, function() {
       return {color: null};
-    }, ["call$2$color", "call$1"], ["message$2$color", "message$1"], 141, 0, 0);
-    _instance_1_u(A.LimitedMapView.prototype, "get$containsKey", "containsKey$1", 11);
-    _instance_1_u(A.MergedMapView.prototype, "get$containsKey", "containsKey$1", 11);
+    }, ["call$2$color", "call$1"], ["message$2$color", "message$1"], 126, 0, 0);
+    _instance_1_u(A.LimitedMapView.prototype, "get$containsKey", "containsKey$1", 9);
+    _instance_1_u(A.MergedMapView.prototype, "get$containsKey", "containsKey$1", 9);
     _instance(A.MultiSpan.prototype, "get$message", 1, 1, function() {
       return {color: null};
-    }, ["call$2$color", "call$1"], ["message$2$color", "message$1"], 205, 0, 0);
-    _instance_1_i(A.NoSourceMapBuffer.prototype, "get$write", "write$1", 37);
-    _instance_1_u(A.PrefixedMapView.prototype, "get$containsKey", "containsKey$1", 11);
-    _instance_1_u(A.PublicMemberMapView.prototype, "get$containsKey", "containsKey$1", 11);
-    _instance_1_i(A.SourceMapBuffer.prototype, "get$write", "write$1", 37);
-    _instance_1_u(A.UnprefixedMapView.prototype, "get$containsKey", "containsKey$1", 11);
-    _static_1(A, "utils__isPublic$closure", "isPublic", 10);
-    _static_1(A, "calculation_SassCalculation__simplify$closure", "SassCalculation__simplify", 69);
-    _instance_1_u(A.AnySelectorVisitor.prototype, "get$visitComplexSelector", "visitComplexSelector$1", 19);
-    _instance(_ = A._EvaluateVisitor0.prototype, "get$_async_evaluate$_interpolationToValue", 0, 1, null, ["call$3$trim$warnForColor", "call$1", "call$2$warnForColor"], ["_async_evaluate$_interpolationToValue$3$trim$warnForColor", "_async_evaluate$_interpolationToValue$1", "_async_evaluate$_interpolationToValue$2$warnForColor"], 426, 0, 0);
-    _instance_1_u(_, "get$_async_evaluate$_expressionNode", "_async_evaluate$_expressionNode$1", 221);
-    _instance(_ = A._EvaluateVisitor.prototype, "get$_interpolationToValue", 0, 1, null, ["call$3$trim$warnForColor", "call$1", "call$2$warnForColor"], ["_interpolationToValue$3$trim$warnForColor", "_interpolationToValue$1", "_interpolationToValue$2$warnForColor"], 545, 0, 0);
-    _instance_1_u(_, "get$_expressionNode", "_expressionNode$1", 221);
-    _instance_1_u(_ = A.RecursiveStatementVisitor.prototype, "get$visitContentBlock", "visitContentBlock$1", 626);
-    _instance_1_u(_, "get$visitChildren", "visitChildren$1", 627);
+    }, ["call$2$color", "call$1"], ["message$2$color", "message$1"], 157, 0, 0);
+    _instance_1_i(A.NoSourceMapBuffer.prototype, "get$write", "write$1", 31);
+    _instance_1_u(A.PrefixedMapView.prototype, "get$containsKey", "containsKey$1", 9);
+    _instance_1_u(A.PublicMemberMapView.prototype, "get$containsKey", "containsKey$1", 9);
+    _instance_1_i(A.SourceMapBuffer.prototype, "get$write", "write$1", 31);
+    _instance_1_u(A.UnprefixedMapView.prototype, "get$containsKey", "containsKey$1", 9);
+    _static_1(A, "utils__isPublic$closure", "isPublic", 4);
+    _static_1(A, "calculation_SassCalculation__simplify$closure", "SassCalculation__simplify", 67);
+    _instance_1_u(A.AnySelectorVisitor.prototype, "get$visitComplexSelector", "visitComplexSelector$1", 16);
+    _instance(_ = A._EvaluateVisitor0.prototype, "get$_async_evaluate$_interpolationToValue", 0, 1, null, ["call$3$trim$warnForColor", "call$1", "call$2$warnForColor"], ["_async_evaluate$_interpolationToValue$3$trim$warnForColor", "_async_evaluate$_interpolationToValue$1", "_async_evaluate$_interpolationToValue$2$warnForColor"], 315, 0, 0);
+    _instance_1_u(_, "get$_async_evaluate$_expressionNode", "_async_evaluate$_expressionNode$1", 162);
+    _instance(_ = A._EvaluateVisitor.prototype, "get$_interpolationToValue", 0, 1, null, ["call$3$trim$warnForColor", "call$1", "call$2$warnForColor"], ["_interpolationToValue$3$trim$warnForColor", "_interpolationToValue$1", "_interpolationToValue$2$warnForColor"], 309, 0, 0);
+    _instance_1_u(_, "get$_expressionNode", "_expressionNode$1", 162);
+    _instance_1_u(_ = A.RecursiveStatementVisitor.prototype, "get$visitContentBlock", "visitContentBlock$1", 267);
+    _instance_1_u(_, "get$visitChildren", "visitChildren$1", 268);
     _instance_1_u(_ = A.SelectorSearchVisitor.prototype, "get$visitComplexSelector", "visitComplexSelector$1", "SelectorSearchVisitor.T?(ComplexSelector)");
     _instance_1_u(_, "get$visitSelectorList", "visitSelectorList$1", "SelectorSearchVisitor.T?(SelectorList)");
-    _instance_1_u(_ = A._SerializeVisitor.prototype, "get$_visitMediaQuery", "_visitMediaQuery$1", 644);
-    _instance_1_u(_, "get$_writeCalculationValue", "_writeCalculationValue$1", 110);
-    _instance_1_u(_, "get$visitSelectorList", "visitSelectorList$1", 645);
-    _instance_1_u(_, "get$_requiresSemicolon", "_requiresSemicolon$1", 9);
+    _instance_1_u(_ = A._SerializeVisitor.prototype, "get$_visitMediaQuery", "_visitMediaQuery$1", 271);
+    _instance_1_u(_, "get$_writeCalculationValue", "_writeCalculationValue$1", 99);
+    _instance_1_u(_, "get$visitSelectorList", "visitSelectorList$1", 272);
+    _instance_1_u(_, "get$_requiresSemicolon", "_requiresSemicolon$1", 7);
     _instance_1_u(_ = A.StatementSearchVisitor.prototype, "get$visitContentBlock", "visitContentBlock$1", "StatementSearchVisitor.T?(ContentBlock)");
     _instance_1_u(_, "get$visitChildren", "visitChildren$1", "StatementSearchVisitor.T?(List<Statement>)");
     _instance(A.SourceSpanMixin.prototype, "get$message", 1, 1, function() {
       return {color: null};
-    }, ["call$2$color", "call$1"], ["message$2$color", "message$1"], 141, 0, 0);
-    _static_1(A, "frame_Frame___parseVM_tearOff$closure", "Frame___parseVM_tearOff", 98);
-    _static_1(A, "frame_Frame___parseV8_tearOff$closure", "Frame___parseV8_tearOff", 98);
-    _static_1(A, "frame_Frame___parseFirefox_tearOff$closure", "Frame___parseFirefox_tearOff", 98);
-    _static_1(A, "frame_Frame___parseFriendly_tearOff$closure", "Frame___parseFriendly_tearOff", 98);
-    _static_1(A, "trace_Trace___parseVM_tearOff$closure", "Trace___parseVM_tearOff", 292);
-    _static_1(A, "trace_Trace___parseFriendly_tearOff$closure", "Trace___parseFriendly_tearOff", 292);
+    }, ["call$2$color", "call$1"], ["message$2$color", "message$1"], 126, 0, 0);
+    _static_1(A, "frame_Frame___parseVM_tearOff$closure", "Frame___parseVM_tearOff", 105);
+    _static_1(A, "frame_Frame___parseV8_tearOff$closure", "Frame___parseV8_tearOff", 105);
+    _static_1(A, "frame_Frame___parseFirefox_tearOff$closure", "Frame___parseFirefox_tearOff", 105);
+    _static_1(A, "frame_Frame___parseFriendly_tearOff$closure", "Frame___parseFriendly_tearOff", 105);
+    _static_1(A, "trace_Trace___parseVM_tearOff$closure", "Trace___parseVM_tearOff", 254);
+    _static_1(A, "trace_Trace___parseFriendly_tearOff$closure", "Trace___parseFriendly_tearOff", 254);
     _static(A, "from_handlers__TransformByHandlers__defaultHandleError$closure", 3, null, ["call$1$3", "call$3"], ["TransformByHandlers__defaultHandleError", function(error, stackTrace, sink) {
       return A.TransformByHandlers__defaultHandleError(error, stackTrace, sink, type$.dynamic);
-    }], 631, 0);
+    }], 610, 0);
     _static(A, "rate_limit___collect$closure", 2, null, ["call$1$2", "call$2"], ["_collect", function($event, soFar) {
       return A._collect($event, soFar, type$.dynamic);
-    }], 632, 0);
+    }], 611, 0);
     _instance_1_u(A.AnySelectorVisitor0.prototype, "get$visitComplexSelector", "visitComplexSelector$1", 18);
-    _instance(_ = A._EvaluateVisitor2.prototype, "get$_async_evaluate0$_interpolationToValue", 0, 1, null, ["call$3$trim$warnForColor", "call$1", "call$2$warnForColor"], ["_async_evaluate0$_interpolationToValue$3$trim$warnForColor", "_async_evaluate0$_interpolationToValue$1", "_async_evaluate0$_interpolationToValue$2$warnForColor"], 332, 0, 0);
-    _instance_1_u(_, "get$_async_evaluate0$_expressionNode", "_async_evaluate0$_expressionNode$1", 179);
-    _static_1(A, "calculation1___assertCalculationValue$closure", "_assertCalculationValue", 110);
-    _static_1(A, "calculation1___isValidClampArg$closure", "_isValidClampArg", 11);
-    _static_1(A, "calculation0_SassCalculation__simplify$closure", "SassCalculation__simplify0", 69);
-    _static_1(A, "color2___opacify$closure", "_opacify0", 36);
-    _static_1(A, "color2___transparentize$closure", "_transparentize0", 36);
+    _instance(_ = A._EvaluateVisitor2.prototype, "get$_async_evaluate0$_interpolationToValue", 0, 1, null, ["call$3$trim$warnForColor", "call$1", "call$2$warnForColor"], ["_async_evaluate0$_interpolationToValue$3$trim$warnForColor", "_async_evaluate0$_interpolationToValue$1", "_async_evaluate0$_interpolationToValue$2$warnForColor"], 311, 0, 0);
+    _instance_1_u(_, "get$_async_evaluate0$_expressionNode", "_async_evaluate0$_expressionNode$1", 248);
+    _static_1(A, "calculation1___assertCalculationValue$closure", "_assertCalculationValue", 99);
+    _static_1(A, "calculation1___isValidClampArg$closure", "_isValidClampArg", 9);
+    _static_1(A, "calculation0_SassCalculation__simplify$closure", "SassCalculation__simplify0", 67);
+    _static_1(A, "color2___opacify$closure", "_opacify0", 28);
+    _static_1(A, "color2___transparentize$closure", "_transparentize0", 28);
     _static(A, "compile__compile$closure", 1, function() {
       return [null];
     }, ["call$2", "call$1"], ["compile0", function(path) {
       return A.compile0(path, null);
-    }], 633, 0);
+    }], 612, 0);
     _static(A, "compile__compileString$closure", 1, function() {
       return [null];
     }, ["call$2", "call$1"], ["compileString0", function(text) {
       return A.compileString0(text, null);
-    }], 634, 0);
+    }], 613, 0);
     _static(A, "compile__compileAsync$closure", 1, function() {
       return [null];
     }, ["call$2", "call$1"], ["compileAsync1", function(path) {
       return A.compileAsync1(path, null);
-    }], 635, 0);
+    }], 614, 0);
     _static(A, "compile__compileStringAsync$closure", 1, function() {
       return [null];
     }, ["call$2", "call$1"], ["compileStringAsync1", function(text) {
       return A.compileStringAsync1(text, null);
-    }], 636, 0);
-    _static_1(A, "compile___parseImporter$closure", "_parseImporter0", 637);
-    _static_1(A, "compile___simplifyCalcArg$closure", "_simplifyCalcArg", 69);
-    _instance_1_u(A.EmptyExtensionStore0.prototype, "get$addExtensions", "addExtensions$1", 233);
-    _instance(_ = A._EvaluateVisitor1.prototype, "get$_evaluate0$_interpolationToValue", 0, 1, null, ["call$3$trim$warnForColor", "call$1", "call$2$warnForColor"], ["_evaluate0$_interpolationToValue$3$trim$warnForColor", "_evaluate0$_interpolationToValue$1", "_evaluate0$_interpolationToValue$2$warnForColor"], 435, 0, 0);
-    _instance_1_u(_, "get$_evaluate0$_expressionNode", "_evaluate0$_expressionNode$1", 179);
-    _instance_1_u(A.ExtensionStore0.prototype, "get$addExtensions", "addExtensions$1", 233);
-    _static_1(A, "functions0___isUnique$closure", "_isUnique0", 15);
-    _static_1(A, "immutable__jsToDartList$closure", "jsToDartList", 638);
+    }], 615, 0);
+    _static_1(A, "compile___parseImporter$closure", "_parseImporter0", 616);
+    _static_1(A, "compile___simplifyCalcArg$closure", "_simplifyCalcArg", 67);
+    _static_0(A, "compiler__initCompiler$closure", "initCompiler", 617);
+    _static_0(A, "compiler__initAsyncCompiler$closure", "initAsyncCompiler", 618);
+    _instance_0_u(A.CssParser0.prototype, "get$silentComment", "silentComment$0", 22);
+    _instance_1_u(A.EmptyExtensionStore0.prototype, "get$addExtensions", "addExtensions$1", 197);
+    _instance(_ = A._EvaluateVisitor1.prototype, "get$_evaluate0$_interpolationToValue", 0, 1, null, ["call$3$trim$warnForColor", "call$1", "call$2$warnForColor"], ["_evaluate0$_interpolationToValue$3$trim$warnForColor", "_evaluate0$_interpolationToValue$1", "_evaluate0$_interpolationToValue$2$warnForColor"], 424, 0, 0);
+    _instance_1_u(_, "get$_evaluate0$_expressionNode", "_evaluate0$_expressionNode$1", 248);
+    _instance_1_u(A.ExtensionStore0.prototype, "get$addExtensions", "addExtensions$1", 197);
+    _static_1(A, "functions0___isUnique$closure", "_isUnique0", 14);
+    _static_1(A, "immutable__jsToDartList$closure", "jsToDartList", 619);
     _instance(A.LazyFileSpan0.prototype, "get$message", 1, 1, function() {
       return {color: null};
-    }, ["call$2$color", "call$1"], ["message$2$color", "message$1"], 141, 0, 0);
-    _static_2(A, "legacy__render$closure", "render", 639);
-    _static_1(A, "legacy__renderSync$closure", "renderSync", 640);
-    _instance_1_u(A.LimitedMapView0.prototype, "get$containsKey", "containsKey$1", 11);
-    _instance_1_u(A.SelectorList0.prototype, "get$isSuperselector", "isSuperselector$1", 72);
-    _instance_1_u(A.MergedMapView0.prototype, "get$containsKey", "containsKey$1", 11);
+    }, ["call$2$color", "call$1"], ["message$2$color", "message$1"], 126, 0, 0);
+    _static_2(A, "legacy__render$closure", "render", 620);
+    _static_1(A, "legacy__renderSync$closure", "renderSync", 621);
+    _instance_1_u(A.LimitedMapView0.prototype, "get$containsKey", "containsKey$1", 9);
+    _instance_1_u(A.SelectorList0.prototype, "get$isSuperselector", "isSuperselector$1", 65);
+    _instance_1_u(A.MergedMapView0.prototype, "get$containsKey", "containsKey$1", 9);
     _instance(A.MultiSpan0.prototype, "get$message", 1, 1, function() {
       return {color: null};
-    }, ["call$2$color", "call$1"], ["message$2$color", "message$1"], 205, 0, 0);
-    _instance_1_i(A.NoSourceMapBuffer0.prototype, "get$write", "write$1", 37);
+    }, ["call$2$color", "call$1"], ["message$2$color", "message$1"], 157, 0, 0);
+    _instance_1_i(A.NoSourceMapBuffer0.prototype, "get$write", "write$1", 31);
+    _instance_2_u(A.NodePackageImporter0.prototype, "get$_node_package$_compareExpansionKeys", "_node_package$_compareExpansionKeys$2", 142);
     _instance_0_u(_ = A.Parser1.prototype, "get$whitespace", "whitespace$0", 0);
+    _instance_0_u(_, "get$silentComment", "silentComment$0", 22);
     _instance_0_u(_, "get$loudComment", "loudComment$0", 0);
-    _instance_0_u(_, "get$string", "string$0", 22);
+    _instance_0_u(_, "get$string", "string$0", 26);
     _instance(_, "get$error", 1, 2, function() {
       return [null];
-    }, ["call$3", "call$2"], ["error$3", "error$2"], 192, 0, 0);
-    _instance_1_u(A.PrefixedMapView0.prototype, "get$containsKey", "containsKey$1", 11);
-    _instance_1_u(A.PseudoSelector0.prototype, "get$isSuperselector", "isSuperselector$1", 15);
-    _instance_1_u(A.PublicMemberMapView0.prototype, "get$containsKey", "containsKey$1", 11);
+    }, ["call$3", "call$2"], ["error$3", "error$2"], 151, 0, 0);
+    _instance_1_u(A.PrefixedMapView0.prototype, "get$containsKey", "containsKey$1", 9);
+    _instance_1_u(A.PseudoSelector0.prototype, "get$isSuperselector", "isSuperselector$1", 14);
+    _instance_1_u(A.PublicMemberMapView0.prototype, "get$containsKey", "containsKey$1", 9);
     _instance_0_u(A.SassParser0.prototype, "get$loudComment", "loudComment$0", 0);
     _instance_1_u(A._IsInvisibleVisitor2.prototype, "get$visitComplexSelector", "visitComplexSelector$1", 18);
     _instance_1_u(A._IsBogusVisitor0.prototype, "get$visitComplexSelector", "visitComplexSelector$1", 18);
     _instance_1_u(A._IsUselessVisitor0.prototype, "get$visitComplexSelector", "visitComplexSelector$1", 18);
     _instance_1_u(_ = A.SelectorSearchVisitor0.prototype, "get$visitComplexSelector", "visitComplexSelector$1", "SelectorSearchVisitor0.T?(ComplexSelector0)");
     _instance_1_u(_, "get$visitSelectorList", "visitSelectorList$1", "SelectorSearchVisitor0.T?(SelectorList0)");
-    _instance_1_u(_ = A._SerializeVisitor0.prototype, "get$_serialize0$_visitMediaQuery", "_serialize0$_visitMediaQuery$1", 555);
-    _instance_1_u(_, "get$_serialize0$_writeCalculationValue", "_serialize0$_writeCalculationValue$1", 110);
-    _instance_1_u(_, "get$visitSelectorList", "visitSelectorList$1", 556);
+    _instance_1_u(_ = A._SerializeVisitor0.prototype, "get$_serialize0$_visitMediaQuery", "_serialize0$_visitMediaQuery$1", 534);
+    _instance_1_u(_, "get$_serialize0$_writeCalculationValue", "_serialize0$_writeCalculationValue$1", 99);
+    _instance_1_u(_, "get$visitSelectorList", "visitSelectorList$1", 535);
     _instance_1_u(_, "get$_serialize0$_requiresSemicolon", "_serialize0$_requiresSemicolon$1", 8);
-    _instance_1_u(A.SimpleSelector0.prototype, "get$isSuperselector", "isSuperselector$1", 15);
-    _instance_1_i(A.SourceMapBuffer0.prototype, "get$write", "write$1", 37);
+    _instance_1_u(A.SimpleSelector0.prototype, "get$isSuperselector", "isSuperselector$1", 14);
+    _instance_1_i(A.SourceMapBuffer0.prototype, "get$write", "write$1", 31);
     _instance_1_u(_ = A.StatementSearchVisitor0.prototype, "get$visitContentBlock", "visitContentBlock$1", "StatementSearchVisitor0.T?(ContentBlock0)");
     _instance_1_u(_, "get$visitChildren", "visitChildren$1", "StatementSearchVisitor0.T?(List<Statement0>)");
-    _instance(_ = A.StylesheetParser0.prototype, "get$_stylesheet0$_statement", 0, 0, null, ["call$1$root", "call$0"], ["_stylesheet0$_statement$1$root", "_stylesheet0$_statement$0"], 573, 0, 0);
-    _instance_0_u(_, "get$_stylesheet0$_declarationChild", "_stylesheet0$_declarationChild$0", 145);
-    _instance_0_u(_, "get$_stylesheet0$_functionChild", "_stylesheet0$_functionChild$0", 145);
-    _instance_1_u(A.TypeSelector0.prototype, "get$isSuperselector", "isSuperselector$1", 15);
-    _instance_1_u(A.UniversalSelector0.prototype, "get$isSuperselector", "isSuperselector$1", 15);
-    _instance_1_u(A.UnprefixedMapView0.prototype, "get$containsKey", "containsKey$1", 11);
-    _static_1(A, "utils1__jsToDartUrl$closure", "jsToDartUrl", 641);
-    _static_1(A, "utils1__dartToJSUrl$closure", "dartToJSUrl", 642);
-    _static_1(A, "utils0__isPublic$closure", "isPublic0", 10);
+    _instance(_ = A.StylesheetParser0.prototype, "get$_stylesheet0$_statement", 0, 0, null, ["call$1$root", "call$0"], ["_stylesheet0$_statement$1$root", "_stylesheet0$_statement$0"], 552, 0, 0);
+    _instance_0_u(_, "get$_stylesheet0$_declarationChild", "_stylesheet0$_declarationChild$0", 130);
+    _instance_0_u(_, "get$_stylesheet0$_functionChild", "_stylesheet0$_functionChild$0", 130);
+    _instance_1_u(A.TypeSelector0.prototype, "get$isSuperselector", "isSuperselector$1", 14);
+    _instance_1_u(A.UniversalSelector0.prototype, "get$isSuperselector", "isSuperselector$1", 14);
+    _instance_1_u(A.UnprefixedMapView0.prototype, "get$containsKey", "containsKey$1", 9);
+    _static_1(A, "utils1__jsToDartUrl$closure", "jsToDartUrl", 622);
+    _static_1(A, "utils1__dartToJSUrl$closure", "dartToJSUrl", 623);
+    _static_1(A, "utils0__isPublic$closure", "isPublic0", 4);
     _static(A, "path__absolute$closure", 1, function() {
       return [null, null, null, null, null, null, null, null, null, null, null, null, null, null];
     }, ["call$15", "call$1", "call$2", "call$3", "call$4", "call$5", "call$6"], ["absolute", function(part1) {
-      return A.absolute(part1, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+      var _null = null;
+      return A.absolute(part1, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null);
     }, function(part1, part2) {
-      return A.absolute(part1, part2, null, null, null, null, null, null, null, null, null, null, null, null, null);
+      var _null = null;
+      return A.absolute(part1, part2, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null);
     }, function(part1, part2, part3) {
-      return A.absolute(part1, part2, part3, null, null, null, null, null, null, null, null, null, null, null, null);
+      var _null = null;
+      return A.absolute(part1, part2, part3, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null);
     }, function(part1, part2, part3, part4) {
-      return A.absolute(part1, part2, part3, part4, null, null, null, null, null, null, null, null, null, null, null);
+      var _null = null;
+      return A.absolute(part1, part2, part3, part4, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null);
     }, function(part1, part2, part3, part4, part5) {
-      return A.absolute(part1, part2, part3, part4, part5, null, null, null, null, null, null, null, null, null, null);
+      var _null = null;
+      return A.absolute(part1, part2, part3, part4, part5, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null);
     }, function(part1, part2, part3, part4, part5, part6) {
-      return A.absolute(part1, part2, part3, part4, part5, part6, null, null, null, null, null, null, null, null, null);
-    }], 643, 0);
-    _static_1(A, "path__prettyUri$closure", "prettyUri", 101);
-    _static_2(A, "number0__fuzzyLessThan$closure", "fuzzyLessThan", 49);
-    _static_2(A, "number0__fuzzyLessThanOrEquals$closure", "fuzzyLessThanOrEquals", 49);
-    _static_2(A, "number0__fuzzyGreaterThan$closure", "fuzzyGreaterThan", 49);
-    _static_2(A, "number0__fuzzyGreaterThanOrEquals$closure", "fuzzyGreaterThanOrEquals", 49);
-    _static_2(A, "number0__moduloLikeSass$closure", "moduloLikeSass", 66);
-    _static_1(A, "number0__sqrt$closure", "sqrt", 50);
-    _static_1(A, "number0__sin$closure", "sin", 50);
-    _static_1(A, "number0__cos$closure", "cos", 50);
-    _static_1(A, "number0__tan$closure", "tan", 50);
-    _static_1(A, "number0__atan$closure", "atan", 50);
-    _static_1(A, "number0__asin$closure", "asin", 50);
-    _static_1(A, "number0__acos$closure", "acos", 50);
-    _static_2(A, "number2__fuzzyLessThan$closure", "fuzzyLessThan0", 49);
-    _static_2(A, "number2__fuzzyLessThanOrEquals$closure", "fuzzyLessThanOrEquals0", 49);
-    _static_2(A, "number2__fuzzyGreaterThan$closure", "fuzzyGreaterThan0", 49);
-    _static_2(A, "number2__fuzzyGreaterThanOrEquals$closure", "fuzzyGreaterThanOrEquals0", 49);
-    _static_1(A, "number2__fuzzyRound$closure", "fuzzyRound0", 646);
-    _static_2(A, "number2__moduloLikeSass$closure", "moduloLikeSass0", 66);
-    _static_1(A, "number2__sqrt$closure", "sqrt0", 51);
-    _static_1(A, "number2__sin$closure", "sin0", 51);
-    _static_1(A, "number2__cos$closure", "cos0", 51);
-    _static_1(A, "number2__tan$closure", "tan0", 51);
-    _static_1(A, "number2__atan$closure", "atan0", 51);
-    _static_1(A, "number2__asin$closure", "asin0", 51);
-    _static_1(A, "number2__acos$closure", "acos0", 51);
-    _static_1(A, "sass__main$closure", "main1", 648);
-    _static_1(A, "utils2__validateUrlScheme$closure", "validateUrlScheme", 85);
-    _static_1(A, "value0__wrapValue$closure", "wrapValue", 432);
+      var _null = null;
+      return A.absolute(part1, part2, part3, part4, part5, part6, _null, _null, _null, _null, _null, _null, _null, _null, _null);
+    }], 624, 0);
+    _static_1(A, "path__prettyUri$closure", "prettyUri", 625);
+    _static_2(A, "number0__fuzzyLessThan$closure", "fuzzyLessThan", 46);
+    _static_2(A, "number0__fuzzyLessThanOrEquals$closure", "fuzzyLessThanOrEquals", 46);
+    _static_2(A, "number0__fuzzyGreaterThan$closure", "fuzzyGreaterThan", 46);
+    _static_2(A, "number0__fuzzyGreaterThanOrEquals$closure", "fuzzyGreaterThanOrEquals", 46);
+    _static_2(A, "number0__moduloLikeSass$closure", "moduloLikeSass", 56);
+    _static_1(A, "number0__sqrt$closure", "sqrt", 51);
+    _static_1(A, "number0__sin$closure", "sin", 51);
+    _static_1(A, "number0__cos$closure", "cos", 51);
+    _static_1(A, "number0__tan$closure", "tan", 51);
+    _static_1(A, "number0__atan$closure", "atan", 51);
+    _static_1(A, "number0__asin$closure", "asin", 51);
+    _static_1(A, "number0__acos$closure", "acos", 51);
+    _static_2(A, "number2__fuzzyLessThan$closure", "fuzzyLessThan0", 46);
+    _static_2(A, "number2__fuzzyLessThanOrEquals$closure", "fuzzyLessThanOrEquals0", 46);
+    _static_2(A, "number2__fuzzyGreaterThan$closure", "fuzzyGreaterThan0", 46);
+    _static_2(A, "number2__fuzzyGreaterThanOrEquals$closure", "fuzzyGreaterThanOrEquals0", 46);
+    _static_1(A, "number2__fuzzyRound$closure", "fuzzyRound0", 628);
+    _static_2(A, "number2__moduloLikeSass$closure", "moduloLikeSass0", 56);
+    _static_1(A, "number2__sqrt$closure", "sqrt0", 48);
+    _static_1(A, "number2__sin$closure", "sin0", 48);
+    _static_1(A, "number2__cos$closure", "cos0", 48);
+    _static_1(A, "number2__tan$closure", "tan0", 48);
+    _static_1(A, "number2__atan$closure", "atan0", 48);
+    _static_1(A, "number2__asin$closure", "asin0", 48);
+    _static_1(A, "number2__acos$closure", "acos0", 48);
+    _static_1(A, "sass__main$closure", "main1", 465);
+    _static_1(A, "utils2__validateUrlScheme$closure", "validateUrlScheme", 104);
+    _static_1(A, "value0__wrapValue$closure", "wrapValue", 420);
   })();
   (function inheritance() {
     var _mixin = hunkHelpers.mixin,
       _inherit = hunkHelpers.inherit,
       _inheritMany = hunkHelpers.inheritMany;
     _inherit(A.Object, null);
-    _inheritMany(A.Object, [A.JS_CONST, J.Interceptor, J.ArrayIterator, A.Iterable, A.CastIterator, A.Closure, A.MapBase, A.Error, A.ListBase, A.SentinelValue, A.ListIterator, A.MappedIterator, A.WhereIterator, A.ExpandIterator, A.TakeIterator, A.SkipIterator, A.SkipWhileIterator, A.EmptyIterator, A.FollowedByIterator, A.WhereTypeIterator, A.FixedLengthListMixin, A.UnmodifiableListMixin, A.Symbol, A._Record, A.MapView, A.ConstantMap, A._KeysOrValuesOrElementsIterator, A.SetBase, A.JSInvocationMirror, A.TypeErrorDecoder, A.NullThrownFromJavaScriptException, A.ExceptionAndStackTrace, A._StackTrace, A._Required, A.LinkedHashMapCell, A.LinkedHashMapKeyIterator, A.JSSyntaxRegExp, A._MatchImplementation, A._AllMatchesIterator, A.StringMatch, A._StringAllMatchesIterator, A._Cell, A._InitializedCell, A.Rti, A._FunctionParameters, A._Type, A._TimerImpl, A._AsyncAwaitCompleter, A._SyncStarIterator, A.AsyncError, A._Completer, A._FutureListener, A._Future, A._AsyncCallbackEntry, A.Stream, A._StreamController, A._SyncStreamControllerDispatch, A._AsyncStreamControllerDispatch, A._BufferingStreamSubscription, A._AddStreamState, A._DelayedEvent, A._DelayedDone, A._PendingEvents, A._StreamIterator, A._ZoneFunction, A._ZoneSpecification, A._ZoneDelegate, A._Zone, A._HashMapKeyIterator, A._LinkedHashSetCell, A._LinkedHashSetIterator, A._MapBaseValueIterator, A._UnmodifiableMapMixin, A._ListQueueIterator, A._UnmodifiableSetMixin, A.Codec, A.Converter, A._Base64Encoder, A.ByteConversionSink, A._JsonStringifier, A.StringConversionSink, A._Utf8Encoder, A._Utf8Decoder, A.DateTime, A.Duration, A._Enum, A.OutOfMemoryError, A.StackOverflowError, A._Exception, A.FormatException, A.MapEntry, A.Null, A._StringStackTrace, A.RuneIterator, A.StringBuffer, A._Uri, A.UriData, A._SimpleUri, A.Expando, A._JSRandom, A.ArgParser, A.ArgResults, A.Option, A.OptionType, A.Parser0, A._Usage, A.ErrorResult, A.ValueResult, A.StreamCompleter, A.StreamGroup, A._StreamGroupState, A.StreamQueue, A._NextRequest, A.Repl, A.ReplAdapter, A.DefaultEquality, A.IterableEquality, A.ListEquality, A._MapEntry, A.MapEquality, A._QueueList_Object_ListMixin, A._DelegatingIterableBase, A.UnmodifiableSetMixin, A.Context, A._PathDirection, A._PathRelation, A.Style, A.ParsedPath, A.PathException, A.Version, A.VersionRange, A.CssMediaQuery, A.MediaQuerySuccessfulMergeResult, A.CssNode, A.__IsInvisibleVisitor_Object_EveryCssVisitor, A.CssValue, A._FakeAstNode, A.Argument, A.ArgumentDeclaration, A.ArgumentInvocation, A.AtRootQuery, A.ConfiguredVariable, A._IsCalculationSafeVisitor, A.BinaryOperationExpression, A.BooleanExpression, A.ColorExpression, A.FunctionExpression, A.IfExpression, A.InterpolatedFunctionExpression, A.ListExpression, A.MapExpression, A.NullExpression, A.NumberExpression, A.ParenthesizedExpression, A.SelectorExpression, A.StringExpression, A.SupportsExpression, A.UnaryOperationExpression, A.ValueExpression, A.VariableExpression, A.DynamicImport, A.StaticImport, A.Interpolation, A.ParentStatement, A.ContentRule, A.DebugRule, A.ErrorRule, A.ExtendRule, A.ForwardRule, A.IfRule, A.IfRuleClause, A.ImportRule, A.IncludeRule, A.LoudComment, A.__HasContentVisitor_Object_StatementSearchVisitor, A.ReturnRule, A.SilentComment, A.UseRule, A.VariableDeclaration, A.WarnRule, A.SupportsAnything, A.SupportsDeclaration, A.SupportsFunction, A.SupportsInterpolation, A.SupportsNegation, A.SupportsOperation, A.Selector, A.__IsInvisibleVisitor_Object_AnySelectorVisitor, A.__IsBogusVisitor_Object_AnySelectorVisitor, A.__IsUselessVisitor_Object_AnySelectorVisitor, A.ComplexSelectorComponent, A.__ParentSelectorVisitor_Object_SelectorSearchVisitor, A.QualifiedName, A.AsyncEnvironment, A._EnvironmentModule0, A.AsyncImportCache, A.AsyncBuiltInCallable, A.BuiltInCallable, A.PlainCssCallable, A.UserDefinedCallable, A.CompileResult, A.Configuration, A.ConfiguredValue, A.Environment, A._EnvironmentModule, A.SourceSpanException, A.SassScriptException, A.ExecutableOptions, A.UsageException, A._Watcher, A.EmptyExtensionStore, A.Extension, A.Extender, A.ExtensionStore, A.ImportCache, A.AsyncImporter, A.ImporterResult, A.InterpolationBuffer, A.InterpolationMap, A.FileSystemException, A._QuietLogger, A.DeprecationHandlingLogger, A.StderrLogger, A.TrackingLogger, A.BuiltInModule, A.ForwardedModuleView, A.ShadowedModuleView, A.Parser, A.StylesheetGraph, A.StylesheetNode, A.Box, A.ModifiableBox, A.LazyFileSpan, A.MultiDirWatcher, A.MultiSpan, A.NoSourceMapBuffer, A.SourceMapBuffer, A.Value, A.CalculationOperation, A._ColorFormatEnum, A.SpanColorFormat, A.AnySelectorVisitor, A._EvaluateVisitor0, A._ImportedCssVisitor0, A._EvaluationContext0, A._CloneCssVisitor, A.Evaluator, A._EvaluateVisitor, A._ImportedCssVisitor, A._EvaluationContext, A.EveryCssVisitor, A.__MakeExpressionCalculationSafe_Object_ReplaceExpressionVisitor, A.__FindDependenciesVisitor_Object_RecursiveStatementVisitor, A.DependencyReport, A.RecursiveStatementVisitor, A.ReplaceExpressionVisitor, A.SelectorSearchVisitor, A._SerializeVisitor, A.StatementSearchVisitor, A.Entry, A.Mapping, A.TargetLineEntry, A.TargetEntry, A.SourceFile, A.SourceLocationMixin, A.SourceSpanMixin, A.Highlighter, A._Highlight, A._Line, A.SourceLocation, A.Chain, A.Frame, A.LazyTrace, A.Trace, A.UnparsedFrame, A.StringScanner, A._SpanScannerState, A.AsciiGlyphSet, A.UnicodeGlyphSet, A.WatchEvent, A.ChangeType, A.AnySelectorVisitor0, A.SupportsAnything0, A.Argument0, A.ArgumentDeclaration0, A.ArgumentInvocation0, A.Value0, A.AsyncImporter0, A.AsyncBuiltInCallable0, A.AsyncEnvironment0, A._EnvironmentModule2, A._EvaluateVisitor2, A._ImportedCssVisitor2, A._EvaluationContext2, A.AsyncImportCache0, A.Parser1, A.AtRootQuery0, A.ParentStatement0, A.CssNode0, A.Selector0, A.BinaryOperationExpression0, A.BooleanExpression0, A.Box0, A.ModifiableBox0, A.BuiltInCallable0, A.BuiltInModule0, A.CalculationOperation0, A.CalculationInterpolation, A._CloneCssVisitor0, A.ColorExpression0, A._ColorFormatEnum0, A.SpanColorFormat0, A.CompileResult0, A.ComplexSelectorComponent0, A.Configuration0, A.ConfiguredValue0, A.ConfiguredVariable0, A.ContentRule0, A.DebugRule0, A.SupportsDeclaration0, A.DeprecationHandlingLogger0, A.DynamicImport0, A.EmptyExtensionStore0, A.Environment0, A._EnvironmentModule1, A.ErrorRule0, A._EvaluateVisitor1, A._ImportedCssVisitor1, A._EvaluationContext1, A.EveryCssVisitor0, A.SassScriptException0, A._IsCalculationSafeVisitor0, A.__MakeExpressionCalculationSafe_Object_ReplaceExpressionVisitor0, A.ExtendRule0, A.Extension0, A.Extender0, A.ExtensionStore0, A.ForwardRule0, A.ForwardedModuleView0, A.FunctionExpression0, A.SupportsFunction0, A.IfExpression0, A.IfRule0, A.IfRuleClause0, A.NodeImporter, A.ImportCache0, A.ImportRule0, A.IncludeRule0, A.InterpolatedFunctionExpression0, A.Interpolation0, A.SupportsInterpolation0, A.InterpolationBuffer0, A.InterpolationMap0, A.FileSystemException0, A.JSToDartLogger, A.LazyFileSpan0, A.ListExpression0, A.__ParentSelectorVisitor_Object_SelectorSearchVisitor0, A._QuietLogger0, A.LoudComment0, A.MapExpression0, A.CssMediaQuery0, A.MediaQuerySuccessfulMergeResult0, A.__HasContentVisitor_Object_StatementSearchVisitor0, A.MultiSpan0, A.SupportsNegation0, A.NoSourceMapBuffer0, A._FakeAstNode0, A.__IsInvisibleVisitor_Object_EveryCssVisitor0, A.NullExpression0, A.NumberExpression0, A.SupportsOperation0, A.ParenthesizedExpression0, A.PlainCssCallable0, A.QualifiedName0, A.ReplaceExpressionVisitor0, A.ImporterResult0, A.ReturnRule0, A.__IsInvisibleVisitor_Object_AnySelectorVisitor0, A.__IsBogusVisitor_Object_AnySelectorVisitor0, A.__IsUselessVisitor_Object_AnySelectorVisitor0, A.SelectorExpression0, A.SelectorSearchVisitor0, A._SerializeVisitor0, A.ShadowedModuleView0, A.SilentComment0, A.SourceMapBuffer0, A.StatementSearchVisitor0, A.StaticImport0, A.StderrLogger0, A.StringExpression0, A.SupportsExpression0, A.UnaryOperationExpression0, A.UseRule0, A.UserDefinedCallable0, A.CssValue0, A.ValueExpression0, A.VariableExpression0, A.VariableDeclaration0, A.WarnRule0]);
-    _inheritMany(J.Interceptor, [J.JSBool, J.JSNull, J.JavaScriptObject, J.JSNumber, J.JSString]);
+    _inheritMany(A.Object, [A.JS_CONST, J.Interceptor, J.ArrayIterator, A.Iterable, A.CastIterator, A.Closure, A.MapBase, A.Error, A.ListBase, A.SentinelValue, A.ListIterator, A.MappedIterator, A.WhereIterator, A.ExpandIterator, A.TakeIterator, A.SkipIterator, A.SkipWhileIterator, A.EmptyIterator, A.FollowedByIterator, A.WhereTypeIterator, A.FixedLengthListMixin, A.UnmodifiableListMixin, A.Symbol, A._Record, A.MapView, A.ConstantMap, A._KeysOrValuesOrElementsIterator, A.SetBase, A.JSInvocationMirror, A.TypeErrorDecoder, A.NullThrownFromJavaScriptException, A.ExceptionAndStackTrace, A._StackTrace, A._Required, A.LinkedHashMapCell, A.LinkedHashMapKeyIterator, A.JSSyntaxRegExp, A._MatchImplementation, A._AllMatchesIterator, A.StringMatch, A._StringAllMatchesIterator, A._Cell, A.Rti, A._FunctionParameters, A._Type, A._TimerImpl, A._AsyncAwaitCompleter, A._SyncStarIterator, A.AsyncError, A._Completer, A._FutureListener, A._Future, A._AsyncCallbackEntry, A.Stream, A._StreamController, A._SyncStreamControllerDispatch, A._AsyncStreamControllerDispatch, A._BufferingStreamSubscription, A._AddStreamState, A._DelayedEvent, A._DelayedDone, A._PendingEvents, A._StreamIterator, A._ZoneFunction, A._ZoneSpecification, A._ZoneDelegate, A._Zone, A._HashMapKeyIterator, A._LinkedHashSetCell, A._LinkedHashSetIterator, A._MapBaseValueIterator, A._UnmodifiableMapMixin, A._ListQueueIterator, A._UnmodifiableSetMixin, A.Codec, A.Converter, A._Base64Encoder, A.ByteConversionSink, A._JsonStringifier, A.StringConversionSink, A._Utf8Encoder, A._Utf8Decoder, A.DateTime, A.Duration, A._Enum, A.OutOfMemoryError, A.StackOverflowError, A._Exception, A.FormatException, A.MapEntry, A.Null, A._StringStackTrace, A.RuneIterator, A.StringBuffer, A._Uri, A.UriData, A._SimpleUri, A.Expando, A.NullRejectionException, A._JSRandom, A.ArgParser, A.ArgResults, A.Option, A.OptionType, A.Parser0, A._Usage, A.FutureGroup, A.ErrorResult, A.ValueResult, A.StreamCompleter, A.StreamGroup, A._StreamGroupState, A.StreamQueue, A._NextRequest, A.Repl, A.ReplAdapter, A.DefaultEquality, A.IterableEquality, A.ListEquality, A._MapEntry, A.MapEquality, A._QueueList_Object_ListMixin, A._DelegatingIterableBase, A.UnmodifiableSetMixin, A.Context, A._PathDirection, A._PathRelation, A.Style, A.ParsedPath, A.PathException, A.Version, A.VersionRange, A.CssMediaQuery, A.MediaQuerySuccessfulMergeResult, A.CssNode, A.__IsInvisibleVisitor_Object_EveryCssVisitor, A.CssValue, A._FakeAstNode, A.Argument, A.ArgumentDeclaration, A.ArgumentInvocation, A.AtRootQuery, A.ConfiguredVariable, A._IsCalculationSafeVisitor, A.BinaryOperationExpression, A.BooleanExpression, A.ColorExpression, A.FunctionExpression, A.IfExpression, A.InterpolatedFunctionExpression, A.ListExpression, A.MapExpression, A.NullExpression, A.NumberExpression, A.ParenthesizedExpression, A.SelectorExpression, A.StringExpression, A.SupportsExpression, A.UnaryOperationExpression, A.ValueExpression, A.VariableExpression, A.DynamicImport, A.StaticImport, A.Interpolation, A.ParentStatement, A.ContentRule, A.DebugRule, A.ErrorRule, A.ExtendRule, A.ForwardRule, A.IfRule, A.IfRuleClause, A.ImportRule, A.IncludeRule, A.LoudComment, A.__HasContentVisitor_Object_StatementSearchVisitor, A.ReturnRule, A.SilentComment, A.UseRule, A.VariableDeclaration, A.WarnRule, A.SupportsAnything, A.SupportsDeclaration, A.SupportsFunction, A.SupportsInterpolation, A.SupportsNegation, A.SupportsOperation, A.Selector, A.__IsInvisibleVisitor_Object_AnySelectorVisitor, A.__IsBogusVisitor_Object_AnySelectorVisitor, A.__IsUselessVisitor_Object_AnySelectorVisitor, A.ComplexSelectorComponent, A.__ParentSelectorVisitor_Object_SelectorSearchVisitor, A.QualifiedName, A.AsyncEnvironment, A._EnvironmentModule0, A.AsyncImportCache, A.AsyncBuiltInCallable, A.BuiltInCallable, A.PlainCssCallable, A.UserDefinedCallable, A.CompileResult, A.Configuration, A.ConfiguredValue, A.Environment, A._EnvironmentModule, A.SourceSpanException, A.SassScriptException, A.ExecutableOptions, A.UsageException, A._Watcher, A.EmptyExtensionStore, A.Extension, A.Extender, A.ExtensionStore, A.ImportCache, A.AsyncImporter, A.CanonicalizeContext, A.ImporterResult, A.InterpolationBuffer, A.InterpolationMap, A.FileSystemException, A.LoggerWithDeprecationType0, A._QuietLogger, A.StderrLogger, A.TrackingLogger, A.BuiltInModule, A.ForwardedModuleView, A.ShadowedModuleView, A.Parser, A.StylesheetGraph, A.StylesheetNode, A.Box, A.ModifiableBox, A.LazyFileSpan, A.MultiDirWatcher, A.MultiSpan, A.NoSourceMapBuffer, A.SourceMapBuffer, A.Value, A.CalculationOperation, A._ColorFormatEnum, A.SpanColorFormat, A.AnySelectorVisitor, A._EvaluateVisitor0, A._ImportedCssVisitor0, A._EvaluationContext0, A._CloneCssVisitor, A.Evaluator, A._EvaluateVisitor, A._ImportedCssVisitor, A._EvaluationContext, A.EveryCssVisitor, A.__MakeExpressionCalculationSafe_Object_ReplaceExpressionVisitor, A.__FindDependenciesVisitor_Object_RecursiveStatementVisitor, A.DependencyReport, A.RecursiveStatementVisitor, A.ReplaceExpressionVisitor, A.SelectorSearchVisitor, A._SerializeVisitor, A.StatementSearchVisitor, A.Entry, A.Mapping, A.TargetLineEntry, A.TargetEntry, A.SourceFile, A.SourceLocationMixin, A.SourceSpanMixin, A.Highlighter, A._Highlight, A._Line, A.SourceLocation, A.Chain, A.Frame, A.LazyTrace, A.Trace, A.UnparsedFrame, A.StringScanner, A._SpanScannerState, A.AsciiGlyphSet, A.UnicodeGlyphSet, A.WatchEvent, A.ChangeType, A.AnySelectorVisitor0, A.SupportsAnything0, A.Argument0, A.ArgumentDeclaration0, A.ArgumentInvocation0, A.Value0, A.AsyncImporter0, A.AsyncBuiltInCallable0, A.AsyncEnvironment0, A._EnvironmentModule2, A._EvaluateVisitor2, A._ImportedCssVisitor2, A._EvaluationContext2, A.AsyncImportCache0, A.Parser1, A.AtRootQuery0, A.ParentStatement0, A.CssNode0, A.Selector0, A.BinaryOperationExpression0, A.BooleanExpression0, A.Box0, A.ModifiableBox0, A.BuiltInCallable0, A.BuiltInModule0, A.CalculationOperation0, A.CalculationInterpolation, A.CanonicalizeContext0, A._CloneCssVisitor0, A.ColorExpression0, A._ColorFormatEnum0, A.SpanColorFormat0, A.CompileResult0, A.Compiler, A.ComplexSelectorComponent0, A.Configuration0, A.ConfiguredValue0, A.ConfiguredVariable0, A.ContentRule0, A.DebugRule0, A.SupportsDeclaration0, A.LoggerWithDeprecationType, A.DynamicImport0, A.EmptyExtensionStore0, A.Environment0, A._EnvironmentModule1, A.ErrorRule0, A._EvaluateVisitor1, A._ImportedCssVisitor1, A._EvaluationContext1, A.EveryCssVisitor0, A.SassScriptException0, A._IsCalculationSafeVisitor0, A.__MakeExpressionCalculationSafe_Object_ReplaceExpressionVisitor0, A.ExtendRule0, A.Extension0, A.Extender0, A.ExtensionStore0, A.ForwardRule0, A.ForwardedModuleView0, A.FunctionExpression0, A.SupportsFunction0, A.IfExpression0, A.IfRule0, A.IfRuleClause0, A.NodeImporter, A.ImportCache0, A.ImportRule0, A.IncludeRule0, A.InterpolatedFunctionExpression0, A.Interpolation0, A.SupportsInterpolation0, A.InterpolationBuffer0, A.InterpolationMap0, A.FileSystemException0, A.LazyFileSpan0, A.ListExpression0, A.__ParentSelectorVisitor_Object_SelectorSearchVisitor0, A._QuietLogger0, A.LoudComment0, A.MapExpression0, A.CssMediaQuery0, A.MediaQuerySuccessfulMergeResult0, A.__HasContentVisitor_Object_StatementSearchVisitor0, A.MultiSpan0, A.SupportsNegation0, A.NoSourceMapBuffer0, A._FakeAstNode0, A.__IsInvisibleVisitor_Object_EveryCssVisitor0, A.NullExpression0, A.NumberExpression0, A.SupportsOperation0, A.ParenthesizedExpression0, A.PlainCssCallable0, A.QualifiedName0, A.ReplaceExpressionVisitor0, A.ImporterResult0, A.ReturnRule0, A.__IsInvisibleVisitor_Object_AnySelectorVisitor0, A.__IsBogusVisitor_Object_AnySelectorVisitor0, A.__IsUselessVisitor_Object_AnySelectorVisitor0, A.SelectorExpression0, A.SelectorSearchVisitor0, A._SerializeVisitor0, A.ShadowedModuleView0, A.SilentComment0, A.SourceMapBuffer0, A.StatementSearchVisitor0, A.StaticImport0, A.StderrLogger0, A.StringExpression0, A.SupportsExpression0, A.UnaryOperationExpression0, A.UseRule0, A.UserDefinedCallable0, A.CssValue0, A.ValueExpression0, A.VariableExpression0, A.VariableDeclaration0, A.WarnRule0]);
+    _inheritMany(J.Interceptor, [J.JSBool, J.JSNull, J.JavaScriptObject, J.JavaScriptBigInt, J.JavaScriptSymbol, J.JSNumber, J.JSString]);
     _inheritMany(J.JavaScriptObject, [J.LegacyJavaScriptObject, J.JSArray, A.NativeByteBuffer, A.NativeTypedData]);
-    _inheritMany(J.LegacyJavaScriptObject, [J.PlainJavaScriptObject, J.UnknownJavaScriptObject, J.JavaScriptFunction, A.Stdin, A.Stdout, A.ReadlineModule, A.ReadlineOptions, A.ReadlineInterface, A.BufferModule, A.BufferConstants, A.Buffer, A.ConsoleModule, A.Console, A.EventEmitter, A.FS, A.FSConstants, A.FSWatcher, A.ReadStream, A.ReadStreamOptions, A.WriteStream, A.WriteStreamOptions, A.FileOptions, A.StatOptions, A.MkdirOptions, A.RmdirOptions, A.WatchOptions, A.WatchFileOptions, A.Stats, A.Promise, A.Date, A.JsError, A.Atomics, A.Modules, A.Module, A.Net, A.Socket, A.NetAddress, A.NetServer, A.NodeJsError, A.Process, A.CPUUsage, A.Release, A.StreamModule, A.Readable, A.Writable, A.Duplex, A.Transform, A.WritableOptions, A.ReadableOptions, A.Immediate, A.Timeout, A.TTY, A.Util, A.JSArray0, A.Chokidar, A.ChokidarOptions, A.ChokidarWatcher, A.JSFunction, A.ImmutableList, A.ImmutableMap, A.NodeImporterResult, A.RenderContext, A.RenderContextOptions, A.RenderContextResult, A.RenderContextResultStats, A.JSClass, A.JSUrl, A._PropertyDescriptor, A.JSArray1, A.Chokidar0, A.ChokidarOptions0, A.ChokidarWatcher0, A._Channels, A._NodeSassColor, A.CompileOptions, A.NodeCompileResult, A.Exports, A.LoggerNamespace, A.FiberClass, A.Fiber, A.JSFunction0, A.ImmutableList0, A.ImmutableMap0, A.JSImporter, A.CanonicalizeContext, A.JSImporterResult, A.NodeImporterResult0, A._ConstructorOptions, A._NodeSassList, A.JSLogger, A.WarnOptions, A.DebugOptions, A._NodeSassMap, A._ConstructorOptions0, A._NodeSassNumber, A.JSClass0, A.RenderContext0, A.RenderContextOptions0, A.RenderContextResult0, A.RenderContextResultStats0, A.RenderOptions, A.RenderResult, A.RenderResultStats, A._Exports, A._ConstructorOptions1, A._NodeSassString, A.Types, A.JSUrl0, A._PropertyDescriptor0]);
+    _inheritMany(J.LegacyJavaScriptObject, [J.PlainJavaScriptObject, J.UnknownJavaScriptObject, J.JavaScriptFunction, A.Stdin, A.Stdout, A.ReadlineModule, A.ReadlineOptions, A.ReadlineInterface, A.BufferModule, A.BufferConstants, A.Buffer, A.ConsoleModule, A.Console, A.EventEmitter, A.FS, A.FSConstants, A.FSWatcher, A.ReadStream, A.ReadStreamOptions, A.WriteStream, A.WriteStreamOptions, A.FileOptions, A.StatOptions, A.MkdirOptions, A.RmdirOptions, A.WatchOptions, A.WatchFileOptions, A.Stats, A.Promise, A.Date, A.JsError, A.Atomics, A.Modules, A.Module, A.Net, A.Socket, A.NetAddress, A.NetServer, A.NodeJsError, A.Process, A.CPUUsage, A.Release, A.StreamModule, A.Readable, A.Writable, A.Duplex, A.Transform, A.WritableOptions, A.ReadableOptions, A.Immediate, A.Timeout, A.TTY, A.Util, A.JSArray0, A.Chokidar, A.ChokidarOptions, A.ChokidarWatcher, A.JSFunction, A.ImmutableList, A.ImmutableMap, A.NodeImporterResult, A.RenderContext, A.RenderContextOptions, A.RenderContextResult, A.RenderContextResultStats, A.JSModule, A.JSModuleRequire, A.JSClass, A.JSUrl, A._PropertyDescriptor, A._RequireMain, A.JSArray1, A.Chokidar0, A.ChokidarOptions0, A.ChokidarWatcher0, A._Channels, A._NodeSassColor, A.CompileOptions, A.NodeCompileResult, A.Deprecation1, A.Exports, A.LoggerNamespace, A.FiberClass, A.Fiber, A.JSFunction0, A.ImmutableList0, A.ImmutableMap0, A.JSImporter, A.JSImporterResult, A.NodeImporterResult0, A._ConstructorOptions, A._NodeSassList, A.JSLogger, A.WarnOptions, A.DebugOptions, A._NodeSassMap, A.JSModule0, A.JSModuleRequire0, A._ConstructorOptions0, A._NodeSassNumber, A.JSClass0, A.RenderContext0, A.RenderContextOptions0, A.RenderContextResult0, A.RenderContextResultStats0, A.RenderOptions, A.RenderResult, A.RenderResultStats, A._Exports, A._ConstructorOptions1, A._NodeSassString, A.Types, A.JSUrl0, A._PropertyDescriptor0, A._RequireMain0]);
     _inherit(J.JSUnmodifiableArray, J.JSArray);
     _inheritMany(J.JSNumber, [J.JSInt, J.JSNumNotInt]);
     _inheritMany(A.Iterable, [A._CastIterableBase, A.EfficientLengthIterable, A.MappedIterable, A.WhereIterable, A.ExpandIterable, A.TakeIterable, A.SkipIterable, A.SkipWhileIterable, A.FollowedByIterable, A.WhereTypeIterable, A._KeysOrValues, A._AllMatchesIterable, A._StringAllMatchesIterable, A._SyncStarIterable, A.Runes, A._EmptyUnmodifiableSet_IterableBase_UnmodifiableSetMixin, A._PrefixedKeys, A._UnprefixedKeys, A._PrefixedKeys0, A._UnprefixedKeys0]);
     _inheritMany(A._CastIterableBase, [A.CastIterable, A.__CastListBase__CastIterableBase_ListMixin, A.CastSet]);
     _inherit(A._EfficientLengthCastIterable, A.CastIterable);
     _inherit(A._CastListBase, A.__CastListBase__CastIterableBase_ListMixin);
-    _inheritMany(A.Closure, [A.Closure2Args, A.CastMap_entries_closure, A.Closure0Args, A.Instantiation, A.TearOffClosure, A.JsLinkedHashMap_values_closure, A.initHooks_closure, A.initHooks_closure1, A._AsyncRun__initializeScheduleImmediate_internalCallback, A._AsyncRun__initializeScheduleImmediate_closure, A._awaitOnObject_closure, A.Future_wait_closure, A._Future__chainForeignFuture_closure, A._Future__propagateToListeners_handleWhenCompleteCallback_closure, A.Stream_Stream$fromFuture_closure, A.Stream_length_closure, A._CustomZone_bindUnaryCallback_closure, A._RootZone_bindUnaryCallback_closure, A._HashMap_values_closure, A._LinkedCustomHashMap_closure, A.MapBase_entries_closure, A._Uri__makePath_closure, A._createTables_setChars, A._createTables_setRange, A.jsify__convert, A.ArgParser__addOption_closure, A._Usage__writeOption_closure, A._Usage__buildAllowedList_closure, A.StreamGroup__onListen_closure, A.StreamGroup__onCancel_closure, A.StreamQueue__ensureListening_closure, A.alwaysValid_closure, A.ReplAdapter_runAsync__closure, A.UnionSet__iterable_closure, A.UnionSet_contains_closure, A.MapKeySet_difference_closure, A.promiseToFuture_closure, A.promiseToFuture_closure0, A.futureToPromise__closure, A.Context_joinAll_closure, A.Context_split_closure, A._validateArgList_closure, A.ParsedPath__splitExtension_closure, A.PathMap__create_closure0, A.PathMap__create_closure1, A.WindowsStyle_absolutePathToUri_closure, A.Version__splitParts_closure, A.ModifiableCssNode_hasFollowingSibling_closure, A.ArgumentDeclaration_verify_closure, A.ArgumentDeclaration_verify_closure0, A._IsCalculationSafeVisitor_visitListExpression_closure, A.ListExpression_toString_closure, A.Interpolation_toString_closure, A.EachRule_toString_closure, A.IfRuleClause$__closure, A.IfRuleClause$___closure, A.ParentStatement_closure, A.ParentStatement__closure, A._IsBogusVisitor_visitComplexSelector_closure, A._IsUselessVisitor_visitComplexSelector_closure, A.ComplexSelectorComponent_toString_closure, A.IDSelector_unify_closure, A.SelectorList_asSassList_closure, A.SelectorList_resolveParentSelectors_closure, A.SelectorList_resolveParentSelectors__closure, A.SelectorList_resolveParentSelectors__closure0, A.SelectorList__resolveParentSelectorsCompound_closure, A.SelectorList__resolveParentSelectorsCompound_closure0, A.SelectorList__resolveParentSelectorsCompound_closure1, A.SelectorList_withAdditionalCombinators_closure, A.PseudoSelector_specificity__closure, A.PseudoSelector_specificity__closure0, A.PseudoSelector_unify_closure, A.SimpleSelector_isSuperselector_closure, A.SimpleSelector_isSuperselector__closure, A._compileStylesheet_closure0, A.AsyncEnvironment__getVariableFromGlobalModule_closure, A.AsyncEnvironment_setVariable_closure0, A.AsyncEnvironment__getFunctionFromGlobalModule_closure, A.AsyncEnvironment__getMixinFromGlobalModule_closure, A.AsyncEnvironment_toModule_closure, A.AsyncEnvironment_toDummyModule_closure, A._EnvironmentModule__EnvironmentModule_closure5, A._EnvironmentModule__EnvironmentModule_closure6, A._EnvironmentModule__EnvironmentModule_closure7, A._EnvironmentModule__EnvironmentModule_closure8, A._EnvironmentModule__EnvironmentModule_closure9, A._EnvironmentModule__EnvironmentModule_closure10, A.AsyncImportCache_humanize_closure, A.AsyncImportCache_humanize_closure0, A.AsyncImportCache_humanize_closure1, A.AsyncImportCache_humanize_closure2, A.AsyncBuiltInCallable$mixin_closure, A.BuiltInCallable$mixin_closure, A._compileStylesheet_closure, A.Deprecation_fromId_closure, A.Environment__getVariableFromGlobalModule_closure, A.Environment_setVariable_closure0, A.Environment__getFunctionFromGlobalModule_closure, A.Environment__getMixinFromGlobalModule_closure, A.Environment_toModule_closure, A.Environment_toDummyModule_closure, A._EnvironmentModule__EnvironmentModule_closure, A._EnvironmentModule__EnvironmentModule_closure0, A._EnvironmentModule__EnvironmentModule_closure1, A._EnvironmentModule__EnvironmentModule_closure2, A._EnvironmentModule__EnvironmentModule_closure3, A._EnvironmentModule__EnvironmentModule_closure4, A._writeSourceMap_closure, A.ExecutableOptions_emitErrorCss_closure, A.watch_closure, A._Watcher__debounceEvents_closure, A.ExtensionStore_extensionsWhereTarget_closure, A.ExtensionStore__extendComplex_closure, A.ExtensionStore__extendComplex__closure, A.ExtensionStore__extendCompound_closure, A.ExtensionStore__extendCompound_closure0, A.ExtensionStore__extendCompound_closure1, A.ExtensionStore__extendSimple_withoutPseudo, A.ExtensionStore__extendSimple_closure, A.ExtensionStore__extendSimple_closure0, A.ExtensionStore__extendPseudo_closure, A.ExtensionStore__extendPseudo_closure0, A.ExtensionStore__extendPseudo_closure1, A.ExtensionStore__extendPseudo_closure2, A.ExtensionStore__extendPseudo_closure3, A.ExtensionStore__trim_closure, A.ExtensionStore__trim_closure0, A.unifyComplex_closure1, A._weaveParents_closure2, A._weaveParents_closure3, A._weaveParents_closure4, A._mustUnify_closure, A._mustUnify__closure, A.paths__closure, A.paths___closure, A.listIsSuperselector_closure, A.listIsSuperselector__closure, A.complexIsSuperselector_closure, A.complexIsSuperselector_closure0, A._compatibleWithPreviousCombinator_closure, A._selectorPseudoIsSuperselector_closure, A._selectorPseudoIsSuperselector_closure0, A._selectorPseudoIsSuperselector_closure1, A._selectorPseudoIsSuperselector_closure2, A._selectorPseudoIsSuperselector_closure3, A._selectorPseudoIsSuperselector__closure, A._selectorPseudoIsSuperselector___closure0, A._selectorPseudoIsSuperselector___closure1, A._selectorPseudoIsSuperselector_closure4, A._selectorPseudoIsSuperselector_closure5, A._selectorPseudoArgs_closure, A._selectorPseudoArgs_closure0, A.globalFunctions_closure, A.global_closure0, A.global_closure1, A.global_closure2, A.global_closure3, A.global_closure4, A.global_closure5, A.global_closure6, A.global_closure7, A.global_closure8, A.global_closure9, A.global_closure10, A.global_closure11, A.global_closure12, A.global_closure13, A.global_closure14, A.global_closure15, A.global_closure16, A.global_closure17, A.global_closure18, A.global_closure19, A.global_closure20, A.global_closure21, A.global_closure22, A.global_closure23, A.global_closure24, A.global_closure25, A.global__closure, A.global_closure26, A.module_closure1, A.module_closure2, A.module_closure3, A.module_closure4, A.module_closure5, A.module_closure6, A.module_closure7, A.module_closure8, A.module__closure1, A.module_closure9, A._red_closure, A._green_closure, A._blue_closure, A._mix_closure, A._hue_closure, A._saturation_closure, A._lightness_closure, A._complement_closure, A._adjust_closure, A._scale_closure, A._change_closure, A._ieHexStr_closure, A._ieHexStr_closure_hexString, A._updateComponents_getParam, A._updateComponents_closure, A._updateComponents_closure0, A._updateComponents_updateValue, A._functionString_closure, A._removedColorFunction_closure, A._rgb_closure, A._hsl_closure, A._hwb_closure, A._parseChannels_closure0, A._length_closure0, A._nth_closure, A._setNth_closure, A._join_closure, A._append_closure0, A._zip_closure, A._zip__closure, A._zip__closure0, A._zip__closure1, A._index_closure0, A._separator_closure, A._isBracketed_closure, A._slash_closure, A._get_closure, A._set_closure, A._set__closure1, A._set_closure0, A._set__closure0, A._merge_closure, A._merge_closure0, A._merge__closure0, A._deepMerge_closure, A._deepRemove_closure, A._deepRemove__closure, A._remove_closure, A._remove_closure0, A._keys_closure, A._values_closure, A._hasKey_closure, A._modify_modifyNestedMap, A.global_closure, A.module_closure0, A._ceil_closure, A._clamp_closure, A._floor_closure, A._max_closure, A._min_closure, A._round_closure, A._hypot_closure, A._hypot__closure, A._log_closure, A._pow_closure, A._atan2_closure, A._compatible_closure, A._isUnitless_closure, A._unit_closure, A._percentage_closure, A._randomFunction_closure, A._div_closure, A._singleArgumentMathFunc_closure, A._numberFunction_closure, A.global_closure27, A.global_closure28, A.global_closure29, A.global_closure30, A.local_closure, A.local_closure0, A.local__closure0, A.local_closure1, A._nest_closure, A._nest__closure, A._append_closure, A._append__closure, A._append___closure, A._extend_closure, A._replace_closure, A._unify_closure, A._isSuperselector_closure, A._simpleSelectors_closure, A._simpleSelectors__closure, A._parse_closure, A.module_closure, A.module__closure, A.module__closure0, A._unquote_closure, A._quote_closure, A._length_closure, A._insert_closure, A._index_closure, A._slice_closure, A._toUpperCase_closure, A._toLowerCase_closure, A._uniqueId_closure, A.ImportCache_humanize_closure, A.ImportCache_humanize_closure0, A.ImportCache_humanize_closure1, A.ImportCache_humanize_closure2, A.FilesystemImporter_canonicalize_closure, A._exactlyOne_closure0, A.InterpolationMap_mapException_closure, A._realCasePath_helper, A._realCasePath_helper__closure, A.readStdin_closure, A.readStdin_closure0, A.readStdin_closure1, A.readStdin_closure2, A.listDir__closure, A.listDir__closure0, A.listDir_closure_list, A.listDir__list_closure, A.watchDir_closure, A.watchDir_closure0, A.watchDir_closure1, A.watchDir_closure2, A.DeprecationHandlingLogger_summarize_closure, A.DeprecationHandlingLogger_summarize_closure0, A._disallowedFunctionNames_closure, A.Parser_escape_closure, A.Parser_scanIdentChar_matches, A.SassParser_styleRuleSelector_closure, A.SassParser__peekIndentation_closure, A.SassParser__peekIndentation_closure0, A.StylesheetParser_parse__closure0, A.StylesheetParser__expression_addSingleExpression, A.StylesheetParser__expression_addOperator, A.StylesheetParser__isHexColor_closure0, A.StylesheetParser__unicodeRange_closure, A.StylesheetParser__unicodeRange_closure0, A.StylesheetParser_trySpecialFunction_closure, A.StylesheetGraph_modifiedSince_transitiveModificationTime, A.MapExtensions_get_pairs_closure, A._PrefixedKeys_iterator_closure, A.SourceMapBuffer_buildSourceMap_closure, A._UnprefixedKeys_iterator_closure, A._UnprefixedKeys_iterator_closure0, A.indent_closure, A.flattenVertically_closure, A.flattenVertically_closure0, A.SassCalculation__verifyLength_closure, A.SassColor_SassColor$hwb_toRgb, A.SassList_isBlank_closure, A.SassNumber__coerceOrConvertValue_closure, A.SassNumber__coerceOrConvertValue_closure1, A.SassNumber_multiplyUnits_closure7, A.SassNumber_multiplyUnits_closure9, A.SassNumber__areAnyConvertible_closure, A.SassNumber__canonicalizeUnitList_closure, A.SassNumber_unitSuggestion_closure, A.SassNumber_unitSuggestion_closure0, A.SingleUnitSassNumber__coerceToUnit_closure, A.SingleUnitSassNumber__coerceValueToUnit_closure, A.SingleUnitSassNumber_multiplyUnits_closure, A.AnySelectorVisitor_visitComplexSelector_closure, A.AnySelectorVisitor_visitCompoundSelector_closure, A._EvaluateVisitor_closure12, A._EvaluateVisitor_closure13, A._EvaluateVisitor_closure14, A._EvaluateVisitor_closure15, A._EvaluateVisitor_closure16, A._EvaluateVisitor_closure17, A._EvaluateVisitor_closure18, A._EvaluateVisitor_closure19, A._EvaluateVisitor_closure20, A._EvaluateVisitor_closure21, A._EvaluateVisitor_closure22, A._EvaluateVisitor_closure23, A._EvaluateVisitor_closure24, A._EvaluateVisitor__loadModule__closure1, A._EvaluateVisitor__combineCss_closure1, A._EvaluateVisitor__combineCss_closure2, A._EvaluateVisitor__combineCss_visitModule0, A._EvaluateVisitor__extendModules_closure1, A._EvaluateVisitor__scopeForAtRoot_closure5, A._EvaluateVisitor__scopeForAtRoot_closure6, A._EvaluateVisitor__scopeForAtRoot_closure7, A._EvaluateVisitor__scopeForAtRoot_closure8, A._EvaluateVisitor__scopeForAtRoot_closure9, A._EvaluateVisitor__scopeForAtRoot_closure10, A._EvaluateVisitor_visitEachRule_closure2, A._EvaluateVisitor_visitEachRule_closure3, A._EvaluateVisitor_visitEachRule__closure0, A._EvaluateVisitor_visitEachRule___closure0, A._EvaluateVisitor_visitAtRule_closure2, A._EvaluateVisitor_visitAtRule_closure4, A._EvaluateVisitor_visitForRule__closure0, A._EvaluateVisitor_visitIfRule_closure0, A._EvaluateVisitor_visitIfRule___closure0, A._EvaluateVisitor__visitDynamicImport__closure3, A._EvaluateVisitor__visitDynamicImport__closure4, A._EvaluateVisitor__visitDynamicImport__closure5, A._EvaluateVisitor_visitIncludeRule_closure3, A._EvaluateVisitor_visitMediaRule_closure2, A._EvaluateVisitor_visitMediaRule_closure4, A._EvaluateVisitor_visitStyleRule_closure5, A._EvaluateVisitor_visitStyleRule_closure7, A._EvaluateVisitor_visitStyleRule_closure8, A._EvaluateVisitor_visitSupportsRule_closure2, A._EvaluateVisitor_visitWhileRule__closure0, A._EvaluateVisitor__slash_recommendation0, A._EvaluateVisitor_visitListExpression_closure0, A._EvaluateVisitor_visitFunctionExpression_closure3, A._EvaluateVisitor__checkCalculationArguments_check0, A._EvaluateVisitor__runUserDefinedCallable____closure0, A._EvaluateVisitor__runBuiltInCallable_closure4, A._EvaluateVisitor__evaluateArguments_closure3, A._EvaluateVisitor__evaluateArguments_closure4, A._EvaluateVisitor__evaluateArguments_closure6, A._EvaluateVisitor__evaluateMacroArguments_closure3, A._EvaluateVisitor__evaluateMacroArguments_closure4, A._EvaluateVisitor__evaluateMacroArguments_closure6, A._EvaluateVisitor_visitCssAtRule_closure2, A._EvaluateVisitor_visitCssKeyframeBlock_closure2, A._EvaluateVisitor_visitCssMediaRule_closure2, A._EvaluateVisitor_visitCssMediaRule_closure4, A._EvaluateVisitor_visitCssStyleRule_closure3, A._EvaluateVisitor_visitCssSupportsRule_closure2, A._EvaluateVisitor__performInterpolationHelper_closure0, A._EvaluateVisitor__withoutSlash_recommendation0, A._EvaluateVisitor__stackFrame_closure0, A._ImportedCssVisitor_visitCssAtRule_closure0, A._ImportedCssVisitor_visitCssMediaRule_closure0, A._ImportedCssVisitor_visitCssStyleRule_closure0, A._ImportedCssVisitor_visitCssSupportsRule_closure0, A._EvaluateVisitor_closure, A._EvaluateVisitor_closure0, A._EvaluateVisitor_closure1, A._EvaluateVisitor_closure2, A._EvaluateVisitor_closure3, A._EvaluateVisitor_closure4, A._EvaluateVisitor_closure5, A._EvaluateVisitor_closure6, A._EvaluateVisitor_closure7, A._EvaluateVisitor_closure8, A._EvaluateVisitor_closure9, A._EvaluateVisitor_closure10, A._EvaluateVisitor_closure11, A._EvaluateVisitor__loadModule__closure, A._EvaluateVisitor__combineCss_closure, A._EvaluateVisitor__combineCss_closure0, A._EvaluateVisitor__combineCss_visitModule, A._EvaluateVisitor__extendModules_closure, A._EvaluateVisitor__scopeForAtRoot_closure, A._EvaluateVisitor__scopeForAtRoot_closure0, A._EvaluateVisitor__scopeForAtRoot_closure1, A._EvaluateVisitor__scopeForAtRoot_closure2, A._EvaluateVisitor__scopeForAtRoot_closure3, A._EvaluateVisitor__scopeForAtRoot_closure4, A._EvaluateVisitor_visitEachRule_closure, A._EvaluateVisitor_visitEachRule_closure0, A._EvaluateVisitor_visitEachRule__closure, A._EvaluateVisitor_visitEachRule___closure, A._EvaluateVisitor_visitAtRule_closure, A._EvaluateVisitor_visitAtRule_closure1, A._EvaluateVisitor_visitForRule__closure, A._EvaluateVisitor_visitIfRule_closure, A._EvaluateVisitor_visitIfRule___closure, A._EvaluateVisitor__visitDynamicImport__closure, A._EvaluateVisitor__visitDynamicImport__closure0, A._EvaluateVisitor__visitDynamicImport__closure1, A._EvaluateVisitor_visitIncludeRule_closure0, A._EvaluateVisitor_visitMediaRule_closure, A._EvaluateVisitor_visitMediaRule_closure1, A._EvaluateVisitor_visitStyleRule_closure0, A._EvaluateVisitor_visitStyleRule_closure2, A._EvaluateVisitor_visitStyleRule_closure3, A._EvaluateVisitor_visitSupportsRule_closure0, A._EvaluateVisitor_visitWhileRule__closure, A._EvaluateVisitor__slash_recommendation, A._EvaluateVisitor_visitListExpression_closure, A._EvaluateVisitor_visitFunctionExpression_closure0, A._EvaluateVisitor__checkCalculationArguments_check, A._EvaluateVisitor__runUserDefinedCallable____closure, A._EvaluateVisitor__runBuiltInCallable_closure1, A._EvaluateVisitor__evaluateArguments_closure, A._EvaluateVisitor__evaluateArguments_closure0, A._EvaluateVisitor__evaluateArguments_closure2, A._EvaluateVisitor__evaluateMacroArguments_closure, A._EvaluateVisitor__evaluateMacroArguments_closure0, A._EvaluateVisitor__evaluateMacroArguments_closure2, A._EvaluateVisitor_visitCssAtRule_closure0, A._EvaluateVisitor_visitCssKeyframeBlock_closure0, A._EvaluateVisitor_visitCssMediaRule_closure, A._EvaluateVisitor_visitCssMediaRule_closure1, A._EvaluateVisitor_visitCssStyleRule_closure0, A._EvaluateVisitor_visitCssSupportsRule_closure0, A._EvaluateVisitor__performInterpolationHelper_closure, A._EvaluateVisitor__withoutSlash_recommendation, A._EvaluateVisitor__stackFrame_closure, A._ImportedCssVisitor_visitCssAtRule_closure, A._ImportedCssVisitor_visitCssMediaRule_closure, A._ImportedCssVisitor_visitCssStyleRule_closure, A._ImportedCssVisitor_visitCssSupportsRule_closure, A.EveryCssVisitor_visitCssAtRule_closure, A.EveryCssVisitor_visitCssKeyframeBlock_closure, A.EveryCssVisitor_visitCssMediaRule_closure, A.EveryCssVisitor_visitCssStyleRule_closure, A.EveryCssVisitor_visitCssStylesheet_closure, A.EveryCssVisitor_visitCssSupportsRule_closure, A.ReplaceExpressionVisitor_visitListExpression_closure, A.ReplaceExpressionVisitor_visitArgumentInvocation_closure, A.ReplaceExpressionVisitor_visitInterpolation_closure, A.SelectorSearchVisitor_visitComplexSelector_closure, A.SelectorSearchVisitor_visitCompoundSelector_closure, A.serialize_closure, A._SerializeVisitor_visitList_closure, A._SerializeVisitor_visitList_closure0, A._SerializeVisitor_visitList_closure1, A._SerializeVisitor_visitMap_closure, A._SerializeVisitor_visitSelectorList_closure, A.StatementSearchVisitor_visitIfRule_closure, A.StatementSearchVisitor_visitIfRule__closure0, A.StatementSearchVisitor_visitIfRule_closure0, A.StatementSearchVisitor_visitIfRule__closure, A.StatementSearchVisitor_visitChildren_closure, A.SingleMapping_SingleMapping$fromEntries_closure1, A.SingleMapping_toJson_closure, A.Highlighter$__closure, A.Highlighter$___closure, A.Highlighter$__closure0, A.Highlighter__collateLines_closure, A.Highlighter__collateLines_closure1, A.Highlighter__collateLines__closure, A.Highlighter_highlight_closure, A.Chain_Chain$parse_closure, A.Chain_toTrace_closure, A.Chain_toString_closure0, A.Chain_toString__closure0, A.Chain_toString_closure, A.Chain_toString__closure, A.Trace__parseVM_closure, A.Trace$parseV8_closure, A.Trace$parseJSCore_closure, A.Trace$parseFirefox_closure, A.Trace$parseFriendly_closure, A.Trace_terse_closure, A.Trace_foldFrames_closure, A.Trace_foldFrames_closure0, A.Trace_toString_closure0, A.Trace_toString_closure, A.TransformByHandlers_transformByHandlers__closure, A.RateLimit__debounceAggregate_closure0, A.AnySelectorVisitor_visitComplexSelector_closure0, A.AnySelectorVisitor_visitCompoundSelector_closure0, A.ArgumentDeclaration_verify_closure1, A.ArgumentDeclaration_verify_closure2, A.argumentListClass__closure, A.argumentListClass__closure0, A.AsyncBuiltInCallable$mixin_closure0, A._compileStylesheet_closure2, A.AsyncEnvironment__getVariableFromGlobalModule_closure0, A.AsyncEnvironment_setVariable_closure3, A.AsyncEnvironment__getFunctionFromGlobalModule_closure0, A.AsyncEnvironment__getMixinFromGlobalModule_closure0, A.AsyncEnvironment_toModule_closure0, A.AsyncEnvironment_toDummyModule_closure0, A._EnvironmentModule__EnvironmentModule_closure17, A._EnvironmentModule__EnvironmentModule_closure18, A._EnvironmentModule__EnvironmentModule_closure19, A._EnvironmentModule__EnvironmentModule_closure20, A._EnvironmentModule__EnvironmentModule_closure21, A._EnvironmentModule__EnvironmentModule_closure22, A._EvaluateVisitor_closure38, A._EvaluateVisitor_closure39, A._EvaluateVisitor_closure40, A._EvaluateVisitor_closure41, A._EvaluateVisitor_closure42, A._EvaluateVisitor_closure43, A._EvaluateVisitor_closure44, A._EvaluateVisitor_closure45, A._EvaluateVisitor_closure46, A._EvaluateVisitor_closure47, A._EvaluateVisitor_closure48, A._EvaluateVisitor_closure49, A._EvaluateVisitor_closure50, A._EvaluateVisitor__loadModule__closure5, A._EvaluateVisitor__combineCss_closure5, A._EvaluateVisitor__combineCss_closure6, A._EvaluateVisitor__combineCss_visitModule2, A._EvaluateVisitor__extendModules_closure5, A._EvaluateVisitor__scopeForAtRoot_closure17, A._EvaluateVisitor__scopeForAtRoot_closure18, A._EvaluateVisitor__scopeForAtRoot_closure19, A._EvaluateVisitor__scopeForAtRoot_closure20, A._EvaluateVisitor__scopeForAtRoot_closure21, A._EvaluateVisitor__scopeForAtRoot_closure22, A._EvaluateVisitor_visitEachRule_closure8, A._EvaluateVisitor_visitEachRule_closure9, A._EvaluateVisitor_visitEachRule__closure2, A._EvaluateVisitor_visitEachRule___closure2, A._EvaluateVisitor_visitAtRule_closure8, A._EvaluateVisitor_visitAtRule_closure10, A._EvaluateVisitor_visitForRule__closure2, A._EvaluateVisitor_visitIfRule_closure2, A._EvaluateVisitor_visitIfRule___closure2, A._EvaluateVisitor__visitDynamicImport__closure11, A._EvaluateVisitor__visitDynamicImport__closure12, A._EvaluateVisitor__visitDynamicImport__closure13, A._EvaluateVisitor_visitIncludeRule_closure9, A._EvaluateVisitor_visitMediaRule_closure8, A._EvaluateVisitor_visitMediaRule_closure10, A._EvaluateVisitor_visitStyleRule_closure15, A._EvaluateVisitor_visitStyleRule_closure17, A._EvaluateVisitor_visitStyleRule_closure18, A._EvaluateVisitor_visitSupportsRule_closure6, A._EvaluateVisitor_visitWhileRule__closure2, A._EvaluateVisitor__slash_recommendation2, A._EvaluateVisitor_visitListExpression_closure2, A._EvaluateVisitor_visitFunctionExpression_closure9, A._EvaluateVisitor__checkCalculationArguments_check2, A._EvaluateVisitor__runUserDefinedCallable____closure2, A._EvaluateVisitor__runBuiltInCallable_closure10, A._EvaluateVisitor__evaluateArguments_closure11, A._EvaluateVisitor__evaluateArguments_closure12, A._EvaluateVisitor__evaluateArguments_closure14, A._EvaluateVisitor__evaluateMacroArguments_closure11, A._EvaluateVisitor__evaluateMacroArguments_closure12, A._EvaluateVisitor__evaluateMacroArguments_closure14, A._EvaluateVisitor_visitCssAtRule_closure6, A._EvaluateVisitor_visitCssKeyframeBlock_closure6, A._EvaluateVisitor_visitCssMediaRule_closure8, A._EvaluateVisitor_visitCssMediaRule_closure10, A._EvaluateVisitor_visitCssStyleRule_closure9, A._EvaluateVisitor_visitCssSupportsRule_closure6, A._EvaluateVisitor__performInterpolationHelper_closure2, A._EvaluateVisitor__withoutSlash_recommendation2, A._EvaluateVisitor__stackFrame_closure2, A._ImportedCssVisitor_visitCssAtRule_closure2, A._ImportedCssVisitor_visitCssMediaRule_closure2, A._ImportedCssVisitor_visitCssStyleRule_closure2, A._ImportedCssVisitor_visitCssSupportsRule_closure2, A.AsyncImportCache_humanize_closure3, A.AsyncImportCache_humanize_closure4, A.AsyncImportCache_humanize_closure5, A.AsyncImportCache_humanize_closure6, A.booleanClass__closure, A.legacyBooleanClass__closure, A.legacyBooleanClass__closure0, A.BuiltInCallable$mixin_closure0, A.calculationClass__closure, A.calculationClass__closure0, A.calculationClass__closure1, A.calculationClass__closure2, A.calculationClass__closure3, A.calculationClass__closure4, A.calculationClass__closure5, A.calculationOperationClass__closure, A.calculationOperationClass___closure, A.calculationOperationClass__closure1, A.calculationOperationClass__closure2, A.calculationOperationClass__closure3, A.calculationOperationClass__closure4, A.calculationInterpolationClass__closure1, A.calculationInterpolationClass__closure2, A.SassCalculation__verifyLength_closure0, A.global_closure32, A.global_closure33, A.global_closure34, A.global_closure35, A.global_closure36, A.global_closure37, A.global_closure38, A.global_closure39, A.global_closure40, A.global_closure41, A.global_closure42, A.global_closure43, A.global_closure44, A.global_closure45, A.global_closure46, A.global_closure47, A.global_closure48, A.global_closure49, A.global_closure50, A.global_closure51, A.global_closure52, A.global_closure53, A.global_closure54, A.global_closure55, A.global_closure56, A.global_closure57, A.global__closure0, A.global_closure58, A.module_closure12, A.module_closure13, A.module_closure14, A.module_closure15, A.module_closure16, A.module_closure17, A.module_closure18, A.module_closure19, A.module__closure4, A.module_closure20, A._red_closure0, A._green_closure0, A._blue_closure0, A._mix_closure0, A._hue_closure0, A._saturation_closure0, A._lightness_closure0, A._complement_closure0, A._adjust_closure0, A._scale_closure0, A._change_closure0, A._ieHexStr_closure0, A._ieHexStr_closure_hexString0, A._updateComponents_getParam0, A._updateComponents_closure1, A._updateComponents_closure2, A._updateComponents_updateValue0, A._functionString_closure0, A._removedColorFunction_closure0, A._rgb_closure0, A._hsl_closure0, A._hwb_closure0, A._parseChannels_closure3, A.colorClass__closure1, A.colorClass__closure2, A.colorClass__closure3, A.colorClass__closure4, A.colorClass__closure5, A.colorClass__closure6, A.colorClass__closure7, A.colorClass__closure8, A.colorClass__closure9, A.legacyColorClass_closure, A.legacyColorClass_closure0, A.legacyColorClass_closure1, A.legacyColorClass_closure2, A.legacyColorClass_closure3, A.SassColor_SassColor$hwb_toRgb0, A.compileAsync__closure, A.compileStringAsync__closure, A.compileStringAsync__closure0, A._wrapAsyncSassExceptions_closure, A._parseFunctions__closure2, A._parseFunctions__closure3, A._compileStylesheet_closure1, A.ComplexSelectorComponent_toString_closure0, A._disallowedFunctionNames_closure0, A.DeprecationHandlingLogger_summarize_closure1, A.DeprecationHandlingLogger_summarize_closure2, A.EachRule_toString_closure0, A.Environment__getVariableFromGlobalModule_closure0, A.Environment_setVariable_closure3, A.Environment__getFunctionFromGlobalModule_closure0, A.Environment__getMixinFromGlobalModule_closure0, A.Environment_toModule_closure0, A.Environment_toDummyModule_closure0, A._EnvironmentModule__EnvironmentModule_closure11, A._EnvironmentModule__EnvironmentModule_closure12, A._EnvironmentModule__EnvironmentModule_closure13, A._EnvironmentModule__EnvironmentModule_closure14, A._EnvironmentModule__EnvironmentModule_closure15, A._EnvironmentModule__EnvironmentModule_closure16, A._EvaluateVisitor_closure25, A._EvaluateVisitor_closure26, A._EvaluateVisitor_closure27, A._EvaluateVisitor_closure28, A._EvaluateVisitor_closure29, A._EvaluateVisitor_closure30, A._EvaluateVisitor_closure31, A._EvaluateVisitor_closure32, A._EvaluateVisitor_closure33, A._EvaluateVisitor_closure34, A._EvaluateVisitor_closure35, A._EvaluateVisitor_closure36, A._EvaluateVisitor_closure37, A._EvaluateVisitor__loadModule__closure3, A._EvaluateVisitor__combineCss_closure3, A._EvaluateVisitor__combineCss_closure4, A._EvaluateVisitor__combineCss_visitModule1, A._EvaluateVisitor__extendModules_closure3, A._EvaluateVisitor__scopeForAtRoot_closure11, A._EvaluateVisitor__scopeForAtRoot_closure12, A._EvaluateVisitor__scopeForAtRoot_closure13, A._EvaluateVisitor__scopeForAtRoot_closure14, A._EvaluateVisitor__scopeForAtRoot_closure15, A._EvaluateVisitor__scopeForAtRoot_closure16, A._EvaluateVisitor_visitEachRule_closure5, A._EvaluateVisitor_visitEachRule_closure6, A._EvaluateVisitor_visitEachRule__closure1, A._EvaluateVisitor_visitEachRule___closure1, A._EvaluateVisitor_visitAtRule_closure5, A._EvaluateVisitor_visitAtRule_closure7, A._EvaluateVisitor_visitForRule__closure1, A._EvaluateVisitor_visitIfRule_closure1, A._EvaluateVisitor_visitIfRule___closure1, A._EvaluateVisitor__visitDynamicImport__closure7, A._EvaluateVisitor__visitDynamicImport__closure8, A._EvaluateVisitor__visitDynamicImport__closure9, A._EvaluateVisitor_visitIncludeRule_closure6, A._EvaluateVisitor_visitMediaRule_closure5, A._EvaluateVisitor_visitMediaRule_closure7, A._EvaluateVisitor_visitStyleRule_closure10, A._EvaluateVisitor_visitStyleRule_closure12, A._EvaluateVisitor_visitStyleRule_closure13, A._EvaluateVisitor_visitSupportsRule_closure4, A._EvaluateVisitor_visitWhileRule__closure1, A._EvaluateVisitor__slash_recommendation1, A._EvaluateVisitor_visitListExpression_closure1, A._EvaluateVisitor_visitFunctionExpression_closure6, A._EvaluateVisitor__checkCalculationArguments_check1, A._EvaluateVisitor__runUserDefinedCallable____closure1, A._EvaluateVisitor__runBuiltInCallable_closure7, A._EvaluateVisitor__evaluateArguments_closure7, A._EvaluateVisitor__evaluateArguments_closure8, A._EvaluateVisitor__evaluateArguments_closure10, A._EvaluateVisitor__evaluateMacroArguments_closure7, A._EvaluateVisitor__evaluateMacroArguments_closure8, A._EvaluateVisitor__evaluateMacroArguments_closure10, A._EvaluateVisitor_visitCssAtRule_closure4, A._EvaluateVisitor_visitCssKeyframeBlock_closure4, A._EvaluateVisitor_visitCssMediaRule_closure5, A._EvaluateVisitor_visitCssMediaRule_closure7, A._EvaluateVisitor_visitCssStyleRule_closure6, A._EvaluateVisitor_visitCssSupportsRule_closure4, A._EvaluateVisitor__performInterpolationHelper_closure1, A._EvaluateVisitor__withoutSlash_recommendation1, A._EvaluateVisitor__stackFrame_closure1, A._ImportedCssVisitor_visitCssAtRule_closure1, A._ImportedCssVisitor_visitCssMediaRule_closure1, A._ImportedCssVisitor_visitCssStyleRule_closure1, A._ImportedCssVisitor_visitCssSupportsRule_closure1, A.EveryCssVisitor_visitCssAtRule_closure0, A.EveryCssVisitor_visitCssKeyframeBlock_closure0, A.EveryCssVisitor_visitCssMediaRule_closure0, A.EveryCssVisitor_visitCssStyleRule_closure0, A.EveryCssVisitor_visitCssStylesheet_closure0, A.EveryCssVisitor_visitCssSupportsRule_closure0, A.exceptionClass__closure, A.exceptionClass__closure0, A.exceptionClass__closure1, A._IsCalculationSafeVisitor_visitListExpression_closure0, A.ExtensionStore_extensionsWhereTarget_closure0, A.ExtensionStore__extendComplex_closure0, A.ExtensionStore__extendComplex__closure0, A.ExtensionStore__extendCompound_closure2, A.ExtensionStore__extendCompound_closure3, A.ExtensionStore__extendCompound_closure4, A.ExtensionStore__extendSimple_withoutPseudo0, A.ExtensionStore__extendSimple_closure1, A.ExtensionStore__extendSimple_closure2, A.ExtensionStore__extendPseudo_closure4, A.ExtensionStore__extendPseudo_closure5, A.ExtensionStore__extendPseudo_closure6, A.ExtensionStore__extendPseudo_closure7, A.ExtensionStore__extendPseudo_closure8, A.ExtensionStore__trim_closure1, A.ExtensionStore__trim_closure2, A.FilesystemImporter_canonicalize_closure0, A.functionClass__closure, A.functionClass__closure0, A.unifyComplex_closure4, A._weaveParents_closure8, A._weaveParents_closure9, A._weaveParents_closure10, A._mustUnify_closure0, A._mustUnify__closure0, A.paths__closure0, A.paths___closure0, A.listIsSuperselector_closure0, A.listIsSuperselector__closure0, A.complexIsSuperselector_closure1, A.complexIsSuperselector_closure2, A._compatibleWithPreviousCombinator_closure0, A._selectorPseudoIsSuperselector_closure6, A._selectorPseudoIsSuperselector_closure7, A._selectorPseudoIsSuperselector_closure8, A._selectorPseudoIsSuperselector_closure9, A._selectorPseudoIsSuperselector_closure10, A._selectorPseudoIsSuperselector__closure0, A._selectorPseudoIsSuperselector___closure3, A._selectorPseudoIsSuperselector___closure4, A._selectorPseudoIsSuperselector_closure11, A._selectorPseudoIsSuperselector_closure12, A._selectorPseudoArgs_closure1, A._selectorPseudoArgs_closure2, A.globalFunctions_closure0, A.IDSelector_unify_closure0, A.IfRuleClause$__closure0, A.IfRuleClause$___closure0, A.immutableMapToDartMap_closure, A.NodeImporter__tryPath_closure0, A.ImportCache_humanize_closure3, A.ImportCache_humanize_closure4, A.ImportCache_humanize_closure5, A.ImportCache_humanize_closure6, A.Interpolation_toString_closure0, A.InterpolationMap_mapException_closure0, A._realCasePath_helper0, A._realCasePath_helper__closure0, A.listDir__closure1, A.listDir__closure2, A.listDir_closure_list0, A.listDir__list_closure0, A.render_closure0, A._parseFunctions__closure, A._parseFunctions___closure2, A._parseFunctions__closure0, A._parseFunctions__closure1, A._parseFunctions___closure, A._parseImporter_closure, A._parseImporter__closure, A._parseImporter___closure, A.ListExpression_toString_closure0, A._length_closure2, A._nth_closure0, A._setNth_closure0, A._join_closure0, A._append_closure2, A._zip_closure0, A._zip__closure2, A._zip__closure3, A._zip__closure4, A._index_closure2, A._separator_closure0, A._isBracketed_closure0, A._slash_closure0, A.SelectorList_asSassList_closure0, A.SelectorList_resolveParentSelectors_closure0, A.SelectorList_resolveParentSelectors__closure1, A.SelectorList_resolveParentSelectors__closure2, A.SelectorList__resolveParentSelectorsCompound_closure2, A.SelectorList__resolveParentSelectorsCompound_closure3, A.SelectorList__resolveParentSelectorsCompound_closure4, A.SelectorList_withAdditionalCombinators_closure0, A.listClass__closure, A.legacyListClass_closure, A.legacyListClass__closure, A.legacyListClass_closure1, A.legacyListClass_closure2, A.legacyListClass_closure4, A.SassList_isBlank_closure0, A._get_closure0, A._set_closure1, A._set__closure4, A._set_closure2, A._set__closure3, A._merge_closure1, A._merge_closure2, A._merge__closure2, A._deepMerge_closure0, A._deepRemove_closure0, A._deepRemove__closure0, A._remove_closure1, A._remove_closure2, A._keys_closure0, A._values_closure0, A._hasKey_closure0, A._modify_modifyNestedMap0, A.MapExtensions_get_pairs_closure0, A.mapClass__closure, A.mapClass__closure0, A.legacyMapClass_closure, A.legacyMapClass__closure, A.legacyMapClass__closure0, A.legacyMapClass_closure2, A.legacyMapClass_closure3, A.legacyMapClass_closure4, A.global_closure31, A.module_closure11, A._ceil_closure0, A._clamp_closure0, A._floor_closure0, A._max_closure0, A._min_closure0, A._round_closure0, A._hypot_closure0, A._hypot__closure0, A._log_closure0, A._pow_closure0, A._atan2_closure0, A._compatible_closure0, A._isUnitless_closure0, A._unit_closure0, A._percentage_closure0, A._randomFunction_closure0, A._div_closure0, A._singleArgumentMathFunc_closure0, A._numberFunction_closure0, A.global_closure59, A.global_closure60, A.global_closure61, A.global_closure62, A.local_closure2, A.local_closure3, A.local__closure2, A.local_closure4, A.mixinClass__closure, A.mixinClass__closure0, A.ModifiableCssNode_hasFollowingSibling_closure0, A.legacyNullClass__closure, A.numberClass__closure, A.numberClass__closure0, A.numberClass__closure1, A.numberClass__closure2, A.numberClass__closure3, A.numberClass__closure4, A.numberClass__closure5, A.numberClass__closure6, A.numberClass__closure7, A.numberClass__closure8, A.numberClass__closure9, A.numberClass__closure12, A.numberClass__closure13, A.numberClass__closure14, A.numberClass__closure15, A.numberClass__closure16, A.numberClass__closure17, A.numberClass__closure18, A.numberClass__closure19, A.legacyNumberClass_closure, A.legacyNumberClass_closure0, A.legacyNumberClass_closure2, A._parseNumber_closure, A._parseNumber_closure0, A.SassNumber__coerceOrConvertValue_closure3, A.SassNumber__coerceOrConvertValue_closure5, A.SassNumber_multiplyUnits_closure19, A.SassNumber_multiplyUnits_closure21, A.SassNumber__areAnyConvertible_closure0, A.SassNumber__canonicalizeUnitList_closure0, A.SassNumber_unitSuggestion_closure1, A.SassNumber_unitSuggestion_closure2, A.ParentStatement_closure0, A.ParentStatement__closure0, A.Parser_escape_closure0, A.Parser_scanIdentChar_matches0, A._PrefixedKeys_iterator_closure0, A.PseudoSelector_specificity__closure1, A.PseudoSelector_specificity__closure2, A.PseudoSelector_unify_closure0, A.JSClassExtension_setCustomInspect_closure, A.ReplaceExpressionVisitor_visitListExpression_closure0, A.ReplaceExpressionVisitor_visitArgumentInvocation_closure0, A.ReplaceExpressionVisitor_visitInterpolation_closure0, A.SassParser_styleRuleSelector_closure0, A.SassParser__peekIndentation_closure1, A.SassParser__peekIndentation_closure2, A._wrapMain_closure, A._wrapMain_closure0, A._IsBogusVisitor_visitComplexSelector_closure0, A._IsUselessVisitor_visitComplexSelector_closure0, A._nest_closure0, A._nest__closure1, A._append_closure1, A._append__closure1, A._append___closure0, A._extend_closure0, A._replace_closure0, A._unify_closure0, A._isSuperselector_closure0, A._simpleSelectors_closure0, A._simpleSelectors__closure0, A._parse_closure0, A.SelectorSearchVisitor_visitComplexSelector_closure0, A.SelectorSearchVisitor_visitCompoundSelector_closure0, A.serialize_closure0, A._SerializeVisitor_visitList_closure2, A._SerializeVisitor_visitList_closure3, A._SerializeVisitor_visitList_closure4, A._SerializeVisitor_visitMap_closure0, A._SerializeVisitor_visitSelectorList_closure0, A.SimpleSelector_isSuperselector_closure0, A.SimpleSelector_isSuperselector__closure0, A.SingleUnitSassNumber__coerceToUnit_closure0, A.SingleUnitSassNumber__coerceValueToUnit_closure0, A.SingleUnitSassNumber_multiplyUnits_closure1, A.SourceMapBuffer_buildSourceMap_closure0, A.updateSourceSpanPrototype_closure, A.updateSourceSpanPrototype_closure0, A.updateSourceSpanPrototype_closure1, A.updateSourceSpanPrototype_closure2, A.updateSourceSpanPrototype_closure3, A.updateSourceSpanPrototype_closure4, A.updateSourceSpanPrototype_closure5, A.StatementSearchVisitor_visitIfRule_closure1, A.StatementSearchVisitor_visitIfRule__closure2, A.StatementSearchVisitor_visitIfRule_closure2, A.StatementSearchVisitor_visitIfRule__closure1, A.StatementSearchVisitor_visitChildren_closure0, A.module_closure10, A.module__closure2, A.module__closure3, A._unquote_closure0, A._quote_closure0, A._length_closure1, A._insert_closure0, A._index_closure1, A._slice_closure0, A._toUpperCase_closure0, A._toLowerCase_closure0, A._uniqueId_closure0, A.stringClass__closure, A.stringClass__closure0, A.stringClass__closure1, A.stringClass__closure2, A.stringClass__closure3, A.legacyStringClass_closure, A.legacyStringClass_closure0, A.StylesheetParser_parse__closure2, A.StylesheetParser__expression_addSingleExpression0, A.StylesheetParser__expression_addOperator0, A.StylesheetParser__isHexColor_closure2, A.StylesheetParser__unicodeRange_closure1, A.StylesheetParser__unicodeRange_closure2, A.StylesheetParser_trySpecialFunction_closure0, A._UnprefixedKeys_iterator_closure1, A._UnprefixedKeys_iterator_closure2, A._exactlyOne_closure2, A.futureToPromise__closure0, A.indent_closure0, A.flattenVertically_closure1, A.flattenVertically_closure2, A.valueClass__closure, A.valueClass__closure0, A.valueClass__closure1, A.valueClass__closure2, A.valueClass__closure3, A.valueClass__closure4, A.valueClass__closure5, A.valueClass__closure7, A.valueClass__closure8, A.valueClass__closure9, A.valueClass__closure10, A.valueClass__closure11, A.valueClass__closure12, A.valueClass__closure13, A.valueClass__closure14, A.valueClass__closure15, A.valueClass__closure17, A.valueClass__closure18]);
-    _inheritMany(A.Closure2Args, [A._CastListBase_sort_closure, A.CastMap_forEach_closure, A.Primitives_functionNoSuchMethod_closure, A.JsLinkedHashMap_addAll_closure, A.initHooks_closure0, A._awaitOnObject_closure0, A._wrapJsFunctionForAsync_closure, A.Future_wait_handleError, A._Future__chainForeignFuture_closure0, A.Stream_Stream$fromFuture_closure0, A._AddStreamState_makeErrorHandler_closure, A._HashMap_addAll_closure, A.HashMap_HashMap$from_closure, A.LinkedHashMap_LinkedHashMap$from_closure, A.MapBase_addAll_closure, A.MapBase_mapToString_closure, A._JsonStringifier_writeMap_closure, A.NoSuchMethodError_toString_closure, A.Uri__parseIPv4Address_error, A.Uri_parseIPv6Address_error, A.Uri_parseIPv6Address_parseHex, A._createTables_build, A.Parser_parse_closure, A.StreamQueue__ensureListening_closure1, A.futureToPromise_closure, A.PathMap__create_closure, A.IfRule_toString_closure, A.ComplexSelector_specificity_closure, A.CompoundSelector_specificity_closure, A.ExtensionStore_clone_closure, A._weaveParents_closure1, A.paths_closure, A._updateComponents_updateRgb, A._nest__closure0, A._append__closure0, A.ImportCache_clearCanonicalize_closure, A.StylesheetParser__declarationOrBuffer_closure, A.StylesheetParser__declarationOrBuffer_closure0, A.StylesheetParser__styleRule_closure, A.StylesheetParser__propertyOrVariableDeclaration_closure, A.StylesheetParser__propertyOrVariableDeclaration_closure0, A.StylesheetParser__atRootRule_closure, A.StylesheetParser__atRootRule_closure0, A.StylesheetParser__eachRule_closure, A.StylesheetParser__functionRule_closure, A.StylesheetParser__forRule_closure0, A.StylesheetParser__includeRule_closure, A.StylesheetParser_mediaRule_closure, A.StylesheetParser__mixinRule_closure, A.StylesheetParser_mozDocumentRule_closure, A.StylesheetParser_supportsRule_closure, A.StylesheetParser__whileRule_closure, A.StylesheetParser_unknownAtRule_closure, A.longestCommonSubsequence_backtrack, A.mapAddAll2_closure, A.SassNumber_plus_closure, A.SassNumber_minus_closure, A.SassNumber__canonicalMultiplier_closure, A._EvaluateVisitor__closure3, A._EvaluateVisitor__closure4, A._EvaluateVisitor_visitForwardRule_closure1, A._EvaluateVisitor_visitForwardRule_closure2, A._EvaluateVisitor_visitUseRule_closure0, A._EvaluateVisitor__evaluateArguments_closure5, A._EvaluateVisitor__evaluateMacroArguments_closure5, A._EvaluateVisitor__addRestMap_closure0, A._EvaluateVisitor__closure, A._EvaluateVisitor__closure0, A._EvaluateVisitor_visitForwardRule_closure, A._EvaluateVisitor_visitForwardRule_closure0, A._EvaluateVisitor_visitUseRule_closure, A._EvaluateVisitor__evaluateArguments_closure1, A._EvaluateVisitor__evaluateMacroArguments_closure1, A._EvaluateVisitor__addRestMap_closure, A.SingleMapping_toJson_closure0, A.Highlighter__collateLines_closure0, A.Frame_Frame$parseV8_closure_parseLocation, A.TransformByHandlers_transformByHandlers__closure1, A.RateLimit__debounceAggregate_closure, A._EvaluateVisitor__closure11, A._EvaluateVisitor__closure12, A._EvaluateVisitor_visitForwardRule_closure5, A._EvaluateVisitor_visitForwardRule_closure6, A._EvaluateVisitor_visitUseRule_closure2, A._EvaluateVisitor__evaluateArguments_closure13, A._EvaluateVisitor__evaluateMacroArguments_closure13, A._EvaluateVisitor__addRestMap_closure2, A.calculationOperationClass__closure0, A.calculationInterpolationClass__closure, A.calculationInterpolationClass__closure0, A._updateComponents_updateRgb0, A.colorClass__closure, A.colorClass__closure0, A.legacyColorClass_closure4, A.legacyColorClass_closure5, A.legacyColorClass_closure6, A.legacyColorClass_closure7, A._parseFunctions_closure0, A.ComplexSelector_specificity_closure0, A.CompoundSelector_specificity_closure0, A._EvaluateVisitor__closure7, A._EvaluateVisitor__closure8, A._EvaluateVisitor_visitForwardRule_closure3, A._EvaluateVisitor_visitForwardRule_closure4, A._EvaluateVisitor_visitUseRule_closure1, A._EvaluateVisitor__evaluateArguments_closure9, A._EvaluateVisitor__evaluateMacroArguments_closure9, A._EvaluateVisitor__addRestMap_closure1, A.ExtensionStore_clone_closure0, A._weaveParents_closure7, A.paths_closure0, A.IfRule_toString_closure0, A.main_closure, A.main_closure0, A.render_closure1, A._parseFunctions_closure, A.listClass__closure0, A.legacyListClass_closure0, A.legacyListClass_closure3, A.mapClass__closure1, A.legacyMapClass_closure0, A.legacyMapClass_closure1, A.numberClass__closure10, A.numberClass__closure11, A.legacyNumberClass_closure1, A.legacyNumberClass_closure3, A.SassNumber_plus_closure0, A.SassNumber_minus_closure0, A.SassNumber__canonicalMultiplier_closure0, A.JSClassExtension_get_defineStaticMethod_closure, A.JSClassExtension_get_defineMethod_closure, A.JSClassExtension_get_defineGetter_closure, A._nest__closure2, A._append__closure2, A.legacyStringClass_closure1, A.StylesheetParser__declarationOrBuffer_closure1, A.StylesheetParser__declarationOrBuffer_closure2, A.StylesheetParser__styleRule_closure0, A.StylesheetParser__propertyOrVariableDeclaration_closure1, A.StylesheetParser__propertyOrVariableDeclaration_closure2, A.StylesheetParser__atRootRule_closure1, A.StylesheetParser__atRootRule_closure2, A.StylesheetParser__eachRule_closure0, A.StylesheetParser__functionRule_closure0, A.StylesheetParser__forRule_closure2, A.StylesheetParser__includeRule_closure0, A.StylesheetParser_mediaRule_closure0, A.StylesheetParser__mixinRule_closure0, A.StylesheetParser_mozDocumentRule_closure0, A.StylesheetParser_supportsRule_closure0, A.StylesheetParser__whileRule_closure0, A.StylesheetParser_unknownAtRule_closure0, A.futureToPromise_closure0, A.futureToPromise__closure1, A.objectToMap_closure, A.longestCommonSubsequence_backtrack0, A.mapAddAll2_closure0, A.valueClass__closure6, A.valueClass__closure16]);
+    _inheritMany(A.Closure, [A.Closure2Args, A.CastMap_entries_closure, A.Closure0Args, A.Instantiation, A.TearOffClosure, A.JsLinkedHashMap_values_closure, A.initHooks_closure, A.initHooks_closure1, A._AsyncRun__initializeScheduleImmediate_internalCallback, A._AsyncRun__initializeScheduleImmediate_closure, A._awaitOnObject_closure, A.Future_wait_closure, A._Future__chainForeignFuture_closure, A._Future__propagateToListeners_handleWhenCompleteCallback_closure, A.Stream_Stream$fromFuture_closure, A.Stream_length_closure, A._CustomZone_bindUnaryCallback_closure, A._RootZone_bindUnaryCallback_closure, A._HashMap_values_closure, A._LinkedCustomHashMap_closure, A.MapBase_entries_closure, A._JsonMap_values_closure, A._Uri__makePath_closure, A._createTables_setChars, A._createTables_setRange, A.jsify__convert, A.promiseToFuture_closure1, A.promiseToFuture_closure2, A.ArgParser__addOption_closure, A._Usage__writeOption_closure, A._Usage__buildAllowedList_closure, A.FutureGroup_add_closure, A.StreamGroup__onListen_closure, A.StreamGroup__onCancel_closure, A.StreamQueue__ensureListening_closure, A.alwaysValid_closure, A.ReplAdapter_runAsync__closure, A.UnionSet__iterable_closure, A.UnionSet_contains_closure, A.MapKeySet_difference_closure, A.promiseToFuture_closure, A.promiseToFuture_closure0, A.futureToPromise__closure, A.Context_joinAll_closure, A.Context_split_closure, A._validateArgList_closure, A.ParsedPath__splitExtension_closure, A.PathMap__create_closure0, A.PathMap__create_closure1, A.WindowsStyle_absolutePathToUri_closure, A.Version__splitParts_closure, A.ModifiableCssNode_hasFollowingSibling_closure, A.ArgumentDeclaration_verify_closure, A.ArgumentDeclaration_verify_closure0, A._IsCalculationSafeVisitor_visitListExpression_closure, A.ListExpression_toString_closure, A.Interpolation_toString_closure, A.EachRule_toString_closure, A.IfRuleClause$__closure, A.IfRuleClause$___closure, A.ParentStatement_closure, A.ParentStatement__closure, A._IsBogusVisitor_visitComplexSelector_closure, A._IsUselessVisitor_visitComplexSelector_closure, A.ComplexSelectorComponent_toString_closure, A.CompoundSelector_hasComplicatedSuperselectorSemantics_closure, A.IDSelector_unify_closure, A.SelectorList_asSassList_closure, A.SelectorList_nestWithin_closure, A.SelectorList_nestWithin__closure, A.SelectorList_nestWithin__closure0, A.SelectorList__nestWithinCompound_closure, A.SelectorList__nestWithinCompound_closure0, A.SelectorList__nestWithinCompound_closure1, A.SelectorList_withAdditionalCombinators_closure, A.PseudoSelector_specificity__closure, A.PseudoSelector_specificity__closure0, A.PseudoSelector_unify_closure, A.SimpleSelector_isSuperselector_closure, A.SimpleSelector_isSuperselector__closure, A._compileStylesheet_closure0, A.AsyncEnvironment__getVariableFromGlobalModule_closure, A.AsyncEnvironment_setVariable_closure0, A.AsyncEnvironment__getFunctionFromGlobalModule_closure, A.AsyncEnvironment__getMixinFromGlobalModule_closure, A.AsyncEnvironment_toModule_closure, A.AsyncEnvironment_toDummyModule_closure, A._EnvironmentModule__EnvironmentModule_closure5, A._EnvironmentModule__EnvironmentModule_closure6, A._EnvironmentModule__EnvironmentModule_closure7, A._EnvironmentModule__EnvironmentModule_closure8, A._EnvironmentModule__EnvironmentModule_closure9, A._EnvironmentModule__EnvironmentModule_closure10, A.AsyncImportCache_humanize_closure, A.AsyncImportCache_humanize_closure0, A.AsyncImportCache_humanize_closure1, A.AsyncImportCache_humanize_closure2, A.AsyncBuiltInCallable$mixin_closure, A.BuiltInCallable$mixin_closure, A._compileStylesheet_closure, A.Deprecation_fromId_closure, A.Environment__getVariableFromGlobalModule_closure, A.Environment_setVariable_closure0, A.Environment__getFunctionFromGlobalModule_closure, A.Environment__getMixinFromGlobalModule_closure, A.Environment_toModule_closure, A.Environment_toDummyModule_closure, A._EnvironmentModule__EnvironmentModule_closure, A._EnvironmentModule__EnvironmentModule_closure0, A._EnvironmentModule__EnvironmentModule_closure1, A._EnvironmentModule__EnvironmentModule_closure2, A._EnvironmentModule__EnvironmentModule_closure3, A._EnvironmentModule__EnvironmentModule_closure4, A._writeSourceMap_closure, A.ExecutableOptions_emitErrorCss_closure, A.watch_closure, A._Watcher__debounceEvents_closure, A.ExtensionStore_extensionsWhereTarget_closure, A.ExtensionStore__extendComplex_closure, A.ExtensionStore__extendComplex__closure, A.ExtensionStore__extendCompound_closure, A.ExtensionStore__extendCompound_closure0, A.ExtensionStore__extendCompound_closure1, A.ExtensionStore__extendSimple_withoutPseudo, A.ExtensionStore__extendSimple_closure, A.ExtensionStore__extendSimple_closure0, A.ExtensionStore__extendPseudo_closure, A.ExtensionStore__extendPseudo_closure0, A.ExtensionStore__extendPseudo_closure1, A.ExtensionStore__extendPseudo_closure2, A.ExtensionStore__extendPseudo_closure3, A.ExtensionStore__trim_closure, A.ExtensionStore__trim_closure0, A.unifyComplex_closure, A._weaveParents_closure0, A._weaveParents_closure1, A._weaveParents_closure2, A._mustUnify_closure, A._mustUnify__closure, A.paths__closure, A.paths___closure, A.listIsSuperselector_closure, A.listIsSuperselector__closure, A.complexIsSuperselector_closure, A.complexIsSuperselector_closure0, A._compatibleWithPreviousCombinator_closure, A.compoundIsSuperselector_closure, A._selectorPseudoIsSuperselector_closure, A._selectorPseudoIsSuperselector_closure0, A._selectorPseudoIsSuperselector_closure1, A._selectorPseudoIsSuperselector_closure2, A._selectorPseudoIsSuperselector_closure3, A._selectorPseudoIsSuperselector__closure, A._selectorPseudoIsSuperselector___closure, A._selectorPseudoIsSuperselector___closure0, A._selectorPseudoIsSuperselector_closure4, A._selectorPseudoIsSuperselector_closure5, A._selectorPseudoArgs_closure, A._selectorPseudoArgs_closure0, A.globalFunctions_closure, A.global_closure0, A.global_closure1, A.global_closure2, A.global_closure3, A.global_closure4, A.global_closure5, A.global_closure6, A.global_closure7, A.global_closure8, A.global_closure9, A.global_closure10, A.global_closure11, A.global_closure12, A.global_closure13, A.global_closure14, A.global_closure15, A.global_closure16, A.global_closure17, A.global_closure18, A.global_closure19, A.global_closure20, A.global_closure21, A.global_closure22, A.global_closure23, A.global_closure24, A.global_closure25, A.global__closure, A.global_closure26, A.module_closure1, A.module_closure2, A.module_closure3, A.module_closure4, A.module_closure5, A.module_closure6, A.module_closure7, A.module_closure8, A.module__closure1, A.module_closure9, A._red_closure, A._green_closure, A._blue_closure, A._mix_closure, A._hue_closure, A._saturation_closure, A._lightness_closure, A._complement_closure, A._adjust_closure, A._scale_closure, A._change_closure, A._ieHexStr_closure, A._ieHexStr_closure_hexString, A._updateComponents_getParam, A._updateComponents_closure, A._updateComponents_closure0, A._updateComponents_updateValue, A._functionString_closure, A._removedColorFunction_closure, A._rgb_closure, A._hsl_closure, A._hwb_closure, A._parseChannels_closure, A._length_closure0, A._nth_closure, A._setNth_closure, A._join_closure, A._append_closure0, A._zip_closure, A._zip__closure, A._zip__closure0, A._zip__closure1, A._index_closure0, A._separator_closure, A._isBracketed_closure, A._slash_closure, A._get_closure, A._set_closure, A._set__closure0, A._set_closure0, A._set__closure, A._merge_closure, A._merge_closure0, A._merge__closure, A._deepMerge_closure, A._deepRemove_closure, A._deepRemove__closure, A._remove_closure, A._remove_closure0, A._keys_closure, A._values_closure, A._hasKey_closure, A._modify_modifyNestedMap, A.global_closure, A.module_closure0, A._ceil_closure, A._clamp_closure, A._floor_closure, A._max_closure, A._min_closure, A._round_closure, A._hypot_closure, A._hypot__closure, A._log_closure, A._pow_closure, A._atan2_closure, A._compatible_closure, A._isUnitless_closure, A._unit_closure, A._percentage_closure, A._randomFunction_closure, A._div_closure, A._singleArgumentMathFunc_closure, A._numberFunction_closure, A.global_closure27, A.global_closure28, A.global_closure29, A.global_closure30, A.local_closure, A.local_closure0, A.local__closure, A.local_closure1, A._nest_closure, A._nest__closure, A._append_closure, A._append__closure, A._append___closure, A._extend_closure, A._replace_closure, A._unify_closure, A._isSuperselector_closure, A._simpleSelectors_closure, A._simpleSelectors__closure, A._parse_closure, A.module_closure, A.module__closure, A.module__closure0, A._unquote_closure, A._quote_closure, A._length_closure, A._insert_closure, A._index_closure, A._slice_closure, A._toUpperCase_closure, A._toLowerCase_closure, A._uniqueId_closure, A.ImportCache_humanize_closure, A.ImportCache_humanize_closure0, A.ImportCache_humanize_closure1, A.ImportCache_humanize_closure2, A.FilesystemImporter_canonicalize_closure, A.NodePackageImporter__nodePackageExportsResolve_closure, A.NodePackageImporter__nodePackageExportsResolve_closure0, A.NodePackageImporter__nodePackageExportsResolve_closure1, A.NodePackageImporter__nodePackageExportsResolve_closure2, A.NodePackageImporter__nodePackageExportsResolve__closure, A.NodePackageImporter__nodePackageExportsResolve__closure0, A.NodePackageImporter__getMainExport_closure, A._exactlyOne_closure, A.InterpolationMap_mapException_closure, A._realCasePath_helper, A._realCasePath_helper__closure, A.readStdin_closure, A.readStdin_closure0, A.readStdin_closure1, A.readStdin_closure2, A.listDir__closure, A.listDir__closure0, A.listDir_closure_list, A.listDir__list_closure, A.watchDir_closure, A.watchDir_closure0, A.watchDir_closure1, A.watchDir_closure2, A.DeprecationProcessingLogger_summarize_closure, A.DeprecationProcessingLogger_summarize_closure0, A._disallowedFunctionNames_closure, A.Parser_escape_closure, A.Parser_scanIdentChar_matches, A.SassParser_styleRuleSelector_closure, A.SassParser__peekIndentation_closure, A.SassParser__peekIndentation_closure0, A.StylesheetParser_parse__closure0, A.StylesheetParser__expression_addSingleExpression, A.StylesheetParser__expression_addOperator, A.StylesheetParser__isHexColor_closure, A.StylesheetParser__unicodeRange_closure, A.StylesheetParser__unicodeRange_closure0, A.StylesheetParser_trySpecialFunction_closure, A.StylesheetGraph_modifiedSince_transitiveModificationTime, A.MapExtensions_get_pairs_closure, A._PrefixedKeys_iterator_closure, A.SourceMapBuffer_buildSourceMap_closure, A._UnprefixedKeys_iterator_closure, A._UnprefixedKeys_iterator_closure0, A.indent_closure, A.flattenVertically_closure, A.flattenVertically_closure0, A.SassCalculation__verifyLength_closure, A.SassColor_SassColor$hwb_toRgb, A.SassList_isBlank_closure, A.SassNumber__coerceOrConvertValue_closure, A.SassNumber__coerceOrConvertValue_closure1, A.SassNumber_multiplyUnits_closure, A.SassNumber_multiplyUnits_closure1, A.SassNumber__areAnyConvertible_closure, A.SassNumber__canonicalizeUnitList_closure, A.SassNumber_unitSuggestion_closure, A.SassNumber_unitSuggestion_closure0, A.SingleUnitSassNumber__coerceToUnit_closure, A.SingleUnitSassNumber__coerceValueToUnit_closure, A.SingleUnitSassNumber_multiplyUnits_closure, A.AnySelectorVisitor_visitComplexSelector_closure, A.AnySelectorVisitor_visitCompoundSelector_closure, A._EvaluateVisitor_closure12, A._EvaluateVisitor_closure13, A._EvaluateVisitor_closure14, A._EvaluateVisitor_closure15, A._EvaluateVisitor_closure16, A._EvaluateVisitor_closure17, A._EvaluateVisitor_closure18, A._EvaluateVisitor_closure19, A._EvaluateVisitor_closure20, A._EvaluateVisitor_closure21, A._EvaluateVisitor_closure22, A._EvaluateVisitor_closure23, A._EvaluateVisitor_closure24, A._EvaluateVisitor__loadModule__closure1, A._EvaluateVisitor__combineCss_closure1, A._EvaluateVisitor__combineCss_closure2, A._EvaluateVisitor__combineCss_visitModule0, A._EvaluateVisitor__extendModules_closure1, A._EvaluateVisitor__scopeForAtRoot_closure5, A._EvaluateVisitor__scopeForAtRoot_closure6, A._EvaluateVisitor__scopeForAtRoot_closure7, A._EvaluateVisitor__scopeForAtRoot_closure8, A._EvaluateVisitor__scopeForAtRoot_closure9, A._EvaluateVisitor__scopeForAtRoot_closure10, A._EvaluateVisitor_visitEachRule_closure2, A._EvaluateVisitor_visitEachRule_closure3, A._EvaluateVisitor_visitEachRule__closure0, A._EvaluateVisitor_visitEachRule___closure0, A._EvaluateVisitor_visitAtRule_closure2, A._EvaluateVisitor_visitAtRule_closure4, A._EvaluateVisitor_visitForRule__closure0, A._EvaluateVisitor_visitIfRule_closure0, A._EvaluateVisitor_visitIfRule___closure0, A._EvaluateVisitor__visitDynamicImport__closure3, A._EvaluateVisitor__visitDynamicImport__closure4, A._EvaluateVisitor__visitDynamicImport__closure5, A._EvaluateVisitor_visitIncludeRule_closure3, A._EvaluateVisitor_visitMediaRule_closure2, A._EvaluateVisitor_visitMediaRule_closure4, A._EvaluateVisitor_visitStyleRule_closure4, A._EvaluateVisitor_visitStyleRule_closure5, A._EvaluateVisitor__warnForBogusCombinators_closure0, A._EvaluateVisitor_visitSupportsRule_closure2, A._EvaluateVisitor_visitWhileRule__closure0, A._EvaluateVisitor__slash_recommendation0, A._EvaluateVisitor_visitListExpression_closure0, A._EvaluateVisitor_visitFunctionExpression_closure3, A._EvaluateVisitor__checkCalculationArguments_check0, A._EvaluateVisitor__runUserDefinedCallable____closure0, A._EvaluateVisitor__runBuiltInCallable_closure4, A._EvaluateVisitor__evaluateArguments_closure3, A._EvaluateVisitor__evaluateArguments_closure4, A._EvaluateVisitor__evaluateArguments_closure6, A._EvaluateVisitor__evaluateMacroArguments_closure3, A._EvaluateVisitor__evaluateMacroArguments_closure4, A._EvaluateVisitor__evaluateMacroArguments_closure6, A._EvaluateVisitor_visitCssAtRule_closure2, A._EvaluateVisitor_visitCssKeyframeBlock_closure2, A._EvaluateVisitor_visitCssMediaRule_closure2, A._EvaluateVisitor_visitCssMediaRule_closure4, A._EvaluateVisitor_visitCssStyleRule_closure1, A._EvaluateVisitor_visitCssSupportsRule_closure2, A._EvaluateVisitor__performInterpolationHelper_closure0, A._EvaluateVisitor__withoutSlash_recommendation0, A._EvaluateVisitor__stackFrame_closure0, A._ImportedCssVisitor_visitCssAtRule_closure0, A._ImportedCssVisitor_visitCssMediaRule_closure0, A._ImportedCssVisitor_visitCssStyleRule_closure0, A._ImportedCssVisitor_visitCssSupportsRule_closure0, A._EvaluateVisitor_closure, A._EvaluateVisitor_closure0, A._EvaluateVisitor_closure1, A._EvaluateVisitor_closure2, A._EvaluateVisitor_closure3, A._EvaluateVisitor_closure4, A._EvaluateVisitor_closure5, A._EvaluateVisitor_closure6, A._EvaluateVisitor_closure7, A._EvaluateVisitor_closure8, A._EvaluateVisitor_closure9, A._EvaluateVisitor_closure10, A._EvaluateVisitor_closure11, A._EvaluateVisitor__loadModule__closure, A._EvaluateVisitor__combineCss_closure, A._EvaluateVisitor__combineCss_closure0, A._EvaluateVisitor__combineCss_visitModule, A._EvaluateVisitor__extendModules_closure, A._EvaluateVisitor__scopeForAtRoot_closure, A._EvaluateVisitor__scopeForAtRoot_closure0, A._EvaluateVisitor__scopeForAtRoot_closure1, A._EvaluateVisitor__scopeForAtRoot_closure2, A._EvaluateVisitor__scopeForAtRoot_closure3, A._EvaluateVisitor__scopeForAtRoot_closure4, A._EvaluateVisitor_visitEachRule_closure, A._EvaluateVisitor_visitEachRule_closure0, A._EvaluateVisitor_visitEachRule__closure, A._EvaluateVisitor_visitEachRule___closure, A._EvaluateVisitor_visitAtRule_closure, A._EvaluateVisitor_visitAtRule_closure1, A._EvaluateVisitor_visitForRule__closure, A._EvaluateVisitor_visitIfRule_closure, A._EvaluateVisitor_visitIfRule___closure, A._EvaluateVisitor__visitDynamicImport__closure, A._EvaluateVisitor__visitDynamicImport__closure0, A._EvaluateVisitor__visitDynamicImport__closure1, A._EvaluateVisitor_visitIncludeRule_closure0, A._EvaluateVisitor_visitMediaRule_closure, A._EvaluateVisitor_visitMediaRule_closure1, A._EvaluateVisitor_visitStyleRule_closure0, A._EvaluateVisitor_visitStyleRule_closure1, A._EvaluateVisitor__warnForBogusCombinators_closure, A._EvaluateVisitor_visitSupportsRule_closure0, A._EvaluateVisitor_visitWhileRule__closure, A._EvaluateVisitor__slash_recommendation, A._EvaluateVisitor_visitListExpression_closure, A._EvaluateVisitor_visitFunctionExpression_closure0, A._EvaluateVisitor__checkCalculationArguments_check, A._EvaluateVisitor__runUserDefinedCallable____closure, A._EvaluateVisitor__runBuiltInCallable_closure1, A._EvaluateVisitor__evaluateArguments_closure, A._EvaluateVisitor__evaluateArguments_closure0, A._EvaluateVisitor__evaluateArguments_closure2, A._EvaluateVisitor__evaluateMacroArguments_closure, A._EvaluateVisitor__evaluateMacroArguments_closure0, A._EvaluateVisitor__evaluateMacroArguments_closure2, A._EvaluateVisitor_visitCssAtRule_closure0, A._EvaluateVisitor_visitCssKeyframeBlock_closure0, A._EvaluateVisitor_visitCssMediaRule_closure, A._EvaluateVisitor_visitCssMediaRule_closure1, A._EvaluateVisitor_visitCssStyleRule_closure, A._EvaluateVisitor_visitCssSupportsRule_closure0, A._EvaluateVisitor__performInterpolationHelper_closure, A._EvaluateVisitor__withoutSlash_recommendation, A._EvaluateVisitor__stackFrame_closure, A._ImportedCssVisitor_visitCssAtRule_closure, A._ImportedCssVisitor_visitCssMediaRule_closure, A._ImportedCssVisitor_visitCssStyleRule_closure, A._ImportedCssVisitor_visitCssSupportsRule_closure, A.EveryCssVisitor_visitCssAtRule_closure, A.EveryCssVisitor_visitCssKeyframeBlock_closure, A.EveryCssVisitor_visitCssMediaRule_closure, A.EveryCssVisitor_visitCssStyleRule_closure, A.EveryCssVisitor_visitCssStylesheet_closure, A.EveryCssVisitor_visitCssSupportsRule_closure, A.ReplaceExpressionVisitor_visitListExpression_closure, A.ReplaceExpressionVisitor_visitArgumentInvocation_closure, A.ReplaceExpressionVisitor_visitInterpolation_closure, A.SelectorSearchVisitor_visitComplexSelector_closure, A.SelectorSearchVisitor_visitCompoundSelector_closure, A.serialize_closure, A._SerializeVisitor_visitList_closure, A._SerializeVisitor_visitList_closure0, A._SerializeVisitor_visitList_closure1, A._SerializeVisitor_visitMap_closure, A._SerializeVisitor_visitSelectorList_closure, A.StatementSearchVisitor_visitIfRule_closure, A.StatementSearchVisitor_visitIfRule__closure0, A.StatementSearchVisitor_visitIfRule_closure0, A.StatementSearchVisitor_visitIfRule__closure, A.StatementSearchVisitor_visitChildren_closure, A.SingleMapping_SingleMapping$fromEntries_closure1, A.SingleMapping_toJson_closure, A.Highlighter$__closure, A.Highlighter$___closure, A.Highlighter$__closure0, A.Highlighter__collateLines_closure, A.Highlighter__collateLines_closure1, A.Highlighter__collateLines__closure, A.Highlighter_highlight_closure, A.Chain_Chain$parse_closure, A.Chain_toTrace_closure, A.Chain_toString_closure0, A.Chain_toString__closure0, A.Chain_toString_closure, A.Chain_toString__closure, A.Trace__parseVM_closure, A.Trace$parseV8_closure, A.Trace$parseJSCore_closure, A.Trace$parseFirefox_closure, A.Trace$parseFriendly_closure, A.Trace_terse_closure, A.Trace_foldFrames_closure, A.Trace_foldFrames_closure0, A.Trace_toString_closure0, A.Trace_toString_closure, A.TransformByHandlers_transformByHandlers__closure, A.RateLimit__debounceAggregate_closure0, A.AnySelectorVisitor_visitComplexSelector_closure0, A.AnySelectorVisitor_visitCompoundSelector_closure0, A.ArgumentDeclaration_verify_closure1, A.ArgumentDeclaration_verify_closure2, A.argumentListClass__closure, A.argumentListClass__closure0, A.AsyncBuiltInCallable$mixin_closure0, A._compileStylesheet_closure2, A.AsyncEnvironment__getVariableFromGlobalModule_closure0, A.AsyncEnvironment_setVariable_closure3, A.AsyncEnvironment__getFunctionFromGlobalModule_closure0, A.AsyncEnvironment__getMixinFromGlobalModule_closure0, A.AsyncEnvironment_toModule_closure0, A.AsyncEnvironment_toDummyModule_closure0, A._EnvironmentModule__EnvironmentModule_closure17, A._EnvironmentModule__EnvironmentModule_closure18, A._EnvironmentModule__EnvironmentModule_closure19, A._EnvironmentModule__EnvironmentModule_closure20, A._EnvironmentModule__EnvironmentModule_closure21, A._EnvironmentModule__EnvironmentModule_closure22, A._EvaluateVisitor_closure38, A._EvaluateVisitor_closure39, A._EvaluateVisitor_closure40, A._EvaluateVisitor_closure41, A._EvaluateVisitor_closure42, A._EvaluateVisitor_closure43, A._EvaluateVisitor_closure44, A._EvaluateVisitor_closure45, A._EvaluateVisitor_closure46, A._EvaluateVisitor_closure47, A._EvaluateVisitor_closure48, A._EvaluateVisitor_closure49, A._EvaluateVisitor_closure50, A._EvaluateVisitor__loadModule__closure5, A._EvaluateVisitor__combineCss_closure5, A._EvaluateVisitor__combineCss_closure6, A._EvaluateVisitor__combineCss_visitModule2, A._EvaluateVisitor__extendModules_closure5, A._EvaluateVisitor__scopeForAtRoot_closure17, A._EvaluateVisitor__scopeForAtRoot_closure18, A._EvaluateVisitor__scopeForAtRoot_closure19, A._EvaluateVisitor__scopeForAtRoot_closure20, A._EvaluateVisitor__scopeForAtRoot_closure21, A._EvaluateVisitor__scopeForAtRoot_closure22, A._EvaluateVisitor_visitEachRule_closure8, A._EvaluateVisitor_visitEachRule_closure9, A._EvaluateVisitor_visitEachRule__closure2, A._EvaluateVisitor_visitEachRule___closure2, A._EvaluateVisitor_visitAtRule_closure8, A._EvaluateVisitor_visitAtRule_closure10, A._EvaluateVisitor_visitForRule__closure2, A._EvaluateVisitor_visitIfRule_closure2, A._EvaluateVisitor_visitIfRule___closure2, A._EvaluateVisitor__visitDynamicImport__closure11, A._EvaluateVisitor__visitDynamicImport__closure12, A._EvaluateVisitor__visitDynamicImport__closure13, A._EvaluateVisitor_visitIncludeRule_closure9, A._EvaluateVisitor_visitMediaRule_closure8, A._EvaluateVisitor_visitMediaRule_closure10, A._EvaluateVisitor_visitStyleRule_closure12, A._EvaluateVisitor_visitStyleRule_closure13, A._EvaluateVisitor__warnForBogusCombinators_closure2, A._EvaluateVisitor_visitSupportsRule_closure6, A._EvaluateVisitor_visitWhileRule__closure2, A._EvaluateVisitor__slash_recommendation2, A._EvaluateVisitor_visitListExpression_closure2, A._EvaluateVisitor_visitFunctionExpression_closure9, A._EvaluateVisitor__checkCalculationArguments_check2, A._EvaluateVisitor__runUserDefinedCallable____closure2, A._EvaluateVisitor__runBuiltInCallable_closure10, A._EvaluateVisitor__evaluateArguments_closure11, A._EvaluateVisitor__evaluateArguments_closure12, A._EvaluateVisitor__evaluateArguments_closure14, A._EvaluateVisitor__evaluateMacroArguments_closure11, A._EvaluateVisitor__evaluateMacroArguments_closure12, A._EvaluateVisitor__evaluateMacroArguments_closure14, A._EvaluateVisitor_visitCssAtRule_closure6, A._EvaluateVisitor_visitCssKeyframeBlock_closure6, A._EvaluateVisitor_visitCssMediaRule_closure8, A._EvaluateVisitor_visitCssMediaRule_closure10, A._EvaluateVisitor_visitCssStyleRule_closure5, A._EvaluateVisitor_visitCssSupportsRule_closure6, A._EvaluateVisitor__performInterpolationHelper_closure2, A._EvaluateVisitor__withoutSlash_recommendation2, A._EvaluateVisitor__stackFrame_closure2, A._ImportedCssVisitor_visitCssAtRule_closure2, A._ImportedCssVisitor_visitCssMediaRule_closure2, A._ImportedCssVisitor_visitCssStyleRule_closure2, A._ImportedCssVisitor_visitCssSupportsRule_closure2, A.AsyncImportCache_humanize_closure3, A.AsyncImportCache_humanize_closure4, A.AsyncImportCache_humanize_closure5, A.AsyncImportCache_humanize_closure6, A.booleanClass__closure, A.legacyBooleanClass__closure, A.legacyBooleanClass__closure0, A.BuiltInCallable$mixin_closure0, A.calculationClass__closure, A.calculationClass__closure0, A.calculationClass__closure1, A.calculationClass__closure2, A.calculationClass__closure3, A.calculationClass__closure4, A.calculationClass__closure5, A.calculationOperationClass__closure, A.calculationOperationClass___closure, A.calculationOperationClass__closure1, A.calculationOperationClass__closure2, A.calculationOperationClass__closure3, A.calculationOperationClass__closure4, A.calculationInterpolationClass__closure1, A.calculationInterpolationClass__closure2, A.SassCalculation__verifyLength_closure0, A.updateCanonicalizeContextPrototype_closure, A.updateCanonicalizeContextPrototype_closure0, A.global_closure32, A.global_closure33, A.global_closure34, A.global_closure35, A.global_closure36, A.global_closure37, A.global_closure38, A.global_closure39, A.global_closure40, A.global_closure41, A.global_closure42, A.global_closure43, A.global_closure44, A.global_closure45, A.global_closure46, A.global_closure47, A.global_closure48, A.global_closure49, A.global_closure50, A.global_closure51, A.global_closure52, A.global_closure53, A.global_closure54, A.global_closure55, A.global_closure56, A.global_closure57, A.global__closure0, A.global_closure58, A.module_closure12, A.module_closure13, A.module_closure14, A.module_closure15, A.module_closure16, A.module_closure17, A.module_closure18, A.module_closure19, A.module__closure4, A.module_closure20, A._red_closure0, A._green_closure0, A._blue_closure0, A._mix_closure0, A._hue_closure0, A._saturation_closure0, A._lightness_closure0, A._complement_closure0, A._adjust_closure0, A._scale_closure0, A._change_closure0, A._ieHexStr_closure0, A._ieHexStr_closure_hexString0, A._updateComponents_getParam0, A._updateComponents_closure1, A._updateComponents_closure2, A._updateComponents_updateValue0, A._functionString_closure0, A._removedColorFunction_closure0, A._rgb_closure0, A._hsl_closure0, A._hwb_closure0, A._parseChannels_closure0, A.colorClass__closure1, A.colorClass__closure2, A.colorClass__closure3, A.colorClass__closure4, A.colorClass__closure5, A.colorClass__closure6, A.colorClass__closure7, A.colorClass__closure8, A.colorClass__closure9, A.legacyColorClass_closure, A.legacyColorClass_closure0, A.legacyColorClass_closure1, A.legacyColorClass_closure2, A.legacyColorClass_closure3, A.SassColor_SassColor$hwb_toRgb0, A.compileAsync__closure, A.compileStringAsync__closure, A.compileStringAsync__closure0, A._wrapAsyncSassExceptions_closure, A._parseFunctions__closure2, A._parseFunctions__closure3, A.nodePackageImporterClass__closure, A._compileStylesheet_closure1, A.AsyncCompiler_addCompilation_closure, A.compilerClass__closure, A.compilerClass__closure0, A.compilerClass__closure1, A.compilerClass__closure2, A.asyncCompilerClass__closure, A.asyncCompilerClass__closure0, A.asyncCompilerClass__closure1, A.asyncCompilerClass__closure2, A.ComplexSelectorComponent_toString_closure0, A.CompoundSelector_hasComplicatedSuperselectorSemantics_closure0, A._disallowedFunctionNames_closure0, A.Deprecation_fromId_closure0, A.DeprecationProcessingLogger_summarize_closure1, A.DeprecationProcessingLogger_summarize_closure2, A.versionClass__closure, A.versionClass__closure0, A.EachRule_toString_closure0, A.Environment__getVariableFromGlobalModule_closure0, A.Environment_setVariable_closure3, A.Environment__getFunctionFromGlobalModule_closure0, A.Environment__getMixinFromGlobalModule_closure0, A.Environment_toModule_closure0, A.Environment_toDummyModule_closure0, A._EnvironmentModule__EnvironmentModule_closure11, A._EnvironmentModule__EnvironmentModule_closure12, A._EnvironmentModule__EnvironmentModule_closure13, A._EnvironmentModule__EnvironmentModule_closure14, A._EnvironmentModule__EnvironmentModule_closure15, A._EnvironmentModule__EnvironmentModule_closure16, A._EvaluateVisitor_closure25, A._EvaluateVisitor_closure26, A._EvaluateVisitor_closure27, A._EvaluateVisitor_closure28, A._EvaluateVisitor_closure29, A._EvaluateVisitor_closure30, A._EvaluateVisitor_closure31, A._EvaluateVisitor_closure32, A._EvaluateVisitor_closure33, A._EvaluateVisitor_closure34, A._EvaluateVisitor_closure35, A._EvaluateVisitor_closure36, A._EvaluateVisitor_closure37, A._EvaluateVisitor__loadModule__closure3, A._EvaluateVisitor__combineCss_closure3, A._EvaluateVisitor__combineCss_closure4, A._EvaluateVisitor__combineCss_visitModule1, A._EvaluateVisitor__extendModules_closure3, A._EvaluateVisitor__scopeForAtRoot_closure11, A._EvaluateVisitor__scopeForAtRoot_closure12, A._EvaluateVisitor__scopeForAtRoot_closure13, A._EvaluateVisitor__scopeForAtRoot_closure14, A._EvaluateVisitor__scopeForAtRoot_closure15, A._EvaluateVisitor__scopeForAtRoot_closure16, A._EvaluateVisitor_visitEachRule_closure5, A._EvaluateVisitor_visitEachRule_closure6, A._EvaluateVisitor_visitEachRule__closure1, A._EvaluateVisitor_visitEachRule___closure1, A._EvaluateVisitor_visitAtRule_closure5, A._EvaluateVisitor_visitAtRule_closure7, A._EvaluateVisitor_visitForRule__closure1, A._EvaluateVisitor_visitIfRule_closure1, A._EvaluateVisitor_visitIfRule___closure1, A._EvaluateVisitor__visitDynamicImport__closure7, A._EvaluateVisitor__visitDynamicImport__closure8, A._EvaluateVisitor__visitDynamicImport__closure9, A._EvaluateVisitor_visitIncludeRule_closure6, A._EvaluateVisitor_visitMediaRule_closure5, A._EvaluateVisitor_visitMediaRule_closure7, A._EvaluateVisitor_visitStyleRule_closure8, A._EvaluateVisitor_visitStyleRule_closure9, A._EvaluateVisitor__warnForBogusCombinators_closure1, A._EvaluateVisitor_visitSupportsRule_closure4, A._EvaluateVisitor_visitWhileRule__closure1, A._EvaluateVisitor__slash_recommendation1, A._EvaluateVisitor_visitListExpression_closure1, A._EvaluateVisitor_visitFunctionExpression_closure6, A._EvaluateVisitor__checkCalculationArguments_check1, A._EvaluateVisitor__runUserDefinedCallable____closure1, A._EvaluateVisitor__runBuiltInCallable_closure7, A._EvaluateVisitor__evaluateArguments_closure7, A._EvaluateVisitor__evaluateArguments_closure8, A._EvaluateVisitor__evaluateArguments_closure10, A._EvaluateVisitor__evaluateMacroArguments_closure7, A._EvaluateVisitor__evaluateMacroArguments_closure8, A._EvaluateVisitor__evaluateMacroArguments_closure10, A._EvaluateVisitor_visitCssAtRule_closure4, A._EvaluateVisitor_visitCssKeyframeBlock_closure4, A._EvaluateVisitor_visitCssMediaRule_closure5, A._EvaluateVisitor_visitCssMediaRule_closure7, A._EvaluateVisitor_visitCssStyleRule_closure3, A._EvaluateVisitor_visitCssSupportsRule_closure4, A._EvaluateVisitor__performInterpolationHelper_closure1, A._EvaluateVisitor__withoutSlash_recommendation1, A._EvaluateVisitor__stackFrame_closure1, A._ImportedCssVisitor_visitCssAtRule_closure1, A._ImportedCssVisitor_visitCssMediaRule_closure1, A._ImportedCssVisitor_visitCssStyleRule_closure1, A._ImportedCssVisitor_visitCssSupportsRule_closure1, A.EveryCssVisitor_visitCssAtRule_closure0, A.EveryCssVisitor_visitCssKeyframeBlock_closure0, A.EveryCssVisitor_visitCssMediaRule_closure0, A.EveryCssVisitor_visitCssStyleRule_closure0, A.EveryCssVisitor_visitCssStylesheet_closure0, A.EveryCssVisitor_visitCssSupportsRule_closure0, A.exceptionClass__closure, A.exceptionClass__closure0, A.exceptionClass__closure1, A._IsCalculationSafeVisitor_visitListExpression_closure0, A.ExtensionStore_extensionsWhereTarget_closure0, A.ExtensionStore__extendComplex_closure0, A.ExtensionStore__extendComplex__closure0, A.ExtensionStore__extendCompound_closure2, A.ExtensionStore__extendCompound_closure3, A.ExtensionStore__extendCompound_closure4, A.ExtensionStore__extendSimple_withoutPseudo0, A.ExtensionStore__extendSimple_closure1, A.ExtensionStore__extendSimple_closure2, A.ExtensionStore__extendPseudo_closure4, A.ExtensionStore__extendPseudo_closure5, A.ExtensionStore__extendPseudo_closure6, A.ExtensionStore__extendPseudo_closure7, A.ExtensionStore__extendPseudo_closure8, A.ExtensionStore__trim_closure1, A.ExtensionStore__trim_closure2, A.FilesystemImporter_canonicalize_closure0, A.functionClass__closure, A.functionClass__closure0, A.unifyComplex_closure0, A._weaveParents_closure4, A._weaveParents_closure5, A._weaveParents_closure6, A._mustUnify_closure0, A._mustUnify__closure0, A.paths__closure0, A.paths___closure0, A.listIsSuperselector_closure0, A.listIsSuperselector__closure0, A.complexIsSuperselector_closure1, A.complexIsSuperselector_closure2, A._compatibleWithPreviousCombinator_closure0, A.compoundIsSuperselector_closure0, A._selectorPseudoIsSuperselector_closure6, A._selectorPseudoIsSuperselector_closure7, A._selectorPseudoIsSuperselector_closure8, A._selectorPseudoIsSuperselector_closure9, A._selectorPseudoIsSuperselector_closure10, A._selectorPseudoIsSuperselector__closure0, A._selectorPseudoIsSuperselector___closure1, A._selectorPseudoIsSuperselector___closure2, A._selectorPseudoIsSuperselector_closure11, A._selectorPseudoIsSuperselector_closure12, A._selectorPseudoArgs_closure1, A._selectorPseudoArgs_closure2, A.globalFunctions_closure0, A.IDSelector_unify_closure0, A.IfRuleClause$__closure0, A.IfRuleClause$___closure0, A.immutableMapToDartMap_closure, A.NodeImporter__tryPath_closure0, A.ImportCache_humanize_closure3, A.ImportCache_humanize_closure4, A.ImportCache_humanize_closure5, A.ImportCache_humanize_closure6, A.Interpolation_toString_closure0, A.InterpolationMap_mapException_closure0, A._realCasePath_helper0, A._realCasePath_helper__closure0, A.listDir__closure1, A.listDir__closure2, A.listDir_closure_list0, A.listDir__list_closure0, A.render_closure0, A._parseFunctions__closure, A._parseFunctions___closure2, A._parseFunctions__closure0, A._parseFunctions__closure1, A._parseFunctions___closure, A._parseImporter_closure, A._parseImporter__closure, A._parseImporter___closure, A.ListExpression_toString_closure0, A._length_closure2, A._nth_closure0, A._setNth_closure0, A._join_closure0, A._append_closure2, A._zip_closure0, A._zip__closure2, A._zip__closure3, A._zip__closure4, A._index_closure2, A._separator_closure0, A._isBracketed_closure0, A._slash_closure0, A.SelectorList_asSassList_closure0, A.SelectorList_nestWithin_closure0, A.SelectorList_nestWithin__closure1, A.SelectorList_nestWithin__closure2, A.SelectorList__nestWithinCompound_closure2, A.SelectorList__nestWithinCompound_closure3, A.SelectorList__nestWithinCompound_closure4, A.SelectorList_withAdditionalCombinators_closure0, A.listClass__closure, A.legacyListClass_closure, A.legacyListClass__closure, A.legacyListClass_closure1, A.legacyListClass_closure2, A.legacyListClass_closure4, A.SassList_isBlank_closure0, A._get_closure0, A._set_closure1, A._set__closure2, A._set_closure2, A._set__closure1, A._merge_closure1, A._merge_closure2, A._merge__closure0, A._deepMerge_closure0, A._deepRemove_closure0, A._deepRemove__closure0, A._remove_closure1, A._remove_closure2, A._keys_closure0, A._values_closure0, A._hasKey_closure0, A._modify_modifyNestedMap0, A.MapExtensions_get_pairs_closure0, A.mapClass__closure, A.mapClass__closure0, A.legacyMapClass_closure, A.legacyMapClass__closure, A.legacyMapClass__closure0, A.legacyMapClass_closure2, A.legacyMapClass_closure3, A.legacyMapClass_closure4, A.global_closure31, A.module_closure11, A._ceil_closure0, A._clamp_closure0, A._floor_closure0, A._max_closure0, A._min_closure0, A._round_closure0, A._hypot_closure0, A._hypot__closure0, A._log_closure0, A._pow_closure0, A._atan2_closure0, A._compatible_closure0, A._isUnitless_closure0, A._unit_closure0, A._percentage_closure0, A._randomFunction_closure0, A._div_closure0, A._singleArgumentMathFunc_closure0, A._numberFunction_closure0, A.global_closure59, A.global_closure60, A.global_closure61, A.global_closure62, A.local_closure2, A.local_closure3, A.local__closure0, A.local_closure4, A.mixinClass__closure, A.mixinClass__closure0, A.ModifiableCssNode_hasFollowingSibling_closure0, A.NodePackageImporter__nodePackageExportsResolve_closure3, A.NodePackageImporter__nodePackageExportsResolve_closure4, A.NodePackageImporter__nodePackageExportsResolve_closure5, A.NodePackageImporter__nodePackageExportsResolve_closure6, A.NodePackageImporter__nodePackageExportsResolve__closure1, A.NodePackageImporter__nodePackageExportsResolve__closure2, A.NodePackageImporter__getMainExport_closure0, A.legacyNullClass__closure, A.numberClass__closure, A.numberClass__closure0, A.numberClass__closure1, A.numberClass__closure2, A.numberClass__closure3, A.numberClass__closure4, A.numberClass__closure5, A.numberClass__closure6, A.numberClass__closure7, A.numberClass__closure8, A.numberClass__closure9, A.numberClass__closure12, A.numberClass__closure13, A.numberClass__closure14, A.numberClass__closure15, A.numberClass__closure16, A.numberClass__closure17, A.numberClass__closure18, A.numberClass__closure19, A.legacyNumberClass_closure, A.legacyNumberClass_closure0, A.legacyNumberClass_closure2, A._parseNumber_closure, A._parseNumber_closure0, A.SassNumber__coerceOrConvertValue_closure3, A.SassNumber__coerceOrConvertValue_closure5, A.SassNumber_multiplyUnits_closure3, A.SassNumber_multiplyUnits_closure5, A.SassNumber__areAnyConvertible_closure0, A.SassNumber__canonicalizeUnitList_closure0, A.SassNumber_unitSuggestion_closure1, A.SassNumber_unitSuggestion_closure2, A.ParentStatement_closure0, A.ParentStatement__closure0, A.Parser_escape_closure0, A.Parser_scanIdentChar_matches0, A._PrefixedKeys_iterator_closure0, A.PseudoSelector_specificity__closure1, A.PseudoSelector_specificity__closure2, A.PseudoSelector_unify_closure0, A.JSClassExtension_setCustomInspect_closure, A.ReplaceExpressionVisitor_visitListExpression_closure0, A.ReplaceExpressionVisitor_visitArgumentInvocation_closure0, A.ReplaceExpressionVisitor_visitInterpolation_closure0, A.SassParser_styleRuleSelector_closure0, A.SassParser__peekIndentation_closure1, A.SassParser__peekIndentation_closure2, A._wrapMain_closure, A._wrapMain_closure0, A._IsBogusVisitor_visitComplexSelector_closure0, A._IsUselessVisitor_visitComplexSelector_closure0, A._nest_closure0, A._nest__closure1, A._append_closure1, A._append__closure1, A._append___closure0, A._extend_closure0, A._replace_closure0, A._unify_closure0, A._isSuperselector_closure0, A._simpleSelectors_closure0, A._simpleSelectors__closure0, A._parse_closure0, A.SelectorSearchVisitor_visitComplexSelector_closure0, A.SelectorSearchVisitor_visitCompoundSelector_closure0, A.serialize_closure0, A._SerializeVisitor_visitList_closure2, A._SerializeVisitor_visitList_closure3, A._SerializeVisitor_visitList_closure4, A._SerializeVisitor_visitMap_closure0, A._SerializeVisitor_visitSelectorList_closure0, A.SimpleSelector_isSuperselector_closure0, A.SimpleSelector_isSuperselector__closure0, A.SingleUnitSassNumber__coerceToUnit_closure0, A.SingleUnitSassNumber__coerceValueToUnit_closure0, A.SingleUnitSassNumber_multiplyUnits_closure1, A.SourceMapBuffer_buildSourceMap_closure0, A.updateSourceSpanPrototype_closure0, A.updateSourceSpanPrototype_closure1, A.updateSourceSpanPrototype_closure2, A.updateSourceSpanPrototype_closure3, A.updateSourceSpanPrototype_closure4, A.updateSourceSpanPrototype_closure5, A.updateSourceSpanPrototype_closure6, A.StatementSearchVisitor_visitIfRule_closure1, A.StatementSearchVisitor_visitIfRule__closure2, A.StatementSearchVisitor_visitIfRule_closure2, A.StatementSearchVisitor_visitIfRule__closure1, A.StatementSearchVisitor_visitChildren_closure0, A.module_closure10, A.module__closure2, A.module__closure3, A._unquote_closure0, A._quote_closure0, A._length_closure1, A._insert_closure0, A._index_closure1, A._slice_closure0, A._toUpperCase_closure0, A._toLowerCase_closure0, A._uniqueId_closure0, A.stringClass__closure, A.stringClass__closure0, A.stringClass__closure1, A.stringClass__closure2, A.stringClass__closure3, A.legacyStringClass_closure, A.legacyStringClass_closure0, A.StylesheetParser_parse__closure2, A.StylesheetParser__expression_addSingleExpression0, A.StylesheetParser__expression_addOperator0, A.StylesheetParser__isHexColor_closure0, A.StylesheetParser__unicodeRange_closure1, A.StylesheetParser__unicodeRange_closure2, A.StylesheetParser_trySpecialFunction_closure0, A._UnprefixedKeys_iterator_closure1, A._UnprefixedKeys_iterator_closure2, A._exactlyOne_closure0, A.futureToPromise__closure0, A.indent_closure0, A.flattenVertically_closure1, A.flattenVertically_closure2, A.valueClass__closure, A.valueClass__closure0, A.valueClass__closure1, A.valueClass__closure2, A.valueClass__closure3, A.valueClass__closure4, A.valueClass__closure5, A.valueClass__closure7, A.valueClass__closure8, A.valueClass__closure9, A.valueClass__closure10, A.valueClass__closure11, A.valueClass__closure12, A.valueClass__closure13, A.valueClass__closure14, A.valueClass__closure15, A.valueClass__closure17, A.valueClass__closure18]);
+    _inheritMany(A.Closure2Args, [A._CastListBase_sort_closure, A.CastMap_forEach_closure, A.Primitives_functionNoSuchMethod_closure, A.JsLinkedHashMap_addAll_closure, A.initHooks_closure0, A._awaitOnObject_closure0, A._wrapJsFunctionForAsync_closure, A.Future_wait_handleError, A._Future__chainForeignFuture_closure0, A.Stream_Stream$fromFuture_closure0, A._AddStreamState_makeErrorHandler_closure, A._HashMap_addAll_closure, A.HashMap_HashMap$from_closure, A.LinkedHashMap_LinkedHashMap$from_closure, A.MapBase_addAll_closure, A.MapBase_mapToString_closure, A._JsonMap_addAll_closure, A._JsonStringifier_writeMap_closure, A.NoSuchMethodError_toString_closure, A.Uri__parseIPv4Address_error, A.Uri_parseIPv6Address_error, A.Uri_parseIPv6Address_parseHex, A._createTables_build, A.Parser_parse_closure, A.FutureGroup_add_closure0, A.StreamQueue__ensureListening_closure1, A.futureToPromise_closure, A.PathMap__create_closure, A.IfRule_toString_closure, A.ComplexSelector_specificity_closure, A.CompoundSelector_specificity_closure, A.ExtensionStore_clone_closure, A._weaveParents_closure, A.paths_closure, A._updateComponents_updateRgb, A._nest__closure0, A._append__closure0, A.ImportCache_clearCanonicalize_closure, A.StylesheetParser__styleRule_closure, A.StylesheetParser__tryDeclarationChildren_closure, A.StylesheetParser__atRootRule_closure, A.StylesheetParser__atRootRule_closure0, A.StylesheetParser__eachRule_closure, A.StylesheetParser__functionRule_closure, A.StylesheetParser__forRule_closure0, A.StylesheetParser__includeRule_closure, A.StylesheetParser_mediaRule_closure, A.StylesheetParser__mixinRule_closure, A.StylesheetParser_mozDocumentRule_closure, A.StylesheetParser_supportsRule_closure, A.StylesheetParser__whileRule_closure, A.StylesheetParser_unknownAtRule_closure, A.longestCommonSubsequence_backtrack, A.mapAddAll2_closure, A.SassNumber_plus_closure, A.SassNumber_minus_closure, A.SassNumber__canonicalMultiplier_closure, A._EvaluateVisitor__closure3, A._EvaluateVisitor__closure4, A._EvaluateVisitor_visitForwardRule_closure1, A._EvaluateVisitor_visitForwardRule_closure2, A._EvaluateVisitor_visitUseRule_closure0, A._EvaluateVisitor__evaluateArguments_closure5, A._EvaluateVisitor__evaluateMacroArguments_closure5, A._EvaluateVisitor__addRestMap_closure0, A._EvaluateVisitor__closure, A._EvaluateVisitor__closure0, A._EvaluateVisitor_visitForwardRule_closure, A._EvaluateVisitor_visitForwardRule_closure0, A._EvaluateVisitor_visitUseRule_closure, A._EvaluateVisitor__evaluateArguments_closure1, A._EvaluateVisitor__evaluateMacroArguments_closure1, A._EvaluateVisitor__addRestMap_closure, A.SingleMapping_toJson_closure0, A.Highlighter__collateLines_closure0, A.Frame_Frame$parseV8_closure_parseLocation, A.TransformByHandlers_transformByHandlers__closure1, A.RateLimit__debounceAggregate_closure, A._EvaluateVisitor__closure11, A._EvaluateVisitor__closure12, A._EvaluateVisitor_visitForwardRule_closure5, A._EvaluateVisitor_visitForwardRule_closure6, A._EvaluateVisitor_visitUseRule_closure2, A._EvaluateVisitor__evaluateArguments_closure13, A._EvaluateVisitor__evaluateMacroArguments_closure13, A._EvaluateVisitor__addRestMap_closure2, A.calculationOperationClass__closure0, A.calculationInterpolationClass__closure, A.calculationInterpolationClass__closure0, A._updateComponents_updateRgb0, A.colorClass__closure, A.colorClass__closure0, A.legacyColorClass_closure4, A.legacyColorClass_closure5, A.legacyColorClass_closure6, A.legacyColorClass_closure7, A._parseFunctions_closure0, A.ComplexSelector_specificity_closure0, A.CompoundSelector_specificity_closure0, A._EvaluateVisitor__closure7, A._EvaluateVisitor__closure8, A._EvaluateVisitor_visitForwardRule_closure3, A._EvaluateVisitor_visitForwardRule_closure4, A._EvaluateVisitor_visitUseRule_closure1, A._EvaluateVisitor__evaluateArguments_closure9, A._EvaluateVisitor__evaluateMacroArguments_closure9, A._EvaluateVisitor__addRestMap_closure1, A.ExtensionStore_clone_closure0, A._weaveParents_closure3, A.paths_closure0, A.IfRule_toString_closure0, A.main_closure, A.main_closure0, A.render_closure1, A._parseFunctions_closure, A.listClass__closure0, A.legacyListClass_closure0, A.legacyListClass_closure3, A.mapClass__closure1, A.legacyMapClass_closure0, A.legacyMapClass_closure1, A.numberClass__closure10, A.numberClass__closure11, A.legacyNumberClass_closure1, A.legacyNumberClass_closure3, A.SassNumber_plus_closure0, A.SassNumber_minus_closure0, A.SassNumber__canonicalMultiplier_closure0, A.JSClassExtension_get_defineStaticMethod_closure, A.JSClassExtension_get_defineMethod_closure, A.JSClassExtension_get_defineGetter_closure, A._nest__closure2, A._append__closure2, A.legacyStringClass_closure1, A.StylesheetParser__styleRule_closure0, A.StylesheetParser__tryDeclarationChildren_closure0, A.StylesheetParser__atRootRule_closure1, A.StylesheetParser__atRootRule_closure2, A.StylesheetParser__eachRule_closure0, A.StylesheetParser__functionRule_closure0, A.StylesheetParser__forRule_closure2, A.StylesheetParser__includeRule_closure0, A.StylesheetParser_mediaRule_closure0, A.StylesheetParser__mixinRule_closure0, A.StylesheetParser_mozDocumentRule_closure0, A.StylesheetParser_supportsRule_closure0, A.StylesheetParser__whileRule_closure0, A.StylesheetParser_unknownAtRule_closure0, A.futureToPromise_closure0, A.futureToPromise__closure1, A.objectToMap_closure, A.longestCommonSubsequence_backtrack0, A.mapAddAll2_closure0, A.valueClass__closure6, A.valueClass__closure16]);
     _inherit(A.CastList, A._CastListBase);
-    _inheritMany(A.MapBase, [A.CastMap, A.JsLinkedHashMap, A._HashMap, A.UnmodifiableMapBase, A.MergedMapView, A.MergedMapView0]);
-    _inheritMany(A.Error, [A.LateError, A.TypeError, A.JsNoSuchMethodError, A.UnknownJsTypeError, A._CyclicInitializationError, A.RuntimeError, A._Error, A.JsonUnsupportedObjectError, A.AssertionError, A.ArgumentError, A.NoSuchMethodError, A.UnsupportedError, A.UnimplementedError, A.StateError, A.ConcurrentModificationError]);
+    _inheritMany(A.MapBase, [A.CastMap, A.JsLinkedHashMap, A._HashMap, A.UnmodifiableMapBase, A._JsonMap, A.MergedMapView, A.MergedMapView0]);
+    _inheritMany(A.Error, [A.LateError, A.ReachabilityError, A.TypeError, A.JsNoSuchMethodError, A.UnknownJsTypeError, A._CyclicInitializationError, A.RuntimeError, A._Error, A.JsonUnsupportedObjectError, A.AssertionError, A.ArgumentError, A.NoSuchMethodError, A.UnsupportedError, A.UnimplementedError, A.StateError, A.ConcurrentModificationError]);
     _inherit(A.UnmodifiableListBase, A.ListBase);
     _inheritMany(A.UnmodifiableListBase, [A.CodeUnits, A.UnmodifiableListView]);
-    _inheritMany(A.Closure0Args, [A.nullFuture_closure, A._AsyncRun__scheduleImmediateJsOverride_internalCallback, A._AsyncRun__scheduleImmediateWithSetImmediate_internalCallback, A._TimerImpl_internalCallback, A._TimerImpl$periodic_closure, A._Future__addListener_closure, A._Future__prependListeners_closure, A._Future__chainForeignFuture_closure1, A._Future__chainCoreFutureAsync_closure, A._Future__asyncCompleteWithValue_closure, A._Future__asyncCompleteError_closure, A._Future__propagateToListeners_handleWhenCompleteCallback, A._Future__propagateToListeners_handleValueCallback, A._Future__propagateToListeners_handleError, A.Stream_length_closure0, A._StreamController__subscribe_closure, A._StreamController__recordCancel_complete, A._AddStreamState_cancel_closure, A._BufferingStreamSubscription__sendError_sendError, A._BufferingStreamSubscription__sendDone_sendDone, A._PendingEvents_schedule_closure, A._CustomZone_bindCallback_closure, A._CustomZone_bindCallbackGuarded_closure, A._rootHandleError_closure, A._RootZone_bindCallback_closure, A._RootZone_bindCallbackGuarded_closure, A.Utf8Decoder__decoder_closure, A.Utf8Decoder__decoderNonfatal_closure, A.Parser__setOption_closure, A.StreamGroup_add_closure, A.StreamGroup_add_closure0, A.StreamGroup__listenToStream_closure, A.StreamQueue__ensureListening_closure0, A._isStrictMode_closure, A.ReplAdapter_runAsync_closure, A.ParsedPath__splitExtension_closure0, A.ListExpression__elementNeedsParens_closure, A.Interpolation_asPlain_closure, A.Interpolation_asPlain_closure0, A.Interpolation_initialPlain_closure, A.ComplexSelector_singleCompound_closure, A.ComplexSelector_withAdditionalCombinators_closure, A.ComplexSelector_concatenate_closure, A.SelectorList__resolveParentSelectorsCompound__closure, A.PseudoSelector_specificity_closure, A.UniversalSelector_unify_closure, A.UniversalSelector_unify_closure0, A.AsyncEnvironment_setVariable_closure, A.AsyncEnvironment_setVariable_closure1, A.AsyncImportCache_canonicalize_closure, A.AsyncImportCache_canonicalize_closure0, A.AsyncImportCache__canonicalize_closure, A.AsyncImportCache__canonicalize__closure, A.AsyncImportCache__canonicalize_closure0, A.AsyncImportCache_importCanonical_closure, A.Environment_setVariable_closure, A.Environment_setVariable_closure1, A.compileStylesheets_closure, A.ExecutableOptions__parser_closure, A.ExecutableOptions__parser__closure, A.ExecutableOptions__parser__closure0, A.ExecutableOptions_interactive_closure, A.ExecutableOptions_fatalDeprecations_closure, A._Watcher__debounceEvents__closure, A._Watcher__debounceEvents__closure0, A._Watcher__debounceEvents__closure1, A.ExtensionStore__registerSelector_closure, A.ExtensionStore__registerSelector_closure0, A.ExtensionStore_addExtension_closure, A.ExtensionStore_addExtension_closure0, A.ExtensionStore_addExtension_closure1, A.ExtensionStore__simpleSelectors_closure, A.ExtensionStore__extendExistingExtensions_closure, A.ExtensionStore__extendExistingExtensions_closure0, A.ExtensionStore_addExtensions_closure, A.unifyComplex_closure, A.unifyComplex_closure0, A._namespaceAndName_closure, A._weaveParents_closure, A._weaveParents_closure0, A._mergeLeadingCombinators_closure, A._mergeLeadingCombinators_closure0, A._mergeLeadingCombinators_closure1, A._mergeLeadingCombinators_closure2, A._mergeTrailingCombinators_closure, A._mergeTrailingCombinators_closure0, A._mergeTrailingCombinators_closure1, A._mergeTrailingCombinators_closure2, A._mergeTrailingCombinators_closure3, A._mergeTrailingCombinators_closure4, A._mergeTrailingCombinators_closure6, A._mergeTrailingCombinators_closure7, A._mergeTrailingCombinators_closure5, A._mergeTrailingCombinators_closure8, A._chunks_closure, A._chunks_closure0, A._chunks_closure1, A._chunks_closure2, A.compoundIsSuperselector_closure, A.compoundIsSuperselector_closure0, A._selectorPseudoIsSuperselector___closure, A._parseChannels_closure, A._parseChannels_closure1, A._join__closure, A._join__closure0, A._join__closure1, A._set__closure, A._merge__closure, A._deepMergeImpl_closure, A._deepMergeImpl_closure0, A.local__closure, A._prependParent_closure, A._prependParent_closure0, A.ImportCache_canonicalize_closure, A.ImportCache_canonicalize_closure0, A.ImportCache__canonicalize_closure, A.ImportCache__canonicalize__closure, A.ImportCache__canonicalize_closure0, A.ImportCache_importCanonical_closure, A.resolveImportPath_closure, A.resolveImportPath_closure0, A._tryPathAsDirectory_closure, A._exactlyOne_closure, A.InterpolationBuffer_addInterpolation_closure, A.InterpolationMap_mapSpan_closure, A.InterpolationMap_mapSpan_closure0, A._realCasePath_helper_closure, A._readFile_closure, A.writeFile_closure, A.deleteFile_closure, A.fileExists_closure, A.dirExists_closure, A.ensureDir_closure, A.listDir_closure, A.modificationTime_closure, A.watchDir_closure3, A.watchDir__closure, A.DeprecationHandlingLogger_warnForDeprecation_closure, A.DeprecationHandlingLogger_warnForDeprecation_closure0, A.AtRootQueryParser_parse_closure, A.KeyframeSelectorParser_parse_closure, A.MediaQueryParser_parse_closure, A.Parser__parseIdentifier_closure, A.Parser_spanFrom_closure, A.SassParser_children_closure, A.SelectorParser_parse_closure, A.SelectorParser_parseCompoundSelector_closure, A.StylesheetParser_parse_closure, A.StylesheetParser_parse__closure, A.StylesheetParser_parseArgumentDeclaration_closure, A.StylesheetParser_parseVariableDeclaration_closure, A.StylesheetParser_parseUseRule_closure, A.StylesheetParser__parseSingleProduction_closure, A.StylesheetParser__statement_closure, A.StylesheetParser_variableDeclarationWithoutNamespace_closure, A.StylesheetParser_variableDeclarationWithoutNamespace_closure0, A.StylesheetParser__forRule_closure, A.StylesheetParser__memberList_closure, A.StylesheetParser__expression_resetState, A.StylesheetParser__expression_resolveOneOperation, A.StylesheetParser__expression_resolveOperations, A.StylesheetParser__expression_resolveSpaceExpressions, A.StylesheetParser__expression_closure, A.StylesheetParser__expression_closure0, A.StylesheetParser__expression_closure1, A.StylesheetParser_expressionUntilComma_closure, A.StylesheetParser__isHexColor_closure, A.StylesheetParser_identifierLike_closure, A.StylesheetParser_identifierLike_closure0, A.StylesheetParser_namespacedExpression_closure, A.StylesheetParser__tryUrlContents_closure, A.StylesheetParser__interpolatedDeclarationValue_closure, A.StylesheetParser__interpolatedDeclarationValue_closure0, A.StylesheetParser__interpolatedDeclarationValue_closure1, A.StylesheetParser__interpolatedDeclarationValue_closure2, A.StylesheetParser__interpolatedDeclarationValue_closure3, A.StylesheetParser__expressionUntilComparison_closure, A.StylesheetParser__supportsConditionInParens_closure, A.StylesheetParser__publicIdentifier_closure, A.StylesheetGraph_modifiedSince_transitiveModificationTime_closure, A.StylesheetGraph__add_closure, A.StylesheetGraph_addCanonical_closure, A.StylesheetGraph_reload_closure, A.StylesheetGraph__nodeFor_closure, A.StylesheetGraph__nodeFor_closure0, A.MultiDirWatcher_watch_closure, A.SassCalculation_sign_closure, A.SassCalculation_round_closure, A.SassCalculation_round_closure0, A.SassCalculation_round_closure1, A.SassCalculation_round_closure2, A.SassCalculation_round_closure3, A.SassCalculation_round_closure4, A.SassCalculation_round_closure5, A.SassCalculation_round_closure6, A.SassCalculation_round_closure7, A.SassCalculation_round_closure8, A.SassCalculation__roundWithStep_closure0, A.SassCalculation__roundWithStep_closure, A.SassCalculation__roundWithStep_closure1, A.SassCalculation__roundWithStep_closure2, A.SassCalculation__roundWithStep_closure3, A.SassCalculation__roundWithStep_closure4, A.SassCalculation__roundWithStep_closure5, A.SassCalculation__simplify_closure, A.SassCalculation__simplify_closure0, A.SassCalculation__simplify_closure1, A.SassCalculation__simplify_closure2, A.SassNumber_SassNumber$withUnits_closure0, A.SassNumber_SassNumber$withUnits_closure, A.SassNumber_SassNumber$withUnits_closure1, A.SassNumber_SassNumber$withUnits_closure2, A.SassNumber_SassNumber$withUnits_closure4, A.SassNumber_SassNumber$withUnits_closure3, A.SassNumber_SassNumber$withUnits_closure5, A.SassNumber_SassNumber$withUnits_closure6, A.SassNumber_SassNumber$withUnits_closure7, A.SassNumber_SassNumber$withUnits_closure8, A.SassNumber__coerceOrConvertValue_compatibilityException, A.SassNumber__coerceOrConvertValue_closure0, A.SassNumber__coerceOrConvertValue_closure2, A.SassNumber_multiplyUnits_closure, A.SassNumber_multiplyUnits_closure0, A.SassNumber_multiplyUnits_closure1, A.SassNumber_multiplyUnits_closure2, A.SassNumber_multiplyUnits_closure3, A.SassNumber_multiplyUnits_closure4, A.SassNumber_multiplyUnits_closure5, A.SassNumber_multiplyUnits_closure6, A.SassNumber_multiplyUnits_closure8, A.SassNumber_multiplyUnits_closure10, A.SassNumber__unitString_closure, A.SassNumber__unitString_closure0, A.SassNumber__unitString_closure1, A.SassNumber__unitString_closure2, A.SingleUnitSassNumber_multiplyUnits_closure0, A._EvaluateVisitor__closure6, A._EvaluateVisitor__closure5, A._EvaluateVisitor_run_closure0, A._EvaluateVisitor_run__closure0, A._EvaluateVisitor__loadModule_closure1, A._EvaluateVisitor__loadModule_closure2, A._EvaluateVisitor__loadModule__closure2, A._EvaluateVisitor__execute_closure0, A._EvaluateVisitor__extendModules_closure2, A._EvaluateVisitor_visitAtRootRule_closure1, A._EvaluateVisitor_visitAtRootRule_closure2, A._EvaluateVisitor__scopeForAtRoot__closure0, A._EvaluateVisitor_visitContentRule_closure0, A._EvaluateVisitor_visitDeclaration_closure0, A._EvaluateVisitor_visitEachRule_closure4, A._EvaluateVisitor_visitAtRule_closure3, A._EvaluateVisitor_visitAtRule__closure0, A._EvaluateVisitor_visitForRule_closure4, A._EvaluateVisitor_visitForRule_closure5, A._EvaluateVisitor_visitForRule_closure6, A._EvaluateVisitor_visitForRule_closure7, A._EvaluateVisitor_visitForRule_closure8, A._EvaluateVisitor__registerCommentsForModule_closure0, A._EvaluateVisitor_visitIfRule__closure0, A._EvaluateVisitor__visitDynamicImport_closure0, A._EvaluateVisitor__visitDynamicImport__closure6, A._EvaluateVisitor__applyMixin_closure3, A._EvaluateVisitor__applyMixin__closure2, A._EvaluateVisitor__applyMixin_closure2, A._EvaluateVisitor__applyMixin_closure4, A._EvaluateVisitor__applyMixin__closure1, A._EvaluateVisitor__applyMixin___closure0, A._EvaluateVisitor__applyMixin____closure0, A._EvaluateVisitor_visitIncludeRule_closure2, A._EvaluateVisitor_visitIncludeRule_closure4, A._EvaluateVisitor_visitMediaRule_closure3, A._EvaluateVisitor_visitMediaRule__closure0, A._EvaluateVisitor_visitMediaRule___closure0, A._EvaluateVisitor_visitStyleRule_closure4, A._EvaluateVisitor_visitStyleRule_closure6, A._EvaluateVisitor_visitStyleRule__closure0, A._EvaluateVisitor_visitSupportsRule_closure1, A._EvaluateVisitor_visitSupportsRule__closure0, A._EvaluateVisitor__visitSupportsCondition_closure0, A._EvaluateVisitor_visitVariableDeclaration_closure2, A._EvaluateVisitor_visitVariableDeclaration_closure3, A._EvaluateVisitor_visitVariableDeclaration_closure4, A._EvaluateVisitor_visitWarnRule_closure0, A._EvaluateVisitor_visitWhileRule_closure0, A._EvaluateVisitor_visitBinaryOperationExpression_closure0, A._EvaluateVisitor__slash_closure1, A._EvaluateVisitor__slash_closure2, A._EvaluateVisitor_visitVariableExpression_closure0, A._EvaluateVisitor_visitUnaryOperationExpression_closure0, A._EvaluateVisitor_visitFunctionExpression_closure2, A._EvaluateVisitor_visitFunctionExpression_closure4, A._EvaluateVisitor__visitCalculationExpression_closure0, A._EvaluateVisitor__checkAdjacentCalculationValues_closure0, A._EvaluateVisitor_visitInterpolatedFunctionExpression_closure0, A._EvaluateVisitor__runUserDefinedCallable_closure0, A._EvaluateVisitor__runUserDefinedCallable__closure0, A._EvaluateVisitor__runUserDefinedCallable___closure0, A._EvaluateVisitor__runFunctionCallable_closure0, A._EvaluateVisitor__runBuiltInCallable_closure2, A._EvaluateVisitor__runBuiltInCallable_closure3, A._EvaluateVisitor__verifyArguments_closure0, A._EvaluateVisitor_visitCssAtRule_closure1, A._EvaluateVisitor_visitCssKeyframeBlock_closure1, A._EvaluateVisitor_visitCssMediaRule_closure3, A._EvaluateVisitor_visitCssMediaRule__closure0, A._EvaluateVisitor_visitCssMediaRule___closure0, A._EvaluateVisitor_visitCssStyleRule_closure2, A._EvaluateVisitor_visitCssStyleRule__closure0, A._EvaluateVisitor_visitCssStyleRule_closure4, A._EvaluateVisitor_visitCssSupportsRule_closure1, A._EvaluateVisitor_visitCssSupportsRule__closure0, A._EvaluateVisitor__serialize_closure0, A._EvaluateVisitor__expressionNode_closure0, A._EvaluateVisitor__closure2, A._EvaluateVisitor__closure1, A._EvaluateVisitor_run_closure, A._EvaluateVisitor_run__closure, A._EvaluateVisitor_runExpression_closure, A._EvaluateVisitor_runExpression__closure, A._EvaluateVisitor_runExpression___closure, A._EvaluateVisitor_runStatement_closure, A._EvaluateVisitor_runStatement__closure, A._EvaluateVisitor_runStatement___closure, A._EvaluateVisitor__loadModule_closure, A._EvaluateVisitor__loadModule_closure0, A._EvaluateVisitor__loadModule__closure0, A._EvaluateVisitor__execute_closure, A._EvaluateVisitor__extendModules_closure0, A._EvaluateVisitor_visitAtRootRule_closure, A._EvaluateVisitor_visitAtRootRule_closure0, A._EvaluateVisitor__scopeForAtRoot__closure, A._EvaluateVisitor_visitContentRule_closure, A._EvaluateVisitor_visitDeclaration_closure, A._EvaluateVisitor_visitEachRule_closure1, A._EvaluateVisitor_visitAtRule_closure0, A._EvaluateVisitor_visitAtRule__closure, A._EvaluateVisitor_visitForRule_closure, A._EvaluateVisitor_visitForRule_closure0, A._EvaluateVisitor_visitForRule_closure1, A._EvaluateVisitor_visitForRule_closure2, A._EvaluateVisitor_visitForRule_closure3, A._EvaluateVisitor__registerCommentsForModule_closure, A._EvaluateVisitor_visitIfRule__closure, A._EvaluateVisitor__visitDynamicImport_closure, A._EvaluateVisitor__visitDynamicImport__closure2, A._EvaluateVisitor__applyMixin_closure0, A._EvaluateVisitor__applyMixin__closure0, A._EvaluateVisitor__applyMixin_closure, A._EvaluateVisitor__applyMixin_closure1, A._EvaluateVisitor__applyMixin__closure, A._EvaluateVisitor__applyMixin___closure, A._EvaluateVisitor__applyMixin____closure, A._EvaluateVisitor_visitIncludeRule_closure, A._EvaluateVisitor_visitIncludeRule_closure1, A._EvaluateVisitor_visitMediaRule_closure0, A._EvaluateVisitor_visitMediaRule__closure, A._EvaluateVisitor_visitMediaRule___closure, A._EvaluateVisitor_visitStyleRule_closure, A._EvaluateVisitor_visitStyleRule_closure1, A._EvaluateVisitor_visitStyleRule__closure, A._EvaluateVisitor_visitSupportsRule_closure, A._EvaluateVisitor_visitSupportsRule__closure, A._EvaluateVisitor__visitSupportsCondition_closure, A._EvaluateVisitor_visitVariableDeclaration_closure, A._EvaluateVisitor_visitVariableDeclaration_closure0, A._EvaluateVisitor_visitVariableDeclaration_closure1, A._EvaluateVisitor_visitWarnRule_closure, A._EvaluateVisitor_visitWhileRule_closure, A._EvaluateVisitor_visitBinaryOperationExpression_closure, A._EvaluateVisitor__slash_closure, A._EvaluateVisitor__slash_closure0, A._EvaluateVisitor_visitVariableExpression_closure, A._EvaluateVisitor_visitUnaryOperationExpression_closure, A._EvaluateVisitor_visitFunctionExpression_closure, A._EvaluateVisitor_visitFunctionExpression_closure1, A._EvaluateVisitor__visitCalculationExpression_closure, A._EvaluateVisitor__checkAdjacentCalculationValues_closure, A._EvaluateVisitor_visitInterpolatedFunctionExpression_closure, A._EvaluateVisitor__runUserDefinedCallable_closure, A._EvaluateVisitor__runUserDefinedCallable__closure, A._EvaluateVisitor__runUserDefinedCallable___closure, A._EvaluateVisitor__runFunctionCallable_closure, A._EvaluateVisitor__runBuiltInCallable_closure, A._EvaluateVisitor__runBuiltInCallable_closure0, A._EvaluateVisitor__verifyArguments_closure, A._EvaluateVisitor_visitCssAtRule_closure, A._EvaluateVisitor_visitCssKeyframeBlock_closure, A._EvaluateVisitor_visitCssMediaRule_closure0, A._EvaluateVisitor_visitCssMediaRule__closure, A._EvaluateVisitor_visitCssMediaRule___closure, A._EvaluateVisitor_visitCssStyleRule_closure, A._EvaluateVisitor_visitCssStyleRule__closure, A._EvaluateVisitor_visitCssStyleRule_closure1, A._EvaluateVisitor_visitCssSupportsRule_closure, A._EvaluateVisitor_visitCssSupportsRule__closure, A._EvaluateVisitor__serialize_closure, A._EvaluateVisitor__expressionNode_closure, A._FindDependenciesVisitor_visitIncludeRule_closure, A._FindDependenciesVisitor_visitIncludeRule_closure0, A._SerializeVisitor_visitCssComment_closure, A._SerializeVisitor_visitCssAtRule_closure, A._SerializeVisitor_visitCssMediaRule_closure, A._SerializeVisitor_visitCssImport_closure, A._SerializeVisitor_visitCssImport__closure, A._SerializeVisitor_visitCssKeyframeBlock_closure, A._SerializeVisitor_visitCssStyleRule_closure, A._SerializeVisitor_visitCssSupportsRule_closure, A._SerializeVisitor_visitCssDeclaration_closure, A._SerializeVisitor_visitCssDeclaration_closure0, A._SerializeVisitor__writeCalculationValue_closure, A._SerializeVisitor__visitQuotedString_closure, A._SerializeVisitor__visitQuotedString_closure0, A._SerializeVisitor_visitPseudoSelector_closure, A._SerializeVisitor__write_closure, A._SerializeVisitor__visitChildren_closure, A._SerializeVisitor__visitChildren_closure0, A.SingleMapping_SingleMapping$fromEntries_closure, A.SingleMapping_SingleMapping$fromEntries_closure0, A.Highlighter_closure, A.Highlighter__writeFileStart_closure, A.Highlighter__writeMultilineHighlights_closure, A.Highlighter__writeMultilineHighlights_closure0, A.Highlighter__writeMultilineHighlights_closure1, A.Highlighter__writeMultilineHighlights_closure2, A.Highlighter__writeMultilineHighlights__closure, A.Highlighter__writeMultilineHighlights__closure0, A.Highlighter__writeHighlightedText_closure, A.Highlighter__writeIndicator_closure, A.Highlighter__writeIndicator_closure0, A.Highlighter__writeIndicator_closure1, A.Highlighter__writeLabel_closure, A.Highlighter__writeLabel_closure0, A.Highlighter__writeSidebar_closure, A._Highlight_closure, A.Frame_Frame$parseVM_closure, A.Frame_Frame$parseV8_closure, A.Frame_Frame$_parseFirefoxEval_closure, A.Frame_Frame$parseFirefox_closure, A.Frame_Frame$parseFriendly_closure, A.LazyTrace_terse_closure, A.Trace_Trace$from_closure, A.TransformByHandlers_transformByHandlers_closure, A.TransformByHandlers_transformByHandlers__closure0, A.TransformByHandlers_transformByHandlers__closure2, A.RateLimit__debounceAggregate_closure_emit, A.RateLimit__debounceAggregate__closure, A.argumentListClass_closure, A.JSToDartAsyncImporter_canonicalize_closure, A.JSToDartAsyncImporter_load_closure, A.AsyncEnvironment_setVariable_closure2, A.AsyncEnvironment_setVariable_closure4, A._EvaluateVisitor__closure14, A._EvaluateVisitor__closure13, A._EvaluateVisitor_run_closure2, A._EvaluateVisitor_run__closure2, A._EvaluateVisitor__loadModule_closure5, A._EvaluateVisitor__loadModule_closure6, A._EvaluateVisitor__loadModule__closure6, A._EvaluateVisitor__execute_closure2, A._EvaluateVisitor__extendModules_closure6, A._EvaluateVisitor_visitAtRootRule_closure5, A._EvaluateVisitor_visitAtRootRule_closure6, A._EvaluateVisitor__scopeForAtRoot__closure2, A._EvaluateVisitor_visitContentRule_closure2, A._EvaluateVisitor_visitDeclaration_closure2, A._EvaluateVisitor_visitEachRule_closure10, A._EvaluateVisitor_visitAtRule_closure9, A._EvaluateVisitor_visitAtRule__closure2, A._EvaluateVisitor_visitForRule_closure14, A._EvaluateVisitor_visitForRule_closure15, A._EvaluateVisitor_visitForRule_closure16, A._EvaluateVisitor_visitForRule_closure17, A._EvaluateVisitor_visitForRule_closure18, A._EvaluateVisitor__registerCommentsForModule_closure2, A._EvaluateVisitor_visitIfRule__closure2, A._EvaluateVisitor__visitDynamicImport_closure2, A._EvaluateVisitor__visitDynamicImport__closure14, A._EvaluateVisitor__applyMixin_closure9, A._EvaluateVisitor__applyMixin__closure6, A._EvaluateVisitor__applyMixin_closure8, A._EvaluateVisitor__applyMixin_closure10, A._EvaluateVisitor__applyMixin__closure5, A._EvaluateVisitor__applyMixin___closure2, A._EvaluateVisitor__applyMixin____closure2, A._EvaluateVisitor_visitIncludeRule_closure8, A._EvaluateVisitor_visitIncludeRule_closure10, A._EvaluateVisitor_visitMediaRule_closure9, A._EvaluateVisitor_visitMediaRule__closure2, A._EvaluateVisitor_visitMediaRule___closure2, A._EvaluateVisitor_visitStyleRule_closure14, A._EvaluateVisitor_visitStyleRule_closure16, A._EvaluateVisitor_visitStyleRule__closure2, A._EvaluateVisitor_visitSupportsRule_closure5, A._EvaluateVisitor_visitSupportsRule__closure2, A._EvaluateVisitor__visitSupportsCondition_closure2, A._EvaluateVisitor_visitVariableDeclaration_closure8, A._EvaluateVisitor_visitVariableDeclaration_closure9, A._EvaluateVisitor_visitVariableDeclaration_closure10, A._EvaluateVisitor_visitWarnRule_closure2, A._EvaluateVisitor_visitWhileRule_closure2, A._EvaluateVisitor_visitBinaryOperationExpression_closure2, A._EvaluateVisitor__slash_closure5, A._EvaluateVisitor__slash_closure6, A._EvaluateVisitor_visitVariableExpression_closure2, A._EvaluateVisitor_visitUnaryOperationExpression_closure2, A._EvaluateVisitor_visitFunctionExpression_closure8, A._EvaluateVisitor_visitFunctionExpression_closure10, A._EvaluateVisitor__visitCalculationExpression_closure2, A._EvaluateVisitor__checkAdjacentCalculationValues_closure2, A._EvaluateVisitor_visitInterpolatedFunctionExpression_closure2, A._EvaluateVisitor__runUserDefinedCallable_closure2, A._EvaluateVisitor__runUserDefinedCallable__closure2, A._EvaluateVisitor__runUserDefinedCallable___closure2, A._EvaluateVisitor__runFunctionCallable_closure2, A._EvaluateVisitor__runBuiltInCallable_closure8, A._EvaluateVisitor__runBuiltInCallable_closure9, A._EvaluateVisitor__verifyArguments_closure2, A._EvaluateVisitor_visitCssAtRule_closure5, A._EvaluateVisitor_visitCssKeyframeBlock_closure5, A._EvaluateVisitor_visitCssMediaRule_closure9, A._EvaluateVisitor_visitCssMediaRule__closure2, A._EvaluateVisitor_visitCssMediaRule___closure2, A._EvaluateVisitor_visitCssStyleRule_closure8, A._EvaluateVisitor_visitCssStyleRule__closure2, A._EvaluateVisitor_visitCssStyleRule_closure10, A._EvaluateVisitor_visitCssSupportsRule_closure5, A._EvaluateVisitor_visitCssSupportsRule__closure2, A._EvaluateVisitor__serialize_closure2, A._EvaluateVisitor__expressionNode_closure2, A.JSToDartAsyncFileImporter_canonicalize_closure, A.AsyncImportCache_canonicalize_closure1, A.AsyncImportCache_canonicalize_closure2, A.AsyncImportCache__canonicalize_closure1, A.AsyncImportCache__canonicalize__closure0, A.AsyncImportCache__canonicalize_closure2, A.AsyncImportCache_importCanonical_closure0, A.AtRootQueryParser_parse_closure0, A.booleanClass_closure, A.legacyBooleanClass_closure, A.calculationClass_closure, A.calculationOperationClass_closure, A.calculationInterpolationClass_closure, A.SassCalculation_sign_closure0, A.SassCalculation_round_closure9, A.SassCalculation_round_closure10, A.SassCalculation_round_closure11, A.SassCalculation_round_closure12, A.SassCalculation_round_closure13, A.SassCalculation_round_closure14, A.SassCalculation_round_closure15, A.SassCalculation_round_closure16, A.SassCalculation_round_closure17, A.SassCalculation_round_closure18, A.SassCalculation__roundWithStep_closure7, A.SassCalculation__roundWithStep_closure6, A.SassCalculation__roundWithStep_closure8, A.SassCalculation__roundWithStep_closure9, A.SassCalculation__roundWithStep_closure10, A.SassCalculation__roundWithStep_closure11, A.SassCalculation__roundWithStep_closure12, A.SassCalculation__simplify_closure3, A.SassCalculation__simplify_closure4, A.SassCalculation__simplify_closure5, A.SassCalculation__simplify_closure6, A._parseChannels_closure2, A._parseChannels_closure4, A.colorClass_closure, A.compileAsync_closure, A.compileStringAsync_closure, A._simplifyValue_closure, A._simplifyValue_closure0, A._simplifyValue_closure1, A._simplifyValue_closure2, A._simplifyValue_closure3, A._simplifyValue_closure4, A._parseFunctions___closure6, A._parseFunctions___closure5, A.ComplexSelector_singleCompound_closure0, A.ComplexSelector_withAdditionalCombinators_closure0, A.ComplexSelector_concatenate_closure0, A.DeprecationHandlingLogger_warnForDeprecation_closure1, A.DeprecationHandlingLogger_warnForDeprecation_closure2, A.Environment_setVariable_closure2, A.Environment_setVariable_closure4, A._EvaluateVisitor__closure10, A._EvaluateVisitor__closure9, A._EvaluateVisitor_run_closure1, A._EvaluateVisitor_run__closure1, A._EvaluateVisitor__loadModule_closure3, A._EvaluateVisitor__loadModule_closure4, A._EvaluateVisitor__loadModule__closure4, A._EvaluateVisitor__execute_closure1, A._EvaluateVisitor__extendModules_closure4, A._EvaluateVisitor_visitAtRootRule_closure3, A._EvaluateVisitor_visitAtRootRule_closure4, A._EvaluateVisitor__scopeForAtRoot__closure1, A._EvaluateVisitor_visitContentRule_closure1, A._EvaluateVisitor_visitDeclaration_closure1, A._EvaluateVisitor_visitEachRule_closure7, A._EvaluateVisitor_visitAtRule_closure6, A._EvaluateVisitor_visitAtRule__closure1, A._EvaluateVisitor_visitForRule_closure9, A._EvaluateVisitor_visitForRule_closure10, A._EvaluateVisitor_visitForRule_closure11, A._EvaluateVisitor_visitForRule_closure12, A._EvaluateVisitor_visitForRule_closure13, A._EvaluateVisitor__registerCommentsForModule_closure1, A._EvaluateVisitor_visitIfRule__closure1, A._EvaluateVisitor__visitDynamicImport_closure1, A._EvaluateVisitor__visitDynamicImport__closure10, A._EvaluateVisitor__applyMixin_closure6, A._EvaluateVisitor__applyMixin__closure4, A._EvaluateVisitor__applyMixin_closure5, A._EvaluateVisitor__applyMixin_closure7, A._EvaluateVisitor__applyMixin__closure3, A._EvaluateVisitor__applyMixin___closure1, A._EvaluateVisitor__applyMixin____closure1, A._EvaluateVisitor_visitIncludeRule_closure5, A._EvaluateVisitor_visitIncludeRule_closure7, A._EvaluateVisitor_visitMediaRule_closure6, A._EvaluateVisitor_visitMediaRule__closure1, A._EvaluateVisitor_visitMediaRule___closure1, A._EvaluateVisitor_visitStyleRule_closure9, A._EvaluateVisitor_visitStyleRule_closure11, A._EvaluateVisitor_visitStyleRule__closure1, A._EvaluateVisitor_visitSupportsRule_closure3, A._EvaluateVisitor_visitSupportsRule__closure1, A._EvaluateVisitor__visitSupportsCondition_closure1, A._EvaluateVisitor_visitVariableDeclaration_closure5, A._EvaluateVisitor_visitVariableDeclaration_closure6, A._EvaluateVisitor_visitVariableDeclaration_closure7, A._EvaluateVisitor_visitWarnRule_closure1, A._EvaluateVisitor_visitWhileRule_closure1, A._EvaluateVisitor_visitBinaryOperationExpression_closure1, A._EvaluateVisitor__slash_closure3, A._EvaluateVisitor__slash_closure4, A._EvaluateVisitor_visitVariableExpression_closure1, A._EvaluateVisitor_visitUnaryOperationExpression_closure1, A._EvaluateVisitor_visitFunctionExpression_closure5, A._EvaluateVisitor_visitFunctionExpression_closure7, A._EvaluateVisitor__visitCalculationExpression_closure1, A._EvaluateVisitor__checkAdjacentCalculationValues_closure1, A._EvaluateVisitor_visitInterpolatedFunctionExpression_closure1, A._EvaluateVisitor__runUserDefinedCallable_closure1, A._EvaluateVisitor__runUserDefinedCallable__closure1, A._EvaluateVisitor__runUserDefinedCallable___closure1, A._EvaluateVisitor__runFunctionCallable_closure1, A._EvaluateVisitor__runBuiltInCallable_closure5, A._EvaluateVisitor__runBuiltInCallable_closure6, A._EvaluateVisitor__verifyArguments_closure1, A._EvaluateVisitor_visitCssAtRule_closure3, A._EvaluateVisitor_visitCssKeyframeBlock_closure3, A._EvaluateVisitor_visitCssMediaRule_closure6, A._EvaluateVisitor_visitCssMediaRule__closure1, A._EvaluateVisitor_visitCssMediaRule___closure1, A._EvaluateVisitor_visitCssStyleRule_closure5, A._EvaluateVisitor_visitCssStyleRule__closure1, A._EvaluateVisitor_visitCssStyleRule_closure7, A._EvaluateVisitor_visitCssSupportsRule_closure3, A._EvaluateVisitor_visitCssSupportsRule__closure1, A._EvaluateVisitor__serialize_closure1, A._EvaluateVisitor__expressionNode_closure1, A.exceptionClass_closure, A.ExtensionStore__registerSelector_closure1, A.ExtensionStore__registerSelector_closure2, A.ExtensionStore_addExtension_closure2, A.ExtensionStore_addExtension_closure3, A.ExtensionStore_addExtension_closure4, A.ExtensionStore__simpleSelectors_closure0, A.ExtensionStore__extendExistingExtensions_closure1, A.ExtensionStore__extendExistingExtensions_closure2, A.ExtensionStore_addExtensions_closure0, A.JSToDartFileImporter_canonicalize_closure, A.functionClass_closure, A.unifyComplex_closure2, A.unifyComplex_closure3, A._namespaceAndName_closure0, A._weaveParents_closure5, A._weaveParents_closure6, A._mergeLeadingCombinators_closure3, A._mergeLeadingCombinators_closure4, A._mergeLeadingCombinators_closure5, A._mergeLeadingCombinators_closure6, A._mergeTrailingCombinators_closure9, A._mergeTrailingCombinators_closure10, A._mergeTrailingCombinators_closure11, A._mergeTrailingCombinators_closure12, A._mergeTrailingCombinators_closure13, A._mergeTrailingCombinators_closure14, A._mergeTrailingCombinators_closure16, A._mergeTrailingCombinators_closure17, A._mergeTrailingCombinators_closure15, A._mergeTrailingCombinators_closure18, A._chunks_closure3, A._chunks_closure4, A._chunks_closure5, A._chunks_closure6, A.compoundIsSuperselector_closure1, A.compoundIsSuperselector_closure2, A._selectorPseudoIsSuperselector___closure2, A.NodeImporter_load_closure, A.NodeImporter__tryPath_closure, A.NodeImporter__callImporterAsync_closure, A.ImportCache_canonicalize_closure1, A.ImportCache_canonicalize_closure2, A.ImportCache__canonicalize_closure1, A.ImportCache__canonicalize__closure0, A.ImportCache__canonicalize_closure2, A.ImportCache_importCanonical_closure0, A.Interpolation_asPlain_closure1, A.Interpolation_asPlain_closure2, A.Interpolation_initialPlain_closure0, A.InterpolationBuffer_addInterpolation_closure0, A.InterpolationMap_mapSpan_closure1, A.InterpolationMap_mapSpan_closure2, A._realCasePath_helper_closure0, A._readFile_closure0, A.fileExists_closure0, A.dirExists_closure0, A.listDir_closure0, A.JSToDartLogger_warn_closure, A.JSToDartLogger_debug_closure, A.KeyframeSelectorParser_parse_closure0, A.render_closure, A._parseFunctions____closure, A._parseFunctions___closure3, A._parseFunctions___closure4, A._parseFunctions___closure1, A._parseFunctions___closure0, A._parseImporter____closure, A._parseImporter___closure0, A.ListExpression__elementNeedsParens_closure0, A._join__closure2, A._join__closure3, A._join__closure4, A.SelectorList__resolveParentSelectorsCompound__closure0, A.listClass_closure, A._set__closure2, A._merge__closure1, A._deepMergeImpl_closure1, A._deepMergeImpl_closure2, A.mapClass_closure, A.MediaQueryParser_parse_closure0, A.local__closure1, A.mixinClass_closure, A.legacyNullClass_closure, A.numberClass_closure, A.SassNumber_SassNumber$withUnits_closure10, A.SassNumber_SassNumber$withUnits_closure9, A.SassNumber_SassNumber$withUnits_closure11, A.SassNumber_SassNumber$withUnits_closure12, A.SassNumber_SassNumber$withUnits_closure14, A.SassNumber_SassNumber$withUnits_closure13, A.SassNumber_SassNumber$withUnits_closure15, A.SassNumber_SassNumber$withUnits_closure16, A.SassNumber_SassNumber$withUnits_closure17, A.SassNumber_SassNumber$withUnits_closure18, A.SassNumber__coerceOrConvertValue_compatibilityException0, A.SassNumber__coerceOrConvertValue_closure4, A.SassNumber__coerceOrConvertValue_closure6, A.SassNumber_multiplyUnits_closure11, A.SassNumber_multiplyUnits_closure12, A.SassNumber_multiplyUnits_closure13, A.SassNumber_multiplyUnits_closure14, A.SassNumber_multiplyUnits_closure15, A.SassNumber_multiplyUnits_closure16, A.SassNumber_multiplyUnits_closure17, A.SassNumber_multiplyUnits_closure18, A.SassNumber_multiplyUnits_closure20, A.SassNumber_multiplyUnits_closure22, A.SassNumber__unitString_closure3, A.SassNumber__unitString_closure4, A.SassNumber__unitString_closure5, A.SassNumber__unitString_closure6, A.Parser__parseIdentifier_closure0, A.Parser_spanFrom_closure0, A.PseudoSelector_specificity_closure0, A.SassParser_children_closure0, A._prependParent_closure1, A._prependParent_closure2, A.SelectorParser_parse_closure0, A.SelectorParser_parseCompoundSelector_closure0, A._SerializeVisitor_visitCssComment_closure0, A._SerializeVisitor_visitCssAtRule_closure0, A._SerializeVisitor_visitCssMediaRule_closure0, A._SerializeVisitor_visitCssImport_closure0, A._SerializeVisitor_visitCssImport__closure0, A._SerializeVisitor_visitCssKeyframeBlock_closure0, A._SerializeVisitor_visitCssStyleRule_closure0, A._SerializeVisitor_visitCssSupportsRule_closure0, A._SerializeVisitor_visitCssDeclaration_closure1, A._SerializeVisitor_visitCssDeclaration_closure2, A._SerializeVisitor__writeCalculationValue_closure0, A._SerializeVisitor__visitQuotedString_closure1, A._SerializeVisitor__visitQuotedString_closure2, A._SerializeVisitor_visitPseudoSelector_closure0, A._SerializeVisitor__write_closure0, A._SerializeVisitor__visitChildren_closure1, A._SerializeVisitor__visitChildren_closure2, A.SingleUnitSassNumber_multiplyUnits_closure2, A.stringClass_closure, A.StylesheetParser_parse_closure0, A.StylesheetParser_parse__closure1, A.StylesheetParser_parseArgumentDeclaration_closure0, A.StylesheetParser__parseSingleProduction_closure0, A.StylesheetParser_parseSignature_closure, A.StylesheetParser__statement_closure0, A.StylesheetParser_variableDeclarationWithoutNamespace_closure1, A.StylesheetParser_variableDeclarationWithoutNamespace_closure2, A.StylesheetParser__forRule_closure1, A.StylesheetParser__memberList_closure0, A.StylesheetParser__expression_resetState0, A.StylesheetParser__expression_resolveOneOperation0, A.StylesheetParser__expression_resolveOperations0, A.StylesheetParser__expression_resolveSpaceExpressions0, A.StylesheetParser__expression_closure2, A.StylesheetParser__expression_closure3, A.StylesheetParser__expression_closure4, A.StylesheetParser_expressionUntilComma_closure0, A.StylesheetParser__isHexColor_closure1, A.StylesheetParser_identifierLike_closure1, A.StylesheetParser_identifierLike_closure2, A.StylesheetParser_namespacedExpression_closure0, A.StylesheetParser__tryUrlContents_closure0, A.StylesheetParser__interpolatedDeclarationValue_closure4, A.StylesheetParser__interpolatedDeclarationValue_closure5, A.StylesheetParser__interpolatedDeclarationValue_closure6, A.StylesheetParser__interpolatedDeclarationValue_closure7, A.StylesheetParser__interpolatedDeclarationValue_closure8, A.StylesheetParser__expressionUntilComparison_closure0, A.StylesheetParser__supportsConditionInParens_closure0, A.StylesheetParser__publicIdentifier_closure0, A.JSToDartImporter_canonicalize_closure, A.JSToDartImporter_load_closure, A.UniversalSelector_unify_closure1, A.UniversalSelector_unify_closure2, A.resolveImportPath_closure1, A.resolveImportPath_closure2, A._tryPathAsDirectory_closure0, A._exactlyOne_closure1, A.valueClass_closure]);
+    _inheritMany(A.Closure0Args, [A.nullFuture_closure, A._AsyncRun__scheduleImmediateJsOverride_internalCallback, A._AsyncRun__scheduleImmediateWithSetImmediate_internalCallback, A._TimerImpl_internalCallback, A._TimerImpl$periodic_closure, A._Future__addListener_closure, A._Future__prependListeners_closure, A._Future__chainForeignFuture_closure1, A._Future__chainCoreFutureAsync_closure, A._Future__asyncCompleteWithValue_closure, A._Future__asyncCompleteError_closure, A._Future__propagateToListeners_handleWhenCompleteCallback, A._Future__propagateToListeners_handleValueCallback, A._Future__propagateToListeners_handleError, A.Stream_length_closure0, A._StreamController__subscribe_closure, A._StreamController__recordCancel_complete, A._AddStreamState_cancel_closure, A._BufferingStreamSubscription__sendError_sendError, A._BufferingStreamSubscription__sendDone_sendDone, A._PendingEvents_schedule_closure, A._CustomZone_bindCallback_closure, A._CustomZone_bindCallbackGuarded_closure, A._rootHandleError_closure, A._RootZone_bindCallback_closure, A._RootZone_bindCallbackGuarded_closure, A._Utf8Decoder__decoder_closure, A._Utf8Decoder__decoderNonfatal_closure, A.Parser__setOption_closure, A.StreamGroup_add_closure, A.StreamGroup_add_closure0, A.StreamGroup__listenToStream_closure, A.StreamQueue__ensureListening_closure0, A._isStrictMode_closure, A.ReplAdapter_runAsync_closure, A.ParsedPath__splitExtension_closure0, A.PseudoSelector_specificity_closure, A.AsyncEnvironment_setVariable_closure, A.AsyncEnvironment_setVariable_closure1, A.AsyncImportCache_canonicalize_closure, A.AsyncImportCache__canonicalize_closure, A.AsyncImportCache_importCanonical_closure, A.Environment_setVariable_closure, A.Environment_setVariable_closure1, A.ExecutableOptions__parser_closure, A.ExecutableOptions_interactive_closure, A.ExecutableOptions_fatalDeprecations_closure, A.ExtensionStore__registerSelector_closure, A.ExtensionStore_addExtension_closure, A.ExtensionStore_addExtension_closure0, A.ExtensionStore_addExtension_closure1, A.ExtensionStore__extendExistingExtensions_closure, A.ExtensionStore__extendExistingExtensions_closure0, A.ExtensionStore_addExtensions_closure, A.ImportCache_canonicalize_closure, A.ImportCache__canonicalize_closure, A.ImportCache_importCanonical_closure, A.resolveImportPath_closure, A.resolveImportPath_closure0, A._tryPathAsDirectory_closure, A._realCasePath_helper_closure, A._readFile_closure, A.writeFile_closure, A.deleteFile_closure, A.fileExists_closure, A.dirExists_closure, A.ensureDir_closure, A.listDir_closure, A.modificationTime_closure, A.watchDir_closure3, A.watchDir__closure, A.AtRootQueryParser_parse_closure, A.KeyframeSelectorParser_parse_closure, A.MediaQueryParser_parse_closure, A.Parser__parseIdentifier_closure, A.Parser_spanFrom_closure, A.SassParser_children_closure, A.SelectorParser_parse_closure, A.SelectorParser_parseCompoundSelector_closure, A.StylesheetParser_parse_closure, A.StylesheetParser_parse__closure, A.StylesheetParser_parseArgumentDeclaration_closure, A.StylesheetParser_parseVariableDeclaration_closure, A.StylesheetParser_parseUseRule_closure, A.StylesheetParser__parseSingleProduction_closure, A.StylesheetParser__statement_closure, A.StylesheetParser_variableDeclarationWithoutNamespace_closure, A.StylesheetParser_variableDeclarationWithoutNamespace_closure0, A.StylesheetParser__forRule_closure, A.StylesheetParser__memberList_closure, A.StylesheetParser__expression_resetState, A.StylesheetParser__expression_resolveOneOperation, A.StylesheetParser__expression_resolveOperations, A.StylesheetParser__expression_resolveSpaceExpressions, A.StylesheetParser_expressionUntilComma_closure, A.StylesheetParser_namespacedExpression_closure, A.StylesheetParser__expressionUntilComparison_closure, A.StylesheetParser__publicIdentifier_closure, A.StylesheetGraph_modifiedSince_transitiveModificationTime_closure, A.StylesheetGraph__add_closure, A.StylesheetGraph_addCanonical_closure, A.StylesheetGraph_reload_closure, A.StylesheetGraph__nodeFor_closure, A.StylesheetGraph__nodeFor_closure0, A.SassNumber__coerceOrConvertValue_compatibilityException, A.SassNumber__coerceOrConvertValue_closure0, A.SassNumber__coerceOrConvertValue_closure2, A.SassNumber_multiplyUnits_closure0, A.SassNumber_multiplyUnits_closure2, A.SingleUnitSassNumber_multiplyUnits_closure0, A._EvaluateVisitor__closure6, A._EvaluateVisitor__closure5, A._EvaluateVisitor_run_closure0, A._EvaluateVisitor_run__closure0, A._EvaluateVisitor__loadModule_closure1, A._EvaluateVisitor__loadModule_closure2, A._EvaluateVisitor__loadModule__closure2, A._EvaluateVisitor__execute_closure0, A._EvaluateVisitor__extendModules_closure2, A._EvaluateVisitor_visitAtRootRule_closure1, A._EvaluateVisitor_visitAtRootRule_closure2, A._EvaluateVisitor__scopeForAtRoot__closure0, A._EvaluateVisitor_visitContentRule_closure0, A._EvaluateVisitor_visitDeclaration_closure0, A._EvaluateVisitor_visitEachRule_closure4, A._EvaluateVisitor_visitAtRule_closure3, A._EvaluateVisitor_visitAtRule__closure0, A._EvaluateVisitor_visitForRule_closure4, A._EvaluateVisitor_visitForRule_closure5, A._EvaluateVisitor_visitForRule_closure6, A._EvaluateVisitor_visitForRule_closure7, A._EvaluateVisitor_visitForRule_closure8, A._EvaluateVisitor__registerCommentsForModule_closure0, A._EvaluateVisitor_visitIfRule__closure0, A._EvaluateVisitor__visitDynamicImport_closure0, A._EvaluateVisitor__visitDynamicImport__closure6, A._EvaluateVisitor__applyMixin_closure1, A._EvaluateVisitor__applyMixin__closure2, A._EvaluateVisitor__applyMixin_closure2, A._EvaluateVisitor__applyMixin__closure1, A._EvaluateVisitor__applyMixin___closure0, A._EvaluateVisitor__applyMixin____closure0, A._EvaluateVisitor_visitIncludeRule_closure2, A._EvaluateVisitor_visitIncludeRule_closure4, A._EvaluateVisitor_visitMediaRule_closure3, A._EvaluateVisitor_visitMediaRule__closure0, A._EvaluateVisitor_visitMediaRule___closure0, A._EvaluateVisitor_visitStyleRule_closure3, A._EvaluateVisitor_visitStyleRule_closure6, A._EvaluateVisitor_visitStyleRule__closure0, A._EvaluateVisitor_visitSupportsRule_closure1, A._EvaluateVisitor_visitSupportsRule__closure0, A._EvaluateVisitor__visitSupportsCondition_closure0, A._EvaluateVisitor_visitVariableDeclaration_closure2, A._EvaluateVisitor_visitVariableDeclaration_closure3, A._EvaluateVisitor_visitVariableDeclaration_closure4, A._EvaluateVisitor_visitWarnRule_closure0, A._EvaluateVisitor_visitWhileRule_closure0, A._EvaluateVisitor_visitBinaryOperationExpression_closure0, A._EvaluateVisitor_visitVariableExpression_closure0, A._EvaluateVisitor_visitUnaryOperationExpression_closure0, A._EvaluateVisitor_visitFunctionExpression_closure2, A._EvaluateVisitor_visitFunctionExpression_closure4, A._EvaluateVisitor__visitCalculationExpression_closure0, A._EvaluateVisitor_visitInterpolatedFunctionExpression_closure0, A._EvaluateVisitor__runUserDefinedCallable_closure0, A._EvaluateVisitor__runUserDefinedCallable__closure0, A._EvaluateVisitor__runUserDefinedCallable___closure0, A._EvaluateVisitor__runFunctionCallable_closure0, A._EvaluateVisitor__runBuiltInCallable_closure2, A._EvaluateVisitor__runBuiltInCallable_closure3, A._EvaluateVisitor__verifyArguments_closure0, A._EvaluateVisitor_visitCssAtRule_closure1, A._EvaluateVisitor_visitCssKeyframeBlock_closure1, A._EvaluateVisitor_visitCssMediaRule_closure3, A._EvaluateVisitor_visitCssMediaRule__closure0, A._EvaluateVisitor_visitCssMediaRule___closure0, A._EvaluateVisitor_visitCssStyleRule_closure2, A._EvaluateVisitor_visitCssStyleRule__closure0, A._EvaluateVisitor_visitCssSupportsRule_closure1, A._EvaluateVisitor_visitCssSupportsRule__closure0, A._EvaluateVisitor__serialize_closure0, A._EvaluateVisitor__expressionNode_closure0, A._EvaluateVisitor__closure2, A._EvaluateVisitor__closure1, A._EvaluateVisitor_run_closure, A._EvaluateVisitor_run__closure, A._EvaluateVisitor_runExpression_closure, A._EvaluateVisitor_runExpression__closure, A._EvaluateVisitor_runExpression___closure, A._EvaluateVisitor_runStatement_closure, A._EvaluateVisitor_runStatement__closure, A._EvaluateVisitor_runStatement___closure, A._EvaluateVisitor__loadModule_closure, A._EvaluateVisitor__loadModule_closure0, A._EvaluateVisitor__loadModule__closure0, A._EvaluateVisitor__execute_closure, A._EvaluateVisitor__extendModules_closure0, A._EvaluateVisitor_visitAtRootRule_closure, A._EvaluateVisitor_visitAtRootRule_closure0, A._EvaluateVisitor__scopeForAtRoot__closure, A._EvaluateVisitor_visitContentRule_closure, A._EvaluateVisitor_visitDeclaration_closure, A._EvaluateVisitor_visitEachRule_closure1, A._EvaluateVisitor_visitAtRule_closure0, A._EvaluateVisitor_visitAtRule__closure, A._EvaluateVisitor_visitForRule_closure, A._EvaluateVisitor_visitForRule_closure0, A._EvaluateVisitor_visitForRule_closure1, A._EvaluateVisitor_visitForRule_closure2, A._EvaluateVisitor_visitForRule_closure3, A._EvaluateVisitor__registerCommentsForModule_closure, A._EvaluateVisitor_visitIfRule__closure, A._EvaluateVisitor__visitDynamicImport_closure, A._EvaluateVisitor__visitDynamicImport__closure2, A._EvaluateVisitor__applyMixin_closure, A._EvaluateVisitor__applyMixin__closure0, A._EvaluateVisitor__applyMixin_closure0, A._EvaluateVisitor__applyMixin__closure, A._EvaluateVisitor__applyMixin___closure, A._EvaluateVisitor__applyMixin____closure, A._EvaluateVisitor_visitIncludeRule_closure, A._EvaluateVisitor_visitIncludeRule_closure1, A._EvaluateVisitor_visitMediaRule_closure0, A._EvaluateVisitor_visitMediaRule__closure, A._EvaluateVisitor_visitMediaRule___closure, A._EvaluateVisitor_visitStyleRule_closure, A._EvaluateVisitor_visitStyleRule_closure2, A._EvaluateVisitor_visitStyleRule__closure, A._EvaluateVisitor_visitSupportsRule_closure, A._EvaluateVisitor_visitSupportsRule__closure, A._EvaluateVisitor__visitSupportsCondition_closure, A._EvaluateVisitor_visitVariableDeclaration_closure, A._EvaluateVisitor_visitVariableDeclaration_closure0, A._EvaluateVisitor_visitVariableDeclaration_closure1, A._EvaluateVisitor_visitWarnRule_closure, A._EvaluateVisitor_visitWhileRule_closure, A._EvaluateVisitor_visitBinaryOperationExpression_closure, A._EvaluateVisitor_visitVariableExpression_closure, A._EvaluateVisitor_visitUnaryOperationExpression_closure, A._EvaluateVisitor_visitFunctionExpression_closure, A._EvaluateVisitor_visitFunctionExpression_closure1, A._EvaluateVisitor__visitCalculationExpression_closure, A._EvaluateVisitor_visitInterpolatedFunctionExpression_closure, A._EvaluateVisitor__runUserDefinedCallable_closure, A._EvaluateVisitor__runUserDefinedCallable__closure, A._EvaluateVisitor__runUserDefinedCallable___closure, A._EvaluateVisitor__runFunctionCallable_closure, A._EvaluateVisitor__runBuiltInCallable_closure, A._EvaluateVisitor__runBuiltInCallable_closure0, A._EvaluateVisitor__verifyArguments_closure, A._EvaluateVisitor_visitCssAtRule_closure, A._EvaluateVisitor_visitCssKeyframeBlock_closure, A._EvaluateVisitor_visitCssMediaRule_closure0, A._EvaluateVisitor_visitCssMediaRule__closure, A._EvaluateVisitor_visitCssMediaRule___closure, A._EvaluateVisitor_visitCssStyleRule_closure0, A._EvaluateVisitor_visitCssStyleRule__closure, A._EvaluateVisitor_visitCssSupportsRule_closure, A._EvaluateVisitor_visitCssSupportsRule__closure, A._EvaluateVisitor__serialize_closure, A._EvaluateVisitor__expressionNode_closure, A._SerializeVisitor_visitCssComment_closure, A._SerializeVisitor_visitCssAtRule_closure, A._SerializeVisitor_visitCssMediaRule_closure, A._SerializeVisitor_visitCssImport_closure, A._SerializeVisitor_visitCssImport__closure, A._SerializeVisitor_visitCssKeyframeBlock_closure, A._SerializeVisitor_visitCssStyleRule_closure, A._SerializeVisitor_visitCssSupportsRule_closure, A._SerializeVisitor_visitCssDeclaration_closure, A._SerializeVisitor_visitCssDeclaration_closure0, A._SerializeVisitor__write_closure, A._SerializeVisitor__visitChildren_closure, A._SerializeVisitor__visitChildren_closure0, A.SingleMapping_SingleMapping$fromEntries_closure, A.SingleMapping_SingleMapping$fromEntries_closure0, A.Highlighter_closure, A.Highlighter__writeFileStart_closure, A.Highlighter__writeMultilineHighlights_closure, A.Highlighter__writeMultilineHighlights_closure0, A.Highlighter__writeMultilineHighlights_closure1, A.Highlighter__writeMultilineHighlights_closure2, A.Highlighter__writeMultilineHighlights__closure, A.Highlighter__writeMultilineHighlights__closure0, A.Highlighter__writeHighlightedText_closure, A.Highlighter__writeIndicator_closure, A.Highlighter__writeIndicator_closure0, A.Highlighter__writeIndicator_closure1, A.Highlighter__writeLabel_closure, A.Highlighter__writeLabel_closure0, A.Highlighter__writeSidebar_closure, A._Highlight_closure, A.Frame_Frame$parseVM_closure, A.Frame_Frame$parseV8_closure, A.Frame_Frame$_parseFirefoxEval_closure, A.Frame_Frame$parseFirefox_closure, A.Frame_Frame$parseFriendly_closure, A.LazyTrace_terse_closure, A.Trace_Trace$from_closure, A.TransformByHandlers_transformByHandlers_closure, A.TransformByHandlers_transformByHandlers__closure0, A.TransformByHandlers_transformByHandlers__closure2, A.RateLimit__debounceAggregate_closure_emit, A.RateLimit__debounceAggregate__closure, A.argumentListClass_closure, A.JSToDartAsyncImporter_canonicalize_closure, A.JSToDartAsyncImporter_load_closure, A.AsyncEnvironment_setVariable_closure2, A.AsyncEnvironment_setVariable_closure4, A._EvaluateVisitor__closure14, A._EvaluateVisitor__closure13, A._EvaluateVisitor_run_closure2, A._EvaluateVisitor_run__closure2, A._EvaluateVisitor__loadModule_closure5, A._EvaluateVisitor__loadModule_closure6, A._EvaluateVisitor__loadModule__closure6, A._EvaluateVisitor__execute_closure2, A._EvaluateVisitor__extendModules_closure6, A._EvaluateVisitor_visitAtRootRule_closure5, A._EvaluateVisitor_visitAtRootRule_closure6, A._EvaluateVisitor__scopeForAtRoot__closure2, A._EvaluateVisitor_visitContentRule_closure2, A._EvaluateVisitor_visitDeclaration_closure2, A._EvaluateVisitor_visitEachRule_closure10, A._EvaluateVisitor_visitAtRule_closure9, A._EvaluateVisitor_visitAtRule__closure2, A._EvaluateVisitor_visitForRule_closure14, A._EvaluateVisitor_visitForRule_closure15, A._EvaluateVisitor_visitForRule_closure16, A._EvaluateVisitor_visitForRule_closure17, A._EvaluateVisitor_visitForRule_closure18, A._EvaluateVisitor__registerCommentsForModule_closure2, A._EvaluateVisitor_visitIfRule__closure2, A._EvaluateVisitor__visitDynamicImport_closure2, A._EvaluateVisitor__visitDynamicImport__closure14, A._EvaluateVisitor__applyMixin_closure5, A._EvaluateVisitor__applyMixin__closure6, A._EvaluateVisitor__applyMixin_closure6, A._EvaluateVisitor__applyMixin__closure5, A._EvaluateVisitor__applyMixin___closure2, A._EvaluateVisitor__applyMixin____closure2, A._EvaluateVisitor_visitIncludeRule_closure8, A._EvaluateVisitor_visitIncludeRule_closure10, A._EvaluateVisitor_visitMediaRule_closure9, A._EvaluateVisitor_visitMediaRule__closure2, A._EvaluateVisitor_visitMediaRule___closure2, A._EvaluateVisitor_visitStyleRule_closure11, A._EvaluateVisitor_visitStyleRule_closure14, A._EvaluateVisitor_visitStyleRule__closure2, A._EvaluateVisitor_visitSupportsRule_closure5, A._EvaluateVisitor_visitSupportsRule__closure2, A._EvaluateVisitor__visitSupportsCondition_closure2, A._EvaluateVisitor_visitVariableDeclaration_closure8, A._EvaluateVisitor_visitVariableDeclaration_closure9, A._EvaluateVisitor_visitVariableDeclaration_closure10, A._EvaluateVisitor_visitWarnRule_closure2, A._EvaluateVisitor_visitWhileRule_closure2, A._EvaluateVisitor_visitBinaryOperationExpression_closure2, A._EvaluateVisitor_visitVariableExpression_closure2, A._EvaluateVisitor_visitUnaryOperationExpression_closure2, A._EvaluateVisitor_visitFunctionExpression_closure8, A._EvaluateVisitor_visitFunctionExpression_closure10, A._EvaluateVisitor__visitCalculationExpression_closure2, A._EvaluateVisitor_visitInterpolatedFunctionExpression_closure2, A._EvaluateVisitor__runUserDefinedCallable_closure2, A._EvaluateVisitor__runUserDefinedCallable__closure2, A._EvaluateVisitor__runUserDefinedCallable___closure2, A._EvaluateVisitor__runFunctionCallable_closure2, A._EvaluateVisitor__runBuiltInCallable_closure8, A._EvaluateVisitor__runBuiltInCallable_closure9, A._EvaluateVisitor__verifyArguments_closure2, A._EvaluateVisitor_visitCssAtRule_closure5, A._EvaluateVisitor_visitCssKeyframeBlock_closure5, A._EvaluateVisitor_visitCssMediaRule_closure9, A._EvaluateVisitor_visitCssMediaRule__closure2, A._EvaluateVisitor_visitCssMediaRule___closure2, A._EvaluateVisitor_visitCssStyleRule_closure6, A._EvaluateVisitor_visitCssStyleRule__closure2, A._EvaluateVisitor_visitCssSupportsRule_closure5, A._EvaluateVisitor_visitCssSupportsRule__closure2, A._EvaluateVisitor__serialize_closure2, A._EvaluateVisitor__expressionNode_closure2, A.JSToDartAsyncFileImporter_canonicalize_closure, A.AsyncImportCache_canonicalize_closure0, A.AsyncImportCache__canonicalize_closure0, A.AsyncImportCache_importCanonical_closure0, A.AtRootQueryParser_parse_closure0, A.booleanClass_closure, A.legacyBooleanClass_closure, A.calculationClass_closure, A.calculationOperationClass_closure, A.calculationInterpolationClass_closure, A.colorClass_closure, A.compileAsync_closure, A.compileStringAsync_closure, A._parseFunctions___closure6, A._parseFunctions___closure5, A._parseDeprecations_closure, A.nodePackageImporterClass_closure, A.compilerClass_closure, A.asyncCompilerClass_closure, A.asyncCompilerClass___closure, A.initAsyncCompiler_closure, A.deprecations_closure, A.versionClass_closure, A.Environment_setVariable_closure2, A.Environment_setVariable_closure4, A._EvaluateVisitor__closure10, A._EvaluateVisitor__closure9, A._EvaluateVisitor_run_closure1, A._EvaluateVisitor_run__closure1, A._EvaluateVisitor__loadModule_closure3, A._EvaluateVisitor__loadModule_closure4, A._EvaluateVisitor__loadModule__closure4, A._EvaluateVisitor__execute_closure1, A._EvaluateVisitor__extendModules_closure4, A._EvaluateVisitor_visitAtRootRule_closure3, A._EvaluateVisitor_visitAtRootRule_closure4, A._EvaluateVisitor__scopeForAtRoot__closure1, A._EvaluateVisitor_visitContentRule_closure1, A._EvaluateVisitor_visitDeclaration_closure1, A._EvaluateVisitor_visitEachRule_closure7, A._EvaluateVisitor_visitAtRule_closure6, A._EvaluateVisitor_visitAtRule__closure1, A._EvaluateVisitor_visitForRule_closure9, A._EvaluateVisitor_visitForRule_closure10, A._EvaluateVisitor_visitForRule_closure11, A._EvaluateVisitor_visitForRule_closure12, A._EvaluateVisitor_visitForRule_closure13, A._EvaluateVisitor__registerCommentsForModule_closure1, A._EvaluateVisitor_visitIfRule__closure1, A._EvaluateVisitor__visitDynamicImport_closure1, A._EvaluateVisitor__visitDynamicImport__closure10, A._EvaluateVisitor__applyMixin_closure3, A._EvaluateVisitor__applyMixin__closure4, A._EvaluateVisitor__applyMixin_closure4, A._EvaluateVisitor__applyMixin__closure3, A._EvaluateVisitor__applyMixin___closure1, A._EvaluateVisitor__applyMixin____closure1, A._EvaluateVisitor_visitIncludeRule_closure5, A._EvaluateVisitor_visitIncludeRule_closure7, A._EvaluateVisitor_visitMediaRule_closure6, A._EvaluateVisitor_visitMediaRule__closure1, A._EvaluateVisitor_visitMediaRule___closure1, A._EvaluateVisitor_visitStyleRule_closure7, A._EvaluateVisitor_visitStyleRule_closure10, A._EvaluateVisitor_visitStyleRule__closure1, A._EvaluateVisitor_visitSupportsRule_closure3, A._EvaluateVisitor_visitSupportsRule__closure1, A._EvaluateVisitor__visitSupportsCondition_closure1, A._EvaluateVisitor_visitVariableDeclaration_closure5, A._EvaluateVisitor_visitVariableDeclaration_closure6, A._EvaluateVisitor_visitVariableDeclaration_closure7, A._EvaluateVisitor_visitWarnRule_closure1, A._EvaluateVisitor_visitWhileRule_closure1, A._EvaluateVisitor_visitBinaryOperationExpression_closure1, A._EvaluateVisitor_visitVariableExpression_closure1, A._EvaluateVisitor_visitUnaryOperationExpression_closure1, A._EvaluateVisitor_visitFunctionExpression_closure5, A._EvaluateVisitor_visitFunctionExpression_closure7, A._EvaluateVisitor__visitCalculationExpression_closure1, A._EvaluateVisitor_visitInterpolatedFunctionExpression_closure1, A._EvaluateVisitor__runUserDefinedCallable_closure1, A._EvaluateVisitor__runUserDefinedCallable__closure1, A._EvaluateVisitor__runUserDefinedCallable___closure1, A._EvaluateVisitor__runFunctionCallable_closure1, A._EvaluateVisitor__runBuiltInCallable_closure5, A._EvaluateVisitor__runBuiltInCallable_closure6, A._EvaluateVisitor__verifyArguments_closure1, A._EvaluateVisitor_visitCssAtRule_closure3, A._EvaluateVisitor_visitCssKeyframeBlock_closure3, A._EvaluateVisitor_visitCssMediaRule_closure6, A._EvaluateVisitor_visitCssMediaRule__closure1, A._EvaluateVisitor_visitCssMediaRule___closure1, A._EvaluateVisitor_visitCssStyleRule_closure4, A._EvaluateVisitor_visitCssStyleRule__closure1, A._EvaluateVisitor_visitCssSupportsRule_closure3, A._EvaluateVisitor_visitCssSupportsRule__closure1, A._EvaluateVisitor__serialize_closure1, A._EvaluateVisitor__expressionNode_closure1, A.exceptionClass_closure, A.ExtensionStore__registerSelector_closure0, A.ExtensionStore_addExtension_closure2, A.ExtensionStore_addExtension_closure3, A.ExtensionStore_addExtension_closure4, A.ExtensionStore__extendExistingExtensions_closure1, A.ExtensionStore__extendExistingExtensions_closure2, A.ExtensionStore_addExtensions_closure0, A.JSToDartFileImporter_canonicalize_closure, A.functionClass_closure, A.NodeImporter_load_closure, A.NodeImporter__tryPath_closure, A.NodeImporter__callImporterAsync_closure, A.ImportCache_canonicalize_closure0, A.ImportCache__canonicalize_closure0, A.ImportCache_importCanonical_closure0, A._realCasePath_helper_closure0, A._readFile_closure0, A.fileExists_closure0, A.dirExists_closure0, A.listDir_closure0, A.JSToDartLogger_internalWarn_closure, A.JSToDartLogger_debug_closure, A.KeyframeSelectorParser_parse_closure0, A.render_closure, A._parseFunctions____closure, A._parseFunctions___closure3, A._parseFunctions___closure4, A._parseFunctions___closure1, A._parseFunctions___closure0, A._parseImporter____closure, A._parseImporter___closure0, A.listClass_closure, A.mapClass_closure, A.MediaQueryParser_parse_closure0, A.mixinClass_closure, A.legacyNullClass_closure, A.numberClass_closure, A.SassNumber__coerceOrConvertValue_compatibilityException0, A.SassNumber__coerceOrConvertValue_closure4, A.SassNumber__coerceOrConvertValue_closure6, A.SassNumber_multiplyUnits_closure4, A.SassNumber_multiplyUnits_closure6, A.Parser__parseIdentifier_closure0, A.Parser_spanFrom_closure0, A.PseudoSelector_specificity_closure0, A.SassParser_children_closure0, A.SelectorParser_parse_closure0, A.SelectorParser_parseCompoundSelector_closure0, A._SerializeVisitor_visitCssComment_closure0, A._SerializeVisitor_visitCssAtRule_closure0, A._SerializeVisitor_visitCssMediaRule_closure0, A._SerializeVisitor_visitCssImport_closure0, A._SerializeVisitor_visitCssImport__closure0, A._SerializeVisitor_visitCssKeyframeBlock_closure0, A._SerializeVisitor_visitCssStyleRule_closure0, A._SerializeVisitor_visitCssSupportsRule_closure0, A._SerializeVisitor_visitCssDeclaration_closure1, A._SerializeVisitor_visitCssDeclaration_closure2, A._SerializeVisitor__write_closure0, A._SerializeVisitor__visitChildren_closure1, A._SerializeVisitor__visitChildren_closure2, A.SingleUnitSassNumber_multiplyUnits_closure2, A.updateSourceSpanPrototype_closure, A.stringClass_closure, A.StylesheetParser_parse_closure0, A.StylesheetParser_parse__closure1, A.StylesheetParser_parseArgumentDeclaration_closure0, A.StylesheetParser__parseSingleProduction_closure0, A.StylesheetParser_parseSignature_closure, A.StylesheetParser__statement_closure0, A.StylesheetParser_variableDeclarationWithoutNamespace_closure1, A.StylesheetParser_variableDeclarationWithoutNamespace_closure2, A.StylesheetParser__forRule_closure1, A.StylesheetParser__memberList_closure0, A.StylesheetParser__expression_resetState0, A.StylesheetParser__expression_resolveOneOperation0, A.StylesheetParser__expression_resolveOperations0, A.StylesheetParser__expression_resolveSpaceExpressions0, A.StylesheetParser_expressionUntilComma_closure0, A.StylesheetParser_namespacedExpression_closure0, A.StylesheetParser__expressionUntilComparison_closure0, A.StylesheetParser__publicIdentifier_closure0, A.JSToDartImporter_canonicalize_closure, A.JSToDartImporter_load_closure, A.resolveImportPath_closure1, A.resolveImportPath_closure2, A._tryPathAsDirectory_closure0, A.valueClass_closure]);
     _inheritMany(A.EfficientLengthIterable, [A.ListIterable, A.EmptyIterable, A.LinkedHashMapKeyIterable, A._HashMapKeyIterable, A._MapBaseValueIterable]);
-    _inheritMany(A.ListIterable, [A.SubListIterable, A.MappedListIterable, A.ReversedListIterable, A.ListQueue, A._GeneratorIterable]);
+    _inheritMany(A.ListIterable, [A.SubListIterable, A.MappedListIterable, A.ReversedListIterable, A.ListQueue, A._JsonMapKeyIterable, A._GeneratorIterable]);
     _inherit(A.EfficientLengthMappedIterable, A.MappedIterable);
     _inherit(A.EfficientLengthTakeIterable, A.TakeIterable);
     _inherit(A.EfficientLengthSkipIterable, A.SkipIterable);
     _inherit(A.EfficientLengthFollowedByIterable, A.FollowedByIterable);
-    _inheritMany(A._Record, [A._Record2, A._Record3, A._RecordN]);
+    _inheritMany(A._Record, [A._Record1, A._Record2, A._Record3, A._RecordN]);
+    _inherit(A._Record_1, A._Record1);
     _inheritMany(A._Record2, [A._Record_2, A._Record_2_forImport, A._Record_2_imports_modules, A._Record_2_loadedUrls_stylesheet, A._Record_2_sourceMap]);
-    _inheritMany(A._Record3, [A._Record_3, A._Record_3_importer_isDependency, A._Record_3_originalUrl]);
-    _inheritMany(A._RecordN, [A._Record_4, A._Record_4_baseImporter_baseUrl_forImport, A._Record_5_named_namedNodes_positional_positionalNodes_separator]);
+    _inheritMany(A._Record3, [A._Record_3, A._Record_3_forImport, A._Record_3_importer_isDependency, A._Record_3_originalUrl]);
+    _inherit(A._Record_5_named_namedNodes_positional_positionalNodes_separator, A._RecordN);
     _inheritMany(A.MapView, [A._UnmodifiableMapView_MapView__UnmodifiableMapMixin, A.PathMap]);
     _inherit(A.UnmodifiableMapView, A._UnmodifiableMapView_MapView__UnmodifiableMapMixin);
     _inherit(A.ConstantMapView, A.UnmodifiableMapView);
@@ -115868,7 +116480,7 @@ self.util = _cliPkgRequires.util;
     _inherit(A.UnmodifiableSetView, A._UnmodifiableSetView_SetBase__UnmodifiableSetMixin);
     _inheritMany(A.Codec, [A.Encoding, A.Base64Codec, A.JsonCodec]);
     _inheritMany(A.Encoding, [A.AsciiCodec, A.Utf8Codec]);
-    _inheritMany(A.Converter, [A._UnicodeSubsetEncoder, A.Base64Encoder, A.JsonEncoder, A.Utf8Encoder, A.Utf8Decoder]);
+    _inheritMany(A.Converter, [A._UnicodeSubsetEncoder, A.Base64Encoder, A.JsonEncoder, A.JsonDecoder, A.Utf8Encoder, A.Utf8Decoder]);
     _inherit(A.AsciiEncoder, A._UnicodeSubsetEncoder);
     _inheritMany(A.ByteConversionSink, [A._Base64EncoderSink, A._Utf8StringSinkAdapter]);
     _inherit(A._Utf8Base64EncoderSink, A._Base64EncoderSink);
@@ -115914,7 +116526,8 @@ self.util = _cliPkgRequires.util;
     _inherit(A.MultiSpanSassScriptException, A.SassScriptException);
     _inherit(A.MergedExtension, A.Extension);
     _inherit(A.Importer, A.AsyncImporter);
-    _inheritMany(A.Importer, [A.FilesystemImporter, A.NoOpImporter]);
+    _inheritMany(A.Importer, [A.FilesystemImporter, A.NoOpImporter, A.NodePackageImporter]);
+    _inherit(A.DeprecationProcessingLogger, A.LoggerWithDeprecationType0);
     _inheritMany(A.Parser, [A.AtRootQueryParser, A.StylesheetParser, A.KeyframeSelectorParser, A.MediaQueryParser, A.SelectorParser]);
     _inheritMany(A.StylesheetParser, [A.ScssParser, A.SassParser]);
     _inherit(A.CssParser, A.ScssParser);
@@ -115942,17 +116555,19 @@ self.util = _cliPkgRequires.util;
     _inheritMany(A.Selector0, [A.SimpleSelector0, A.ComplexSelector0, A.CompoundSelector0, A.SelectorList0]);
     _inheritMany(A.SimpleSelector0, [A.AttributeSelector0, A.ClassSelector0, A.IDSelector0, A.ParentSelector0, A.PlaceholderSelector0, A.PseudoSelector0, A.TypeSelector0, A.UniversalSelector0]);
     _inherit(A.CompileStringOptions, A.CompileOptions);
+    _inherit(A.AsyncCompiler, A.Compiler);
     _inheritMany(A.SassNumber0, [A.ComplexSassNumber0, A.SingleUnitSassNumber0, A.UnitlessSassNumber0]);
     _inherit(A.ExplicitConfiguration0, A.Configuration0);
     _inheritMany(A.CallableDeclaration0, [A.ContentBlock0, A.FunctionRule0, A.MixinRule0]);
     _inheritMany(A.StylesheetParser0, [A.ScssParser0, A.SassParser0]);
     _inherit(A.CssParser0, A.ScssParser0);
+    _inheritMany(A.LoggerWithDeprecationType, [A.DeprecationProcessingLogger0, A.JSToDartLogger]);
     _inherit(A._NodeException, A.JsError);
     _inheritMany(A.SassException0, [A.MultiSpanSassException0, A.SassRuntimeException0, A.SassFormatException0]);
     _inheritMany(A.MultiSpanSassException0, [A.MultiSpanSassRuntimeException0, A.MultiSpanSassFormatException0]);
     _inherit(A.MultiSpanSassScriptException0, A.SassScriptException0);
     _inherit(A._MakeExpressionCalculationSafe0, A.__MakeExpressionCalculationSafe_Object_ReplaceExpressionVisitor0);
-    _inheritMany(A.Importer0, [A.JSToDartFileImporter, A.FilesystemImporter0, A.NoOpImporter0, A.JSToDartImporter]);
+    _inheritMany(A.Importer0, [A.JSToDartFileImporter, A.FilesystemImporter0, A.NoOpImporter0, A.NodePackageImporter0, A.JSToDartImporter]);
     _inheritMany(A.IfRuleClause0, [A.IfClause0, A.ElseClause0]);
     _inherit(A._ParentSelectorVisitor0, A.__ParentSelectorVisitor_Object_SelectorSearchVisitor0);
     _inherit(A.MergedExtension0, A.Extension0);
@@ -115996,28 +116611,28 @@ self.util = _cliPkgRequires.util;
   })();
   var init = {
     typeUniverse: {eC: new Map(), tR: {}, eT: {}, tPV: {}, sEA: []},
-    mangledGlobalNames: {int: "int", double: "double", num: "num", String: "String", bool: "bool", Null: "Null", List: "List"},
+    mangledGlobalNames: {int: "int", double: "double", num: "num", String: "String", bool: "bool", Null: "Null", List: "List", Object: "Object", Map: "Map"},
     mangledNames: {},
-    types: ["~()", "bool()", "Null()", "int()", "Future<Null>()", "Value0(List<Value0>)", "Value(List<Value>)", "String(String)", "bool(CssNode0)", "bool(CssNode)", "bool(String)", "bool(Object?)", "SassNumber0(List<Value0>)", "SassNumber(List<Value>)", "Object()", "bool(SimpleSelector0)", "bool(SimpleSelector)", "SassString0(List<Value0>)", "bool(ComplexSelector0)", "bool(ComplexSelector)", "SassString(List<Value>)", "SassBoolean0(List<Value0>)", "String()", "SassBoolean(List<Value>)", "JSClass0()", "Value()", "List<String>()", "SassList0(List<Value0>)", "Object?()", "SassList(List<Value>)", "Future<~>()", "Value0()", "String?()", "FileSpan()", "bool(int?)", "SassColor(List<Value>)", "SassColor0(List<Value0>)", "~(Object?)", "SassMap0(List<Value0>)", "Null(~())", "SassMap(List<Value>)", "Future<Null>(Future<~>())", "double(double)", "Value(Value)", "Value?()", "Value0(Value0)", "Value0?()", "bool(int)", "Uri(Uri)", "bool(num,num)", "SassNumber(SassNumber)", "SassNumber0(SassNumber0)", "bool(ComplexSelectorComponent0)", "bool(ComplexSelectorComponent)", "bool(Value0)", "Uri?/()", "Uri?()", "~(Value0)", "@()", "ComplexSelector(ComplexSelector)", "ValueExpression0(Value0)", "ComplexSelector0(ComplexSelector0)", "Null(Object,StackTrace)", "~(Value)", "double(SassColor0)", "ValueExpression(Value)", "double(double,double)", "Future<Value>()", "Null(@)", "Object(Object)", "Future<Value?>()", "~(Object,StackTrace)", "bool(SelectorList0)", "bool(SelectorList)", "Frame()", "SelectorList?()", "Future<Value0?>()", "bool(Object)", "SelectorList0?()", "bool(Value)", "Future<Value0>()", "SassRuntimeException(AstNode)", "Declaration0(List<Statement0>,FileSpan)", "List<CssMediaQuery>?(List<CssMediaQuery>)", "Declaration(List<Statement>,FileSpan)", "~(String)", "~([int?])", "~(String,Value)", "@(@)", "Callable0?()", "~(Module0<Callable0>,bool)", "Value?(Statement)", "double()", "Value0?(Statement0)", "Null([Object?])", "~(Module1<Callable>,bool)", "List<String>?()", "AsyncCallable?()", "Frame(String)", "Future<Value0>(List<Value0>)", "+originalUrl(Importer,Uri,Uri)?()", "String(@)", "Callable?()", "AsyncCallable0?()", "~(Value0,Value0)", "SassRuntimeException0(AstNode0)", "~(Value,Value)", "Null(_NodeSassColor,num)", "Future<Value0?>(Statement0)", "~(String,Value0)", "~(Object)", "int(Uri)", "Stylesheet?()", "List<CssMediaQuery0>?(List<CssMediaQuery0>)", "Future<Value?>(Statement)", "double(Value)", "double(Value0)", "Map<ComplexSelector,Extension>()", "String(Expression0)", "bool(Expression0)", "UnaryOperator0()", "Null(Module1<AsyncCallable0>,bool)", "bool(@)", "bool(Module1<AsyncCallable0>)", "bool(ModifiableCssNode)", "SassCalculation0(Object)", "bool(Expression)", "~(@)", "bool(_Highlight)", "Null(Module0<AsyncCallable>,bool)", "CallableDeclaration0()", "int(SassColor0)", "String(Expression)", "int(_NodeSassColor)", "bool(Module0<Callable0>)", "~(String,Object?)", "bool(Module1<Callable>)", "UnaryOperator()", "List<Object>()", "String(Object)", "Map<ComplexSelector0,Extension0>()", "String(String{color:Object?})", "Statement()", "CallableDeclaration()", "~(String,Function)", "Statement0()", "bool(Module0<AsyncCallable>)", "~(~())", "bool(ModifiableCssNode0)", "Iterable<String>()", "bool(Statement)", "Future<Object>()", "bool(Import)", "SelectorList(Value)", "InterpolationMap(List<SourceLocation>)", "AstNode?()", "String(SassNumber)", "SelectorList(SelectorList,SelectorList)", "~(List<Value>)", "Future<Value>(List<Value>)", "~([Object?])", "SassNumber()", "Expression(Expression)", "Callable0?(Module0<Callable0>)", "Uri(String)", "int(Frame)", "String(Frame)", "MapKeySet<Module0<Callable0>>(Map<Module0<Callable0>,AstNode>)", "Trace()", "bool(Frame)", "Map<String,Callable0>(Module0<Callable0>)", "bool(String?)", "~(Object[StackTrace?])", "~(Iterable<ExtensionStore>)", "Iterable<String>(String)", "AsyncCallable0?(Module1<AsyncCallable0>)", "MapKeySet<Module1<AsyncCallable0>>(Map<Module1<AsyncCallable0>,AstNode0>)", "Map<String,AsyncCallable0>(Module1<AsyncCallable0>)", "Iterable<String>(@)", "AstNode0(AstNode0)", "DateTime()", "~(String[~])", "SassFunction0(List<Value0>)", "~(Uint8List,String,int)", "SassMixin0(List<Value0>)", "Future<~>(List<Value0>)", "FileSpan?()", "Trace?()", "List<ExtensionStore0>()", "bool(ModifiableCssParentNode0)", "List<Extension>()", "int(int)", "0&(String,FileSpan[StackTrace?])", "List<CssValue<Combinator>>()", "Future<SassNumber0>()", "ComplexSelectorComponent?()", "bool(Queue<List<ComplexSelectorComponent>>)", "bool(UseRule0)", "bool(ForwardRule0)", "VariableDeclaration()", "List<CssValue<Combinator>>?()", "AtRootRule(List<Statement>,FileSpan)", "AtRule(List<Statement>,FileSpan)", "Combinator?()", "QueueList<ComplexSelectorComponent>()", "String(String{color:@})", "Entry(Entry)", "+(PseudoSelector,int)?()", "~(String,@)", "Set<0^>()<Object?>", "int(double)", "InterpolationMap0(List<SourceLocation>)", "AstNode0?()", "String(SassNumber0)", "Future<+originalUrl(AsyncImporter0,Uri,Uri)?>()", "0&(Object[Object?])", "0&(@[@])", "int(ComplexSelector)", "SimpleSelector()", "Object(CalculationOperation0)", "double(double,String)", "AstNode(AstNode)", "SassFunction(List<Value>)", "String(int)", "SassMixin(List<Value>)", "String(Value0)", "Future<~>(List<Value>)", "double?(String,num{assertPercent:bool,checkPercent:bool,checkUnitless:bool})", "AsyncCallable?(Module0<AsyncCallable>)", "List<ExtensionStore>()", "Future<NodeCompileResult>()", "AsyncImporter0(Object?)", "double(double,double?,num)", "~(Iterable<ExtensionStore0>)", "Callable?(Module1<Callable>)", "MapKeySet<Module1<Callable>>(Map<Module1<Callable>,AstNode0>)", "Map<String,Callable>(Module1<Callable>)", "bool(ModifiableCssParentNode)", "int(int,double?)", "~(List<Value0>)", "MapKeySet<Module0<AsyncCallable>>(Map<Module0<AsyncCallable>,AstNode>)", "Value0?(Value0)", "Map<String,AsyncCallable>(Module0<AsyncCallable>)", "SassNumber0()", "String(_NodeException)", "List<CssComment0>()", "ListSeparator()", "List<Extension0>()", "Future<SassNumber>()", "List<CssValue0<Combinator0>>()", "ComplexSelectorComponent0?()", "bool(Queue<List<ComplexSelectorComponent0>>)", "List<CssValue0<Combinator0>>?()", "Combinator0?()", "QueueList<ComplexSelectorComponent0>()", "+(PseudoSelector0,int)?()", "~(@,@)", "bool(Statement0)", "bool(Import0)", "+originalUrl(Importer0,Uri,Uri)?()", "List<CssComment>()", "ListSeparator0()", "@(Value0,num)", "Value0(int)", "SassMap0?()", "Object(_NodeSassMap,int)", "Null(_NodeSassMap,int,Object)", "bool(SassNumber0)", "ImmutableList0(SassNumber0)", "bool(SassNumber0,String)", "SassNumber0(SassNumber0,Object,Object[String?])", "SassNumber0(SassNumber0,SassNumber0[String?,String?])", "double(SassNumber0,Object,Object[String?])", "double(SassNumber0,SassNumber0[String?,String?])", "int(ComplexSelector0)", "bool(UseRule)", "Expression0(Expression0)", "SelectorList0(Value0)", "SelectorList0(SelectorList0,SelectorList0)", "SimpleSelector0()", "FileLocation(FileSpan)", "String(FileSpan)", "int(SourceLocation)", "bool(ForwardRule)", "Future<~>?()", "AtRootRule0(List<Statement0>,FileSpan)", "AtRule0(List<Statement0>,FileSpan)", "int(@,@)", "Future<String>()", "bool(Object?,Object?)", "int(Object?)", "~(Object?,Object?)", "Trace(String)", "SassMap?()", "Future<+originalUrl(AsyncImporter,Uri,Uri)?>()", "WhileRule(List<Statement>,FileSpan)", "SourceFile()", "SourceFile?(int)", "String?(SourceFile?)", "int(_Line)", "SassString(SimpleSelector)", "Object(_Line)", "Object(_Highlight)", "int(_Highlight,_Highlight)", "List<_Line>(MapEntry<Object,List<_Highlight>>)", "SourceSpanWithContext()", "List<Frame>(Trace)", "int(Trace)", "SassString(int)", "String(Trace)", "SassString(String)", "~(String,int)", "Frame(String,String)", "~(String,int?)", "int(int,int)", "Frame(Frame)", "bool(+originalUrl(Importer,Uri,Uri))", "Uri(+originalUrl(Importer,Uri,Uri))", "bool(+baseImporter,baseUrl,forImport(Uri,Importer,Uri?,bool),+originalUrl(Importer,Uri,Uri)?)", "String(Argument0)", "bool(Deprecation)", "SassArgumentList0(Object,Object,Object[String?])", "ImmutableMap0(SassArgumentList0)", "Value?(Module0<Callable0>)", "Value0?(Module1<AsyncCallable0>)", "Module1<AsyncCallable0>?(Module1<AsyncCallable0>)", "Module0<Callable0>?(Module0<Callable0>)", "@(String)", "Map<String,Value0>(Module1<AsyncCallable0>)", "Map<String,AstNode0>(Module1<AsyncCallable0>)", "Uint8List(@,@)", "Map<String,Value>(Module0<Callable0>)", "Future<CssValue0<String>>(Interpolation0{trim:bool,warnForColor:bool})", "Map<String,AstNode>(Module0<Callable0>)", "Future<@>()", "String(int,IfClause)", "+(String?,String?)()", "ArgParser()", "Object?(Object?)", "Set<Deprecation>()", "Future<~>(String)", "~(Module1<AsyncCallable0>,bool)", "Future<+loadedUrls,stylesheet(Set<Uri>,CssStylesheet0)>()", "Future<Module1<AsyncCallable0>>()", "List<WatchEvent>(List<WatchEvent>)", "~(Module1<AsyncCallable0>)", "AtRootQuery()", "String(BuiltInCallable)", "List<CssMediaQuery>()", "ChangeType?()", "Future<Value0?>(Value0)", "ChangeType()", "Future<CssValue0<String>>(Interpolation0)", "~([Future<~>?])", "SelectorList()", "CompoundSelector()", "Statement({root:bool})", "Future<Value0?>(IfRuleClause0)", "bool(Extension)", "Expression({bracketList:bool,singleEquals:bool,until:bool()?})", "Stylesheet()", "UserDefinedCallable0<AsyncEnvironment0>(ContentBlock0)", "Statement?()", "VariableDeclaration(VariableDeclaration)", "ArgumentDeclaration()", "Set<ModifiableBox<SelectorList>>()", "UseRule()", "~(String,Option)", "Future<Value0>(Expression0)", "StyleRule(List<Statement>,FileSpan)", "~(@,StackTrace)", "Value0/()", "EachRule(List<Statement>,FileSpan)", "FunctionRule(List<Statement>,FileSpan)", "ForRule(List<Statement>,FileSpan)", "ContentBlock(List<Statement>,FileSpan)", "MediaRule(List<Statement>,FileSpan)", "MixinRule(List<Statement>,FileSpan)", "Iterable<ComplexSelector>(List<ComplexSelector>)", "Future<Stylesheet0?>()", "bool(+originalUrl(AsyncImporter0,Uri,Uri))", "Uri(+originalUrl(AsyncImporter0,Uri,Uri))", "AtRootQuery0()", "SupportsRule(List<Statement>,FileSpan)", "List<SimpleSelector>(Extender)", "~(Expression)", "~(BinaryOperator)", "SassCalculation0(Object[Object?,Object?])", "SassCalculation0(SassCalculation0[String?])", "ImmutableList(SassCalculation0)", "Object(Object,String,Object,Object)", "bool(CalculationOperator0)", "bool(CalculationOperation0,Object)", "int(CalculationOperation0)", "String(CalculationOperation0)", "StringExpression(Interpolation)", "CalculationInterpolation(Object,String)", "bool(CalculationInterpolation,Object)", "int(CalculationInterpolation)", "String(CalculationInterpolation)", "DateTime(StylesheetNode)", "List<Extender>?(SimpleSelector)", "List<Extender>(PseudoSelector)", "List<List<Extender>>(List<Extender>)", "List<ComplexSelector>(ComplexSelector)", "PseudoSelector(ComplexSelector)", "0&(List<Value0>)", "+(SassNumber0,SassNumber0)?()", "SassColor0(Object,_Channels)", "SassColor0(SassColor0,_Channels)", "~(SimpleSelector,Set<ModifiableBox<SelectorList>>)", "int(int,ComplexSelectorComponent)", "Null(_NodeSassColor,num?[num?,num?,num?,SassColor0?])", "QualifiedName()", "double(_NodeSassColor)", "SassScriptException()", "ComplexSelectorComponent()", "List<ComplexSelectorComponent>?(List<ComplexSelectorComponent>,List<ComplexSelectorComponent>)", "AsyncImporter0(JSImporter)", "0&(@)", "SingleUnitSassNumber(double)", "int(int,ComplexSelectorComponent0)", "ComplexSelectorComponent0()", "String(CssValue0<Combinator0>)", "int(int,SimpleSelector0)", "String(BuiltInCallable0)", "Future<CssValue<String>>(Interpolation{trim:bool,warnForColor:bool})", "Value0?(Module1<Callable>)", "Module1<Callable>?(Module1<Callable>)", "String(CssValue<Combinator>)", "bool(List<Iterable<ComplexSelectorComponent>>)", "Map<String,Value0>(Module1<Callable>)", "Object(Value0)", "int(int,SimpleSelector)", "@(@,String)", "CssValue0<String>(Interpolation0{trim:bool,warnForColor:bool})", "Null(@,StackTrace)", "SassList(ComplexSelector)", "~(Module0<AsyncCallable>,bool)", "+loadedUrls,stylesheet(Set<Uri>,CssStylesheet0)()", "Module1<Callable>()", "~(Module1<Callable>)", "Future<+loadedUrls,stylesheet(Set<Uri>,CssStylesheet)>()", "Future<Module0<AsyncCallable>>()", "CssValue0<String>(Interpolation0)", "bool(PseudoSelector)", "Value0?(IfRuleClause0)", "UserDefinedCallable0<Environment0>(ContentBlock0)", "Value0(Expression0)", "~(Module0<AsyncCallable>)", "FileSpan(_NodeException)", "bool(Extension0)", "Set<ModifiableBox0<SelectorList0>>()", "SelectorList?(PseudoSelector)", "Iterable<ComplexSelector>(ComplexSelector)", "_Future<@>(@)", "Iterable<ComplexSelector0>(List<ComplexSelector0>)", "SimpleSelector(SimpleSelector)", "List<SimpleSelector0>(Extender0)", "List<Extender0>?(SimpleSelector0)", "List<Extender0>(PseudoSelector0)", "List<List<Extender0>>(List<Extender0>)", "List<ComplexSelector0>(ComplexSelector0)", "PseudoSelector0(ComplexSelector0)", "~(SimpleSelector0,Set<ModifiableBox0<SelectorList0>>)", "SassFunction0(Object,String,Value0(List<Value0>))", "Null(@,@)", "QualifiedName0()", "Future<Value?>(Value)", "List<ComplexSelectorComponent0>?(List<ComplexSelectorComponent0>,List<ComplexSelectorComponent0>)", "Null(Function,Function)", "bool(List<Iterable<ComplexSelectorComponent0>>)", "Future<CssValue<String>>(Interpolation)", "String(String?)", "Value?(Module0<AsyncCallable>)", "Module0<AsyncCallable>?(Module0<AsyncCallable>)", "~(int,@)", "bool(PseudoSelector0)", "SelectorList0?(PseudoSelector0)", "String(int,IfClause0)", "Future<Value?>(IfRuleClause)", "String(Value)", "~(Object?,Object,Object?)", "+(String,String)(String)", "0&(List<Value>)", "Stylesheet0?()", "bool(+originalUrl(Importer0,Uri,Uri))", "Uri(+originalUrl(Importer0,Uri,Uri))", "~(String,WarnOptions)", "~(String,DebugOptions)", "Null(RenderResult)", "JSFunction0(JSFunction0)", "Object?(Object,String,String[Object?])", "Null(Object)", "UserDefinedCallable<AsyncEnvironment>(ContentBlock)", "bool(String?,String?)", "List<Value0>(Value0)", "bool(List<Value0>)", "SassList0(ComplexSelector0)", "Iterable<ComplexSelector0>(ComplexSelector0)", "SimpleSelector0(SimpleSelector0)", "SassList0(Object[Object?,_ConstructorOptions?])", "+(SassNumber,SassNumber)?()", "Null(_NodeSassList,int?[bool?,SassList0?])", "Map<String,Value>(Module0<AsyncCallable>)", "Object(_NodeSassList,int)", "Null(_NodeSassList,int,Object)", "bool(_NodeSassList)", "Null(_NodeSassList,bool)", "int(_NodeSassList)", "SassMap0(Value0)", "SassMap0(SassMap0)", "Map<String,AstNode>(Module0<AsyncCallable>)", "SassMap0(Object[ImmutableMap0?])", "ImmutableMap0(SassMap0)", "@(SassMap0,Object)", "Null(_NodeSassMap,int?[SassMap0?])", "SassNumber0(int)", "Future<Value>(Expression)", "int(_NodeSassMap)", "List<Value>(Value)", "SassNumber0(Value0)", "List<CssMediaQuery0>()", "Value0(Object)", "0&(Object)", "SassNumber0(Object,num[Object?])", "double(SassNumber0)", "bool(List<Value>)", "int?(SassNumber0)", "Value/()", "int(SassNumber0[String?])", "double(SassNumber0,num,num[String?])", "SassNumber0(SassNumber0[String?])", "SassNumber0(SassNumber0,String[String?])", "int(String?)", "Object(String)", "bool(Version)", "SassMap(Value)", "SassMap(SassMap)", "Null(_NodeSassNumber,num?[String?,SassNumber0?])", "double(_NodeSassNumber)", "Null(_NodeSassNumber,num)", "String(_NodeSassNumber)", "Null(_NodeSassNumber,String)", "SassScriptException0()", "CssValue<String>(Interpolation{trim:bool,warnForColor:bool})", "String(Object,@,@[@])", "~(Symbol0,@)", "Future<Stylesheet?>()", "SassNumber(Value)", "+loadedUrls,stylesheet(Set<Uri>,CssStylesheet)()", "SassString0(SimpleSelector0)", "Module0<Callable0>()", "SelectorList0()", "CompoundSelector0()", "~(CssMediaQuery0)", "~(SelectorList0)", "~(MapEntry<Value0,Value0>)", "SingleUnitSassNumber0(double)", "~(Module0<Callable0>)", "JSUrl0?(FileSpan)", "Value?(Value)", "Value(Object)", "SassString0(int)", "SassString0(String)", "SassString0(Object[Object?,_ConstructorOptions1?])", "String(SassString0)", "bool(SassString0)", "int(SassString0)", "int(SassString0,Value0[String?])", "Null(_NodeSassString,String?[SassString0?])", "String(_NodeSassString)", "Null(_NodeSassString,String)", "Statement0({root:bool})", "CssValue<String>(Interpolation)", "Stylesheet0()", "Statement0?()", "VariableDeclaration0(VariableDeclaration0)", "ArgumentDeclaration0()", "+(String,ArgumentDeclaration0)()", "VariableDeclaration0()", "bool(+originalUrl(AsyncImporter,Uri,Uri))", "StyleRule0(List<Statement0>,FileSpan)", "Value?(IfRuleClause)", "EachRule0(List<Statement0>,FileSpan)", "FunctionRule0(List<Statement0>,FileSpan)", "ForRule0(List<Statement0>,FileSpan)", "ContentBlock0(List<Statement0>,FileSpan)", "MediaRule0(List<Statement0>,FileSpan)", "MixinRule0(List<Statement0>,FileSpan)", "UserDefinedCallable<Environment>(ContentBlock)", "SupportsRule0(List<Statement0>,FileSpan)", "WhileRule0(List<Statement0>,FileSpan)", "~(Expression0)", "~(BinaryOperator0)", "StringExpression0(Interpolation0)", "Null(~(Object?),~(Object?))", "ImmutableList0(Value0)", "String?(Value0)", "int(Value0,Value0[String?])", "SassBoolean0(Value0[String?])", "SassCalculation0(Value0[String?])", "SassColor0(Value0[String?])", "SassFunction0(Value0[String?])", "SassMap0(Value0[String?])", "SassMixin0(Value0[String?])", "SassNumber0(Value0[String?])", "SassString0(Value0[String?])", "SassMap0?(Value0)", "bool(Value0,Object?)", "int(Value0[Object?])", "Value(Expression)", "Expression()", "~(Zone?,ZoneDelegate?,Zone,Object,StackTrace)", "0^(Zone?,ZoneDelegate?,Zone,0^())<Object?>", "0^(Zone?,ZoneDelegate?,Zone,0^(1^),1^)<Object?,Object?>", "0^(Zone?,ZoneDelegate?,Zone,0^(1^,2^),1^,2^)<Object?,Object?,Object?>", "0^()(Zone,ZoneDelegate,Zone,0^())<Object?>", "0^(1^)(Zone,ZoneDelegate,Zone,0^(1^))<Object?,Object?>", "0^(1^,2^)(Zone,ZoneDelegate,Zone,0^(1^,2^))<Object?,Object?,Object?>", "AsyncError?(Zone,ZoneDelegate,Zone,Object,StackTrace?)", "~(Zone?,ZoneDelegate?,Zone,~())", "Timer(Zone,ZoneDelegate,Zone,Duration,~())", "Timer(Zone,ZoneDelegate,Zone,Duration,~(Timer))", "~(Zone,ZoneDelegate,Zone,String)", "Zone(Zone?,ZoneDelegate?,Zone,ZoneSpecification?,Map<Object?,Object?>?)", "~(ContentBlock)", "~(List<Statement>)", "0^(0^,0^)<num>", "Uri(+originalUrl(AsyncImporter,Uri,Uri))", "String(Argument)", "~(Object,StackTrace,EventSink<0^>)<Object?>", "List<0^>(0^,List<0^>?)<Object?>", "NodeCompileResult(String[CompileOptions?])", "NodeCompileResult(String[CompileStringOptions?])", "Promise(String[CompileOptions?])", "Promise(String[CompileStringOptions?])", "Importer0(Object?)", "List<Object?>(Object?)", "~(RenderOptions,~(Object?,RenderResult?))", "RenderResult(RenderOptions)", "Uri(JSUrl0)", "JSUrl0(Uri)", "String(String[String?,String?,String?,String?,String?,String?,String?,String?,String?,String?,String?,String?,String?,String?])", "~(CssMediaQuery)", "~(SelectorList)", "int(num)", "~(MapEntry<Value,Value>)", "Future<~>(List<String>)", "Map<String,AstNode0>(Module1<Callable>)"],
+    types: ["~()", "Null()", "Future<Null>()", "Value0(List<Value0>)", "bool(String)", "String(String)", "Value(List<Value>)", "bool(CssNode)", "bool(CssNode0)", "bool(Object?)", "int()", "SassNumber(List<Value>)", "SassNumber0(List<Value0>)", "bool(SimpleSelector)", "bool(SimpleSelector0)", "JSClass0()", "bool(ComplexSelector)", "SassString(List<Value>)", "bool(ComplexSelector0)", "SassString0(List<Value0>)", "SassBoolean(List<Value>)", "SassBoolean0(List<Value0>)", "bool()", "SassList0(List<Value0>)", "SassList(List<Value>)", "Future<~>()", "String()", "FileSpan()", "SassColor0(List<Value0>)", "SassColor(List<Value>)", "bool(int?)", "~(Object?)", "Null(~())", "SassMap(List<Value>)", "Value()", "Object?()", "SassMap0(List<Value0>)", "double(double)", "Future<Null>(Future<~>())", "Value(Value)", "Value?()", "Value0?()", "Value0(Value0)", "Uri(Uri)", "String?()", "bool(int)", "bool(num,num)", "Value0()", "SassNumber0(SassNumber0)", "bool(ComplexSelectorComponent)", "bool(ComplexSelectorComponent0)", "SassNumber(SassNumber)", "Null(Object,StackTrace)", "bool(Value0)", "~(Value)", "ComplexSelector0(ComplexSelector0)", "double(double,double)", "double(SassColor0)", "ValueExpression(Value)", "ComplexSelector(ComplexSelector)", "@()", "Null(@)", "~(Value0)", "ValueExpression0(Value0)", "Future<Value0>()", "bool(SelectorList0)", "Future<Value?>()", "Object(Object)", "Future<Value>()", "Frame()", "bool(SelectorList)", "~(@)", "bool(Value)", "~(Object,StackTrace)", "Future<Value0?>()", "bool(Object)", "~(Value0,Value0)", "~(Module0<Callable0>,bool)", "Value?(Statement)", "Object()", "~(Module1<Callable>,bool)", "Stylesheet?()", "@(@)", "double(Value)", "Future<Value?>(Statement)", "Callable?()", "AsyncCallable?()", "int(Uri)", "Future<Value0>(List<Value0>)", "List<CssMediaQuery>?(List<CssMediaQuery>)", "~(Value,Value)", "SassRuntimeException(AstNode)", "AsyncCallable0?()", "Null([Object?])", "SassRuntimeException0(AstNode0)", "double(Value0)", "~([int?])", "Future<Value0?>(Statement0)", "~(String,Value)", "~(Object)", "List<CssMediaQuery0>?(List<CssMediaQuery0>)", "Value0?(Statement0)", "Callable0?()", "~(String,Value0)", "~(String)", "Frame(String)", "Null(_NodeSassColor,num)", "String(Expression0)", "String(@)", "Null(Module1<AsyncCallable0>,bool)", "SassCalculation0(Object)", "String(Expression)", "bool(Module1<AsyncCallable0>)", "bool(Expression)", "~(String,@)", "Map<ComplexSelector,Extension>()", "int(SassColor0)", "bool(Module0<Callable0>)", "int(_NodeSassColor)", "Null(Module0<AsyncCallable>,bool)", "~(String,Object?)", "bool(Module1<Callable>)", "+originalUrl(Importer,Uri,Uri)?()", "bool(Module0<AsyncCallable>)", "List<String>()", "Map<ComplexSelector0,Extension0>()", "String(String{color:Object?})", "Statement()", "bool(@)", "~(String,Function)", "Statement0()", "~(~())", "bool(Expression0)", "bool(_Highlight)", "String(Object)", "SassFunction0(List<Value0>)", "String(Value0)", "SelectorList(Value)", "SelectorList(SelectorList,SelectorList)", "bool(String?)", "Uri?()", "Uri(String)", "int(String,String)", "String?(String?)", "String?(Object)", "Iterable<String>()", "Iterable<String>(String)", "Iterable<String>(@)", "DateTime()", "~(String[~])", "int(int)", "0&(String,FileSpan[StackTrace?])", "bool(Statement)", "VariableDeclaration()", "AtRootRule(List<Statement>,FileSpan)", "AtRule(List<Statement>,FileSpan)", "bool(Import)", "String(String{color:@})", "Entry(Entry)", "int(double)", "double(double,String)", "Set<0^>()<Object?>", "AstNode(AstNode)", "SassFunction(List<Value>)", "SassMixin(List<Value>)", "Future<~>(List<Value>)", "~([Object?])", "List<ExtensionStore>()", "~(@,@)", "bool(ModifiableCssParentNode)", "~(Object?,Object?)", "@(String)", "Future<SassNumber>()", "List<CssComment>()", "bool(UseRule)", "bool(ForwardRule)", "Future<String>()", "int(ComplexSelector)", "AsyncCallable?(Module0<AsyncCallable>)", "Future<Object>()", "MapKeySet<Module0<AsyncCallable>>(Map<Module0<AsyncCallable>,AstNode>)", "InterpolationMap(List<SourceLocation>)", "AstNode?()", "String(SassNumber)", "~(List<Value>)", "Map<String,AsyncCallable>(Module0<AsyncCallable>)", "SassNumber()", "bool(Object?,Object?)", "int(@,@)", "double?(String,num{assertPercent:bool,checkPercent:bool,checkUnitless:bool})", "Value0?(Value0)", "String(int)", "~(List<Value0>)", "Map<String,Callable>(Module1<Callable>)", "MapKeySet<Module1<Callable>>(Map<Module1<Callable>,AstNode0>)", "AtRule0(List<Statement0>,FileSpan)", "Callable?(Module1<Callable>)", "~(Iterable<ExtensionStore0>)", "Version(String)", "Set<0&>(Object)", "AsyncImporter0(Object?)", "Future<NodeCompileResult>()", "SelectorList0(SelectorList0,SelectorList0)", "SelectorList0(Value0)", "Expression0(Expression0)", "int(ComplexSelector0)", "bool(Queue<List<ComplexSelectorComponent>>)", "Object(CalculationOperation0)", "double(SassNumber0,SassNumber0[String?,String?])", "0&(@[@])", "AtRootRule0(List<Statement0>,FileSpan)", "int(Object?)", "SassNumber0()", "0&(Object[Object?])", "Future<~>?()", "int(SourceLocation)", "String(SassNumber0)", "AstNode0?()", "double(SassNumber0,Object,Object[String?])", "InterpolationMap0(List<SourceLocation>)", "List<Extension>()", "~(Uint8List,String,int)", "SassNumber0(SassNumber0,SassNumber0[String?,String?])", "String(FileSpan)", "SassNumber0(SassNumber0,Object,Object[String?])", "bool(SassNumber0,String)", "~(Iterable<ExtensionStore>)", "bool(ForwardRule0)", "bool(UseRule0)", "List<CssComment0>()", "ImmutableList0(SassNumber0)", "FileLocation(FileSpan)", "Future<SassNumber0>()", "bool(SassNumber0)", "Map<String,Callable0>(Module0<Callable0>)", "Null(_NodeSassMap,int,Object)", "Object(_NodeSassMap,int)", "bool(ModifiableCssParentNode0)", "Expression(Expression)", "Value0(int)", "@(Value0,num)", "Future<~>(List<Value0>)", "SassMixin0(List<Value0>)", "MapKeySet<Module0<Callable0>>(Map<Module0<Callable0>,AstNode>)", "~(Object[StackTrace?])", "bool(Import0)", "Callable0?(Module0<Callable0>)", "bool(Statement0)", "AstNode0(AstNode0)", "int(int,double?)", "bool(Queue<List<ComplexSelectorComponent0>>)", "double(double,double?,num)", "Map<String,AsyncCallable0>(Module1<AsyncCallable0>)", "MapKeySet<Module1<AsyncCallable0>>(Map<Module1<AsyncCallable0>,AstNode0>)", "Trace(String)", "List<Extension0>()", "AsyncCallable0?(Module1<AsyncCallable0>)", "Future<Value>(List<Value>)", "bool(Frame)", "Trace()", "String(Frame)", "int(Frame)", "String(_NodeException)", "Uri?/()", "List<ExtensionStore0>()", "Value(Expression)", "Future<+originalUrl(AsyncImporter,Uri,Uri)?>()", "~(ContentBlock)", "~(List<Statement>)", "UserDefinedCallable<Environment>(ContentBlock)", "Value?(IfRuleClause)", "~(CssMediaQuery)", "~(SelectorList)", "~(MapEntry<Value,Value>)", "SourceFile()", "SourceFile?(int)", "String?(SourceFile?)", "int(_Line)", "Future<Stylesheet?>()", "Object(_Line)", "Object(_Highlight)", "int(_Highlight,_Highlight)", "List<_Line>(MapEntry<Object,List<_Highlight>>)", "SourceSpanWithContext()", "List<Frame>(Trace)", "int(Trace)", "CssValue<String>(Interpolation)", "String(Trace)", "~(String,int)", "bool(+originalUrl(AsyncImporter,Uri,Uri))", "Frame(String,String)", "Value?(Value)", "~(Module0<Callable0>)", "Frame(Frame)", "Uri(+originalUrl(AsyncImporter,Uri,Uri))", "~(String,int?)", "int(int,int)", "String(Argument0)", "Module0<Callable0>()", "SassArgumentList0(Object,Object,Object[String?])", "ImmutableMap0(SassArgumentList0)", "SassMap(Value)", "bool(Deprecation)", "Value0?(Module1<AsyncCallable0>)", "Module1<AsyncCallable0>?(Module1<AsyncCallable0>)", "+loadedUrls,stylesheet(Set<Uri>,CssStylesheet)()", "Map<String,AstNode>(Module0<AsyncCallable>)", "Map<String,Value0>(Module1<AsyncCallable0>)", "Map<String,AstNode0>(Module1<AsyncCallable0>)", "CssValue<String>(Interpolation{trim:bool,warnForColor:bool})", "Value?(Module0<Callable0>)", "Future<CssValue0<String>>(Interpolation0{trim:bool,warnForColor:bool})", "Map<String,Value>(Module0<AsyncCallable>)", "Module0<Callable0>?(Module0<Callable0>)", "Value/()", "Future<CssValue<String>>(Interpolation{trim:bool,warnForColor:bool})", "Future<Value>(Expression)", "Module0<AsyncCallable>?(Module0<AsyncCallable>)", "Value?(Module0<AsyncCallable>)", "Map<String,Value>(Module0<Callable0>)", "~(Module1<AsyncCallable0>,bool)", "Future<+loadedUrls,stylesheet(Set<Uri>,CssStylesheet0)>()", "Future<Module1<AsyncCallable0>>()", "Map<String,AstNode>(Module0<Callable0>)", "~(Module1<AsyncCallable0>)", "~(Symbol0,@)", "UserDefinedCallable<AsyncEnvironment>(ContentBlock)", "Future<Value?>(IfRuleClause)", "Uint8List(@,@)", "Future<Value0?>(Value0)", "ArgParser()", "Future<CssValue0<String>>(Interpolation0)", "Set<Deprecation>()", "SimpleSelector(SimpleSelector)", "Future<~>(String)", "Future<CssValue<String>>(Interpolation)", "Future<Value0?>(IfRuleClause0)", "Iterable<ComplexSelector>(ComplexSelector)", "Future<Value?>(Value)", "UserDefinedCallable0<AsyncEnvironment0>(ContentBlock0)", "List<WatchEvent>(List<WatchEvent>)", "SassList(ComplexSelector)", "bool(Extension)", "Set<ModifiableBox<SelectorList>>()", "~(Module0<AsyncCallable>)", "Future<Value0>(Expression0)", "int(int,SimpleSelector)", "Value0/()", "Iterable<ComplexSelector>(List<ComplexSelector>)", "List<SimpleSelector>(Extender)", "List<Extender>?(SimpleSelector)", "Future<Module0<AsyncCallable>>()", "~(Module0<AsyncCallable>,bool)", "String(CssValue<Combinator>)", "Future<+originalUrl(AsyncImporter0,Uri,Uri)?>()", "Future<Stylesheet0?>()", "bool(+originalUrl(AsyncImporter0,Uri,Uri))", "Uri(+originalUrl(AsyncImporter0,Uri,Uri))", "AtRootQuery0()", "int(int,ComplexSelectorComponent)", "SingleUnitSassNumber(double)", "List<Extender>(PseudoSelector)", "List<List<Extender>>(List<Extender>)", "SassCalculation0(Object[Object?,Object?])", "SassCalculation0(SassCalculation0[String?])", "ImmutableList(SassCalculation0)", "Object(Object,String,Object,Object)", "bool(CalculationOperator0)", "bool(CalculationOperation0,Object)", "int(CalculationOperation0)", "String(CalculationOperation0)", "~(int,@)", "CalculationInterpolation(Object,String)", "bool(CalculationInterpolation,Object)", "int(CalculationInterpolation)", "String(CalculationInterpolation)", "bool(CanonicalizeContext0)", "JSUrl0?(CanonicalizeContext0)", "List<ComplexSelector>(ComplexSelector)", "PseudoSelector(ComplexSelector)", "~(SimpleSelector,Set<ModifiableBox<SelectorList>>)", "List<ComplexSelectorComponent>?(List<ComplexSelectorComponent>,List<ComplexSelectorComponent>)", "SassScriptException()", "Future<+loadedUrls,stylesheet(Set<Uri>,CssStylesheet)>()", "0&(List<Value0>)", "SassColor0(Object,_Channels)", "SassColor0(SassColor0,_Channels)", "bool(List<Iterable<ComplexSelectorComponent>>)", "bool(PseudoSelector)", "Null(_NodeSassColor,num?[num?,num?,num?,SassColor0?])", "SelectorList?(PseudoSelector)", "double(_NodeSassColor)", "Object?(Object?)", "DateTime(StylesheetNode)", "StringExpression(Interpolation)", "AsyncImporter0(JSImporter)", "0&(@)", "@(@,String)", "Iterable<Deprecation0>()", "NodePackageImporter0(Object[String?])", "~(BinaryOperator)", "NodeCompileResult(Compiler,String[CompileOptions?])", "NodeCompileResult(Compiler,String[CompileStringOptions?])", "Null(Compiler)", "Promise(AsyncCompiler,String[CompileOptions?])", "Promise(AsyncCompiler,String[CompileStringOptions?])", "Promise(AsyncCompiler)", "Future<AsyncCompiler>()", "int(int,ComplexSelectorComponent0)", "String(CssValue0<Combinator0>)", "int(int,SimpleSelector0)", "String(BuiltInCallable0)", "bool(Deprecation0)", "Version(Object,int,int,int)", "~(Expression)", "WhileRule(List<Statement>,FileSpan)", "Value0?(Module1<Callable>)", "Module1<Callable>?(Module1<Callable>)", "SupportsRule(List<Statement>,FileSpan)", "MixinRule(List<Statement>,FileSpan)", "Object(Value0)", "Map<String,AstNode0>(Module1<Callable>)", "MediaRule(List<Statement>,FileSpan)", "~(String,Option)", "CssValue0<String>(Interpolation0{trim:bool,warnForColor:bool})", "_Future<@>(@)", "ContentBlock(List<Statement>,FileSpan)", "ForRule(List<Statement>,FileSpan)", "+loadedUrls,stylesheet(Set<Uri>,CssStylesheet0)()", "Module1<Callable>()", "~(Module1<Callable>)", "FunctionRule(List<Statement>,FileSpan)", "EachRule(List<Statement>,FileSpan)", "CssValue0<String>(Interpolation0)", "Declaration(List<Statement>,FileSpan)", "Value0?(IfRuleClause0)", "UserDefinedCallable0<Environment0>(ContentBlock0)", "Value0(Expression0)", "StyleRule(List<Statement>,FileSpan)", "FileSpan(_NodeException)", "bool(Extension0)", "Set<ModifiableBox0<SelectorList0>>()", "Null(@,@)", "UseRule()", "Iterable<ComplexSelector0>(List<ComplexSelector0>)", "ArgumentDeclaration()", "List<SimpleSelector0>(Extender0)", "List<Extender0>?(SimpleSelector0)", "List<Extender0>(PseudoSelector0)", "List<List<Extender0>>(List<Extender0>)", "List<ComplexSelector0>(ComplexSelector0)", "PseudoSelector0(ComplexSelector0)", "~(SimpleSelector0,Set<ModifiableBox0<SelectorList0>>)", "SassFunction0(Object,String,Value0(List<Value0>))", "List<ComplexSelectorComponent0>?(List<ComplexSelectorComponent0>,List<ComplexSelectorComponent0>)", "VariableDeclaration(VariableDeclaration)", "bool(List<Iterable<ComplexSelectorComponent0>>)", "Statement?()", "bool(PseudoSelector0)", "SelectorList0?(PseudoSelector0)", "String(int,IfClause0)", "Stylesheet()", "Expression({bracketList:bool,singleEquals:bool,until:bool()?})", "~(Object?,Object,Object?)", "+(String,String)(String)", "Future<~>(List<String>)", "Stylesheet0?()", "bool(+originalUrl(Importer0,Uri,Uri))", "Uri(+originalUrl(Importer0,Uri,Uri))", "~(String,WarnOptions)", "~(String,DebugOptions)", "Null(RenderResult)", "JSFunction0(JSFunction0)", "Object?(Object,String,String[Object?])", "Null(Object)", "String(Value)", "List<Value0>(Value0)", "bool(List<Value0>)", "SassList0(ComplexSelector0)", "Iterable<ComplexSelector0>(ComplexSelector0)", "SimpleSelector0(SimpleSelector0)", "SassList0(Object[Object?,_ConstructorOptions?])", "Statement({root:bool})", "Null(_NodeSassList,int?[bool?,SassList0?])", "CompoundSelector()", "Object(_NodeSassList,int)", "Null(_NodeSassList,int,Object)", "bool(_NodeSassList)", "Null(_NodeSassList,bool)", "int(_NodeSassList)", "SassMap0(Value0)", "SassMap0(SassMap0)", "SassMap0(Object[ImmutableMap0?])", "ImmutableMap0(SassMap0)", "@(SassMap0,Object)", "Null(_NodeSassMap,int?[SassMap0?])", "SassNumber0(int)", "SelectorList()", "int(_NodeSassMap)", "String(int,IfClause)", "SassNumber0(Value0)", "List<CssMediaQuery0>()", "Value0(Object)", "0&(Object)", "bool(ModifiableCssNode0)", "SassNumber0(Object,num[Object?])", "double(SassNumber0)", "~(@,StackTrace)", "int?(SassNumber0)", "List<CssMediaQuery>()", "int(SassNumber0[String?])", "double(SassNumber0,num,num[String?])", "SassNumber0(SassNumber0[String?])", "SassNumber0(SassNumber0,String[String?])", "String(BuiltInCallable)", "AtRootQuery()", "~([Future<~>?])", "Future<@>()", "String(Argument)", "Null(_NodeSassNumber,num?[String?,SassNumber0?])", "double(_NodeSassNumber)", "Null(_NodeSassNumber,num)", "String(_NodeSassNumber)", "Null(_NodeSassNumber,String)", "SassScriptException0()", "bool(ModifiableCssNode)", "String(Object,@,@[@])", "0&(List<Value>)", "bool(Version)", "Object(String)", "int(String?)", "SassString0(SimpleSelector0)", "SelectorList0()", "CompoundSelector0()", "~(CssMediaQuery0)", "~(SelectorList0)", "~(MapEntry<Value0,Value0>)", "SingleUnitSassNumber0(double)", "bool(+forImport(Importer,Uri,bool),+originalUrl(Importer,Uri,Uri)?)", "JSUrl0?(FileSpan)", "Uri(+originalUrl(Importer,Uri,Uri))", "bool(+originalUrl(Importer,Uri,Uri))", "SassString0(int)", "SassString0(String)", "SassString0(Object[Object?,_ConstructorOptions1?])", "String(SassString0)", "bool(SassString0)", "int(SassString0)", "int(SassString0,Value0[String?])", "Null(_NodeSassString,String?[SassString0?])", "String(_NodeSassString)", "Null(_NodeSassString,String)", "Statement0({root:bool})", "bool(String?,String?)", "Stylesheet0()", "Statement0?()", "VariableDeclaration0(VariableDeclaration0)", "ArgumentDeclaration0()", "+(String,ArgumentDeclaration0)()", "VariableDeclaration0()", "StyleRule0(List<Statement0>,FileSpan)", "Declaration0(List<Statement0>,FileSpan)", "SassString(String)", "EachRule0(List<Statement0>,FileSpan)", "FunctionRule0(List<Statement0>,FileSpan)", "ForRule0(List<Statement0>,FileSpan)", "ContentBlock0(List<Statement0>,FileSpan)", "MediaRule0(List<Statement0>,FileSpan)", "MixinRule0(List<Statement0>,FileSpan)", "SassString(int)", "SupportsRule0(List<Statement0>,FileSpan)", "WhileRule0(List<Statement0>,FileSpan)", "~(Expression0)", "~(BinaryOperator0)", "StringExpression0(Interpolation0)", "Null(~(Object?),~(Object?))", "ImmutableList0(Value0)", "String?(Value0)", "int(Value0,Value0[String?])", "SassBoolean0(Value0[String?])", "SassCalculation0(Value0[String?])", "SassColor0(Value0[String?])", "SassFunction0(Value0[String?])", "SassMap0(Value0[String?])", "SassMixin0(Value0[String?])", "SassNumber0(Value0[String?])", "SassString0(Value0[String?])", "SassMap0?(Value0)", "bool(Value0,Object?)", "int(Value0[Object?])", "SassString(SimpleSelector)", "List<Value>(Value)", "~(Zone?,ZoneDelegate?,Zone,Object,StackTrace)", "0^(Zone?,ZoneDelegate?,Zone,0^())<Object?>", "0^(Zone?,ZoneDelegate?,Zone,0^(1^),1^)<Object?,Object?>", "0^(Zone?,ZoneDelegate?,Zone,0^(1^,2^),1^,2^)<Object?,Object?,Object?>", "0^()(Zone,ZoneDelegate,Zone,0^())<Object?>", "0^(1^)(Zone,ZoneDelegate,Zone,0^(1^))<Object?,Object?>", "0^(1^,2^)(Zone,ZoneDelegate,Zone,0^(1^,2^))<Object?,Object?,Object?>", "AsyncError?(Zone,ZoneDelegate,Zone,Object,StackTrace?)", "~(Zone?,ZoneDelegate?,Zone,~())", "Timer(Zone,ZoneDelegate,Zone,Duration,~())", "Timer(Zone,ZoneDelegate,Zone,Duration,~(Timer))", "~(Zone,ZoneDelegate,Zone,String)", "Zone(Zone?,ZoneDelegate?,Zone,ZoneSpecification?,Map<Object?,Object?>?)", "Value(Object)", "SassNumber(Value)", "0^(0^,0^)<num>", "bool(List<Value>)", "String(String?)", "~(Object,StackTrace,EventSink<0^>)<Object?>", "List<0^>(0^,List<0^>?)<Object?>", "NodeCompileResult(String[CompileOptions?])", "NodeCompileResult(String[CompileStringOptions?])", "Promise(String[CompileOptions?])", "Promise(String[CompileStringOptions?])", "Importer0(Object?)", "Compiler()", "Promise()", "List<Object?>(Object?)", "~(RenderOptions,~(Object?,RenderResult?))", "RenderResult(RenderOptions)", "Uri(JSUrl0)", "JSUrl0(Uri)", "String(String[String?,String?,String?,String?,String?,String?,String?,String?,String?,String?,String?,String?,String?,String?])", "String(Object?)", "Null(@,StackTrace)", "SassMap(SassMap)", "int(num)", "Null(Function,Function)", "+originalUrl(Importer0,Uri,Uri)?()", "Map<String,Value0>(Module1<Callable>)"],
     interceptorsByTag: null,
     leafTags: null,
     arrayRti: Symbol("$ti"),
     rttc: {
+      "1;": t1 => o => o instanceof A._Record_1 && t1._is(o._0),
       "2;": (t1, t2) => o => o instanceof A._Record_2 && t1._is(o._0) && t2._is(o._1),
       "2;forImport": (t1, t2) => o => o instanceof A._Record_2_forImport && t1._is(o._0) && t2._is(o._1),
       "2;sourceMap": (t1, t2) => o => o instanceof A._Record_2_sourceMap && t1._is(o._0) && t2._is(o._1),
       "2;imports,modules": (t1, t2) => o => o instanceof A._Record_2_imports_modules && t1._is(o._0) && t2._is(o._1),
       "2;loadedUrls,stylesheet": (t1, t2) => o => o instanceof A._Record_2_loadedUrls_stylesheet && t1._is(o._0) && t2._is(o._1),
       "3;": (t1, t2, t3) => o => o instanceof A._Record_3 && t1._is(o._0) && t2._is(o._1) && t3._is(o._2),
+      "3;forImport": (t1, t2, t3) => o => o instanceof A._Record_3_forImport && t1._is(o._0) && t2._is(o._1) && t3._is(o._2),
       "3;originalUrl": (t1, t2, t3) => o => o instanceof A._Record_3_originalUrl && t1._is(o._0) && t2._is(o._1) && t3._is(o._2),
       "3;importer,isDependency": (t1, t2, t3) => o => o instanceof A._Record_3_importer_isDependency && t1._is(o._0) && t2._is(o._1) && t3._is(o._2),
-      "4;": types => o => o instanceof A._Record_4 && A.pairwiseIsTest(types, o._values),
-      "4;baseImporter,baseUrl,forImport": types => o => o instanceof A._Record_4_baseImporter_baseUrl_forImport && A.pairwiseIsTest(types, o._values),
       "5;named,namedNodes,positional,positionalNodes,separator": types => o => o instanceof A._Record_5_named_namedNodes_positional_positionalNodes_separator && A.pairwiseIsTest(types, o._values)
     }
   };
-  A._Universe_addRules(init.typeUniverse, JSON.parse('{"PlainJavaScriptObject":"LegacyJavaScriptObject","UnknownJavaScriptObject":"LegacyJavaScriptObject","JavaScriptFunction":"LegacyJavaScriptObject","Stdin":"LegacyJavaScriptObject","Stdout":"LegacyJavaScriptObject","ReadlineModule":"LegacyJavaScriptObject","ReadlineOptions":"LegacyJavaScriptObject","ReadlineInterface":"LegacyJavaScriptObject","BufferModule":"LegacyJavaScriptObject","BufferConstants":"LegacyJavaScriptObject","Buffer":"LegacyJavaScriptObject","ConsoleModule":"LegacyJavaScriptObject","Console":"LegacyJavaScriptObject","EventEmitter":"LegacyJavaScriptObject","FS":"LegacyJavaScriptObject","FSConstants":"LegacyJavaScriptObject","FSWatcher":"LegacyJavaScriptObject","ReadStream":"LegacyJavaScriptObject","ReadStreamOptions":"LegacyJavaScriptObject","WriteStream":"LegacyJavaScriptObject","WriteStreamOptions":"LegacyJavaScriptObject","FileOptions":"LegacyJavaScriptObject","StatOptions":"LegacyJavaScriptObject","MkdirOptions":"LegacyJavaScriptObject","RmdirOptions":"LegacyJavaScriptObject","WatchOptions":"LegacyJavaScriptObject","WatchFileOptions":"LegacyJavaScriptObject","Stats":"LegacyJavaScriptObject","Promise":"LegacyJavaScriptObject","Date":"LegacyJavaScriptObject","JsError":"LegacyJavaScriptObject","Atomics":"LegacyJavaScriptObject","Modules":"LegacyJavaScriptObject","Module":"LegacyJavaScriptObject","Net":"LegacyJavaScriptObject","Socket":"LegacyJavaScriptObject","NetAddress":"LegacyJavaScriptObject","NetServer":"LegacyJavaScriptObject","NodeJsError":"LegacyJavaScriptObject","JsAssertionError":"LegacyJavaScriptObject","JsRangeError":"LegacyJavaScriptObject","JsReferenceError":"LegacyJavaScriptObject","JsSyntaxError":"LegacyJavaScriptObject","JsTypeError":"LegacyJavaScriptObject","JsSystemError":"LegacyJavaScriptObject","Process":"LegacyJavaScriptObject","CPUUsage":"LegacyJavaScriptObject","Release":"LegacyJavaScriptObject","StreamModule":"LegacyJavaScriptObject","Readable":"LegacyJavaScriptObject","Writable":"LegacyJavaScriptObject","Duplex":"LegacyJavaScriptObject","Transform":"LegacyJavaScriptObject","WritableOptions":"LegacyJavaScriptObject","ReadableOptions":"LegacyJavaScriptObject","Immediate":"LegacyJavaScriptObject","Timeout":"LegacyJavaScriptObject","TTY":"LegacyJavaScriptObject","TTYReadStream":"LegacyJavaScriptObject","TTYWriteStream":"LegacyJavaScriptObject","Util":"LegacyJavaScriptObject","JSArray0":"LegacyJavaScriptObject","Chokidar":"LegacyJavaScriptObject","ChokidarOptions":"LegacyJavaScriptObject","ChokidarWatcher":"LegacyJavaScriptObject","JSFunction":"LegacyJavaScriptObject","ImmutableList":"LegacyJavaScriptObject","ImmutableMap":"LegacyJavaScriptObject","NodeImporterResult":"LegacyJavaScriptObject","RenderContext":"LegacyJavaScriptObject","RenderContextOptions":"LegacyJavaScriptObject","RenderContextResult":"LegacyJavaScriptObject","RenderContextResultStats":"LegacyJavaScriptObject","JSClass":"LegacyJavaScriptObject","JSUrl":"LegacyJavaScriptObject","_PropertyDescriptor":"LegacyJavaScriptObject","JSArray1":"LegacyJavaScriptObject","Chokidar0":"LegacyJavaScriptObject","ChokidarOptions0":"LegacyJavaScriptObject","ChokidarWatcher0":"LegacyJavaScriptObject","_Channels":"LegacyJavaScriptObject","_NodeSassColor":"LegacyJavaScriptObject","CompileOptions":"LegacyJavaScriptObject","CompileStringOptions":"LegacyJavaScriptObject","NodeCompileResult":"LegacyJavaScriptObject","_NodeException":"LegacyJavaScriptObject","Exports":"LegacyJavaScriptObject","LoggerNamespace":"LegacyJavaScriptObject","Fiber":"LegacyJavaScriptObject","FiberClass":"LegacyJavaScriptObject","JSFunction0":"LegacyJavaScriptObject","ImmutableList0":"LegacyJavaScriptObject","ImmutableMap0":"LegacyJavaScriptObject","JSImporter":"LegacyJavaScriptObject","CanonicalizeContext":"LegacyJavaScriptObject","JSImporterResult":"LegacyJavaScriptObject","NodeImporterResult0":"LegacyJavaScriptObject","_ConstructorOptions":"LegacyJavaScriptObject","_NodeSassList":"LegacyJavaScriptObject","WarnOptions":"LegacyJavaScriptObject","DebugOptions":"LegacyJavaScriptObject","JSLogger":"LegacyJavaScriptObject","_NodeSassMap":"LegacyJavaScriptObject","_ConstructorOptions0":"LegacyJavaScriptObject","_NodeSassNumber":"LegacyJavaScriptObject","JSClass0":"LegacyJavaScriptObject","RenderContext0":"LegacyJavaScriptObject","RenderContextOptions0":"LegacyJavaScriptObject","RenderContextResult0":"LegacyJavaScriptObject","RenderContextResultStats0":"LegacyJavaScriptObject","RenderOptions":"LegacyJavaScriptObject","RenderResult":"LegacyJavaScriptObject","RenderResultStats":"LegacyJavaScriptObject","_Exports":"LegacyJavaScriptObject","_ConstructorOptions1":"LegacyJavaScriptObject","_NodeSassString":"LegacyJavaScriptObject","Types":"LegacyJavaScriptObject","JSUrl0":"LegacyJavaScriptObject","_PropertyDescriptor0":"LegacyJavaScriptObject","JSBool":{"bool":[],"TrustedGetRuntimeType":[]},"JSNull":{"Null":[],"TrustedGetRuntimeType":[]},"LegacyJavaScriptObject":{"Promise":[],"JsSystemError":[],"ImmutableList":[],"_Channels":[],"_NodeSassColor":[],"CompileOptions":[],"CompileStringOptions":[],"NodeCompileResult":[],"_NodeException":[],"Fiber":[],"JSFunction0":[],"ImmutableList0":[],"ImmutableMap0":[],"JSImporter":[],"JSImporterResult":[],"NodeImporterResult0":[],"_ConstructorOptions":[],"_NodeSassList":[],"WarnOptions":[],"DebugOptions":[],"_NodeSassMap":[],"_ConstructorOptions0":[],"_NodeSassNumber":[],"JSClass0":[],"RenderContextOptions0":[],"RenderOptions":[],"RenderResult":[],"_ConstructorOptions1":[],"_NodeSassString":[],"JSUrl0":[]},"JSArray":{"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"JSUnmodifiableArray":{"JSArray":["1"],"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"JSNumber":{"double":[],"num":[],"Comparable":["num"]},"JSInt":{"double":[],"int":[],"num":[],"Comparable":["num"],"TrustedGetRuntimeType":[]},"JSNumNotInt":{"double":[],"num":[],"Comparable":["num"],"TrustedGetRuntimeType":[]},"JSString":{"String":[],"Comparable":["String"],"TrustedGetRuntimeType":[]},"_CastIterableBase":{"Iterable":["2"]},"CastIterable":{"_CastIterableBase":["1","2"],"Iterable":["2"],"Iterable.E":"2"},"_EfficientLengthCastIterable":{"CastIterable":["1","2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"_CastListBase":{"ListBase":["2"],"List":["2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"]},"CastList":{"_CastListBase":["1","2"],"ListBase":["2"],"List":["2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2","ListBase.E":"2"},"CastSet":{"Set":["2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"CastMap":{"MapBase":["3","4"],"Map":["3","4"],"MapBase.V":"4","MapBase.K":"3"},"LateError":{"Error":[]},"CodeUnits":{"ListBase":["int"],"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"ListBase.E":"int"},"EfficientLengthIterable":{"Iterable":["1"]},"ListIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"SubListIterable":{"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"MappedIterable":{"Iterable":["2"],"Iterable.E":"2"},"EfficientLengthMappedIterable":{"MappedIterable":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"MappedListIterable":{"ListIterable":["2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListIterable.E":"2","Iterable.E":"2"},"WhereIterable":{"Iterable":["1"],"Iterable.E":"1"},"ExpandIterable":{"Iterable":["2"],"Iterable.E":"2"},"TakeIterable":{"Iterable":["1"],"Iterable.E":"1"},"EfficientLengthTakeIterable":{"TakeIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"SkipIterable":{"Iterable":["1"],"Iterable.E":"1"},"EfficientLengthSkipIterable":{"SkipIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"SkipWhileIterable":{"Iterable":["1"],"Iterable.E":"1"},"EmptyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"FollowedByIterable":{"Iterable":["1"],"Iterable.E":"1"},"EfficientLengthFollowedByIterable":{"FollowedByIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"WhereTypeIterable":{"Iterable":["1"],"Iterable.E":"1"},"UnmodifiableListBase":{"ListBase":["1"],"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"ReversedListIterable":{"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"Symbol":{"Symbol0":[]},"ConstantMapView":{"UnmodifiableMapView":["1","2"],"Map":["1","2"]},"ConstantMap":{"Map":["1","2"]},"ConstantStringMap":{"ConstantMap":["1","2"],"Map":["1","2"]},"_KeysOrValues":{"Iterable":["1"],"Iterable.E":"1"},"ConstantSet":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"ConstantStringSet":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"GeneralConstantSet":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"Instantiation":{"Function":[]},"Instantiation1":{"Function":[]},"NullError":{"TypeError":[],"Error":[]},"JsNoSuchMethodError":{"Error":[]},"UnknownJsTypeError":{"Error":[]},"NullThrownFromJavaScriptException":{"Exception":[]},"_StackTrace":{"StackTrace":[]},"Closure":{"Function":[]},"Closure0Args":{"Function":[]},"Closure2Args":{"Function":[]},"TearOffClosure":{"Function":[]},"StaticClosure":{"Function":[]},"BoundClosure":{"Function":[]},"_CyclicInitializationError":{"Error":[]},"RuntimeError":{"Error":[]},"JsLinkedHashMap":{"MapBase":["1","2"],"Map":["1","2"],"MapBase.V":"2","MapBase.K":"1"},"LinkedHashMapKeyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"JsIdentityLinkedHashMap":{"JsLinkedHashMap":["1","2"],"MapBase":["1","2"],"Map":["1","2"],"MapBase.V":"2","MapBase.K":"1"},"JsConstantLinkedHashMap":{"JsLinkedHashMap":["1","2"],"MapBase":["1","2"],"Map":["1","2"],"MapBase.V":"2","MapBase.K":"1"},"_MatchImplementation":{"RegExpMatch":[],"Match":[]},"_AllMatchesIterable":{"Iterable":["RegExpMatch"],"Iterable.E":"RegExpMatch"},"StringMatch":{"Match":[]},"_StringAllMatchesIterable":{"Iterable":["Match"],"Iterable.E":"Match"},"NativeByteBuffer":{"ByteBuffer":[],"TrustedGetRuntimeType":[]},"NativeByteData":{"ByteData":[],"TrustedGetRuntimeType":[]},"NativeTypedArray":{"JavaScriptIndexingBehavior":["1"]},"NativeTypedArrayOfDouble":{"ListBase":["double"],"JavaScriptIndexingBehavior":["double"],"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]},"NativeTypedArrayOfInt":{"ListBase":["int"],"JavaScriptIndexingBehavior":["int"],"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"NativeFloat32List":{"NativeTypedArrayOfDouble":[],"ListBase":["double"],"Float32List":[],"JavaScriptIndexingBehavior":["double"],"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double"},"NativeFloat64List":{"NativeTypedArrayOfDouble":[],"ListBase":["double"],"Float64List":[],"JavaScriptIndexingBehavior":["double"],"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double"},"NativeInt16List":{"NativeTypedArrayOfInt":[],"ListBase":["int"],"Int16List":[],"JavaScriptIndexingBehavior":["int"],"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeInt32List":{"NativeTypedArrayOfInt":[],"ListBase":["int"],"Int32List":[],"JavaScriptIndexingBehavior":["int"],"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeInt8List":{"NativeTypedArrayOfInt":[],"ListBase":["int"],"Int8List":[],"JavaScriptIndexingBehavior":["int"],"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint16List":{"NativeTypedArrayOfInt":[],"ListBase":["int"],"Uint16List":[],"JavaScriptIndexingBehavior":["int"],"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint32List":{"NativeTypedArrayOfInt":[],"ListBase":["int"],"Uint32List":[],"JavaScriptIndexingBehavior":["int"],"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint8ClampedList":{"NativeTypedArrayOfInt":[],"ListBase":["int"],"Uint8ClampedList":[],"JavaScriptIndexingBehavior":["int"],"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint8List":{"NativeTypedArrayOfInt":[],"ListBase":["int"],"Uint8List":[],"JavaScriptIndexingBehavior":["int"],"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"_Error":{"Error":[]},"_TypeError":{"TypeError":[],"Error":[]},"AsyncError":{"Error":[]},"_Future":{"Future":["1"]},"_SyncStarIterable":{"Iterable":["1"],"Iterable.E":"1"},"_AsyncCompleter":{"_Completer":["1"]},"_SyncCompleter":{"_Completer":["1"]},"_StreamController":{"EventSink":["1"]},"_AsyncStreamController":{"_StreamController":["1"],"EventSink":["1"]},"_SyncStreamController":{"_StreamController":["1"],"EventSink":["1"]},"_ControllerStream":{"_StreamImpl":["1"],"Stream":["1"],"Stream.T":"1"},"_ControllerSubscription":{"_BufferingStreamSubscription":["1"],"StreamSubscription":["1"],"_BufferingStreamSubscription.T":"1"},"_BufferingStreamSubscription":{"StreamSubscription":["1"],"_BufferingStreamSubscription.T":"1"},"_StreamImpl":{"Stream":["1"]},"_ForwardingStream":{"Stream":["2"]},"_ForwardingStreamSubscription":{"_BufferingStreamSubscription":["2"],"StreamSubscription":["2"],"_BufferingStreamSubscription.T":"2"},"_ExpandStream":{"_ForwardingStream":["1","2"],"Stream":["2"],"Stream.T":"2"},"_ZoneSpecification":{"ZoneSpecification":[]},"_ZoneDelegate":{"ZoneDelegate":[]},"_Zone":{"Zone":[]},"_CustomZone":{"Zone":[]},"_RootZone":{"Zone":[]},"Queue":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"_HashMap":{"MapBase":["1","2"],"Map":["1","2"],"MapBase.V":"2","MapBase.K":"1"},"_IdentityHashMap":{"_HashMap":["1","2"],"MapBase":["1","2"],"Map":["1","2"],"MapBase.V":"2","MapBase.K":"1"},"_HashMapKeyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_LinkedCustomHashMap":{"JsLinkedHashMap":["1","2"],"MapBase":["1","2"],"Map":["1","2"],"MapBase.V":"2","MapBase.K":"1"},"_LinkedHashSet":{"_SetBase":["1"],"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_LinkedIdentityHashSet":{"_LinkedHashSet":["1"],"_SetBase":["1"],"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"UnmodifiableListView":{"ListBase":["1"],"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListBase.E":"1"},"ListBase":{"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"MapBase":{"Map":["1","2"]},"UnmodifiableMapBase":{"MapBase":["1","2"],"Map":["1","2"]},"_MapBaseValueIterable":{"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"MapView":{"Map":["1","2"]},"UnmodifiableMapView":{"Map":["1","2"]},"ListQueue":{"ListIterable":["1"],"Queue":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"SetBase":{"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_SetBase":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"UnmodifiableSetView":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"AsciiCodec":{"Codec":["String","List<int>"]},"_UnicodeSubsetEncoder":{"Converter":["String","List<int>"]},"AsciiEncoder":{"Converter":["String","List<int>"]},"Base64Codec":{"Codec":["List<int>","String"]},"Base64Encoder":{"Converter":["List<int>","String"]},"Encoding":{"Codec":["String","List<int>"]},"JsonUnsupportedObjectError":{"Error":[]},"JsonCyclicError":{"Error":[]},"JsonCodec":{"Codec":["Object?","String"]},"JsonEncoder":{"Converter":["Object?","String"]},"Utf8Codec":{"Codec":["String","List<int>"]},"Utf8Encoder":{"Converter":["String","List<int>"]},"Utf8Decoder":{"Converter":["List<int>","String"]},"DateTime":{"Comparable":["DateTime"]},"double":{"num":[],"Comparable":["num"]},"Duration":{"Comparable":["Duration"]},"int":{"num":[],"Comparable":["num"]},"List":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"num":{"Comparable":["num"]},"RegExpMatch":{"Match":[]},"Set":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"String":{"Comparable":["String"]},"AssertionError":{"Error":[]},"TypeError":{"Error":[]},"ArgumentError":{"Error":[]},"RangeError":{"Error":[]},"IndexError":{"RangeError":[],"Error":[]},"NoSuchMethodError":{"Error":[]},"UnsupportedError":{"Error":[]},"UnimplementedError":{"Error":[]},"StateError":{"Error":[]},"ConcurrentModificationError":{"Error":[]},"OutOfMemoryError":{"Error":[]},"StackOverflowError":{"Error":[]},"_Exception":{"Exception":[]},"FormatException":{"Exception":[]},"_GeneratorIterable":{"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"_StringStackTrace":{"StackTrace":[]},"Runes":{"Iterable":["int"],"Iterable.E":"int"},"_Uri":{"Uri":[]},"_SimpleUri":{"Uri":[]},"_DataUri":{"Uri":[]},"ArgParserException":{"FormatException":[],"Exception":[]},"ErrorResult":{"Result":["0&"]},"ValueResult":{"Result":["1"]},"_CompleterStream":{"Stream":["1"],"Stream.T":"1"},"_NextRequest":{"_EventRequest":["1"]},"EmptyUnmodifiableSet":{"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"QueueList":{"ListBase":["1"],"List":["1"],"Queue":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListBase.E":"1","QueueList.E":"1"},"_CastQueueList":{"QueueList":["2"],"ListBase":["2"],"List":["2"],"Queue":["2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListBase.E":"2","QueueList.E":"2"},"UnionSet":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"UnmodifiableSetView0":{"DelegatingSet":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"MapKeySet":{"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_DelegatingIterableBase":{"Iterable":["1"]},"DelegatingSet":{"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"PathException":{"Exception":[]},"PathMap":{"Map":["String?","1"]},"Version":{"VersionRange":[],"Comparable":["VersionRange"]},"VersionRange":{"Comparable":["VersionRange"]},"ModifiableCssAtRule":{"ModifiableCssParentNode":[],"ModifiableCssNode":[],"CssParentNode":[],"CssNode":[],"AstNode":[]},"ModifiableCssComment":{"ModifiableCssNode":[],"CssComment":[],"CssNode":[],"AstNode":[]},"ModifiableCssDeclaration":{"ModifiableCssNode":[],"CssNode":[],"AstNode":[]},"ModifiableCssImport":{"ModifiableCssNode":[],"CssNode":[],"AstNode":[]},"ModifiableCssKeyframeBlock":{"ModifiableCssParentNode":[],"ModifiableCssNode":[],"CssParentNode":[],"CssNode":[],"AstNode":[]},"ModifiableCssMediaRule":{"ModifiableCssParentNode":[],"ModifiableCssNode":[],"CssParentNode":[],"CssNode":[],"AstNode":[]},"ModifiableCssNode":{"CssNode":[],"AstNode":[]},"ModifiableCssParentNode":{"ModifiableCssNode":[],"CssParentNode":[],"CssNode":[],"AstNode":[]},"ModifiableCssStyleRule":{"ModifiableCssParentNode":[],"ModifiableCssNode":[],"CssParentNode":[],"CssNode":[],"AstNode":[]},"ModifiableCssStylesheet":{"ModifiableCssParentNode":[],"CssStylesheet":[],"ModifiableCssNode":[],"CssParentNode":[],"CssNode":[],"AstNode":[]},"ModifiableCssSupportsRule":{"ModifiableCssParentNode":[],"ModifiableCssNode":[],"CssParentNode":[],"CssNode":[],"AstNode":[]},"CssNode":{"AstNode":[]},"CssParentNode":{"CssNode":[],"AstNode":[]},"CssStylesheet":{"CssParentNode":[],"CssNode":[],"AstNode":[]},"CssValue":{"AstNode":[]},"_FakeAstNode":{"AstNode":[]},"Argument":{"AstNode":[]},"ArgumentDeclaration":{"AstNode":[]},"ArgumentInvocation":{"AstNode":[]},"ConfiguredVariable":{"AstNode":[]},"Expression":{"AstNode":[]},"BinaryOperationExpression":{"Expression":[],"AstNode":[]},"BooleanExpression":{"Expression":[],"AstNode":[]},"ColorExpression":{"Expression":[],"AstNode":[]},"FunctionExpression":{"Expression":[],"AstNode":[]},"IfExpression":{"Expression":[],"AstNode":[]},"InterpolatedFunctionExpression":{"Expression":[],"AstNode":[]},"ListExpression":{"Expression":[],"AstNode":[]},"MapExpression":{"Expression":[],"AstNode":[]},"NullExpression":{"Expression":[],"AstNode":[]},"NumberExpression":{"Expression":[],"AstNode":[]},"ParenthesizedExpression":{"Expression":[],"AstNode":[]},"SelectorExpression":{"Expression":[],"AstNode":[]},"StringExpression":{"Expression":[],"AstNode":[]},"SupportsExpression":{"Expression":[],"AstNode":[]},"UnaryOperationExpression":{"Expression":[],"AstNode":[]},"ValueExpression":{"Expression":[],"AstNode":[]},"VariableExpression":{"Expression":[],"AstNode":[]},"DynamicImport":{"Import":[],"AstNode":[]},"StaticImport":{"Import":[],"AstNode":[]},"Interpolation":{"AstNode":[]},"AtRootRule":{"Statement":[],"AstNode":[]},"AtRule":{"Statement":[],"AstNode":[]},"CallableDeclaration":{"Statement":[],"AstNode":[]},"ContentBlock":{"Statement":[],"AstNode":[]},"ContentRule":{"Statement":[],"AstNode":[]},"DebugRule":{"Statement":[],"AstNode":[]},"Declaration":{"Statement":[],"AstNode":[]},"EachRule":{"Statement":[],"AstNode":[]},"ErrorRule":{"Statement":[],"AstNode":[]},"ExtendRule":{"Statement":[],"AstNode":[]},"ForRule":{"Statement":[],"AstNode":[]},"ForwardRule":{"Statement":[],"AstNode":[]},"FunctionRule":{"Statement":[],"AstNode":[]},"IfClause":{"IfRuleClause":[]},"ElseClause":{"IfRuleClause":[]},"IfRule":{"Statement":[],"AstNode":[]},"ImportRule":{"Statement":[],"AstNode":[]},"IncludeRule":{"Statement":[],"AstNode":[]},"LoudComment":{"Statement":[],"AstNode":[]},"MediaRule":{"Statement":[],"AstNode":[]},"MixinRule":{"Statement":[],"AstNode":[]},"_HasContentVisitor":{"StatementSearchVisitor":["bool"],"StatementSearchVisitor.T":"bool"},"ParentStatement":{"Statement":[],"AstNode":[]},"ReturnRule":{"Statement":[],"AstNode":[]},"SilentComment":{"Statement":[],"AstNode":[]},"StyleRule":{"Statement":[],"AstNode":[]},"Stylesheet":{"Statement":[],"AstNode":[]},"SupportsRule":{"Statement":[],"AstNode":[]},"UseRule":{"Statement":[],"AstNode":[]},"VariableDeclaration":{"Statement":[],"AstNode":[]},"WarnRule":{"Statement":[],"AstNode":[]},"WhileRule":{"Statement":[],"AstNode":[]},"SupportsAnything":{"AstNode":[]},"SupportsDeclaration":{"AstNode":[]},"SupportsFunction":{"AstNode":[]},"SupportsInterpolation":{"AstNode":[]},"SupportsNegation":{"AstNode":[]},"SupportsOperation":{"AstNode":[]},"Selector":{"AstNode":[]},"AttributeSelector":{"SimpleSelector":[],"AstNode":[]},"ClassSelector":{"SimpleSelector":[],"AstNode":[]},"ComplexSelector":{"AstNode":[]},"CompoundSelector":{"AstNode":[]},"IDSelector":{"SimpleSelector":[],"AstNode":[]},"SelectorList":{"AstNode":[]},"_ParentSelectorVisitor":{"SelectorSearchVisitor":["ParentSelector"],"SelectorSearchVisitor.T":"ParentSelector"},"ParentSelector":{"SimpleSelector":[],"AstNode":[]},"PlaceholderSelector":{"SimpleSelector":[],"AstNode":[]},"PseudoSelector":{"SimpleSelector":[],"AstNode":[]},"SimpleSelector":{"AstNode":[]},"TypeSelector":{"SimpleSelector":[],"AstNode":[]},"UniversalSelector":{"SimpleSelector":[],"AstNode":[]},"_EnvironmentModule0":{"Module0":["AsyncCallable"]},"AsyncBuiltInCallable":{"AsyncCallable":[]},"BuiltInCallable":{"Callable0":[],"AsyncBuiltInCallable":[],"AsyncCallable":[]},"PlainCssCallable":{"Callable0":[],"AsyncCallable":[]},"UserDefinedCallable":{"Callable0":[],"AsyncCallable":[]},"ExplicitConfiguration":{"Configuration":[]},"_EnvironmentModule":{"Module0":["Callable0"]},"SassRuntimeException":{"Exception":[]},"SassException":{"Exception":[]},"MultiSpanSassException":{"Exception":[]},"MultiSpanSassRuntimeException":{"SassRuntimeException":[],"Exception":[]},"SassFormatException":{"SourceSpanFormatException":[],"FormatException":[],"Exception":[]},"MultiSpanSassFormatException":{"MultiSourceSpanFormatException":[],"SassFormatException":[],"SourceSpanFormatException":[],"FormatException":[],"Exception":[]},"UsageException":{"Exception":[]},"EmptyExtensionStore":{"ExtensionStore":[]},"MergedExtension":{"Extension":[]},"Importer":{"AsyncImporter":[]},"FilesystemImporter":{"Importer":[],"AsyncImporter":[]},"BuiltInModule":{"Module0":["1"]},"ForwardedModuleView":{"Module0":["1"]},"ShadowedModuleView":{"Module0":["1"]},"LazyFileSpan":{"FileSpan":[],"SourceSpanWithContext":[],"SourceSpan":[],"Comparable":["SourceSpan"]},"LimitedMapView":{"MapBase":["1","2"],"Map":["1","2"],"MapBase.V":"2","MapBase.K":"1"},"MergedMapView":{"MapBase":["1","2"],"Map":["1","2"],"MapBase.V":"2","MapBase.K":"1"},"MultiSpan":{"FileSpan":[],"SourceSpanWithContext":[],"SourceSpan":[],"Comparable":["SourceSpan"]},"PrefixedMapView":{"MapBase":["String","1"],"Map":["String","1"],"MapBase.V":"1","MapBase.K":"String"},"_PrefixedKeys":{"Iterable":["String"],"Iterable.E":"String"},"PublicMemberMapView":{"MapBase":["String","1"],"Map":["String","1"],"MapBase.V":"1","MapBase.K":"String"},"UnprefixedMapView":{"MapBase":["String","1"],"Map":["String","1"],"MapBase.V":"1","MapBase.K":"String"},"_UnprefixedKeys":{"Iterable":["String"],"Iterable.E":"String"},"SassArgumentList":{"SassList":[],"Value":[]},"SassBoolean":{"Value":[]},"SassCalculation":{"Value":[]},"SassColor":{"Value":[]},"SassFunction":{"Value":[]},"SassList":{"Value":[]},"SassMap":{"Value":[]},"SassMixin":{"Value":[]},"_SassNull":{"Value":[]},"SassNumber":{"Value":[]},"ComplexSassNumber":{"SassNumber":[],"Value":[]},"SingleUnitSassNumber":{"SassNumber":[],"Value":[]},"UnitlessSassNumber":{"SassNumber":[],"Value":[]},"SassString":{"Value":[]},"_EvaluationContext0":{"EvaluationContext":[]},"_EvaluationContext":{"EvaluationContext":[]},"Entry":{"Comparable":["Entry"]},"FileLocation":{"SourceLocation":[],"Comparable":["SourceLocation"]},"FileSpan":{"SourceSpanWithContext":[],"SourceSpan":[],"Comparable":["SourceSpan"]},"_FileSpan":{"FileSpan":[],"SourceSpanWithContext":[],"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceLocation":{"Comparable":["SourceLocation"]},"SourceLocationMixin":{"SourceLocation":[],"Comparable":["SourceLocation"]},"SourceSpan":{"Comparable":["SourceSpan"]},"SourceSpanBase":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceSpanException":{"Exception":[]},"SourceSpanFormatException":{"FormatException":[],"Exception":[]},"MultiSourceSpanException":{"Exception":[]},"MultiSourceSpanFormatException":{"FormatException":[],"Exception":[]},"SourceSpanMixin":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceSpanWithContext":{"SourceSpan":[],"Comparable":["SourceSpan"]},"Chain":{"StackTrace":[]},"LazyTrace":{"Trace":[],"StackTrace":[]},"Trace":{"StackTrace":[]},"UnparsedFrame":{"Frame":[]},"StringScannerException":{"SourceSpanFormatException":[],"FormatException":[],"Exception":[]},"SupportsAnything0":{"AstNode0":[]},"Argument0":{"AstNode0":[]},"ArgumentDeclaration0":{"AstNode0":[]},"ArgumentInvocation0":{"AstNode0":[]},"SassArgumentList0":{"SassList0":[],"Value0":[]},"JSToDartAsyncImporter":{"AsyncImporter0":[]},"AsyncBuiltInCallable0":{"AsyncCallable0":[]},"_EnvironmentModule2":{"Module1":["AsyncCallable0"]},"_EvaluationContext2":{"EvaluationContext0":[]},"JSToDartAsyncFileImporter":{"AsyncImporter0":[]},"AtRootRule0":{"Statement0":[],"AstNode0":[]},"ModifiableCssAtRule0":{"ModifiableCssParentNode0":[],"ModifiableCssNode0":[],"CssParentNode0":[],"CssNode0":[],"AstNode0":[]},"AtRule0":{"Statement0":[],"AstNode0":[]},"AttributeSelector0":{"SimpleSelector0":[],"AstNode0":[]},"BinaryOperationExpression0":{"Expression0":[],"AstNode0":[]},"BooleanExpression0":{"Expression0":[],"AstNode0":[]},"SassBoolean0":{"Value0":[]},"BuiltInCallable0":{"Callable":[],"AsyncBuiltInCallable0":[],"AsyncCallable0":[]},"BuiltInModule0":{"Module1":["1"]},"SassCalculation0":{"Value0":[]},"CallableDeclaration0":{"Statement0":[],"AstNode0":[]},"ClassSelector0":{"SimpleSelector0":[],"AstNode0":[]},"ColorExpression0":{"Expression0":[],"AstNode0":[]},"SassColor0":{"Value0":[]},"ModifiableCssComment0":{"ModifiableCssNode0":[],"CssComment0":[],"CssNode0":[],"AstNode0":[]},"ComplexSassNumber0":{"SassNumber0":[],"Value0":[]},"ComplexSelector0":{"AstNode0":[]},"CompoundSelector0":{"AstNode0":[]},"ExplicitConfiguration0":{"Configuration0":[]},"ConfiguredVariable0":{"AstNode0":[]},"ContentBlock0":{"Statement0":[],"AstNode0":[]},"ContentRule0":{"Statement0":[],"AstNode0":[]},"DebugRule0":{"Statement0":[],"AstNode0":[]},"ModifiableCssDeclaration0":{"ModifiableCssNode0":[],"CssNode0":[],"AstNode0":[]},"Declaration0":{"Statement0":[],"AstNode0":[]},"SupportsDeclaration0":{"AstNode0":[]},"DynamicImport0":{"Import0":[],"AstNode0":[]},"EachRule0":{"Statement0":[],"AstNode0":[]},"EmptyExtensionStore0":{"ExtensionStore0":[]},"_EnvironmentModule1":{"Module1":["Callable"]},"ErrorRule0":{"Statement0":[],"AstNode0":[]},"_EvaluationContext1":{"EvaluationContext0":[]},"SassRuntimeException0":{"Exception":[]},"SassException0":{"Exception":[]},"MultiSpanSassException0":{"Exception":[]},"MultiSpanSassRuntimeException0":{"SassRuntimeException0":[],"Exception":[]},"SassFormatException0":{"SourceSpanFormatException":[],"FormatException":[],"Exception":[]},"MultiSpanSassFormatException0":{"MultiSourceSpanFormatException":[],"SassFormatException0":[],"SourceSpanFormatException":[],"FormatException":[],"Exception":[]},"Expression0":{"AstNode0":[]},"ExtendRule0":{"Statement0":[],"AstNode0":[]},"JSToDartFileImporter":{"Importer0":[],"AsyncImporter0":[]},"FilesystemImporter0":{"Importer0":[],"AsyncImporter0":[]},"ForRule0":{"Statement0":[],"AstNode0":[]},"ForwardRule0":{"Statement0":[],"AstNode0":[]},"ForwardedModuleView0":{"Module1":["1"]},"FunctionExpression0":{"Expression0":[],"AstNode0":[]},"SupportsFunction0":{"AstNode0":[]},"SassFunction0":{"Value0":[]},"FunctionRule0":{"Statement0":[],"AstNode0":[]},"IDSelector0":{"SimpleSelector0":[],"AstNode0":[]},"IfExpression0":{"Expression0":[],"AstNode0":[]},"IfClause0":{"IfRuleClause0":[]},"ElseClause0":{"IfRuleClause0":[]},"IfRule0":{"Statement0":[],"AstNode0":[]},"ModifiableCssImport0":{"ModifiableCssNode0":[],"CssNode0":[],"AstNode0":[]},"ImportRule0":{"Statement0":[],"AstNode0":[]},"Importer0":{"AsyncImporter0":[]},"IncludeRule0":{"Statement0":[],"AstNode0":[]},"InterpolatedFunctionExpression0":{"Expression0":[],"AstNode0":[]},"Interpolation0":{"AstNode0":[]},"SupportsInterpolation0":{"AstNode0":[]},"ModifiableCssKeyframeBlock0":{"ModifiableCssParentNode0":[],"ModifiableCssNode0":[],"CssParentNode0":[],"CssNode0":[],"AstNode0":[]},"LazyFileSpan0":{"FileSpan":[],"SourceSpanWithContext":[],"SourceSpan":[],"Comparable":["SourceSpan"]},"LimitedMapView0":{"MapBase":["1","2"],"Map":["1","2"],"MapBase.V":"2","MapBase.K":"1"},"ListExpression0":{"Expression0":[],"AstNode0":[]},"SelectorList0":{"AstNode0":[]},"_ParentSelectorVisitor0":{"SelectorSearchVisitor0":["ParentSelector0"],"SelectorSearchVisitor0.T":"ParentSelector0"},"SassList0":{"Value0":[]},"LoudComment0":{"Statement0":[],"AstNode0":[]},"MapExpression0":{"Expression0":[],"AstNode0":[]},"SassMap0":{"Value0":[]},"ModifiableCssMediaRule0":{"ModifiableCssParentNode0":[],"ModifiableCssNode0":[],"CssParentNode0":[],"CssNode0":[],"AstNode0":[]},"MediaRule0":{"Statement0":[],"AstNode0":[]},"MergedExtension0":{"Extension0":[]},"MergedMapView0":{"MapBase":["1","2"],"Map":["1","2"],"MapBase.V":"2","MapBase.K":"1"},"SassMixin0":{"Value0":[]},"MixinRule0":{"Statement0":[],"AstNode0":[]},"_HasContentVisitor0":{"StatementSearchVisitor0":["bool"],"StatementSearchVisitor0.T":"bool"},"MultiSpan0":{"FileSpan":[],"SourceSpanWithContext":[],"SourceSpan":[],"Comparable":["SourceSpan"]},"SupportsNegation0":{"AstNode0":[]},"NoOpImporter0":{"Importer0":[],"AsyncImporter0":[]},"_FakeAstNode0":{"AstNode0":[]},"CssNode0":{"AstNode0":[]},"CssParentNode0":{"CssNode0":[],"AstNode0":[]},"ModifiableCssNode0":{"CssNode0":[],"AstNode0":[]},"ModifiableCssParentNode0":{"ModifiableCssNode0":[],"CssParentNode0":[],"CssNode0":[],"AstNode0":[]},"NullExpression0":{"Expression0":[],"AstNode0":[]},"_SassNull0":{"Value0":[]},"NumberExpression0":{"Expression0":[],"AstNode0":[]},"SassNumber0":{"Value0":[]},"SupportsOperation0":{"AstNode0":[]},"ParentSelector0":{"SimpleSelector0":[],"AstNode0":[]},"ParentStatement0":{"Statement0":[],"AstNode0":[]},"ParenthesizedExpression0":{"Expression0":[],"AstNode0":[]},"PlaceholderSelector0":{"SimpleSelector0":[],"AstNode0":[]},"PlainCssCallable0":{"Callable":[],"AsyncCallable0":[]},"PrefixedMapView0":{"MapBase":["String","1"],"Map":["String","1"],"MapBase.V":"1","MapBase.K":"String"},"_PrefixedKeys0":{"Iterable":["String"],"Iterable.E":"String"},"PseudoSelector0":{"SimpleSelector0":[],"AstNode0":[]},"PublicMemberMapView0":{"MapBase":["String","1"],"Map":["String","1"],"MapBase.V":"1","MapBase.K":"String"},"ReturnRule0":{"Statement0":[],"AstNode0":[]},"Selector0":{"AstNode0":[]},"SelectorExpression0":{"Expression0":[],"AstNode0":[]},"ShadowedModuleView0":{"Module1":["1"]},"SilentComment0":{"Statement0":[],"AstNode0":[]},"SimpleSelector0":{"AstNode0":[]},"SingleUnitSassNumber0":{"SassNumber0":[],"Value0":[]},"StaticImport0":{"Import0":[],"AstNode0":[]},"StringExpression0":{"Expression0":[],"AstNode0":[]},"SassString0":{"Value0":[]},"ModifiableCssStyleRule0":{"ModifiableCssParentNode0":[],"ModifiableCssNode0":[],"CssParentNode0":[],"CssNode0":[],"AstNode0":[]},"StyleRule0":{"Statement0":[],"AstNode0":[]},"CssStylesheet0":{"CssParentNode0":[],"CssNode0":[],"AstNode0":[]},"ModifiableCssStylesheet0":{"ModifiableCssParentNode0":[],"CssStylesheet0":[],"ModifiableCssNode0":[],"CssParentNode0":[],"CssNode0":[],"AstNode0":[]},"Stylesheet0":{"Statement0":[],"AstNode0":[]},"SupportsExpression0":{"Expression0":[],"AstNode0":[]},"ModifiableCssSupportsRule0":{"ModifiableCssParentNode0":[],"ModifiableCssNode0":[],"CssParentNode0":[],"CssNode0":[],"AstNode0":[]},"SupportsRule0":{"Statement0":[],"AstNode0":[]},"JSToDartImporter":{"Importer0":[],"AsyncImporter0":[]},"TypeSelector0":{"SimpleSelector0":[],"AstNode0":[]},"UnaryOperationExpression0":{"Expression0":[],"AstNode0":[]},"UnitlessSassNumber0":{"SassNumber0":[],"Value0":[]},"UniversalSelector0":{"SimpleSelector0":[],"AstNode0":[]},"UnprefixedMapView0":{"MapBase":["String","1"],"Map":["String","1"],"MapBase.V":"1","MapBase.K":"String"},"_UnprefixedKeys0":{"Iterable":["String"],"Iterable.E":"String"},"UseRule0":{"Statement0":[],"AstNode0":[]},"UserDefinedCallable0":{"Callable":[],"AsyncCallable0":[]},"CssValue0":{"AstNode0":[]},"ValueExpression0":{"Expression0":[],"AstNode0":[]},"VariableExpression0":{"Expression0":[],"AstNode0":[]},"VariableDeclaration0":{"Statement0":[],"AstNode0":[]},"WarnRule0":{"Statement0":[],"AstNode0":[]},"WhileRule0":{"Statement0":[],"AstNode0":[]},"Int8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8ClampedList":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Float32List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]},"Float64List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]},"CssComment":{"CssNode":[],"AstNode":[]},"Import":{"AstNode":[]},"Statement":{"AstNode":[]},"Callable0":{"AsyncCallable":[]},"Callable":{"AsyncCallable0":[]},"CssComment0":{"CssNode0":[],"AstNode0":[]},"Import0":{"AstNode0":[]},"Statement0":{"AstNode0":[]}}'));
-  A._Universe_addErasedTypes(init.typeUniverse, JSON.parse('{"ArrayIterator":1,"ListIterator":1,"MappedIterator":2,"WhereIterator":1,"ExpandIterator":2,"TakeIterator":1,"SkipIterator":1,"SkipWhileIterator":1,"EmptyIterator":1,"FollowedByIterator":1,"FixedLengthListMixin":1,"UnmodifiableListMixin":1,"UnmodifiableListBase":1,"__CastListBase__CastIterableBase_ListMixin":2,"_KeysOrValuesOrElementsIterator":1,"ConstantSet":1,"LinkedHashMapKeyIterator":1,"NativeTypedArray":1,"EventSink":1,"_SyncStarIterator":1,"_SyncStreamControllerDispatch":1,"_AsyncStreamControllerDispatch":1,"_AddStreamState":1,"_StreamControllerAddStreamState":1,"_DelayedEvent":1,"_DelayedData":1,"_PendingEvents":1,"_StreamIterator":1,"_ZoneFunction":1,"Queue":1,"_HashMapKeyIterator":1,"_LinkedHashSetIterator":1,"UnmodifiableMapBase":2,"_MapBaseValueIterator":2,"_UnmodifiableMapMixin":2,"MapView":2,"_ListQueueIterator":1,"_UnmodifiableSetMixin":1,"_UnmodifiableMapView_MapView__UnmodifiableMapMixin":2,"_UnmodifiableSetView_SetBase__UnmodifiableSetMixin":1,"_StringSinkConversionSink":1,"Expando":1,"_EventRequest":1,"_EmptyUnmodifiableSet_IterableBase_UnmodifiableSetMixin":1,"DefaultEquality":1,"IterableEquality":1,"ListEquality":1,"MapEquality":2,"_QueueList_Object_ListMixin":1,"_UnionSet_SetBase_UnmodifiableSetMixin":1,"UnmodifiableSetMixin":1,"_UnmodifiableSetView_DelegatingSet_UnmodifiableSetMixin":1,"_DelegatingIterableBase":1,"_MapKeySet__DelegatingIterableBase_UnmodifiableSetMixin":1,"ParentStatement":1,"ParentStatement0":1}'));
+  A._Universe_addRules(init.typeUniverse, JSON.parse('{"PlainJavaScriptObject":"LegacyJavaScriptObject","UnknownJavaScriptObject":"LegacyJavaScriptObject","JavaScriptFunction":"LegacyJavaScriptObject","Stdin":"LegacyJavaScriptObject","Stdout":"LegacyJavaScriptObject","ReadlineModule":"LegacyJavaScriptObject","ReadlineOptions":"LegacyJavaScriptObject","ReadlineInterface":"LegacyJavaScriptObject","BufferModule":"LegacyJavaScriptObject","BufferConstants":"LegacyJavaScriptObject","Buffer":"LegacyJavaScriptObject","ConsoleModule":"LegacyJavaScriptObject","Console":"LegacyJavaScriptObject","EventEmitter":"LegacyJavaScriptObject","FS":"LegacyJavaScriptObject","FSConstants":"LegacyJavaScriptObject","FSWatcher":"LegacyJavaScriptObject","ReadStream":"LegacyJavaScriptObject","ReadStreamOptions":"LegacyJavaScriptObject","WriteStream":"LegacyJavaScriptObject","WriteStreamOptions":"LegacyJavaScriptObject","FileOptions":"LegacyJavaScriptObject","StatOptions":"LegacyJavaScriptObject","MkdirOptions":"LegacyJavaScriptObject","RmdirOptions":"LegacyJavaScriptObject","WatchOptions":"LegacyJavaScriptObject","WatchFileOptions":"LegacyJavaScriptObject","Stats":"LegacyJavaScriptObject","Promise":"LegacyJavaScriptObject","Date":"LegacyJavaScriptObject","JsError":"LegacyJavaScriptObject","Atomics":"LegacyJavaScriptObject","Modules":"LegacyJavaScriptObject","Module":"LegacyJavaScriptObject","Net":"LegacyJavaScriptObject","Socket":"LegacyJavaScriptObject","NetAddress":"LegacyJavaScriptObject","NetServer":"LegacyJavaScriptObject","NodeJsError":"LegacyJavaScriptObject","JsAssertionError":"LegacyJavaScriptObject","JsRangeError":"LegacyJavaScriptObject","JsReferenceError":"LegacyJavaScriptObject","JsSyntaxError":"LegacyJavaScriptObject","JsTypeError":"LegacyJavaScriptObject","JsSystemError":"LegacyJavaScriptObject","Process":"LegacyJavaScriptObject","CPUUsage":"LegacyJavaScriptObject","Release":"LegacyJavaScriptObject","StreamModule":"LegacyJavaScriptObject","Readable":"LegacyJavaScriptObject","Writable":"LegacyJavaScriptObject","Duplex":"LegacyJavaScriptObject","Transform":"LegacyJavaScriptObject","WritableOptions":"LegacyJavaScriptObject","ReadableOptions":"LegacyJavaScriptObject","Immediate":"LegacyJavaScriptObject","Timeout":"LegacyJavaScriptObject","TTY":"LegacyJavaScriptObject","TTYReadStream":"LegacyJavaScriptObject","TTYWriteStream":"LegacyJavaScriptObject","Util":"LegacyJavaScriptObject","JSArray0":"LegacyJavaScriptObject","Chokidar":"LegacyJavaScriptObject","ChokidarOptions":"LegacyJavaScriptObject","ChokidarWatcher":"LegacyJavaScriptObject","JSFunction":"LegacyJavaScriptObject","ImmutableList":"LegacyJavaScriptObject","ImmutableMap":"LegacyJavaScriptObject","NodeImporterResult":"LegacyJavaScriptObject","RenderContext":"LegacyJavaScriptObject","RenderContextOptions":"LegacyJavaScriptObject","RenderContextResult":"LegacyJavaScriptObject","RenderContextResultStats":"LegacyJavaScriptObject","JSModule":"LegacyJavaScriptObject","JSModuleRequire":"LegacyJavaScriptObject","JSClass":"LegacyJavaScriptObject","JSUrl":"LegacyJavaScriptObject","_PropertyDescriptor":"LegacyJavaScriptObject","_RequireMain":"LegacyJavaScriptObject","JSArray1":"LegacyJavaScriptObject","Chokidar0":"LegacyJavaScriptObject","ChokidarOptions0":"LegacyJavaScriptObject","ChokidarWatcher0":"LegacyJavaScriptObject","_Channels":"LegacyJavaScriptObject","_NodeSassColor":"LegacyJavaScriptObject","CompileOptions":"LegacyJavaScriptObject","CompileStringOptions":"LegacyJavaScriptObject","NodeCompileResult":"LegacyJavaScriptObject","Deprecation1":"LegacyJavaScriptObject","_NodeException":"LegacyJavaScriptObject","Exports":"LegacyJavaScriptObject","LoggerNamespace":"LegacyJavaScriptObject","Fiber":"LegacyJavaScriptObject","FiberClass":"LegacyJavaScriptObject","JSFunction0":"LegacyJavaScriptObject","ImmutableList0":"LegacyJavaScriptObject","ImmutableMap0":"LegacyJavaScriptObject","JSImporter":"LegacyJavaScriptObject","JSImporterResult":"LegacyJavaScriptObject","NodeImporterResult0":"LegacyJavaScriptObject","_ConstructorOptions":"LegacyJavaScriptObject","_NodeSassList":"LegacyJavaScriptObject","WarnOptions":"LegacyJavaScriptObject","DebugOptions":"LegacyJavaScriptObject","JSLogger":"LegacyJavaScriptObject","_NodeSassMap":"LegacyJavaScriptObject","JSModule0":"LegacyJavaScriptObject","JSModuleRequire0":"LegacyJavaScriptObject","_ConstructorOptions0":"LegacyJavaScriptObject","_NodeSassNumber":"LegacyJavaScriptObject","JSClass0":"LegacyJavaScriptObject","RenderContext0":"LegacyJavaScriptObject","RenderContextOptions0":"LegacyJavaScriptObject","RenderContextResult0":"LegacyJavaScriptObject","RenderContextResultStats0":"LegacyJavaScriptObject","RenderOptions":"LegacyJavaScriptObject","RenderResult":"LegacyJavaScriptObject","RenderResultStats":"LegacyJavaScriptObject","_Exports":"LegacyJavaScriptObject","_ConstructorOptions1":"LegacyJavaScriptObject","_NodeSassString":"LegacyJavaScriptObject","Types":"LegacyJavaScriptObject","JSUrl0":"LegacyJavaScriptObject","_PropertyDescriptor0":"LegacyJavaScriptObject","_RequireMain0":"LegacyJavaScriptObject","JSBool":{"bool":[],"TrustedGetRuntimeType":[]},"JSNull":{"Null":[],"TrustedGetRuntimeType":[]},"LegacyJavaScriptObject":{"Promise":[],"JsSystemError":[],"ImmutableList":[],"_Channels":[],"_NodeSassColor":[],"CompileOptions":[],"CompileStringOptions":[],"NodeCompileResult":[],"Deprecation1":[],"_NodeException":[],"Fiber":[],"JSFunction0":[],"ImmutableList0":[],"ImmutableMap0":[],"JSImporter":[],"JSImporterResult":[],"NodeImporterResult0":[],"_ConstructorOptions":[],"_NodeSassList":[],"WarnOptions":[],"DebugOptions":[],"_NodeSassMap":[],"_ConstructorOptions0":[],"_NodeSassNumber":[],"JSClass0":[],"RenderContextOptions0":[],"RenderOptions":[],"RenderResult":[],"_ConstructorOptions1":[],"_NodeSassString":[],"JSUrl0":[]},"JSArray":{"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"JSUnmodifiableArray":{"JSArray":["1"],"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"JSNumber":{"double":[],"num":[],"Comparable":["num"]},"JSInt":{"double":[],"int":[],"num":[],"Comparable":["num"],"TrustedGetRuntimeType":[]},"JSNumNotInt":{"double":[],"num":[],"Comparable":["num"],"TrustedGetRuntimeType":[]},"JSString":{"String":[],"Comparable":["String"],"TrustedGetRuntimeType":[]},"_CastIterableBase":{"Iterable":["2"]},"CastIterable":{"_CastIterableBase":["1","2"],"Iterable":["2"],"Iterable.E":"2"},"_EfficientLengthCastIterable":{"CastIterable":["1","2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"_CastListBase":{"ListBase":["2"],"List":["2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"]},"CastList":{"_CastListBase":["1","2"],"ListBase":["2"],"List":["2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListBase.E":"2","Iterable.E":"2"},"CastSet":{"Set":["2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"CastMap":{"MapBase":["3","4"],"Map":["3","4"],"MapBase.V":"4","MapBase.K":"3"},"LateError":{"Error":[]},"ReachabilityError":{"Error":[]},"CodeUnits":{"ListBase":["int"],"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"ListBase.E":"int"},"EfficientLengthIterable":{"Iterable":["1"]},"ListIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"SubListIterable":{"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"MappedIterable":{"Iterable":["2"],"Iterable.E":"2"},"EfficientLengthMappedIterable":{"MappedIterable":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"MappedListIterable":{"ListIterable":["2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListIterable.E":"2","Iterable.E":"2"},"WhereIterable":{"Iterable":["1"],"Iterable.E":"1"},"ExpandIterable":{"Iterable":["2"],"Iterable.E":"2"},"TakeIterable":{"Iterable":["1"],"Iterable.E":"1"},"EfficientLengthTakeIterable":{"TakeIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"SkipIterable":{"Iterable":["1"],"Iterable.E":"1"},"EfficientLengthSkipIterable":{"SkipIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"SkipWhileIterable":{"Iterable":["1"],"Iterable.E":"1"},"EmptyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"FollowedByIterable":{"Iterable":["1"],"Iterable.E":"1"},"EfficientLengthFollowedByIterable":{"FollowedByIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"WhereTypeIterable":{"Iterable":["1"],"Iterable.E":"1"},"UnmodifiableListBase":{"ListBase":["1"],"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"ReversedListIterable":{"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"Symbol":{"Symbol0":[]},"ConstantMapView":{"UnmodifiableMapView":["1","2"],"Map":["1","2"]},"ConstantMap":{"Map":["1","2"]},"ConstantStringMap":{"ConstantMap":["1","2"],"Map":["1","2"]},"_KeysOrValues":{"Iterable":["1"],"Iterable.E":"1"},"ConstantSet":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"ConstantStringSet":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"GeneralConstantSet":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"Instantiation":{"Function":[]},"Instantiation1":{"Function":[]},"NullError":{"TypeError":[],"Error":[]},"JsNoSuchMethodError":{"Error":[]},"UnknownJsTypeError":{"Error":[]},"NullThrownFromJavaScriptException":{"Exception":[]},"_StackTrace":{"StackTrace":[]},"Closure":{"Function":[]},"Closure0Args":{"Function":[]},"Closure2Args":{"Function":[]},"TearOffClosure":{"Function":[]},"StaticClosure":{"Function":[]},"BoundClosure":{"Function":[]},"_CyclicInitializationError":{"Error":[]},"RuntimeError":{"Error":[]},"JsLinkedHashMap":{"MapBase":["1","2"],"Map":["1","2"],"MapBase.V":"2","MapBase.K":"1"},"LinkedHashMapKeyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"JsIdentityLinkedHashMap":{"JsLinkedHashMap":["1","2"],"MapBase":["1","2"],"Map":["1","2"],"MapBase.V":"2","MapBase.K":"1"},"JsConstantLinkedHashMap":{"JsLinkedHashMap":["1","2"],"MapBase":["1","2"],"Map":["1","2"],"MapBase.V":"2","MapBase.K":"1"},"_MatchImplementation":{"RegExpMatch":[],"Match":[]},"_AllMatchesIterable":{"Iterable":["RegExpMatch"],"Iterable.E":"RegExpMatch"},"StringMatch":{"Match":[]},"_StringAllMatchesIterable":{"Iterable":["Match"],"Iterable.E":"Match"},"NativeByteBuffer":{"ByteBuffer":[],"TrustedGetRuntimeType":[]},"NativeByteData":{"ByteData":[],"TrustedGetRuntimeType":[]},"NativeTypedArray":{"JavaScriptIndexingBehavior":["1"]},"NativeTypedArrayOfDouble":{"ListBase":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]},"NativeTypedArrayOfInt":{"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"NativeFloat32List":{"NativeTypedArrayOfDouble":[],"ListBase":["double"],"Float32List":[],"List":["double"],"JavaScriptIndexingBehavior":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double"},"NativeFloat64List":{"NativeTypedArrayOfDouble":[],"ListBase":["double"],"Float64List":[],"List":["double"],"JavaScriptIndexingBehavior":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double"},"NativeInt16List":{"NativeTypedArrayOfInt":[],"ListBase":["int"],"Int16List":[],"List":["int"],"JavaScriptIndexingBehavior":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeInt32List":{"NativeTypedArrayOfInt":[],"ListBase":["int"],"Int32List":[],"List":["int"],"JavaScriptIndexingBehavior":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeInt8List":{"NativeTypedArrayOfInt":[],"ListBase":["int"],"Int8List":[],"List":["int"],"JavaScriptIndexingBehavior":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint16List":{"NativeTypedArrayOfInt":[],"ListBase":["int"],"Uint16List":[],"List":["int"],"JavaScriptIndexingBehavior":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint32List":{"NativeTypedArrayOfInt":[],"ListBase":["int"],"Uint32List":[],"List":["int"],"JavaScriptIndexingBehavior":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint8ClampedList":{"NativeTypedArrayOfInt":[],"ListBase":["int"],"Uint8ClampedList":[],"List":["int"],"JavaScriptIndexingBehavior":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint8List":{"NativeTypedArrayOfInt":[],"ListBase":["int"],"Uint8List":[],"List":["int"],"JavaScriptIndexingBehavior":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"_Error":{"Error":[]},"_TypeError":{"TypeError":[],"Error":[]},"AsyncError":{"Error":[]},"_Future":{"Future":["1"]},"_SyncStarIterable":{"Iterable":["1"],"Iterable.E":"1"},"_AsyncCompleter":{"_Completer":["1"]},"_SyncCompleter":{"_Completer":["1"]},"_StreamController":{"EventSink":["1"]},"_AsyncStreamController":{"_StreamController":["1"],"EventSink":["1"]},"_SyncStreamController":{"_StreamController":["1"],"EventSink":["1"]},"_ControllerStream":{"_StreamImpl":["1"],"Stream":["1"],"Stream.T":"1"},"_ControllerSubscription":{"_BufferingStreamSubscription":["1"],"StreamSubscription":["1"],"_BufferingStreamSubscription.T":"1"},"_BufferingStreamSubscription":{"StreamSubscription":["1"],"_BufferingStreamSubscription.T":"1"},"_StreamImpl":{"Stream":["1"]},"_ForwardingStream":{"Stream":["2"]},"_ForwardingStreamSubscription":{"_BufferingStreamSubscription":["2"],"StreamSubscription":["2"],"_BufferingStreamSubscription.T":"2"},"_ExpandStream":{"_ForwardingStream":["1","2"],"Stream":["2"],"Stream.T":"2"},"_ZoneSpecification":{"ZoneSpecification":[]},"_ZoneDelegate":{"ZoneDelegate":[]},"_Zone":{"Zone":[]},"_CustomZone":{"Zone":[]},"_RootZone":{"Zone":[]},"Queue":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"_HashMap":{"MapBase":["1","2"],"Map":["1","2"],"MapBase.V":"2","MapBase.K":"1"},"_IdentityHashMap":{"_HashMap":["1","2"],"MapBase":["1","2"],"Map":["1","2"],"MapBase.V":"2","MapBase.K":"1"},"_HashMapKeyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_LinkedCustomHashMap":{"JsLinkedHashMap":["1","2"],"MapBase":["1","2"],"Map":["1","2"],"MapBase.V":"2","MapBase.K":"1"},"_LinkedHashSet":{"_SetBase":["1"],"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_LinkedIdentityHashSet":{"_LinkedHashSet":["1"],"_SetBase":["1"],"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"UnmodifiableListView":{"ListBase":["1"],"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListBase.E":"1"},"ListBase":{"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"MapBase":{"Map":["1","2"]},"UnmodifiableMapBase":{"MapBase":["1","2"],"Map":["1","2"]},"_MapBaseValueIterable":{"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"MapView":{"Map":["1","2"]},"UnmodifiableMapView":{"Map":["1","2"]},"ListQueue":{"Queue":["1"],"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"SetBase":{"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_SetBase":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"UnmodifiableSetView":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_JsonMap":{"MapBase":["String","@"],"Map":["String","@"],"MapBase.V":"@","MapBase.K":"String"},"_JsonMapKeyIterable":{"ListIterable":["String"],"EfficientLengthIterable":["String"],"Iterable":["String"],"ListIterable.E":"String","Iterable.E":"String"},"AsciiCodec":{"Codec":["String","List<int>"]},"_UnicodeSubsetEncoder":{"Converter":["String","List<int>"]},"AsciiEncoder":{"Converter":["String","List<int>"]},"Base64Codec":{"Codec":["List<int>","String"]},"Base64Encoder":{"Converter":["List<int>","String"]},"Encoding":{"Codec":["String","List<int>"]},"JsonUnsupportedObjectError":{"Error":[]},"JsonCyclicError":{"Error":[]},"JsonCodec":{"Codec":["Object?","String"]},"JsonEncoder":{"Converter":["Object?","String"]},"JsonDecoder":{"Converter":["String","Object?"]},"Utf8Codec":{"Codec":["String","List<int>"]},"Utf8Encoder":{"Converter":["String","List<int>"]},"Utf8Decoder":{"Converter":["List<int>","String"]},"DateTime":{"Comparable":["DateTime"]},"double":{"num":[],"Comparable":["num"]},"Duration":{"Comparable":["Duration"]},"int":{"num":[],"Comparable":["num"]},"List":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"num":{"Comparable":["num"]},"RegExpMatch":{"Match":[]},"Set":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"String":{"Comparable":["String"]},"AssertionError":{"Error":[]},"TypeError":{"Error":[]},"ArgumentError":{"Error":[]},"RangeError":{"Error":[]},"IndexError":{"RangeError":[],"Error":[]},"NoSuchMethodError":{"Error":[]},"UnsupportedError":{"Error":[]},"UnimplementedError":{"Error":[]},"StateError":{"Error":[]},"ConcurrentModificationError":{"Error":[]},"OutOfMemoryError":{"Error":[]},"StackOverflowError":{"Error":[]},"_Exception":{"Exception":[]},"FormatException":{"Exception":[]},"_GeneratorIterable":{"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"_StringStackTrace":{"StackTrace":[]},"Runes":{"Iterable":["int"],"Iterable.E":"int"},"_Uri":{"_PlatformUri":[],"Uri":[]},"_SimpleUri":{"_PlatformUri":[],"Uri":[]},"_DataUri":{"_PlatformUri":[],"Uri":[]},"NullRejectionException":{"Exception":[]},"ArgParserException":{"FormatException":[],"Exception":[]},"ErrorResult":{"Result":["0&"]},"ValueResult":{"Result":["1"]},"_CompleterStream":{"Stream":["1"],"Stream.T":"1"},"_NextRequest":{"_EventRequest":["1"]},"EmptyUnmodifiableSet":{"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"QueueList":{"ListBase":["1"],"List":["1"],"Queue":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListBase.E":"1","QueueList.E":"1"},"_CastQueueList":{"QueueList":["2"],"ListBase":["2"],"List":["2"],"Queue":["2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListBase.E":"2","QueueList.E":"2"},"UnionSet":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"UnmodifiableSetView0":{"DelegatingSet":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"MapKeySet":{"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_DelegatingIterableBase":{"Iterable":["1"]},"DelegatingSet":{"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"PathException":{"Exception":[]},"PathMap":{"Map":["String?","1"]},"Version":{"VersionRange":[],"Comparable":["VersionRange"]},"VersionRange":{"Comparable":["VersionRange"]},"ModifiableCssAtRule":{"ModifiableCssParentNode":[],"ModifiableCssNode":[],"CssParentNode":[],"CssNode":[],"AstNode":[]},"ModifiableCssComment":{"ModifiableCssNode":[],"CssComment":[],"CssNode":[],"AstNode":[]},"ModifiableCssDeclaration":{"ModifiableCssNode":[],"CssNode":[],"AstNode":[]},"ModifiableCssImport":{"ModifiableCssNode":[],"CssNode":[],"AstNode":[]},"ModifiableCssKeyframeBlock":{"ModifiableCssParentNode":[],"ModifiableCssNode":[],"CssParentNode":[],"CssNode":[],"AstNode":[]},"ModifiableCssMediaRule":{"ModifiableCssParentNode":[],"ModifiableCssNode":[],"CssParentNode":[],"CssNode":[],"AstNode":[]},"ModifiableCssNode":{"CssNode":[],"AstNode":[]},"ModifiableCssParentNode":{"ModifiableCssNode":[],"CssParentNode":[],"CssNode":[],"AstNode":[]},"ModifiableCssStyleRule":{"ModifiableCssParentNode":[],"ModifiableCssNode":[],"CssParentNode":[],"CssNode":[],"AstNode":[]},"ModifiableCssStylesheet":{"ModifiableCssParentNode":[],"CssStylesheet":[],"ModifiableCssNode":[],"CssParentNode":[],"CssNode":[],"AstNode":[]},"ModifiableCssSupportsRule":{"ModifiableCssParentNode":[],"ModifiableCssNode":[],"CssParentNode":[],"CssNode":[],"AstNode":[]},"CssNode":{"AstNode":[]},"CssParentNode":{"CssNode":[],"AstNode":[]},"CssStylesheet":{"CssParentNode":[],"CssNode":[],"AstNode":[]},"CssValue":{"AstNode":[]},"_FakeAstNode":{"AstNode":[]},"Argument":{"AstNode":[]},"ArgumentDeclaration":{"AstNode":[]},"ArgumentInvocation":{"AstNode":[]},"ConfiguredVariable":{"AstNode":[]},"Expression":{"AstNode":[]},"BinaryOperationExpression":{"Expression":[],"AstNode":[]},"BooleanExpression":{"Expression":[],"AstNode":[]},"ColorExpression":{"Expression":[],"AstNode":[]},"FunctionExpression":{"Expression":[],"AstNode":[]},"IfExpression":{"Expression":[],"AstNode":[]},"InterpolatedFunctionExpression":{"Expression":[],"AstNode":[]},"ListExpression":{"Expression":[],"AstNode":[]},"MapExpression":{"Expression":[],"AstNode":[]},"NullExpression":{"Expression":[],"AstNode":[]},"NumberExpression":{"Expression":[],"AstNode":[]},"ParenthesizedExpression":{"Expression":[],"AstNode":[]},"SelectorExpression":{"Expression":[],"AstNode":[]},"StringExpression":{"Expression":[],"AstNode":[]},"SupportsExpression":{"Expression":[],"AstNode":[]},"UnaryOperationExpression":{"Expression":[],"AstNode":[]},"ValueExpression":{"Expression":[],"AstNode":[]},"VariableExpression":{"Expression":[],"AstNode":[]},"DynamicImport":{"Import":[],"AstNode":[]},"StaticImport":{"Import":[],"AstNode":[]},"Interpolation":{"AstNode":[]},"AtRootRule":{"Statement":[],"AstNode":[]},"AtRule":{"Statement":[],"AstNode":[]},"CallableDeclaration":{"Statement":[],"AstNode":[]},"ContentBlock":{"Statement":[],"AstNode":[]},"ContentRule":{"Statement":[],"AstNode":[]},"DebugRule":{"Statement":[],"AstNode":[]},"Declaration":{"Statement":[],"AstNode":[]},"EachRule":{"Statement":[],"AstNode":[]},"ErrorRule":{"Statement":[],"AstNode":[]},"ExtendRule":{"Statement":[],"AstNode":[]},"ForRule":{"Statement":[],"AstNode":[]},"ForwardRule":{"Statement":[],"AstNode":[]},"FunctionRule":{"Statement":[],"AstNode":[]},"IfClause":{"IfRuleClause":[]},"ElseClause":{"IfRuleClause":[]},"IfRule":{"Statement":[],"AstNode":[]},"ImportRule":{"Statement":[],"AstNode":[]},"IncludeRule":{"Statement":[],"AstNode":[]},"LoudComment":{"Statement":[],"AstNode":[]},"MediaRule":{"Statement":[],"AstNode":[]},"MixinRule":{"Statement":[],"AstNode":[]},"_HasContentVisitor":{"StatementSearchVisitor":["bool"],"StatementSearchVisitor.T":"bool"},"ParentStatement":{"Statement":[],"AstNode":[]},"ReturnRule":{"Statement":[],"AstNode":[]},"SilentComment":{"Statement":[],"AstNode":[]},"StyleRule":{"Statement":[],"AstNode":[]},"Stylesheet":{"Statement":[],"AstNode":[]},"SupportsRule":{"Statement":[],"AstNode":[]},"UseRule":{"Statement":[],"AstNode":[]},"VariableDeclaration":{"Statement":[],"AstNode":[]},"WarnRule":{"Statement":[],"AstNode":[]},"WhileRule":{"Statement":[],"AstNode":[]},"SupportsAnything":{"AstNode":[]},"SupportsDeclaration":{"AstNode":[]},"SupportsFunction":{"AstNode":[]},"SupportsInterpolation":{"AstNode":[]},"SupportsNegation":{"AstNode":[]},"SupportsOperation":{"AstNode":[]},"Selector":{"AstNode":[]},"AttributeSelector":{"SimpleSelector":[],"AstNode":[]},"ClassSelector":{"SimpleSelector":[],"AstNode":[]},"ComplexSelector":{"AstNode":[]},"CompoundSelector":{"AstNode":[]},"IDSelector":{"SimpleSelector":[],"AstNode":[]},"SelectorList":{"AstNode":[]},"_ParentSelectorVisitor":{"SelectorSearchVisitor":["ParentSelector"],"SelectorSearchVisitor.T":"ParentSelector"},"ParentSelector":{"SimpleSelector":[],"AstNode":[]},"PlaceholderSelector":{"SimpleSelector":[],"AstNode":[]},"PseudoSelector":{"SimpleSelector":[],"AstNode":[]},"SimpleSelector":{"AstNode":[]},"TypeSelector":{"SimpleSelector":[],"AstNode":[]},"UniversalSelector":{"SimpleSelector":[],"AstNode":[]},"_EnvironmentModule0":{"Module0":["AsyncCallable"]},"AsyncBuiltInCallable":{"AsyncCallable":[]},"BuiltInCallable":{"Callable0":[],"AsyncBuiltInCallable":[],"AsyncCallable":[]},"PlainCssCallable":{"Callable0":[],"AsyncCallable":[]},"UserDefinedCallable":{"Callable0":[],"AsyncCallable":[]},"ExplicitConfiguration":{"Configuration":[]},"_EnvironmentModule":{"Module0":["Callable0"]},"SassRuntimeException":{"Exception":[]},"SassException":{"Exception":[]},"MultiSpanSassException":{"Exception":[]},"MultiSpanSassRuntimeException":{"SassRuntimeException":[],"Exception":[]},"SassFormatException":{"SourceSpanFormatException":[],"FormatException":[],"Exception":[]},"MultiSpanSassFormatException":{"MultiSourceSpanFormatException":[],"SassFormatException":[],"SourceSpanFormatException":[],"FormatException":[],"Exception":[]},"UsageException":{"Exception":[]},"EmptyExtensionStore":{"ExtensionStore":[]},"MergedExtension":{"Extension":[]},"Importer":{"AsyncImporter":[]},"FilesystemImporter":{"Importer":[],"AsyncImporter":[]},"NodePackageImporter":{"Importer":[],"AsyncImporter":[]},"BuiltInModule":{"Module0":["1"]},"ForwardedModuleView":{"Module0":["1"]},"ShadowedModuleView":{"Module0":["1"]},"LazyFileSpan":{"FileSpan":[],"SourceSpanWithContext":[],"SourceSpan":[],"Comparable":["SourceSpan"]},"LimitedMapView":{"MapBase":["1","2"],"Map":["1","2"],"MapBase.V":"2","MapBase.K":"1"},"MergedMapView":{"MapBase":["1","2"],"Map":["1","2"],"MapBase.V":"2","MapBase.K":"1"},"MultiSpan":{"FileSpan":[],"SourceSpanWithContext":[],"SourceSpan":[],"Comparable":["SourceSpan"]},"PrefixedMapView":{"MapBase":["String","1"],"Map":["String","1"],"MapBase.V":"1","MapBase.K":"String"},"_PrefixedKeys":{"Iterable":["String"],"Iterable.E":"String"},"PublicMemberMapView":{"MapBase":["String","1"],"Map":["String","1"],"MapBase.V":"1","MapBase.K":"String"},"UnprefixedMapView":{"MapBase":["String","1"],"Map":["String","1"],"MapBase.V":"1","MapBase.K":"String"},"_UnprefixedKeys":{"Iterable":["String"],"Iterable.E":"String"},"SassArgumentList":{"SassList":[],"Value":[]},"SassBoolean":{"Value":[]},"SassCalculation":{"Value":[]},"SassColor":{"Value":[]},"SassFunction":{"Value":[]},"SassList":{"Value":[]},"SassMap":{"Value":[]},"SassMixin":{"Value":[]},"_SassNull":{"Value":[]},"SassNumber":{"Value":[]},"ComplexSassNumber":{"SassNumber":[],"Value":[]},"SingleUnitSassNumber":{"SassNumber":[],"Value":[]},"UnitlessSassNumber":{"SassNumber":[],"Value":[]},"SassString":{"Value":[]},"_EvaluationContext0":{"EvaluationContext":[]},"_EvaluationContext":{"EvaluationContext":[]},"Entry":{"Comparable":["Entry"]},"FileLocation":{"SourceLocation":[],"Comparable":["SourceLocation"]},"FileSpan":{"SourceSpanWithContext":[],"SourceSpan":[],"Comparable":["SourceSpan"]},"_FileSpan":{"FileSpan":[],"SourceSpanWithContext":[],"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceLocation":{"Comparable":["SourceLocation"]},"SourceLocationMixin":{"SourceLocation":[],"Comparable":["SourceLocation"]},"SourceSpan":{"Comparable":["SourceSpan"]},"SourceSpanBase":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceSpanException":{"Exception":[]},"SourceSpanFormatException":{"FormatException":[],"Exception":[]},"MultiSourceSpanException":{"Exception":[]},"MultiSourceSpanFormatException":{"FormatException":[],"Exception":[]},"SourceSpanMixin":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceSpanWithContext":{"SourceSpan":[],"Comparable":["SourceSpan"]},"Chain":{"StackTrace":[]},"LazyTrace":{"Trace":[],"StackTrace":[]},"Trace":{"StackTrace":[]},"UnparsedFrame":{"Frame":[]},"StringScannerException":{"SourceSpanFormatException":[],"FormatException":[],"Exception":[]},"SupportsAnything0":{"AstNode0":[]},"Argument0":{"AstNode0":[]},"ArgumentDeclaration0":{"AstNode0":[]},"ArgumentInvocation0":{"AstNode0":[]},"SassArgumentList0":{"SassList0":[],"Value0":[]},"JSToDartAsyncImporter":{"AsyncImporter0":[]},"AsyncBuiltInCallable0":{"AsyncCallable0":[]},"_EnvironmentModule2":{"Module1":["AsyncCallable0"]},"_EvaluationContext2":{"EvaluationContext0":[]},"JSToDartAsyncFileImporter":{"AsyncImporter0":[]},"AtRootRule0":{"Statement0":[],"AstNode0":[]},"ModifiableCssAtRule0":{"ModifiableCssParentNode0":[],"ModifiableCssNode0":[],"CssParentNode0":[],"CssNode0":[],"AstNode0":[]},"AtRule0":{"Statement0":[],"AstNode0":[]},"AttributeSelector0":{"SimpleSelector0":[],"AstNode0":[]},"BinaryOperationExpression0":{"Expression0":[],"AstNode0":[]},"BooleanExpression0":{"Expression0":[],"AstNode0":[]},"SassBoolean0":{"Value0":[]},"BuiltInCallable0":{"Callable":[],"AsyncBuiltInCallable0":[],"AsyncCallable0":[]},"BuiltInModule0":{"Module1":["1"]},"SassCalculation0":{"Value0":[]},"CallableDeclaration0":{"Statement0":[],"AstNode0":[]},"ClassSelector0":{"SimpleSelector0":[],"AstNode0":[]},"ColorExpression0":{"Expression0":[],"AstNode0":[]},"SassColor0":{"Value0":[]},"ModifiableCssComment0":{"ModifiableCssNode0":[],"CssComment0":[],"CssNode0":[],"AstNode0":[]},"AsyncCompiler":{"Compiler":[]},"ComplexSassNumber0":{"SassNumber0":[],"Value0":[]},"ComplexSelector0":{"AstNode0":[]},"CompoundSelector0":{"AstNode0":[]},"ExplicitConfiguration0":{"Configuration0":[]},"ConfiguredVariable0":{"AstNode0":[]},"ContentBlock0":{"Statement0":[],"AstNode0":[]},"ContentRule0":{"Statement0":[],"AstNode0":[]},"DebugRule0":{"Statement0":[],"AstNode0":[]},"ModifiableCssDeclaration0":{"ModifiableCssNode0":[],"CssNode0":[],"AstNode0":[]},"Declaration0":{"Statement0":[],"AstNode0":[]},"SupportsDeclaration0":{"AstNode0":[]},"DynamicImport0":{"Import0":[],"AstNode0":[]},"EachRule0":{"Statement0":[],"AstNode0":[]},"EmptyExtensionStore0":{"ExtensionStore0":[]},"_EnvironmentModule1":{"Module1":["Callable"]},"ErrorRule0":{"Statement0":[],"AstNode0":[]},"_EvaluationContext1":{"EvaluationContext0":[]},"SassRuntimeException0":{"Exception":[]},"SassException0":{"Exception":[]},"MultiSpanSassException0":{"Exception":[]},"MultiSpanSassRuntimeException0":{"SassRuntimeException0":[],"Exception":[]},"SassFormatException0":{"SourceSpanFormatException":[],"FormatException":[],"Exception":[]},"MultiSpanSassFormatException0":{"MultiSourceSpanFormatException":[],"SassFormatException0":[],"SourceSpanFormatException":[],"FormatException":[],"Exception":[]},"Expression0":{"AstNode0":[]},"ExtendRule0":{"Statement0":[],"AstNode0":[]},"JSToDartFileImporter":{"Importer0":[],"AsyncImporter0":[]},"FilesystemImporter0":{"Importer0":[],"AsyncImporter0":[]},"ForRule0":{"Statement0":[],"AstNode0":[]},"ForwardRule0":{"Statement0":[],"AstNode0":[]},"ForwardedModuleView0":{"Module1":["1"]},"FunctionExpression0":{"Expression0":[],"AstNode0":[]},"SupportsFunction0":{"AstNode0":[]},"SassFunction0":{"Value0":[]},"FunctionRule0":{"Statement0":[],"AstNode0":[]},"IDSelector0":{"SimpleSelector0":[],"AstNode0":[]},"IfExpression0":{"Expression0":[],"AstNode0":[]},"IfClause0":{"IfRuleClause0":[]},"ElseClause0":{"IfRuleClause0":[]},"IfRule0":{"Statement0":[],"AstNode0":[]},"ModifiableCssImport0":{"ModifiableCssNode0":[],"CssNode0":[],"AstNode0":[]},"ImportRule0":{"Statement0":[],"AstNode0":[]},"Importer0":{"AsyncImporter0":[]},"IncludeRule0":{"Statement0":[],"AstNode0":[]},"InterpolatedFunctionExpression0":{"Expression0":[],"AstNode0":[]},"Interpolation0":{"AstNode0":[]},"SupportsInterpolation0":{"AstNode0":[]},"ModifiableCssKeyframeBlock0":{"ModifiableCssParentNode0":[],"ModifiableCssNode0":[],"CssParentNode0":[],"CssNode0":[],"AstNode0":[]},"LazyFileSpan0":{"FileSpan":[],"SourceSpanWithContext":[],"SourceSpan":[],"Comparable":["SourceSpan"]},"LimitedMapView0":{"MapBase":["1","2"],"Map":["1","2"],"MapBase.V":"2","MapBase.K":"1"},"ListExpression0":{"Expression0":[],"AstNode0":[]},"SelectorList0":{"AstNode0":[]},"_ParentSelectorVisitor0":{"SelectorSearchVisitor0":["ParentSelector0"],"SelectorSearchVisitor0.T":"ParentSelector0"},"SassList0":{"Value0":[]},"LoudComment0":{"Statement0":[],"AstNode0":[]},"MapExpression0":{"Expression0":[],"AstNode0":[]},"SassMap0":{"Value0":[]},"ModifiableCssMediaRule0":{"ModifiableCssParentNode0":[],"ModifiableCssNode0":[],"CssParentNode0":[],"CssNode0":[],"AstNode0":[]},"MediaRule0":{"Statement0":[],"AstNode0":[]},"MergedExtension0":{"Extension0":[]},"MergedMapView0":{"MapBase":["1","2"],"Map":["1","2"],"MapBase.V":"2","MapBase.K":"1"},"SassMixin0":{"Value0":[]},"MixinRule0":{"Statement0":[],"AstNode0":[]},"_HasContentVisitor0":{"StatementSearchVisitor0":["bool"],"StatementSearchVisitor0.T":"bool"},"MultiSpan0":{"FileSpan":[],"SourceSpanWithContext":[],"SourceSpan":[],"Comparable":["SourceSpan"]},"SupportsNegation0":{"AstNode0":[]},"NoOpImporter0":{"Importer0":[],"AsyncImporter0":[]},"_FakeAstNode0":{"AstNode0":[]},"CssNode0":{"AstNode0":[]},"CssParentNode0":{"CssNode0":[],"AstNode0":[]},"ModifiableCssNode0":{"CssNode0":[],"AstNode0":[]},"ModifiableCssParentNode0":{"ModifiableCssNode0":[],"CssParentNode0":[],"CssNode0":[],"AstNode0":[]},"NodePackageImporter0":{"Importer0":[],"AsyncImporter0":[]},"NullExpression0":{"Expression0":[],"AstNode0":[]},"_SassNull0":{"Value0":[]},"NumberExpression0":{"Expression0":[],"AstNode0":[]},"SassNumber0":{"Value0":[]},"SupportsOperation0":{"AstNode0":[]},"ParentSelector0":{"SimpleSelector0":[],"AstNode0":[]},"ParentStatement0":{"Statement0":[],"AstNode0":[]},"ParenthesizedExpression0":{"Expression0":[],"AstNode0":[]},"PlaceholderSelector0":{"SimpleSelector0":[],"AstNode0":[]},"PlainCssCallable0":{"Callable":[],"AsyncCallable0":[]},"PrefixedMapView0":{"MapBase":["String","1"],"Map":["String","1"],"MapBase.V":"1","MapBase.K":"String"},"_PrefixedKeys0":{"Iterable":["String"],"Iterable.E":"String"},"PseudoSelector0":{"SimpleSelector0":[],"AstNode0":[]},"PublicMemberMapView0":{"MapBase":["String","1"],"Map":["String","1"],"MapBase.V":"1","MapBase.K":"String"},"ReturnRule0":{"Statement0":[],"AstNode0":[]},"Selector0":{"AstNode0":[]},"SelectorExpression0":{"Expression0":[],"AstNode0":[]},"ShadowedModuleView0":{"Module1":["1"]},"SilentComment0":{"Statement0":[],"AstNode0":[]},"SimpleSelector0":{"AstNode0":[]},"SingleUnitSassNumber0":{"SassNumber0":[],"Value0":[]},"StaticImport0":{"Import0":[],"AstNode0":[]},"StringExpression0":{"Expression0":[],"AstNode0":[]},"SassString0":{"Value0":[]},"ModifiableCssStyleRule0":{"ModifiableCssParentNode0":[],"ModifiableCssNode0":[],"CssParentNode0":[],"CssNode0":[],"AstNode0":[]},"StyleRule0":{"Statement0":[],"AstNode0":[]},"CssStylesheet0":{"CssParentNode0":[],"CssNode0":[],"AstNode0":[]},"ModifiableCssStylesheet0":{"ModifiableCssParentNode0":[],"CssStylesheet0":[],"ModifiableCssNode0":[],"CssParentNode0":[],"CssNode0":[],"AstNode0":[]},"Stylesheet0":{"Statement0":[],"AstNode0":[]},"SupportsExpression0":{"Expression0":[],"AstNode0":[]},"ModifiableCssSupportsRule0":{"ModifiableCssParentNode0":[],"ModifiableCssNode0":[],"CssParentNode0":[],"CssNode0":[],"AstNode0":[]},"SupportsRule0":{"Statement0":[],"AstNode0":[]},"JSToDartImporter":{"Importer0":[],"AsyncImporter0":[]},"TypeSelector0":{"SimpleSelector0":[],"AstNode0":[]},"UnaryOperationExpression0":{"Expression0":[],"AstNode0":[]},"UnitlessSassNumber0":{"SassNumber0":[],"Value0":[]},"UniversalSelector0":{"SimpleSelector0":[],"AstNode0":[]},"UnprefixedMapView0":{"MapBase":["String","1"],"Map":["String","1"],"MapBase.V":"1","MapBase.K":"String"},"_UnprefixedKeys0":{"Iterable":["String"],"Iterable.E":"String"},"UseRule0":{"Statement0":[],"AstNode0":[]},"UserDefinedCallable0":{"Callable":[],"AsyncCallable0":[]},"CssValue0":{"AstNode0":[]},"ValueExpression0":{"Expression0":[],"AstNode0":[]},"VariableExpression0":{"Expression0":[],"AstNode0":[]},"VariableDeclaration0":{"Statement0":[],"AstNode0":[]},"WarnRule0":{"Statement0":[],"AstNode0":[]},"WhileRule0":{"Statement0":[],"AstNode0":[]},"Int8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8ClampedList":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Float32List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]},"Float64List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]},"CssComment":{"CssNode":[],"AstNode":[]},"Import":{"AstNode":[]},"Statement":{"AstNode":[]},"Callable0":{"AsyncCallable":[]},"Callable":{"AsyncCallable0":[]},"CssComment0":{"CssNode0":[],"AstNode0":[]},"Import0":{"AstNode0":[]},"Statement0":{"AstNode0":[]}}'));
+  A._Universe_addErasedTypes(init.typeUniverse, JSON.parse('{"WhereIterator":1,"SkipIterator":1,"SkipWhileIterator":1,"EmptyIterator":1,"FollowedByIterator":1,"FixedLengthListMixin":1,"UnmodifiableListMixin":1,"UnmodifiableListBase":1,"__CastListBase__CastIterableBase_ListMixin":2,"ConstantSet":1,"LinkedHashMapKeyIterator":1,"NativeTypedArray":1,"EventSink":1,"_SyncStarIterator":1,"_SyncStreamControllerDispatch":1,"_AsyncStreamControllerDispatch":1,"_AddStreamState":1,"_StreamControllerAddStreamState":1,"_DelayedEvent":1,"_DelayedData":1,"_PendingEvents":1,"_StreamIterator":1,"_ZoneFunction":1,"Queue":1,"UnmodifiableMapBase":2,"_UnmodifiableMapMixin":2,"MapView":2,"_UnmodifiableSetMixin":1,"_UnmodifiableMapView_MapView__UnmodifiableMapMixin":2,"_UnmodifiableSetView_SetBase__UnmodifiableSetMixin":1,"_StringSinkConversionSink":1,"Expando":1,"_EventRequest":1,"_EmptyUnmodifiableSet_IterableBase_UnmodifiableSetMixin":1,"DefaultEquality":1,"IterableEquality":1,"ListEquality":1,"_QueueList_Object_ListMixin":1,"_UnionSet_SetBase_UnmodifiableSetMixin":1,"UnmodifiableSetMixin":1,"_UnmodifiableSetView_DelegatingSet_UnmodifiableSetMixin":1,"_DelegatingIterableBase":1,"_MapKeySet__DelegatingIterableBase_UnmodifiableSetMixin":1,"ParentStatement":1,"ParentStatement0":1}'));
   var string$ = {
     x0a_BUG_: "\n\nBUG: This should include a source span!",
     x0a_Morex20: "\n\nMore info and automated migrator: https://sass-lang.com/d/slash-div",
@@ -116031,12 +116646,17 @@ self.util = _cliPkgRequires.util;
     x0aYou_m: "\nYou may not @extend the same selector from within different media queries.",
     x20It_wi: " It will be omitted from the generated CSS.",
     x20be_an: " be an extender.\nThis will be an error in Dart Sass 2.0.0.\n\nMore info: https://sass-lang.com/d/bogus-combinators",
-    x20depre: " deprecation to be fatal.\nRemove this setting if you need to keep using this feature.",
+    x20can_n: " can not have both conditions and paths at the same level.\nFound ",
+    x20deprex20i: " deprecation is not yet active, so silencing it is unnecessary.",
+    x20deprex20m: " deprecation must be enabled before it can be made fatal.",
+    x20deprex20t: " deprecation to be fatal.\nRemove this setting if you need to keep using this feature.",
+    x20deprex2c: " deprecation, since it has also been made fatal.",
     x20in_in: " in interpolation here.\nIt may end up represented as ",
     x20is_as: " is asynchronous.\nThis is probably caused by a bug in a Sass plugin.",
     x20is_av: " is available from multiple global modules.",
     x20is_de: " is deprecated.\n\nTo preserve current behavior: ",
-    x20is_noa: " is not a valid selector: it must be a string,\na list of strings, or a list of lists of strings.",
+    x20is_noaf: " is not a future deprecation, so it does not need to be explicitly enabled.",
+    x20is_noav: " is not a valid selector: it must be a string,\na list of strings, or a list of lists of strings.",
     x20is_nov: " is not valid CSS.\nThis will be an error in Dart Sass 2.0.0.\n\nMore info: https://sass-lang.com/d/bogus-combinators",
     x20must_b: " must be either nearest, up, down or to-zero.",
     x20must_n: " must not be greater than the number of characters in the file, ",
@@ -116063,6 +116683,8 @@ self.util = _cliPkgRequires.util;
     x24list1: "$list1, $list2, $separator: auto, $bracketed: auto",
     x24selec: "$selectors: At least one selector must be passed.",
     x24separ: '$separator: Must be "space", "comma", "slash", or "auto".',
+    x27x20must: "' must be a path relative to the package root at '",
+    x27x2c_whi: "', which is not a '.scss', '.sass', or '.css' file.",
     x28__isn: "() isn't in the sass:color module.\n\nRecommendation: color.adjust(",
     x29x0a_Mor: ")\n\nMore info: https://sass-lang.com/documentation/functions/color#",
     x29x20in_a: ") in a future release.\n\nRecommendation: math.random(math.div($limit, 1",
@@ -116082,6 +116704,8 @@ self.util = _cliPkgRequires.util;
     x40funct: "@function if($condition, $if-true, $if-false) {",
     x40use_r: "@use rules must be written before any other rules.",
     A_list: "A list with more than one element must have an explicit separator.",
+    A_pkg_h: "A pkg: URL must not have a host, port, username or password.",
+    A_pkg_q: "A pkg: URL must not have a query or fragment.",
     ABCDEF: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",
     An_impa: "An importer may not have a findFileUrl method as well as canonicalize and load methods.",
     An_impu: "An importer must have either canonicalize and load methods, or a findFileUrl method.",
@@ -116114,7 +116738,6 @@ self.util = _cliPkgRequires.util;
     Invali: 'Invalid return value for custom function "',
     It_s_n: "It's not clear which file to import. Found:\n",
     Keywor: "Keyword arguments can't be used with calculations.",
-    Local_: "Local '' has been assigned during initialization.",
     May_on: "May only contains Strings or Expressions.",
     Media_: "Media rules may not be used within nested declarations.",
     Mixinsb: "Mixins may not be declared in control directives.",
@@ -116127,25 +116750,33 @@ self.util = _cliPkgRequires.util;
     No_Sasc: "No Sass callable is currently being evaluated.",
     No_Sass: "No Sass stylesheet is currently being evaluated.",
     NoSour: "NoSourceMapBuffer.buildSourceMap() is not supported.",
+    None_o: "None of the patterns in the switch expression the matched input value. See https://github.com/dart-lang/language/issues/3488 for details.",
     Number: "Number to round and step arguments are required.",
     Only_2: "Only 2 slash-separated elements allowed, but ",
     Only_oa: "Only one argument may be passed to the plain-CSS invert() function.",
     Only_op: "Only one positional argument is allowed. All other arguments must be passed by name.",
     Other_: "Other modules' members can't be defined with !global.",
+    Parent: "Parent selectors can't have suffixes in plain CSS.",
     Passina: "Passing a string to call() is deprecated and will be illegal in Dart Sass 2.0.0.\n\nRecommendation: call(get-function(",
     Passinp: "Passing percentage units to the global abs() function is deprecated.\nIn the future, this will emit a CSS abs() function to be resolved by the browser.\nTo preserve current behavior: math.abs(",
-    Placeh: "Placeholder selectors aren't allowed here.",
+    Placeh: "Placeholder selectors aren't allowed in plain CSS.",
     Plain_: "Plain CSS functions don't support keyword arguments.",
     Positi: "Positional arguments must come before keyword arguments.",
     Privat: "Private members can't be accessed from outside their modules.",
     RGB_pa: "RGB parameters may not be passed along with ",
     Rest_a: "Rest arguments can't be used with calculations.",
-    Sass__: "Sass @import rules will be deprecated in the future.\nRemove the --future-deprecation=import flag to silence this warning for now.",
-    Sass_v: "Sass variables aren't allowed in plain CSS.",
+    Sassx20_ff: "Sass @function names beginning with -- are deprecated for forward-compatibility with plain CSS functions.\n\nFor details, see https://sass-lang.com/d/css-function-mixin",
+    Sassx20_fm: "Sass @function names beginning with -- are deprecated for forward-compatibility with plain CSS mixins.\n\nFor details, see https://sass-lang.com/d/css-function-mixin",
+    Sassx20_i: "Sass @import rules will be deprecated in the future.\nRemove the --future-deprecation=import flag to silence this warning for now.",
+    Sassx20_m: "Sass @mixin names beginning with -- are deprecated for forward-compatibility with plain CSS mixins.\n\nFor details, see https://sass-lang.com/d/css-function-mixin",
+    Sassx20v: "Sass variables aren't allowed in plain CSS.",
+    Sassx27s: "Sass's behavior for declarations that appear after nested\nrules will be changing to match the behavior specified by CSS in an upcoming\nversion. To keep the existing behavior, move the declaration above the nested\nrule. To opt into the new behavior, wrap the declaration in `& {}`.\n\nMore info: https://sass-lang.com/d/mixed-decls",
     Silent: "Silent comments aren't allowed in plain CSS.",
-    Style_: "Style rules may not be used within nested declarations.",
+    Style_k: "Style rules may not be used within keyframe blocks.",
+    Style_n: "Style rules may not be used within nested declarations.",
     Suppor: "Supports rules may not be used within nested declarations.",
     The_Ex: "The ExtensionStore and CssStylesheet passed to cloneCssStylesheet() must come from the same compilation.",
+    The_No: "The Node package importer cannot be used without a filesystem.",
     The_ca: "The canonicalize() method must return a URL.",
     The_fie: "The findFileUrl() method must return a URL.",
     The_fiu: 'The findFileUrl() must return a URL with scheme file://, was "',
@@ -116163,16 +116794,22 @@ self.util = _cliPkgRequires.util;
     This_o: "This operation can't be used in a calculation.",
     This_s: "This selector doesn't have any properties and won't be rendered.",
     This_v: "This variable was not declared with !default in the @used module.",
-    Top_le: 'Top-level selectors may not contain the parent selector "&".',
+    Top_lel: "Top-level leading combinators aren't allowed in plain CSS.",
+    Top_les: 'Top-level selectors may not contain the parent selector "&".',
+    Unable: "Unable to determine which of multiple potential resolutions found for ",
+    Unexpe: "Unexpected Zone.current[#_canonicalizeContext] value ",
+    User_a: "User-authored deprecations should not be silenced.",
     Using__i: "Using / for division is deprecated and will be removed in Dart Sass 2.0.0.\n\nRecommendation: ",
     Using__o: "Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0.\n\nRecommendation: ",
     Using_c: "Using color.alpha() for a Microsoft filter is deprecated.\n\nRecommendation: ",
+    Using_t: "Using the current working directory as an implicit load path is deprecated. Either add it as an explicit load path or importer, or load this stylesheet from a different URL.",
     Variab_: "Variable keyword argument map must have string keys.\n",
     Variabs: "Variable keyword arguments must be a map (was ",
     You_ma: "You may not @extend selectors across media queries.",
     You_pr: "You probably don't mean to use the color value ",
     x60_inst: "` instead.\nSee https://sass-lang.com/d/extend-compound for details.\n",
     addExt: "addExtensions() can't be called for a const ExtensionStore.",
+    canoni: "canonicalizeContext may only be accessed within a call to canonicalize().",
     compou: "compound selectors may no longer be extended.\nConsider `@extend ",
     conten: "content-exists() may only be called within a mixin.",
     fileEx: "fileExists() is only supported on Node.js",
@@ -116200,6 +116837,7 @@ self.util = _cliPkgRequires.util;
       AsyncBuiltInCallable_2: findType("AsyncBuiltInCallable0"),
       AsyncCallable: findType("AsyncCallable"),
       AsyncCallable_2: findType("AsyncCallable0"),
+      AsyncCompiler: findType("AsyncCompiler"),
       AsyncImporter: findType("AsyncImporter0"),
       Box_SelectorList: findType("Box<SelectorList>"),
       Box_SelectorList_2: findType("Box0<SelectorList0>"),
@@ -116214,6 +116852,9 @@ self.util = _cliPkgRequires.util;
       Callable: findType("Callable0"),
       Callable_2: findType("Callable"),
       ChangeType: findType("ChangeType"),
+      CodeUnits: findType("CodeUnits"),
+      Combinator: findType("Combinator"),
+      Combinator_2: findType("Combinator0"),
       Comparable_dynamic: findType("Comparable<@>"),
       Comparable_nullable_Object: findType("Comparable<Object?>"),
       CompileResult: findType("CompileResult"),
@@ -116249,7 +116890,8 @@ self.util = _cliPkgRequires.util;
       CssValue_Value_2: findType("CssValue0<Value0>"),
       DateTime: findType("DateTime"),
       Deprecation: findType("Deprecation"),
-      Deprecation_2: findType("Deprecation0"),
+      Deprecation_2: findType("Deprecation1"),
+      Deprecation_3: findType("Deprecation0"),
       EfficientLengthIterable_dynamic: findType("EfficientLengthIterable<@>"),
       Error: findType("Error"),
       EvaluationContext: findType("EvaluationContext"),
@@ -116261,15 +116903,27 @@ self.util = _cliPkgRequires.util;
       Extender_2: findType("Extender0"),
       Extension: findType("Extension"),
       Extension_2: findType("Extension0"),
+      FileLocation: findType("FileLocation"),
       FileSpan: findType("FileSpan"),
       Float32List: findType("Float32List"),
       Float64List: findType("Float64List"),
       FormatException: findType("FormatException"),
       Frame: findType("Frame"),
       Function: findType("Function"),
+      FutureGroup_void: findType("FutureGroup<~>"),
       FutureOr_Record_2_Set_Uri_loadedUrls_and_CssStylesheet_stylesheet: findType("+loadedUrls,stylesheet(Set<Uri>,CssStylesheet)/"),
       FutureOr_Record_2_Set_Uri_loadedUrls_and_CssStylesheet_stylesheet_2: findType("+loadedUrls,stylesheet(Set<Uri>,CssStylesheet0)/"),
       FutureOr_nullable_Uri: findType("Uri?/"),
+      Future_Record_2_Set_Uri_loadedUrls_and_CssStylesheet_stylesheet: findType("Future<+loadedUrls,stylesheet(Set<Uri>,CssStylesheet)>"),
+      Future_Record_2_Set_Uri_loadedUrls_and_CssStylesheet_stylesheet_2: findType("Future<+loadedUrls,stylesheet(Set<Uri>,CssStylesheet0)>"),
+      Future_Value: findType("Future<Value>"),
+      Future_Value_2: findType("Future<Value0>"),
+      Future_nullable_CssValue_String: findType("Future<CssValue<String>?>"),
+      Future_nullable_CssValue_String_2: findType("Future<CssValue0<String>?>"),
+      Future_nullable_ImporterResult: findType("Future<ImporterResult0?>"),
+      Future_nullable_Uri: findType("Future<Uri?>"),
+      Future_nullable_Value: findType("Future<Value?>"),
+      Future_nullable_Value_2: findType("Future<Value0?>"),
       Future_void: findType("Future<~>"),
       IfClause: findType("IfClause"),
       IfClause_2: findType("IfClause0"),
@@ -116281,6 +116935,7 @@ self.util = _cliPkgRequires.util;
       Importer: findType("Importer0"),
       ImporterResult: findType("ImporterResult"),
       ImporterResult_2: findType("ImporterResult0"),
+      Importer_2: findType("Importer"),
       Int16List: findType("Int16List"),
       Int32List: findType("Int32List"),
       Int8List: findType("Int8List"),
@@ -116339,8 +116994,8 @@ self.util = _cliPkgRequires.util;
       JSArray_IfClause_2: findType("JSArray<IfClause0>"),
       JSArray_Import: findType("JSArray<Import>"),
       JSArray_Import_2: findType("JSArray<Import0>"),
-      JSArray_Importer: findType("JSArray<Importer0>"),
-      JSArray_Importer_2: findType("JSArray<Importer>"),
+      JSArray_Importer: findType("JSArray<Importer>"),
+      JSArray_Importer_2: findType("JSArray<Importer0>"),
       JSArray_Iterable_ComplexSelectorComponent: findType("JSArray<Iterable<ComplexSelectorComponent>>"),
       JSArray_Iterable_ComplexSelectorComponent_2: findType("JSArray<Iterable<ComplexSelectorComponent0>>"),
       JSArray_JSFunction: findType("JSArray<JSFunction0>"),
@@ -116472,6 +117127,8 @@ self.util = _cliPkgRequires.util;
       MappedListIterable_String_Value: findType("MappedListIterable<String,Value>"),
       MappedListIterable_String_Value_2: findType("MappedListIterable<String,Value0>"),
       MappedListIterable_String_dynamic: findType("MappedListIterable<String,@>"),
+      MixinRule: findType("MixinRule"),
+      MixinRule_2: findType("MixinRule0"),
       ModifiableBox_SelectorList: findType("ModifiableBox<SelectorList>"),
       ModifiableBox_SelectorList_2: findType("ModifiableBox0<SelectorList0>"),
       ModifiableCssAtRule: findType("ModifiableCssAtRule"),
@@ -116512,6 +117169,7 @@ self.util = _cliPkgRequires.util;
       RangeError: findType("RangeError"),
       Record: findType("Record"),
       Record_0: findType("+()"),
+      Record_1_nullable_Object: findType("+(Object?)"),
       Record_2_Expression_and_Expression: findType("+(Expression,Expression)"),
       Record_2_Expression_and_Expression_2: findType("+(Expression0,Expression0)"),
       Record_2_List_Expression_and_Map_String_Expression: findType("+(List<Expression>,Map<String,Expression>)"),
@@ -116525,18 +117183,20 @@ self.util = _cliPkgRequires.util;
       Record_2_String_and_nullable_InterpolationMap_2: findType("+(String,InterpolationMap0?)"),
       Record_2_Uri_and_bool_forImport: findType("+forImport(Uri,bool)"),
       Record_2_nullable_Object_and_nullable_Object: findType("+(Object?,Object?)"),
+      Record_2_nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl_and_bool: findType("+(+originalUrl(AsyncImporter,Uri,Uri)?,bool)"),
+      Record_2_nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl_and_bool_2: findType("+(+originalUrl(AsyncImporter0,Uri,Uri)?,bool)"),
       Record_2_nullable_String_and_nullable_String: findType("+(String?,String?)"),
       Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl: findType("+originalUrl(AsyncImporter,Uri,Uri)"),
       Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl_2: findType("+originalUrl(AsyncImporter0,Uri,Uri)"),
+      Record_3_AsyncImporter_and_Uri_and_bool_forImport: findType("+forImport(AsyncImporter,Uri,bool)"),
+      Record_3_AsyncImporter_and_Uri_and_bool_forImport_2: findType("+forImport(AsyncImporter0,Uri,bool)"),
       Record_3_Importer_and_Uri_and_Uri_originalUrl: findType("+originalUrl(Importer,Uri,Uri)"),
       Record_3_Importer_and_Uri_and_Uri_originalUrl_2: findType("+originalUrl(Importer0,Uri,Uri)"),
+      Record_3_Importer_and_Uri_and_bool_forImport: findType("+forImport(Importer,Uri,bool)"),
+      Record_3_Importer_and_Uri_and_bool_forImport_2: findType("+forImport(Importer0,Uri,bool)"),
       Record_3_Stylesheet_and_nullable_AsyncImporter_importer_and_bool_isDependency: findType("+importer,isDependency(Stylesheet,AsyncImporter?,bool)"),
       Record_3_Stylesheet_and_nullable_AsyncImporter_importer_and_bool_isDependency_2: findType("+importer,isDependency(Stylesheet0,AsyncImporter0?,bool)"),
       Record_3_nullable_Object_and_nullable_Object_and_nullable_Object_originalUrl: findType("+originalUrl(Object?,Object?,Object?)"),
-      Record_4_Uri_and_AsyncImporter_baseImporter_and_nullable_Uri_baseUrl_and_bool_forImport: findType("+baseImporter,baseUrl,forImport(Uri,AsyncImporter,Uri?,bool)"),
-      Record_4_Uri_and_AsyncImporter_baseImporter_and_nullable_Uri_baseUrl_and_bool_forImport_2: findType("+baseImporter,baseUrl,forImport(Uri,AsyncImporter0,Uri?,bool)"),
-      Record_4_Uri_and_Importer_baseImporter_and_nullable_Uri_baseUrl_and_bool_forImport: findType("+baseImporter,baseUrl,forImport(Uri,Importer,Uri?,bool)"),
-      Record_4_Uri_and_Importer_baseImporter_and_nullable_Uri_baseUrl_and_bool_forImport_2: findType("+baseImporter,baseUrl,forImport(Uri,Importer0,Uri?,bool)"),
       Record_5_Map_String_Value_named_and_Map_String_AstNode_namedNodes_and_List_Value_positional_and_List_AstNode_positionalNodes_and_ListSeparator_separator: findType("+named,namedNodes,positional,positionalNodes,separator(Map<String,Value>,Map<String,AstNode>,List<Value>,List<AstNode>,ListSeparator)"),
       Record_5_Map_String_Value_named_and_Map_String_AstNode_namedNodes_and_List_Value_positional_and_List_AstNode_positionalNodes_and_ListSeparator_separator_2: findType("+named,namedNodes,positional,positionalNodes,separator(Map<String,Value0>,Map<String,AstNode0>,List<Value0>,List<AstNode0>,ListSeparator0)"),
       RegExpMatch: findType("RegExpMatch"),
@@ -116549,8 +117209,6 @@ self.util = _cliPkgRequires.util;
       SassArgumentList_2: findType("SassArgumentList0"),
       SassBoolean: findType("SassBoolean"),
       SassBoolean_2: findType("SassBoolean0"),
-      SassCalculation: findType("SassCalculation"),
-      SassCalculation_2: findType("SassCalculation0"),
       SassColor: findType("SassColor"),
       SassColor_2: findType("SassColor0"),
       SassFormatException: findType("SassFormatException"),
@@ -116587,6 +117245,7 @@ self.util = _cliPkgRequires.util;
       StreamQueue_String: findType("StreamQueue<String>"),
       Stream_WatchEvent: findType("Stream<WatchEvent>"),
       String: findType("String"),
+      StringExpression: findType("StringExpression"),
       StylesheetNode: findType("StylesheetNode"),
       Timer: findType("Timer"),
       Trace: findType("Trace"),
@@ -116598,8 +117257,6 @@ self.util = _cliPkgRequires.util;
       Uint32List: findType("Uint32List"),
       Uint8ClampedList: findType("Uint8ClampedList"),
       Uint8List: findType("Uint8List"),
-      UnaryOperationExpression: findType("UnaryOperationExpression"),
-      UnaryOperationExpression_2: findType("UnaryOperationExpression0"),
       UnionSet_Uri: findType("UnionSet<Uri>"),
       UnknownJavaScriptObject: findType("UnknownJavaScriptObject"),
       UnmodifiableListView_CssComment: findType("UnmodifiableListView<CssComment>"),
@@ -116633,8 +117290,6 @@ self.util = _cliPkgRequires.util;
       UserDefinedCallable_AsyncEnvironment_2: findType("UserDefinedCallable0<AsyncEnvironment0>"),
       UserDefinedCallable_Environment: findType("UserDefinedCallable<Environment>"),
       UserDefinedCallable_Environment_2: findType("UserDefinedCallable0<Environment0>"),
-      UserDefinedCallable_dynamic: findType("UserDefinedCallable<@>"),
-      UserDefinedCallable_dynamic_2: findType("UserDefinedCallable0<@>"),
       Value: findType("Value"),
       Value_2: findType("Value0"),
       Value_Function_List_Value: findType("Value(List<Value>)"),
@@ -116649,15 +117304,19 @@ self.util = _cliPkgRequires.util;
       WhereTypeIterable_PseudoSelector: findType("WhereTypeIterable<PseudoSelector>"),
       WhereTypeIterable_PseudoSelector_2: findType("WhereTypeIterable<PseudoSelector0>"),
       WhereTypeIterable_String: findType("WhereTypeIterable<String>"),
+      _AsyncCompleter_List_void: findType("_AsyncCompleter<List<~>>"),
       _AsyncCompleter_Object: findType("_AsyncCompleter<Object>"),
       _AsyncCompleter_Stream_WatchEvent: findType("_AsyncCompleter<Stream<WatchEvent>>"),
       _AsyncCompleter_String: findType("_AsyncCompleter<String>"),
       _AsyncCompleter_nullable_Object: findType("_AsyncCompleter<Object?>"),
       _CompleterStream_WatchEvent: findType("_CompleterStream<WatchEvent>"),
       _EventRequest_dynamic: findType("_EventRequest<@>"),
+      _Future_List_void: findType("_Future<List<~>>"),
       _Future_Object: findType("_Future<Object>"),
       _Future_Stream_WatchEvent: findType("_Future<Stream<WatchEvent>>"),
       _Future_String: findType("_Future<String>"),
+      _Future_Value: findType("_Future<Value>"),
+      _Future_Value_2: findType("_Future<Value0>"),
       _Future_bool: findType("_Future<bool>"),
       _Future_dynamic: findType("_Future<@>"),
       _Future_int: findType("_Future<int>"),
@@ -116671,6 +117330,8 @@ self.util = _cliPkgRequires.util;
       _LinkedIdentityHashSet_Extension_2: findType("_LinkedIdentityHashSet<Extension0>"),
       _MapEntry: findType("_MapEntry"),
       _NodeException: findType("_NodeException"),
+      _PlatformUri: findType("_PlatformUri"),
+      _SyncStarIterable_Deprecation: findType("_SyncStarIterable<Deprecation0>"),
       _SyncStarIterable_Extension: findType("_SyncStarIterable<Extension>"),
       _SyncStarIterable_Extension_2: findType("_SyncStarIterable<Extension0>"),
       _SyncStarIterable_SimpleSelector: findType("_SyncStarIterable<SimpleSelector>"),
@@ -116687,17 +117348,21 @@ self.util = _cliPkgRequires.util;
       legacy_Object: findType("Object*"),
       nullable_AstNode: findType("AstNode?"),
       nullable_AstNode_2: findType("AstNode0?"),
+      nullable_CanonicalizeContext: findType("CanonicalizeContext?"),
+      nullable_CanonicalizeContext_2: findType("CanonicalizeContext0?"),
+      nullable_CssValue_String: findType("CssValue<String>?"),
+      nullable_CssValue_String_2: findType("CssValue0<String>?"),
       nullable_Future_Null: findType("Future<Null>?"),
       nullable_Future_void: findType("Future<~>?"),
-      nullable_ImporterResult: findType("ImporterResult0?"),
+      nullable_ImporterResult: findType("ImporterResult?"),
+      nullable_ImporterResult_2: findType("ImporterResult0?"),
       nullable_Object: findType("Object?"),
       nullable_Record_2_String_and_String: findType("+(String,String)?"),
       nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl: findType("+originalUrl(AsyncImporter,Uri,Uri)?"),
       nullable_Record_3_AsyncImporter_and_Uri_and_Uri_originalUrl_2: findType("+originalUrl(AsyncImporter0,Uri,Uri)?"),
       nullable_Record_3_Importer_and_Uri_and_Uri_originalUrl: findType("+originalUrl(Importer,Uri,Uri)?"),
       nullable_Record_3_Importer_and_Uri_and_Uri_originalUrl_2: findType("+originalUrl(Importer0,Uri,Uri)?"),
-      nullable_Record_3_Stylesheet_and_nullable_AsyncImporter_importer_and_bool_isDependency: findType("+importer,isDependency(Stylesheet,AsyncImporter?,bool)?"),
-      nullable_Record_3_Stylesheet_and_nullable_AsyncImporter_importer_and_bool_isDependency_2: findType("+importer,isDependency(Stylesheet0,AsyncImporter0?,bool)?"),
+      nullable_Record_3_Stylesheet_and_nullable_AsyncImporter_importer_and_bool_isDependency: findType("+importer,isDependency(Stylesheet0,AsyncImporter0?,bool)?"),
       nullable_Record_3_int_and_String_and_nullable_String: findType("+(int,String,String?)?"),
       nullable_SourceFile: findType("SourceFile?"),
       nullable_SourceSpan: findType("SourceSpan?"),
@@ -116735,48 +117400,48 @@ self.util = _cliPkgRequires.util;
     B.UnknownJavaScriptObject_methods = J.UnknownJavaScriptObject.prototype;
     B.AsciiEncoder_127 = new A.AsciiEncoder(127);
     B.C_EmptyUnmodifiableSet1 = new A.EmptyUnmodifiableSet(A.findType("EmptyUnmodifiableSet<String>"));
-    B.AtRootQuery_UsS = new A.AtRootQuery(false, B.C_EmptyUnmodifiableSet1, false, true);
-    B.AtRootQuery_UsS0 = new A.AtRootQuery0(false, B.C_EmptyUnmodifiableSet1, false, true);
-    B.AttributeOperator_8aB = new A.AttributeOperator("*=", "substring");
-    B.AttributeOperator_8aB0 = new A.AttributeOperator0("*=", "substring");
-    B.AttributeOperator_BGd = new A.AttributeOperator("$=", "suffix");
-    B.AttributeOperator_BGd0 = new A.AttributeOperator0("$=", "suffix");
-    B.AttributeOperator_ES6 = new A.AttributeOperator("=", "equal");
-    B.AttributeOperator_ES60 = new A.AttributeOperator0("=", "equal");
-    B.AttributeOperator_eot = new A.AttributeOperator("^=", "prefix");
-    B.AttributeOperator_eot0 = new A.AttributeOperator0("^=", "prefix");
-    B.AttributeOperator_ivT = new A.AttributeOperator("|=", "dash");
-    B.AttributeOperator_ivT0 = new A.AttributeOperator0("|=", "dash");
-    B.AttributeOperator_r60 = new A.AttributeOperator("~=", "include");
-    B.AttributeOperator_r600 = new A.AttributeOperator0("~=", "include");
-    B.BinaryOperator_2jN = new A.BinaryOperator("single equals", "=", 0, false, "singleEquals");
-    B.BinaryOperator_2jN0 = new A.BinaryOperator0("single equals", "=", 0, false, "singleEquals");
-    B.BinaryOperator_7Tg = new A.BinaryOperator("greater than or equals", ">=", 4, false, "greaterThanOrEquals");
-    B.BinaryOperator_7Tg0 = new A.BinaryOperator0("greater than or equals", ">=", 4, false, "greaterThanOrEquals");
-    B.BinaryOperator_M6L = new A.BinaryOperator("or", "or", 1, true, "or");
-    B.BinaryOperator_M6L0 = new A.BinaryOperator0("or", "or", 1, true, "or");
-    B.BinaryOperator_OTG = new A.BinaryOperator("modulo", "%", 6, false, "modulo");
-    B.BinaryOperator_OTG0 = new A.BinaryOperator0("modulo", "%", 6, false, "modulo");
-    B.BinaryOperator_SNp = new A.BinaryOperator("and", "and", 2, true, "and");
-    B.BinaryOperator_SNp0 = new A.BinaryOperator0("and", "and", 2, true, "and");
-    B.BinaryOperator_U8c = new A.BinaryOperator("less than", "<", 4, false, "lessThan");
-    B.BinaryOperator_U8c0 = new A.BinaryOperator0("less than", "<", 4, false, "lessThan");
-    B.BinaryOperator_ViB = new A.BinaryOperator("not equals", "!=", 3, false, "notEquals");
-    B.BinaryOperator_ViB0 = new A.BinaryOperator0("not equals", "!=", 3, false, "notEquals");
-    B.BinaryOperator_anB = new A.BinaryOperator("plus", "+", 5, true, "plus");
-    B.BinaryOperator_anB0 = new A.BinaryOperator0("plus", "+", 5, true, "plus");
-    B.BinaryOperator_cIH = new A.BinaryOperator("greater than", ">", 4, false, "greaterThan");
-    B.BinaryOperator_cIH0 = new A.BinaryOperator0("greater than", ">", 4, false, "greaterThan");
-    B.BinaryOperator_kpg = new A.BinaryOperator("less than or equals", "<=", 4, false, "lessThanOrEquals");
-    B.BinaryOperator_kpg0 = new A.BinaryOperator0("less than or equals", "<=", 4, false, "lessThanOrEquals");
-    B.BinaryOperator_olz = new A.BinaryOperator("minus", "-", 5, false, "minus");
-    B.BinaryOperator_olz0 = new A.BinaryOperator0("minus", "-", 5, false, "minus");
-    B.BinaryOperator_qN2 = new A.BinaryOperator("times", "*", 6, true, "times");
-    B.BinaryOperator_qN20 = new A.BinaryOperator0("times", "*", 6, true, "times");
-    B.BinaryOperator_ql5 = new A.BinaryOperator("equals", "==", 3, false, "equals");
-    B.BinaryOperator_ql50 = new A.BinaryOperator0("equals", "==", 3, false, "equals");
-    B.BinaryOperator_t8B = new A.BinaryOperator("divided by", "/", 6, false, "dividedBy");
-    B.BinaryOperator_t8B0 = new A.BinaryOperator0("divided by", "/", 6, false, "dividedBy");
+    B.AtRootQuery_n2q = new A.AtRootQuery(false, B.C_EmptyUnmodifiableSet1, false, true);
+    B.AtRootQuery_n2q0 = new A.AtRootQuery0(false, B.C_EmptyUnmodifiableSet1, false, true);
+    B.AttributeOperator_4QF = new A.AttributeOperator("=", "equal");
+    B.AttributeOperator_4QF0 = new A.AttributeOperator0("=", "equal");
+    B.AttributeOperator_61T = new A.AttributeOperator("*=", "substring");
+    B.AttributeOperator_61T0 = new A.AttributeOperator0("*=", "substring");
+    B.AttributeOperator_cMb = new A.AttributeOperator("^=", "prefix");
+    B.AttributeOperator_cMb0 = new A.AttributeOperator0("^=", "prefix");
+    B.AttributeOperator_jqB = new A.AttributeOperator("|=", "dash");
+    B.AttributeOperator_jqB0 = new A.AttributeOperator0("|=", "dash");
+    B.AttributeOperator_qhE = new A.AttributeOperator("$=", "suffix");
+    B.AttributeOperator_qhE0 = new A.AttributeOperator0("$=", "suffix");
+    B.AttributeOperator_yT8 = new A.AttributeOperator("~=", "include");
+    B.AttributeOperator_yT80 = new A.AttributeOperator0("~=", "include");
+    B.BinaryOperator_2No = new A.BinaryOperator("times", "*", 6, true, "times");
+    B.BinaryOperator_2No0 = new A.BinaryOperator0("times", "*", 6, true, "times");
+    B.BinaryOperator_KNx = new A.BinaryOperator("modulo", "%", 6, false, "modulo");
+    B.BinaryOperator_KNx0 = new A.BinaryOperator0("modulo", "%", 6, false, "modulo");
+    B.BinaryOperator_SPQ = new A.BinaryOperator("less than or equals", "<=", 4, false, "lessThanOrEquals");
+    B.BinaryOperator_SPQ0 = new A.BinaryOperator0("less than or equals", "<=", 4, false, "lessThanOrEquals");
+    B.BinaryOperator_SjO = new A.BinaryOperator("minus", "-", 5, false, "minus");
+    B.BinaryOperator_SjO0 = new A.BinaryOperator0("minus", "-", 5, false, "minus");
+    B.BinaryOperator_U77 = new A.BinaryOperator("divided by", "/", 6, false, "dividedBy");
+    B.BinaryOperator_U770 = new A.BinaryOperator0("divided by", "/", 6, false, "dividedBy");
+    B.BinaryOperator_bEa = new A.BinaryOperator("greater than", ">", 4, false, "greaterThan");
+    B.BinaryOperator_bEa0 = new A.BinaryOperator0("greater than", ">", 4, false, "greaterThan");
+    B.BinaryOperator_eDt = new A.BinaryOperator("and", "and", 2, true, "and");
+    B.BinaryOperator_eDt0 = new A.BinaryOperator0("and", "and", 2, true, "and");
+    B.BinaryOperator_g8k = new A.BinaryOperator("equals", "==", 3, false, "equals");
+    B.BinaryOperator_g8k0 = new A.BinaryOperator0("equals", "==", 3, false, "equals");
+    B.BinaryOperator_icU = new A.BinaryOperator("not equals", "!=", 3, false, "notEquals");
+    B.BinaryOperator_icU0 = new A.BinaryOperator0("not equals", "!=", 3, false, "notEquals");
+    B.BinaryOperator_miq = new A.BinaryOperator("less than", "<", 4, false, "lessThan");
+    B.BinaryOperator_miq0 = new A.BinaryOperator0("less than", "<", 4, false, "lessThan");
+    B.BinaryOperator_oEm = new A.BinaryOperator("greater than or equals", ">=", 4, false, "greaterThanOrEquals");
+    B.BinaryOperator_oEm0 = new A.BinaryOperator0("greater than or equals", ">=", 4, false, "greaterThanOrEquals");
+    B.BinaryOperator_qNM = new A.BinaryOperator("or", "or", 1, true, "or");
+    B.BinaryOperator_qNM0 = new A.BinaryOperator0("or", "or", 1, true, "or");
+    B.BinaryOperator_u15 = new A.BinaryOperator("plus", "+", 5, true, "plus");
+    B.BinaryOperator_u150 = new A.BinaryOperator0("plus", "+", 5, true, "plus");
+    B.BinaryOperator_wdM = new A.BinaryOperator("single equals", "=", 0, false, "singleEquals");
+    B.BinaryOperator_wdM0 = new A.BinaryOperator0("single equals", "=", 0, false, "singleEquals");
     B.CONSTANT = new A.Instantiation1(A.math0__max$closure(), A.findType("Instantiation1<int>"));
     B.C_AsciiCodec = new A.AsciiCodec();
     B.C_AsciiGlyphSet = new A.AsciiGlyphSet();
@@ -116917,7 +117582,7 @@ self.util = _cliPkgRequires.util;
     B.C_JsonCodec = new A.JsonCodec();
     B.C_ListEquality0 = new A.ListEquality();
     B.C_ListEquality = new A.ListEquality();
-    B.C_MapEquality = new A.MapEquality();
+    B.C_MapEquality = new A.MapEquality(A.findType("MapEquality<Object,Object>"));
     B.C_OutOfMemoryError = new A.OutOfMemoryError();
     B.C_SentinelValue = new A.SentinelValue();
     B.C_UnicodeGlyphSet = new A.UnicodeGlyphSet();
@@ -116937,55 +117602,64 @@ self.util = _cliPkgRequires.util;
     B.C__RootZone = new A._RootZone();
     B.C__SassNull = new A._SassNull();
     B.C__SassNull0 = new A._SassNull0();
-    B.CalculationOperator_2bx = new A.CalculationOperator("minus", "-", 1, "minus");
-    B.CalculationOperator_2bx0 = new A.CalculationOperator0("minus", "-", 1, "minus");
-    B.CalculationOperator_IyK = new A.CalculationOperator("plus", "+", 1, "plus");
-    B.CalculationOperator_IyK0 = new A.CalculationOperator0("plus", "+", 1, "plus");
-    B.CalculationOperator_OvN = new A.CalculationOperator("divided by", "/", 2, "dividedBy");
-    B.CalculationOperator_OvN0 = new A.CalculationOperator0("divided by", "/", 2, "dividedBy");
-    B.CalculationOperator_jFr = new A.CalculationOperator("times", "*", 2, "times");
-    B.CalculationOperator_jFr0 = new A.CalculationOperator0("times", "*", 2, "times");
+    B.CalculationOperator_171 = new A.CalculationOperator("times", "*", 2, "times");
+    B.CalculationOperator_1710 = new A.CalculationOperator0("times", "*", 2, "times");
+    B.CalculationOperator_CxF = new A.CalculationOperator("minus", "-", 1, "minus");
+    B.CalculationOperator_CxF0 = new A.CalculationOperator0("minus", "-", 1, "minus");
+    B.CalculationOperator_Qf1 = new A.CalculationOperator("divided by", "/", 2, "dividedBy");
+    B.CalculationOperator_Qf10 = new A.CalculationOperator0("divided by", "/", 2, "dividedBy");
+    B.CalculationOperator_g2q = new A.CalculationOperator("plus", "+", 1, "plus");
+    B.CalculationOperator_g2q0 = new A.CalculationOperator0("plus", "+", 1, "plus");
     B.ChangeType_add = new A.ChangeType("add");
     B.ChangeType_modify = new A.ChangeType("modify");
     B.ChangeType_remove = new A.ChangeType("remove");
-    B.Combinator_4QF = new A.Combinator("+", "nextSibling");
-    B.Combinator_4QF0 = new A.Combinator0("+", "nextSibling");
-    B.Combinator_Cht = new A.Combinator(">", "child");
-    B.Combinator_Cht0 = new A.Combinator0(">", "child");
-    B.Combinator_Htt = new A.Combinator("~", "followingSibling");
-    B.Combinator_Htt0 = new A.Combinator0("~", "followingSibling");
+    B.Combinator_8I8 = new A.Combinator(">", "child");
+    B.Combinator_8I80 = new A.Combinator0(">", "child");
+    B.Combinator_gRV = new A.Combinator("+", "nextSibling");
+    B.Combinator_gRV0 = new A.Combinator0("+", "nextSibling");
+    B.Combinator_y18 = new A.Combinator("~", "followingSibling");
+    B.Combinator_y180 = new A.Combinator0("~", "followingSibling");
     B.Object_empty = {};
     B.Map_empty17 = new A.ConstantStringMap(B.Object_empty, [], A.findType("ConstantStringMap<String,ConfiguredValue>"));
     B.Configuration_Map_empty_null = new A.Configuration(B.Map_empty17, null);
     B.Map_empty18 = new A.ConstantStringMap(B.Object_empty, [], A.findType("ConstantStringMap<String,ConfiguredValue0>"));
     B.Configuration_Map_empty_null0 = new A.Configuration0(B.Map_empty18, null);
-    B.Deprecation_043 = new A.Deprecation("abs-percent", "1.65.0", "Passing percentages to the Sass abs() function.", false, "absPercent");
-    B.Deprecation_0bn = new A.Deprecation0("function-units", false, "functionUnits");
-    B.Deprecation_4iQ = new A.Deprecation0("call-string", false, "callString");
-    B.Deprecation_8WR = new A.Deprecation("function-units", "1.56.0", "Passing invalid units to built-in functions.", false, "functionUnits");
-    B.Deprecation_Auo = new A.Deprecation("duplicate-var-flags", "1.62.0", "Using !default or !global multiple times for one variable.", false, "duplicateVariableFlags");
-    B.Deprecation_B8J = new A.Deprecation("import", null, "@import rules.", true, "import");
-    B.Deprecation_E5x = new A.Deprecation0("relative-canonical", false, "relativeCanonical");
-    B.Deprecation_EsU = new A.Deprecation0("strict-unary", false, "strictUnary");
-    B.Deprecation_GbU = new A.Deprecation0("moz-document", false, "mozDocument");
-    B.Deprecation_JAZ = new A.Deprecation("elseif", "1.3.2", "@elseif.", false, "elseif");
-    B.Deprecation_LT8 = new A.Deprecation0("color-module-compat", false, "colorModuleCompat");
-    B.Deprecation_UZD = new A.Deprecation0("null-alpha", false, "nullAlpha");
-    B.Deprecation_XV6 = new A.Deprecation0("bogus-combinators", false, "bogusCombinators");
-    B.Deprecation_elseif_false_elseif = new A.Deprecation0("elseif", false, "elseif");
-    B.Deprecation_gJ9 = new A.Deprecation("moz-document", "1.7.2", "@-moz-document.", false, "mozDocument");
-    B.Deprecation_hzy = new A.Deprecation("new-global", "1.17.2", "Declaring new variables with !global.", false, "newGlobal");
-    B.Deprecation_import_true_import = new A.Deprecation0("import", true, "import");
-    B.Deprecation_la6 = new A.Deprecation0("abs-percent", false, "absPercent");
-    B.Deprecation_mFp = new A.Deprecation("relative-canonical", "1.14.2", null, false, "relativeCanonical");
-    B.Deprecation_qVK = new A.Deprecation("call-string", "0.0.0", "Passing a string directly to meta.call().", false, "callString");
-    B.Deprecation_s4m = new A.Deprecation("color-module-compat", "1.23.0", "Using color module functions in place of plain CSS functions.", false, "colorModuleCompat");
-    B.Deprecation_sIK = new A.Deprecation("strict-unary", "1.55.0", "Ambiguous + and - operators.", false, "strictUnary");
-    B.Deprecation_vrR = new A.Deprecation("bogus-combinators", "1.54.0", "Leading, trailing, and repeated combinators.", false, "bogusCombinators");
-    B.Deprecation_wKk = new A.Deprecation0("new-global", false, "newGlobal");
-    B.Deprecation_wWh = new A.Deprecation0("slash-div", false, "slashDiv");
-    B.Deprecation_xHK = new A.Deprecation("slash-div", "1.33.0", "/ operator for division.", false, "slashDiv");
-    B.Deprecation_ynv = new A.Deprecation0("duplicate-var-flags", false, "duplicateVariableFlags");
+    B.Deprecation_2Vk = new A.Deprecation("strict-unary", "1.55.0", false, "strictUnary");
+    B.Deprecation_2jN = new A.Deprecation("function-units", "1.56.0", false, "functionUnits");
+    B.Deprecation_2nU = new A.Deprecation("new-global", "1.17.2", false, "newGlobal");
+    B.Deprecation_5pG = new A.Deprecation0("bogus-combinators", "1.54.0", "Leading, trailing, and repeated combinators.", false, "bogusCombinators");
+    B.Deprecation_Agq = new A.Deprecation0("calc-interp", null, null, false, "calcInterp");
+    B.Deprecation_B4v = new A.Deprecation("fs-importer-cwd", "1.73.0", false, "fsImporterCwd");
+    B.Deprecation_E8a = new A.Deprecation0("slash-div", "1.33.0", "/ operator for division.", false, "slashDiv");
+    B.Deprecation_EJz = new A.Deprecation("elseif", "1.3.2", false, "elseif");
+    B.Deprecation_EfO = new A.Deprecation0("color-module-compat", "1.23.0", "Using color module functions in place of plain CSS functions.", false, "colorModuleCompat");
+    B.Deprecation_FGJ = new A.Deprecation0("mixed-decls", "1.77.7", "Declarations after or between nested rules.", false, "mixedDecls");
+    B.Deprecation_GFc = new A.Deprecation("abs-percent", "1.65.0", false, "absPercent");
+    B.Deprecation_HJ0 = new A.Deprecation("css-function-mixin", "1.76.0", false, "cssFunctionMixin");
+    B.Deprecation_IMm = new A.Deprecation("relative-canonical", "1.14.2", false, "relativeCanonical");
+    B.Deprecation_Iit = new A.Deprecation0("moz-document", "1.7.2", "@-moz-document.", false, "mozDocument");
+    B.Deprecation_JeE = new A.Deprecation("user-authored", null, false, "userAuthored");
+    B.Deprecation_MMc = new A.Deprecation0("call-string", "0.0.0", "Passing a string directly to meta.call().", false, "callString");
+    B.Deprecation_Ssf = new A.Deprecation0("relative-canonical", "1.14.2", "Imports using relative canonical URLs.", false, "relativeCanonical");
+    B.Deprecation_W6Z = new A.Deprecation0("new-global", "1.17.2", "Declaring new variables with !global.", false, "newGlobal");
+    B.Deprecation_gf0 = new A.Deprecation("mixed-decls", "1.77.7", false, "mixedDecls");
+    B.Deprecation_gkc = new A.Deprecation("call-string", "0.0.0", false, "callString");
+    B.Deprecation_iDZ = new A.Deprecation("color-module-compat", "1.23.0", false, "colorModuleCompat");
+    B.Deprecation_iXE = new A.Deprecation0("duplicate-var-flags", "1.62.0", "Using !default or !global multiple times for one variable.", false, "duplicateVarFlags");
+    B.Deprecation_ido = new A.Deprecation("bogus-combinators", "1.54.0", false, "bogusCombinators");
+    B.Deprecation_import_null_true_import = new A.Deprecation("import", null, true, "import");
+    B.Deprecation_jYb = new A.Deprecation0("abs-percent", "1.65.0", "Passing percentages to the Sass abs() function.", false, "absPercent");
+    B.Deprecation_kmo = new A.Deprecation0("fs-importer-cwd", "1.73.0", "Using the current working directory as an implicit load path.", false, "fsImporterCwd");
+    B.Deprecation_oCX = new A.Deprecation0("function-units", "1.56.0", "Passing invalid units to built-in functions.", false, "functionUnits");
+    B.Deprecation_oJv = new A.Deprecation("slash-div", "1.33.0", false, "slashDiv");
+    B.Deprecation_omH = new A.Deprecation0("null-alpha", "1.62.3", "Passing null as alpha in the JS API.", false, "nullAlpha");
+    B.Deprecation_oty = new A.Deprecation0("user-authored", null, null, false, "userAuthored");
+    B.Deprecation_qBS = new A.Deprecation0("css-function-mixin", "1.76.0", "Function and mixin names beginning with --.", false, "cssFunctionMixin");
+    B.Deprecation_qd9 = new A.Deprecation0("import", null, "@import rules.", true, "import");
+    B.Deprecation_uNF = new A.Deprecation("moz-document", "1.7.2", false, "mozDocument");
+    B.Deprecation_woc = new A.Deprecation0("strict-unary", "1.55.0", "Ambiguous + and - operators.", false, "strictUnary");
+    B.Deprecation_xw8 = new A.Deprecation0("elseif", "1.3.2", "@elseif.", false, "elseif");
+    B.Deprecation_zrt = new A.Deprecation("duplicate-var-flags", "1.62.0", false, "duplicateVarFlags");
     B.Duration_0 = new A.Duration(0);
     B.ExtendMode_allTargets_allTargets = new A.ExtendMode("allTargets", "allTargets");
     B.ExtendMode_allTargets_allTargets0 = new A.ExtendMode0("allTargets", "allTargets");
@@ -116993,51 +117667,61 @@ self.util = _cliPkgRequires.util;
     B.ExtendMode_normal_normal0 = new A.ExtendMode0("normal", "normal");
     B.ExtendMode_replace_replace = new A.ExtendMode("replace", "replace");
     B.ExtendMode_replace_replace0 = new A.ExtendMode0("replace", "replace");
+    B.JsonDecoder_null = new A.JsonDecoder(null);
     B.JsonEncoder_null = new A.JsonEncoder(null);
-    B.LineFeed_SsD = new A.LineFeed0("lf", "\n", "lf");
-    B.LineFeed_gg4 = new A.LineFeed0("crlf", "\r\n", "crlf");
+    B.LineFeed_75j = new A.LineFeed0("lfcr", "\n\r", "lfcr");
+    B.LineFeed_89t = new A.LineFeed0("cr", "\r", "cr");
+    B.LineFeed_A4L = new A.LineFeed0("crlf", "\r\n", "crlf");
+    B.LineFeed_LvD = new A.LineFeed0("lf", "\n", "lf");
     B.LineFeed_lf = new A.LineFeed("lf");
-    B.LineFeed_oyU = new A.LineFeed0("cr", "\r", "cr");
-    B.LineFeed_t2a = new A.LineFeed0("lfcr", "\n\r", "lfcr");
-    B.ListSeparator_EVt = new A.ListSeparator("space", " ", "space");
-    B.ListSeparator_EVt0 = new A.ListSeparator0("space", " ", "space");
-    B.ListSeparator_rXA = new A.ListSeparator("comma", ",", "comma");
-    B.ListSeparator_rXA0 = new A.ListSeparator0("comma", ",", "comma");
+    B.ListSeparator_ECn = new A.ListSeparator("comma", ",", "comma");
+    B.ListSeparator_ECn0 = new A.ListSeparator0("comma", ",", "comma");
+    B.ListSeparator_cQA = new A.ListSeparator("slash", "/", "slash");
+    B.ListSeparator_cQA0 = new A.ListSeparator0("slash", "/", "slash");
+    B.ListSeparator_nbm = new A.ListSeparator("space", " ", "space");
+    B.ListSeparator_nbm0 = new A.ListSeparator0("space", " ", "space");
     B.ListSeparator_undecided_null_undecided = new A.ListSeparator("undecided", null, "undecided");
     B.ListSeparator_undecided_null_undecided0 = new A.ListSeparator0("undecided", null, "undecided");
-    B.ListSeparator_zg9 = new A.ListSeparator("slash", "/", "slash");
-    B.ListSeparator_zg90 = new A.ListSeparator0("slash", "/", "slash");
-    B.Deprecation_7XU = new A.Deprecation("null-alpha", "1.62.3", "Passing null as alpha in the JS API.", false, "nullAlpha");
-    B.Deprecation_WbD = new A.Deprecation("calc-interp", null, null, false, "calcInterp");
-    B.Deprecation_A0N = new A.Deprecation("user-authored", null, null, false, "userAuthored");
-    B.List_GN8 = A._setArrayType(makeConstList([B.Deprecation_qVK, B.Deprecation_JAZ, B.Deprecation_gJ9, B.Deprecation_mFp, B.Deprecation_hzy, B.Deprecation_s4m, B.Deprecation_xHK, B.Deprecation_vrR, B.Deprecation_sIK, B.Deprecation_8WR, B.Deprecation_043, B.Deprecation_Auo, B.Deprecation_7XU, B.Deprecation_WbD, B.Deprecation_B8J, B.Deprecation_A0N]), A.findType("JSArray<Deprecation>"));
-    B.List_M1A = A._setArrayType(makeConstList([0, 0, 24576, 1023, 65534, 34815, 65534, 18431]), type$.JSArray_int);
-    B.List_MMm = A._setArrayType(makeConstList([0, 0, 26624, 1023, 65534, 2047, 65534, 2047]), type$.JSArray_int);
-    B.List_OL3 = A._setArrayType(makeConstList([0, 0, 32722, 12287, 65534, 34815, 65534, 18431]), type$.JSArray_int);
-    B.List_XRg0 = A._setArrayType(makeConstList([0, 0, 32722, 12287, 65535, 34815, 65534, 18431]), type$.JSArray_int);
-    B.List_XRg = A._setArrayType(makeConstList([0, 0, 65490, 12287, 65535, 34815, 65534, 18431]), type$.JSArray_int);
-    B.List_YmH = A._setArrayType(makeConstList([0, 0, 32776, 33792, 1, 10240, 0, 0]), type$.JSArray_int);
-    B.List_cUt = A._setArrayType(makeConstList([B.CalculationOperator_IyK0, B.CalculationOperator_2bx0, B.CalculationOperator_jFr0, B.CalculationOperator_OvN0]), A.findType("JSArray<CalculationOperator0>"));
-    B.List_ejq = A._setArrayType(makeConstList([0, 0, 32754, 11263, 65534, 34815, 65534, 18431]), type$.JSArray_int);
+    B.List_2jN = A._setArrayType(makeConstList([0, 0, 32722, 12287, 65534, 34815, 65534, 18431]), type$.JSArray_int);
+    B.List_42A = A._setArrayType(makeConstList([0, 0, 65490, 45055, 65535, 34815, 65534, 18431]), type$.JSArray_int);
+    B.List_4AN = A._setArrayType(makeConstList([0, 0, 32754, 11263, 65534, 34815, 65534, 18431]), type$.JSArray_int);
+    B.Object_79D = {em: 0, rem: 1, ex: 2, rex: 3, cap: 4, rcap: 5, ch: 6, rch: 7, ic: 8, ric: 9, lh: 10, rlh: 11, vw: 12, lvw: 13, svw: 14, dvw: 15, vh: 16, lvh: 17, svh: 18, dvh: 19, vi: 20, lvi: 21, svi: 22, dvi: 23, vb: 24, lvb: 25, svb: 26, dvb: 27, vmin: 28, lvmin: 29, svmin: 30, dvmin: 31, vmax: 32, lvmax: 33, svmax: 34, dvmax: 35, cqw: 36, cqh: 37, cqi: 38, cqb: 39, cqmin: 40, cqmax: 41, cm: 42, mm: 43, q: 44, in: 45, pt: 46, pc: 47, px: 48};
+    B.Set_ot1A = new A.ConstantStringSet(B.Object_79D, 49, type$.ConstantStringSet_String);
+    B.Object_Yf3 = {deg: 0, grad: 1, rad: 2, turn: 3};
+    B.Set_YZQG9 = new A.ConstantStringSet(B.Object_Yf3, 4, type$.ConstantStringSet_String);
+    B.Object_s_0_ms_1 = {s: 0, ms: 1};
+    B.Set_wEo81 = new A.ConstantStringSet(B.Object_s_0_ms_1, 2, type$.ConstantStringSet_String);
+    B.Object_hz_0_khz_1 = {hz: 0, khz: 1};
+    B.Set_y00Wb = new A.ConstantStringSet(B.Object_hz_0_khz_1, 2, type$.ConstantStringSet_String);
+    B.Object_3CF = {dpi: 0, dpcm: 1, dppx: 2};
+    B.Set_Db0y4 = new A.ConstantStringSet(B.Object_3CF, 3, type$.ConstantStringSet_String);
+    B.List_Eeh = A._setArrayType(makeConstList([B.Set_ot1A, B.Set_YZQG9, B.Set_wEo81, B.Set_y00Wb, B.Set_Db0y4]), A.findType("JSArray<Set<String>>"));
+    B.List_GVy = A._setArrayType(makeConstList([0, 0, 26624, 1023, 65534, 2047, 65534, 2047]), type$.JSArray_int);
+    B.List_M2I0 = A._setArrayType(makeConstList([0, 0, 32722, 12287, 65535, 34815, 65534, 18431]), type$.JSArray_int);
+    B.List_M2I = A._setArrayType(makeConstList([0, 0, 65490, 12287, 65535, 34815, 65534, 18431]), type$.JSArray_int);
+    B.List_VOY = A._setArrayType(makeConstList([0, 0, 32776, 33792, 1, 10240, 0, 0]), type$.JSArray_int);
+    B.Deprecation_gQW = new A.Deprecation("null-alpha", "1.62.3", false, "nullAlpha");
+    B.Deprecation_ErI = new A.Deprecation("calc-interp", null, false, "calcInterp");
+    B.List_Yb0 = A._setArrayType(makeConstList([B.Deprecation_gkc, B.Deprecation_EJz, B.Deprecation_uNF, B.Deprecation_IMm, B.Deprecation_2nU, B.Deprecation_iDZ, B.Deprecation_oJv, B.Deprecation_ido, B.Deprecation_2Vk, B.Deprecation_2jN, B.Deprecation_zrt, B.Deprecation_gQW, B.Deprecation_GFc, B.Deprecation_B4v, B.Deprecation_HJ0, B.Deprecation_gf0, B.Deprecation_import_null_true_import, B.Deprecation_JeE, B.Deprecation_ErI]), A.findType("JSArray<Deprecation>"));
     B.List_empty11 = A._setArrayType(makeConstList([]), type$.JSArray_Argument);
     B.List_empty22 = A._setArrayType(makeConstList([]), type$.JSArray_Argument_2);
     B.List_empty24 = A._setArrayType(makeConstList([]), type$.JSArray_AsyncCallable_2);
     B.List_empty25 = A._setArrayType(makeConstList([]), type$.JSArray_AsyncImporter);
-    B.List_empty2 = A._setArrayType(makeConstList([]), type$.JSArray_ComplexSelector);
-    B.List_empty15 = A._setArrayType(makeConstList([]), type$.JSArray_ComplexSelector_2);
-    B.List_empty0 = A._setArrayType(makeConstList([]), type$.JSArray_ComplexSelectorComponent);
-    B.List_empty13 = A._setArrayType(makeConstList([]), type$.JSArray_ComplexSelectorComponent_2);
+    B.List_empty1 = A._setArrayType(makeConstList([]), type$.JSArray_ComplexSelector);
+    B.List_empty14 = A._setArrayType(makeConstList([]), type$.JSArray_ComplexSelector_2);
+    B.List_empty2 = A._setArrayType(makeConstList([]), type$.JSArray_ComplexSelectorComponent);
+    B.List_empty15 = A._setArrayType(makeConstList([]), type$.JSArray_ComplexSelectorComponent_2);
     B.List_empty10 = A._setArrayType(makeConstList([]), type$.JSArray_ConfiguredVariable);
     B.List_empty21 = A._setArrayType(makeConstList([]), type$.JSArray_ConfiguredVariable_2);
     B.List_empty3 = A._setArrayType(makeConstList([]), type$.JSArray_CssNode);
     B.List_empty16 = A._setArrayType(makeConstList([]), type$.JSArray_CssNode_2);
-    B.List_empty1 = A._setArrayType(makeConstList([]), type$.JSArray_CssValue_Combinator);
-    B.List_empty14 = A._setArrayType(makeConstList([]), type$.JSArray_CssValue_Combinator_2);
+    B.List_empty0 = A._setArrayType(makeConstList([]), type$.JSArray_CssValue_Combinator);
+    B.List_empty13 = A._setArrayType(makeConstList([]), type$.JSArray_CssValue_Combinator_2);
     B.List_empty9 = A._setArrayType(makeConstList([]), type$.JSArray_Expression);
     B.List_empty20 = A._setArrayType(makeConstList([]), type$.JSArray_Expression_2);
     B.List_empty5 = A._setArrayType(makeConstList([]), type$.JSArray_Extension);
     B.List_empty17 = A._setArrayType(makeConstList([]), type$.JSArray_Extension_2);
-    B.List_empty23 = A._setArrayType(makeConstList([]), type$.JSArray_Importer);
+    B.List_empty23 = A._setArrayType(makeConstList([]), type$.JSArray_Importer_2);
     B.List_empty7 = A._setArrayType(makeConstList([]), A.findType("JSArray<Module0<0&>>"));
     B.List_empty18 = A._setArrayType(makeConstList([]), A.findType("JSArray<Module1<0&>>"));
     B.List_empty12 = A._setArrayType(makeConstList([]), type$.JSArray_Statement);
@@ -117046,19 +117730,17 @@ self.util = _cliPkgRequires.util;
     B.List_empty19 = A._setArrayType(makeConstList([]), type$.JSArray_Value_2);
     B.List_empty4 = A._setArrayType(makeConstList([]), type$.JSArray_int);
     B.List_empty6 = A._setArrayType(makeConstList([]), type$.JSArray_dynamic);
-    B.Object_gR2 = {em: 0, rem: 1, ex: 2, rex: 3, cap: 4, rcap: 5, ch: 6, rch: 7, ic: 8, ric: 9, lh: 10, rlh: 11, vw: 12, lvw: 13, svw: 14, dvw: 15, vh: 16, lvh: 17, svh: 18, dvh: 19, vi: 20, lvi: 21, svi: 22, dvi: 23, vb: 24, lvb: 25, svb: 26, dvb: 27, vmin: 28, lvmin: 29, svmin: 30, dvmin: 31, vmax: 32, lvmax: 33, svmax: 34, dvmax: 35, cqw: 36, cqh: 37, cqi: 38, cqb: 39, cqmin: 40, cqmax: 41, cm: 42, mm: 43, q: 44, in: 45, pt: 46, pc: 47, px: 48};
-    B.Set_UGQ3 = new A.ConstantStringSet(B.Object_gR2, 49, type$.ConstantStringSet_String);
-    B.Object_wEo = {deg: 0, grad: 1, rad: 2, turn: 3};
-    B.Set_gf1m2 = new A.ConstantStringSet(B.Object_wEo, 4, type$.ConstantStringSet_String);
-    B.Object_s_0_ms_1 = {s: 0, ms: 1};
-    B.Set_23h = new A.ConstantStringSet(B.Object_s_0_ms_1, 2, type$.ConstantStringSet_String);
-    B.Object_hz_0_khz_1 = {hz: 0, khz: 1};
-    B.Set_AKW81 = new A.ConstantStringSet(B.Object_hz_0_khz_1, 2, type$.ConstantStringSet_String);
-    B.Object_f7G = {dpi: 0, dpcm: 1, dppx: 2};
-    B.Set_wDQui = new A.ConstantStringSet(B.Object_f7G, 3, type$.ConstantStringSet_String);
-    B.List_gyp = A._setArrayType(makeConstList([B.Set_UGQ3, B.Set_gf1m2, B.Set_23h, B.Set_AKW81, B.Set_wDQui]), A.findType("JSArray<Set<String>>"));
-    B.List_oFp = A._setArrayType(makeConstList([0, 0, 65490, 45055, 65535, 34815, 65534, 18431]), type$.JSArray_int);
-    B.List_yzX = A._setArrayType(makeConstList([0, 0, 27858, 1023, 65534, 51199, 65535, 32767]), type$.JSArray_int);
+    B.List_kUZ = A._setArrayType(makeConstList([B.CalculationOperator_g2q0, B.CalculationOperator_CxF0, B.CalculationOperator_1710, B.CalculationOperator_Qf10]), A.findType("JSArray<CalculationOperator0>"));
+    B.List_oyU = A._setArrayType(makeConstList([0, 0, 27858, 1023, 65534, 51199, 65535, 32767]), type$.JSArray_int);
+    B.List_piR = A._setArrayType(makeConstList([0, 0, 24576, 1023, 65534, 34815, 65534, 18431]), type$.JSArray_int);
+    B.List_wIq = A._setArrayType(makeConstList([B.Deprecation_MMc, B.Deprecation_xw8, B.Deprecation_Iit, B.Deprecation_Ssf, B.Deprecation_W6Z, B.Deprecation_EfO, B.Deprecation_E8a, B.Deprecation_5pG, B.Deprecation_woc, B.Deprecation_oCX, B.Deprecation_iXE, B.Deprecation_omH, B.Deprecation_jYb, B.Deprecation_kmo, B.Deprecation_qBS, B.Deprecation_FGJ, B.Deprecation_qd9, B.Deprecation_oty, B.Deprecation_Agq]), A.findType("JSArray<Deprecation0>"));
+    B.Object_Jgz = {length: 0, angle: 1, time: 2, frequency: 3, "pixel density": 4};
+    B.List_Mul = A._setArrayType(makeConstList(["in", "cm", "pc", "mm", "q", "pt", "px"]), type$.JSArray_String);
+    B.List_deg_grad_rad_turn = A._setArrayType(makeConstList(["deg", "grad", "rad", "turn"]), type$.JSArray_String);
+    B.List_s_ms = A._setArrayType(makeConstList(["s", "ms"]), type$.JSArray_String);
+    B.List_Hz_kHz = A._setArrayType(makeConstList(["Hz", "kHz"]), type$.JSArray_String);
+    B.List_dpi_dpcm_dppx = A._setArrayType(makeConstList(["dpi", "dpcm", "dppx"]), type$.JSArray_String);
+    B.Map_397RH = new A.ConstantStringMap(B.Object_Jgz, [B.List_Mul, B.List_deg_grad_rad_turn, B.List_s_ms, B.List_Hz_kHz, B.List_dpi_dpcm_dppx], A.findType("ConstantStringMap<String,List<String>>"));
     B.Map_empty7 = new A.ConstantStringMap(B.Object_empty, [], A.findType("ConstantStringMap<Module0<AsyncCallable>,List<CssComment>>"));
     B.Map_empty0 = new A.ConstantStringMap(B.Object_empty, [], A.findType("ConstantStringMap<Module0<Callable0>,List<CssComment>>"));
     B.Map_empty2 = new A.ConstantStringMap(B.Object_empty, [], A.findType("ConstantStringMap<Module0<0&>,List<CssComment>>"));
@@ -117077,38 +117759,31 @@ self.util = _cliPkgRequires.util;
     B.Map_empty13 = new A.ConstantStringMap(B.Object_empty, [], A.findType("ConstantStringMap<String,Value0>"));
     B.Map_empty3 = new A.ConstantStringMap(B.Object_empty, [], A.findType("ConstantStringMap<Symbol0,@>"));
     B.Map_empty = new A.ConstantStringMap(B.Object_empty, [], A.findType("ConstantStringMap<String?,String>"));
-    B.Object_UMI = {in: 0, cm: 1, pc: 2, mm: 3, q: 4, pt: 5, px: 6, deg: 7, grad: 8, rad: 9, turn: 10, s: 11, ms: 12, Hz: 13, kHz: 14, dpi: 15, dpcm: 16, dppx: 17};
-    B.Object_MIo = {in: 0, cm: 1, pc: 2, mm: 3, q: 4, pt: 5, px: 6};
-    B.Map_scaO3 = new A.ConstantStringMap(B.Object_MIo, [1, 0.39370078740157477, 0.16666666666666666, 0.03937007874015748, 0.00984251968503937, 0.013888888888888888, 0.010416666666666666], type$.ConstantStringMap_String_double);
-    B.Map_scsoL = new A.ConstantStringMap(B.Object_MIo, [2.54, 1, 0.42333333333333334, 0.1, 0.025, 0.035277777777777776, 0.026458333333333334], type$.ConstantStringMap_String_double);
-    B.Map_sci7B = new A.ConstantStringMap(B.Object_MIo, [6, 2.3622047244094486, 1, 0.2362204724409449, 0.05905511811023623, 0.08333333333333333, 0.0625], type$.ConstantStringMap_String_double);
-    B.Map_sc8pl = new A.ConstantStringMap(B.Object_MIo, [25.4, 10, 4.233333333333333, 1, 0.25, 0.35277777777777775, 0.26458333333333334], type$.ConstantStringMap_String_double);
-    B.Map_sckr3 = new A.ConstantStringMap(B.Object_MIo, [101.6, 40, 16.933333333333334, 4, 1, 1.411111111111111, 1.0583333333333333], type$.ConstantStringMap_String_double);
-    B.Map_scaBQ = new A.ConstantStringMap(B.Object_MIo, [72, 28.346456692913385, 12, 2.834645669291339, 0.7086614173228347, 1, 0.75], type$.ConstantStringMap_String_double);
-    B.Map_scGVy = new A.ConstantStringMap(B.Object_MIo, [96, 37.79527559055118, 16, 3.7795275590551185, 0.9448818897637796, 1.3333333333333333, 1], type$.ConstantStringMap_String_double);
-    B.Map_ia0 = new A.ConstantStringMap(B.Object_wEo, [1, 0.9, 57.29577951308232, 360], type$.ConstantStringMap_String_double);
-    B.Map_iaijl = new A.ConstantStringMap(B.Object_wEo, [1.1111111111111112, 1, 63.66197723675813, 400], type$.ConstantStringMap_String_double);
-    B.Map_iaMqi = new A.ConstantStringMap(B.Object_wEo, [0.017453292519943295, 0.015707963267948967, 1, 6.283185307179586], type$.ConstantStringMap_String_double);
-    B.Map_iaJel = new A.ConstantStringMap(B.Object_wEo, [0.002777777777777778, 0.0025, 0.15915494309189535, 1], type$.ConstantStringMap_String_double);
-    B.Map_V0M2a = new A.ConstantStringMap(B.Object_s_0_ms_1, [1, 0.001], type$.ConstantStringMap_String_double);
-    B.Map_V0nPR = new A.ConstantStringMap(B.Object_s_0_ms_1, [1000, 1], type$.ConstantStringMap_String_double);
+    B.Object_AiQ = {in: 0, cm: 1, pc: 2, mm: 3, q: 4, pt: 5, px: 6, deg: 7, grad: 8, rad: 9, turn: 10, s: 11, ms: 12, Hz: 13, kHz: 14, dpi: 15, dpcm: 16, dppx: 17};
+    B.Object_Uy1 = {in: 0, cm: 1, pc: 2, mm: 3, q: 4, pt: 5, px: 6};
+    B.Map_MuACk = new A.ConstantStringMap(B.Object_Uy1, [1, 0.39370078740157477, 0.16666666666666666, 0.03937007874015748, 0.00984251968503937, 0.013888888888888888, 0.010416666666666666], type$.ConstantStringMap_String_double);
+    B.Map_MuHeh = new A.ConstantStringMap(B.Object_Uy1, [2.54, 1, 0.42333333333333334, 0.1, 0.025, 0.035277777777777776, 0.026458333333333334], type$.ConstantStringMap_String_double);
+    B.Map_Mudgs = new A.ConstantStringMap(B.Object_Uy1, [6, 2.3622047244094486, 1, 0.2362204724409449, 0.05905511811023623, 0.08333333333333333, 0.0625], type$.ConstantStringMap_String_double);
+    B.Map_Mu8oi = new A.ConstantStringMap(B.Object_Uy1, [25.4, 10, 4.233333333333333, 1, 0.25, 0.35277777777777775, 0.26458333333333334], type$.ConstantStringMap_String_double);
+    B.Map_MusBb = new A.ConstantStringMap(B.Object_Uy1, [101.6, 40, 16.933333333333334, 4, 1, 1.411111111111111, 1.0583333333333333], type$.ConstantStringMap_String_double);
+    B.Map_MuX5a = new A.ConstantStringMap(B.Object_Uy1, [72, 28.346456692913385, 12, 2.834645669291339, 0.7086614173228347, 1, 0.75], type$.ConstantStringMap_String_double);
+    B.Map_MuVWp = new A.ConstantStringMap(B.Object_Uy1, [96, 37.79527559055118, 16, 3.7795275590551185, 0.9448818897637796, 1.3333333333333333, 1], type$.ConstantStringMap_String_double);
+    B.Map_P98ha = new A.ConstantStringMap(B.Object_Yf3, [1, 0.9, 57.29577951308232, 360], type$.ConstantStringMap_String_double);
+    B.Map_P9IYz = new A.ConstantStringMap(B.Object_Yf3, [1.1111111111111112, 1, 63.66197723675813, 400], type$.ConstantStringMap_String_double);
+    B.Map_P9t42 = new A.ConstantStringMap(B.Object_Yf3, [0.017453292519943295, 0.015707963267948967, 1, 6.283185307179586], type$.ConstantStringMap_String_double);
+    B.Map_P9ZUB = new A.ConstantStringMap(B.Object_Yf3, [0.002777777777777778, 0.0025, 0.15915494309189535, 1], type$.ConstantStringMap_String_double);
+    B.Map_kUCK0 = new A.ConstantStringMap(B.Object_s_0_ms_1, [1, 0.001], type$.ConstantStringMap_String_double);
+    B.Map_kUfVB = new A.ConstantStringMap(B.Object_s_0_ms_1, [1000, 1], type$.ConstantStringMap_String_double);
     B.Object_Hz_0_kHz_1 = {Hz: 0, kHz: 1};
-    B.Map_8secN = new A.ConstantStringMap(B.Object_Hz_0_kHz_1, [1, 1000], type$.ConstantStringMap_String_double);
-    B.Map_8sxHw = new A.ConstantStringMap(B.Object_Hz_0_kHz_1, [0.001, 1], type$.ConstantStringMap_String_double);
-    B.Map_lyv9F = new A.ConstantStringMap(B.Object_f7G, [1, 2.54, 96], type$.ConstantStringMap_String_double);
-    B.Map_lyhdB = new A.ConstantStringMap(B.Object_f7G, [0.39370078740157477, 1, 37.79527559055118], type$.ConstantStringMap_String_double);
-    B.Map_lyCkv = new A.ConstantStringMap(B.Object_f7G, [0.010416666666666666, 0.026458333333333334, 1], type$.ConstantStringMap_String_double);
-    B.Map_nfuzN = new A.ConstantStringMap(B.Object_UMI, [B.Map_scaO3, B.Map_scsoL, B.Map_sci7B, B.Map_sc8pl, B.Map_sckr3, B.Map_scaBQ, B.Map_scGVy, B.Map_ia0, B.Map_iaijl, B.Map_iaMqi, B.Map_iaJel, B.Map_V0M2a, B.Map_V0nPR, B.Map_8secN, B.Map_8sxHw, B.Map_lyv9F, B.Map_lyhdB, B.Map_lyCkv], A.findType("ConstantStringMap<String,Map<String,double>>"));
-    B.Object_kaS = {length: 0, angle: 1, time: 2, frequency: 3, "pixel density": 4};
-    B.List_scn = A._setArrayType(makeConstList(["in", "cm", "pc", "mm", "q", "pt", "px"]), type$.JSArray_String);
-    B.List_deg_grad_rad_turn = A._setArrayType(makeConstList(["deg", "grad", "rad", "turn"]), type$.JSArray_String);
-    B.List_s_ms = A._setArrayType(makeConstList(["s", "ms"]), type$.JSArray_String);
-    B.List_Hz_kHz = A._setArrayType(makeConstList(["Hz", "kHz"]), type$.JSArray_String);
-    B.List_dpi_dpcm_dppx = A._setArrayType(makeConstList(["dpi", "dpcm", "dppx"]), type$.JSArray_String);
-    B.Map_ws7dy = new A.ConstantStringMap(B.Object_kaS, [B.List_scn, B.List_deg_grad_rad_turn, B.List_s_ms, B.List_Hz_kHz, B.List_dpi_dpcm_dppx], A.findType("ConstantStringMap<String,List<String>>"));
-    B.OptionType_YwU = new A.OptionType("OptionType.single");
-    B.OptionType_nMZ = new A.OptionType("OptionType.flag");
-    B.OptionType_qyr = new A.OptionType("OptionType.multiple");
+    B.Map_WfkC8 = new A.ConstantStringMap(B.Object_Hz_0_kHz_1, [1, 1000], type$.ConstantStringMap_String_double);
+    B.Map_Wfs7p = new A.ConstantStringMap(B.Object_Hz_0_kHz_1, [0.001, 1], type$.ConstantStringMap_String_double);
+    B.Map_dgy9B = new A.ConstantStringMap(B.Object_3CF, [1, 2.54, 96], type$.ConstantStringMap_String_double);
+    B.Map_dgLkt = new A.ConstantStringMap(B.Object_3CF, [0.39370078740157477, 1, 37.79527559055118], type$.ConstantStringMap_String_double);
+    B.Map_dgw3K = new A.ConstantStringMap(B.Object_3CF, [0.010416666666666666, 0.026458333333333334, 1], type$.ConstantStringMap_String_double);
+    B.Map_gQqJO = new A.ConstantStringMap(B.Object_AiQ, [B.Map_MuACk, B.Map_MuHeh, B.Map_Mudgs, B.Map_Mu8oi, B.Map_MusBb, B.Map_MuX5a, B.Map_MuVWp, B.Map_P98ha, B.Map_P9IYz, B.Map_P9t42, B.Map_P9ZUB, B.Map_kUCK0, B.Map_kUfVB, B.Map_WfkC8, B.Map_Wfs7p, B.Map_dgy9B, B.Map_dgLkt, B.Map_dgw3K], A.findType("ConstantStringMap<String,Map<String,double>>"));
+    B.OptionType_I6i = new A.OptionType("OptionType.flag");
+    B.OptionType_tew = new A.OptionType("OptionType.single");
+    B.OptionType_yPm = new A.OptionType("OptionType.multiple");
     B.OutputStyle_0 = new A.OutputStyle("expanded");
     B.OutputStyle_00 = new A.OutputStyle0("expanded");
     B.OutputStyle_1 = new A.OutputStyle("compressed");
@@ -117121,21 +117796,19 @@ self.util = _cliPkgRequires.util;
     B.SassBoolean_false0 = new A.SassBoolean0(false);
     B.SassBoolean_true = new A.SassBoolean(true);
     B.SassBoolean_true0 = new A.SassBoolean0(true);
-    B.SassList_Sof = new A.SassList(B.List_empty8, B.ListSeparator_rXA, false);
-    B.SassList_Sof0 = new A.SassList(B.List_empty8, B.ListSeparator_rXA, true);
-    B.SassList_Sof1 = new A.SassList0(B.List_empty19, B.ListSeparator_rXA0, false);
-    B.SassList_Sof2 = new A.SassList0(B.List_empty19, B.ListSeparator_rXA0, true);
-    B.SassList_nj9 = new A.SassList0(B.List_empty19, B.ListSeparator_undecided_null_undecided0, false);
+    B.SassList_bdS = new A.SassList(B.List_empty8, B.ListSeparator_ECn, false);
+    B.SassList_bdS0 = new A.SassList(B.List_empty8, B.ListSeparator_ECn, true);
+    B.SassList_bdS1 = new A.SassList0(B.List_empty19, B.ListSeparator_ECn0, false);
+    B.SassList_bdS2 = new A.SassList0(B.List_empty19, B.ListSeparator_ECn0, true);
+    B.SassList_k8F = new A.SassList0(B.List_empty19, B.ListSeparator_undecided_null_undecided0, false);
     B.Map_empty21 = new A.ConstantStringMap(B.Object_empty, [], A.findType("ConstantStringMap<Value,Value>"));
     B.SassMap_Map_empty = new A.SassMap(B.Map_empty21);
     B.Map_empty22 = new A.ConstantStringMap(B.Object_empty, [], A.findType("ConstantStringMap<Value0,Value0>"));
     B.SassMap_Map_empty0 = new A.SassMap0(B.Map_empty22);
-    B.Set_FIwG4 = new A.GeneralConstantSet([B.BinaryOperator_qN2, B.BinaryOperator_t8B, B.BinaryOperator_anB, B.BinaryOperator_olz], A.findType("GeneralConstantSet<BinaryOperator>"));
-    B.Set_FIwG40 = new A.GeneralConstantSet([B.BinaryOperator_qN20, B.BinaryOperator_t8B0, B.BinaryOperator_anB0, B.BinaryOperator_olz0], A.findType("GeneralConstantSet<BinaryOperator0>"));
-    B.Object_sd2 = {calc: 0, clamp: 1, hypot: 2, sin: 3, cos: 4, tan: 5, asin: 6, acos: 7, atan: 8, sqrt: 9, exp: 10, sign: 11, mod: 12, rem: 13, atan2: 14, pow: 15, log: 16};
-    B.Set_WfnXb = new A.ConstantStringSet(B.Object_sd2, 17, type$.ConstantStringSet_String);
-    B.Object_C0t = {is: 0, matches: 1, where: 2};
-    B.Set_aAXJu = new A.ConstantStringSet(B.Object_C0t, 3, type$.ConstantStringSet_String);
+    B.Object_oyn = {".scss": 0, ".sass": 1, ".css": 2};
+    B.Set_0 = new A.ConstantStringSet(B.Object_oyn, 3, type$.ConstantStringSet_String);
+    B.Object_6Gw = {sass: 0, style: 1, default: 2};
+    B.Set_TnQrk = new A.ConstantStringSet(B.Object_6Gw, 3, type$.ConstantStringSet_String);
     B.Set_empty1 = new A.ConstantStringSet(B.Object_empty, 0, A.findType("ConstantStringSet<CssMediaQuery>"));
     B.Set_empty5 = new A.ConstantStringSet(B.Object_empty, 0, A.findType("ConstantStringSet<CssMediaQuery0>"));
     B.Set_empty2 = new A.ConstantStringSet(B.Object_empty, 0, A.findType("ConstantStringSet<Module0<AsyncCallable>>"));
@@ -117145,13 +117818,17 @@ self.util = _cliPkgRequires.util;
     B.Set_empty7 = new A.ConstantStringSet(B.Object_empty, 0, type$.ConstantStringSet_String);
     B.Set_empty3 = new A.ConstantStringSet(B.Object_empty, 0, A.findType("ConstantStringSet<StylesheetNode>"));
     B.Set_empty = new A.ConstantStringSet(B.Object_empty, 0, A.findType("ConstantStringSet<Uri>"));
+    B.Object_q8Y = {is: 0, matches: 1, where: 2};
+    B.Set_mlzm2 = new A.ConstantStringSet(B.Object_q8Y, 3, type$.ConstantStringSet_String);
+    B.Set_mqKz = new A.GeneralConstantSet([B.BinaryOperator_2No, B.BinaryOperator_U77, B.BinaryOperator_u15, B.BinaryOperator_SjO], A.findType("GeneralConstantSet<BinaryOperator>"));
+    B.Set_mqKz0 = new A.GeneralConstantSet([B.BinaryOperator_2No0, B.BinaryOperator_U770, B.BinaryOperator_u150, B.BinaryOperator_SjO0], A.findType("GeneralConstantSet<BinaryOperator0>"));
+    B.Object_GUq = {calc: 0, clamp: 1, hypot: 2, sin: 3, cos: 4, tan: 5, asin: 6, acos: 7, atan: 8, sqrt: 9, exp: 10, sign: 11, mod: 12, rem: 13, atan2: 14, pow: 15, log: 16};
+    B.Set_yHF81 = new A.ConstantStringSet(B.Object_GUq, 17, type$.ConstantStringSet_String);
     B.StderrLogger_false = new A.StderrLogger(false);
     B.StderrLogger_false0 = new A.StderrLogger0(false);
-    B.Symbol__containingUrl = new A.Symbol("_containingUrl");
+    B.Symbol__canonicalizeContext = new A.Symbol("_canonicalizeContext");
     B.Symbol__evaluationContext = new A.Symbol("_evaluationContext");
     B.Symbol__extensions = new A.Symbol("_extensions");
-    B.Symbol__inImportRule = new A.Symbol("_inImportRule");
-    B.Symbol__none = new A.Symbol("_none");
     B.Symbol__sourceSpecificity = new A.Symbol("_sourceSpecificity");
     B.Symbol_call = new A.Symbol("call");
     B.Syntax_CSS_css = new A.Syntax("CSS", "css");
@@ -117160,24 +117837,24 @@ self.util = _cliPkgRequires.util;
     B.Syntax_SCSS_scss0 = new A.Syntax0("SCSS", "scss");
     B.Syntax_Sass_sass = new A.Syntax("Sass", "sass");
     B.Syntax_Sass_sass0 = new A.Syntax0("Sass", "sass");
-    B.Type_ByteBuffer_RkP = A.typeLiteral("ByteBuffer");
-    B.Type_ByteData_zNC = A.typeLiteral("ByteData");
-    B.Type_Float32List_LB7 = A.typeLiteral("Float32List");
-    B.Type_Float64List_LB7 = A.typeLiteral("Float64List");
-    B.Type_Int16List_uXf = A.typeLiteral("Int16List");
-    B.Type_Int32List_O50 = A.typeLiteral("Int32List");
-    B.Type_Int8List_ekJ = A.typeLiteral("Int8List");
-    B.Type_Object_xQ6 = A.typeLiteral("Object");
-    B.Type_Uint16List_2bx = A.typeLiteral("Uint16List");
-    B.Type_Uint32List_2bx = A.typeLiteral("Uint32List");
-    B.Type_Uint8ClampedList_Jik = A.typeLiteral("Uint8ClampedList");
-    B.Type_Uint8List_WLA = A.typeLiteral("Uint8List");
-    B.UnaryOperator_Ix1 = new A.UnaryOperator("divide", "/", "divide");
-    B.UnaryOperator_Ix10 = new A.UnaryOperator0("divide", "/", "divide");
-    B.UnaryOperator_TLI = new A.UnaryOperator("minus", "-", "minus");
-    B.UnaryOperator_TLI0 = new A.UnaryOperator0("minus", "-", "minus");
-    B.UnaryOperator_gg4 = new A.UnaryOperator("plus", "+", "plus");
-    B.UnaryOperator_gg40 = new A.UnaryOperator0("plus", "+", "plus");
+    B.Type_ByteBuffer_EOZ = A.typeLiteral("ByteBuffer");
+    B.Type_ByteData_mF8 = A.typeLiteral("ByteData");
+    B.Type_Float32List_Ymk = A.typeLiteral("Float32List");
+    B.Type_Float64List_Ymk = A.typeLiteral("Float64List");
+    B.Type_Int16List_cot = A.typeLiteral("Int16List");
+    B.Type_Int32List_m1p = A.typeLiteral("Int32List");
+    B.Type_Int8List_woc = A.typeLiteral("Int8List");
+    B.Type_Object_QJv = A.typeLiteral("Object");
+    B.Type_Uint16List_2mh = A.typeLiteral("Uint16List");
+    B.Type_Uint32List_2mh = A.typeLiteral("Uint32List");
+    B.Type_Uint8ClampedList_9Bb = A.typeLiteral("Uint8ClampedList");
+    B.Type_Uint8List_CSc = A.typeLiteral("Uint8List");
+    B.UnaryOperator_AiQ = new A.UnaryOperator("minus", "-", "minus");
+    B.UnaryOperator_AiQ0 = new A.UnaryOperator0("minus", "-", "minus");
+    B.UnaryOperator_SJr = new A.UnaryOperator("divide", "/", "divide");
+    B.UnaryOperator_SJr0 = new A.UnaryOperator0("divide", "/", "divide");
+    B.UnaryOperator_cLp = new A.UnaryOperator("plus", "+", "plus");
+    B.UnaryOperator_cLp0 = new A.UnaryOperator0("plus", "+", "plus");
     B.UnaryOperator_not_not_not = new A.UnaryOperator("not", "not", "not");
     B.UnaryOperator_not_not_not0 = new A.UnaryOperator0("not", "not", "not");
     B.Utf8Decoder_false = new A.Utf8Decoder(false);
@@ -117199,10 +117876,10 @@ self.util = _cliPkgRequires.util;
     B._IsInvisibleVisitor_true_false0 = new A._IsInvisibleVisitor1(true, false);
     B._IsInvisibleVisitor_true_true = new A._IsInvisibleVisitor(true, true);
     B._IsInvisibleVisitor_true_true0 = new A._IsInvisibleVisitor1(true, true);
-    B._PathDirection_8Gl = new A._PathDirection("at root");
-    B._PathDirection_988 = new A._PathDirection("below root");
-    B._PathDirection_FIw = new A._PathDirection("reaches root");
-    B._PathDirection_ZGD = new A._PathDirection("above root");
+    B._PathDirection_3KU = new A._PathDirection("above root");
+    B._PathDirection_8OV = new A._PathDirection("at root");
+    B._PathDirection_e7w = new A._PathDirection("reaches root");
+    B._PathDirection_yLX = new A._PathDirection("below root");
     B._PathRelation_different = new A._PathRelation("different");
     B._PathRelation_equal = new A._PathRelation("equal");
     B._PathRelation_inconclusive = new A._PathRelation("inconclusive");
@@ -117215,11 +117892,9 @@ self.util = _cliPkgRequires.util;
     B._StreamGroupState_dormant = new A._StreamGroupState("dormant");
     B._StreamGroupState_listening = new A._StreamGroupState("listening");
     B._StreamGroupState_paused = new A._StreamGroupState("paused");
-    B._StringStackTrace_3uE = new A._StringStackTrace("");
-    B._ZoneFunction_3bB = new A._ZoneFunction(B.C__RootZone, A.async___rootCreatePeriodicTimer$closure());
-    B._ZoneFunction_7G2 = new A._ZoneFunction(B.C__RootZone, A.async___rootRegisterBinaryCallback$closure());
-    B._ZoneFunction_Eeh = new A._ZoneFunction(B.C__RootZone, A.async___rootRegisterUnaryCallback$closure());
-    B._ZoneFunction_NMc = new A._ZoneFunction(B.C__RootZone, A.async___rootHandleUncaughtError$closure());
+    B._StringStackTrace_uwd = new A._StringStackTrace("");
+    B._ZoneFunction_NIe = new A._ZoneFunction(B.C__RootZone, A.async___rootHandleUncaughtError$closure());
+    B._ZoneFunction_QOa = new A._ZoneFunction(B.C__RootZone, A.async___rootRegisterUnaryCallback$closure());
     B._ZoneFunction__RootZone__rootCreateTimer = new A._ZoneFunction(B.C__RootZone, A.async___rootCreateTimer$closure());
     B._ZoneFunction__RootZone__rootErrorCallback = new A._ZoneFunction(B.C__RootZone, A.async___rootErrorCallback$closure());
     B._ZoneFunction__RootZone__rootFork = new A._ZoneFunction(B.C__RootZone, A.async___rootFork$closure());
@@ -117229,7 +117904,9 @@ self.util = _cliPkgRequires.util;
     B._ZoneFunction__RootZone__rootRunBinary = new A._ZoneFunction(B.C__RootZone, A.async___rootRunBinary$closure());
     B._ZoneFunction__RootZone__rootRunUnary = new A._ZoneFunction(B.C__RootZone, A.async___rootRunUnary$closure());
     B._ZoneFunction__RootZone__rootScheduleMicrotask = new A._ZoneFunction(B.C__RootZone, A.async___rootScheduleMicrotask$closure());
-    B._ZoneSpecification_ALf = new A._ZoneSpecification(null, null, null, null, null, null, null, null, null, null, null, null, null);
+    B._ZoneFunction_kWM = new A._ZoneFunction(B.C__RootZone, A.async___rootCreatePeriodicTimer$closure());
+    B._ZoneFunction_qxw = new A._ZoneFunction(B.C__RootZone, A.async___rootRegisterBinaryCallback$closure());
+    B._ZoneSpecification_48t = new A._ZoneSpecification(null, null, null, null, null, null, null, null, null, null, null, null, null);
   })();
   (function staticFields() {
     $._JS_INTEROP_INTERCEPTOR_TAG = null;
@@ -117332,13 +118009,16 @@ self.util = _cliPkgRequires.util;
       var t1 = type$.dynamic;
       return A.HashMap_HashMap(t1, t1);
     });
-    _lazyFinal($, "Utf8Decoder__decoder", "$get$Utf8Decoder__decoder", () => new A.Utf8Decoder__decoder_closure().call$0());
-    _lazyFinal($, "Utf8Decoder__decoderNonfatal", "$get$Utf8Decoder__decoderNonfatal", () => new A.Utf8Decoder__decoderNonfatal_closure().call$0());
+    _lazyFinal($, "_Utf8Decoder__reusableBuffer", "$get$_Utf8Decoder__reusableBuffer", () => A.NativeUint8List_NativeUint8List(4096));
+    _lazyFinal($, "_Utf8Decoder__decoder", "$get$_Utf8Decoder__decoder", () => new A._Utf8Decoder__decoder_closure().call$0());
+    _lazyFinal($, "_Utf8Decoder__decoderNonfatal", "$get$_Utf8Decoder__decoderNonfatal", () => new A._Utf8Decoder__decoderNonfatal_closure().call$0());
     _lazyFinal($, "_Base64Decoder__inverseAlphabet", "$get$_Base64Decoder__inverseAlphabet", () => A.NativeInt8List__create1(A._ensureNativeList(A._setArrayType([-2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -1, -2, -2, -2, -2, -2, 62, -2, 62, -2, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -2, -2, -2, -1, -2, -2, -2, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -2, -2, -2, -2, 63, -2, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -2, -2, -2, -2, -2], type$.JSArray_int))));
-    _lazyFinal($, "_Uri__isWindowsCached", "$get$_Uri__isWindowsCached", () => typeof process != "undefined" && Object.prototype.toString.call(process) == "[object process]" && process.platform == "win32");
+    _lazyFinal($, "_Uri__isWindowsCached", "$get$_Uri__isWindowsCached", () => {
+      var t1 = typeof process != "undefined" && Object.prototype.toString.call(process) == "[object process]" && process.platform == "win32";
+      return t1;
+    });
     _lazyFinal($, "_Uri__needsNoEncoding", "$get$_Uri__needsNoEncoding", () => A.RegExp_RegExp("^[\\-\\.0-9A-Z_a-z~]*$", false));
-    _lazy($, "_hasErrorStackProperty", "$get$_hasErrorStackProperty", () => new Error().stack != void 0);
-    _lazyFinal($, "_hashSeed", "$get$_hashSeed", () => A.objectHashCode(B.Type_Object_xQ6));
+    _lazyFinal($, "_hashSeed", "$get$_hashSeed", () => A.objectHashCode(B.Type_Object_QJv));
     _lazyFinal($, "_scannerTables", "$get$_scannerTables", () => A._createTables());
     _lazyFinal($, "Option__invalidChars", "$get$Option__invalidChars", () => A.RegExp_RegExp("[ \\t\\r\\n\"'\\\\/]", false));
     _lazyFinal($, "_isStrictMode", "$get$_isStrictMode", () => new A._isStrictMode_closure().call$0());
@@ -117356,15 +118036,14 @@ self.util = _cliPkgRequires.util;
     _lazyFinal($, "IfExpression_declaration", "$get$IfExpression_declaration", () => A.ArgumentDeclaration_ArgumentDeclaration$parse(string$.x40funct, null));
     _lazyFinal($, "colorsByName", "$get$colorsByName", () => A.LinkedHashMap_LinkedHashMap$_literal(["yellowgreen", A.SassColor$rgb(154, 205, 50, 1), "yellow", A.SassColor$rgb(255, 255, 0, 1), "whitesmoke", A.SassColor$rgb(245, 245, 245, 1), "white", A.SassColor$rgb(255, 255, 255, 1), "wheat", A.SassColor$rgb(245, 222, 179, 1), "violet", A.SassColor$rgb(238, 130, 238, 1), "turquoise", A.SassColor$rgb(64, 224, 208, 1), "transparent", A.SassColor$rgb(0, 0, 0, 0), "tomato", A.SassColor$rgb(255, 99, 71, 1), "thistle", A.SassColor$rgb(216, 191, 216, 1), "teal", A.SassColor$rgb(0, 128, 128, 1), "tan", A.SassColor$rgb(210, 180, 140, 1), "steelblue", A.SassColor$rgb(70, 130, 180, 1), "springgreen", A.SassColor$rgb(0, 255, 127, 1), "snow", A.SassColor$rgb(255, 250, 250, 1), "slategrey", A.SassColor$rgb(112, 128, 144, 1), "slategray", A.SassColor$rgb(112, 128, 144, 1), "slateblue", A.SassColor$rgb(106, 90, 205, 1), "skyblue", A.SassColor$rgb(135, 206, 235, 1), "silver", A.SassColor$rgb(192, 192, 192, 1), "sienna", A.SassColor$rgb(160, 82, 45, 1), "seashell", A.SassColor$rgb(255, 245, 238, 1), "seagreen", A.SassColor$rgb(46, 139, 87, 1), "sandybrown", A.SassColor$rgb(244, 164, 96, 1), "salmon", A.SassColor$rgb(250, 128, 114, 1), "saddlebrown", A.SassColor$rgb(139, 69, 19, 1), "royalblue", A.SassColor$rgb(65, 105, 225, 1), "rosybrown", A.SassColor$rgb(188, 143, 143, 1), "red", A.SassColor$rgb(255, 0, 0, 1), "rebeccapurple", A.SassColor$rgb(102, 51, 153, 1), "purple", A.SassColor$rgb(128, 0, 128, 1), "powderblue", A.SassColor$rgb(176, 224, 230, 1), "plum", A.SassColor$rgb(221, 160, 221, 1), "pink", A.SassColor$rgb(255, 192, 203, 1), "peru", A.SassColor$rgb(205, 133, 63, 1), "peachpuff", A.SassColor$rgb(255, 218, 185, 1), "papayawhip", A.SassColor$rgb(255, 239, 213, 1), "palevioletred", A.SassColor$rgb(219, 112, 147, 1), "paleturquoise", A.SassColor$rgb(175, 238, 238, 1), "palegreen", A.SassColor$rgb(152, 251, 152, 1), "palegoldenrod", A.SassColor$rgb(238, 232, 170, 1), "orchid", A.SassColor$rgb(218, 112, 214, 1), "orangered", A.SassColor$rgb(255, 69, 0, 1), "orange", A.SassColor$rgb(255, 165, 0, 1), "olivedrab", A.SassColor$rgb(107, 142, 35, 1), "olive", A.SassColor$rgb(128, 128, 0, 1), "oldlace", A.SassColor$rgb(253, 245, 230, 1), "navy", A.SassColor$rgb(0, 0, 128, 1), "navajowhite", A.SassColor$rgb(255, 222, 173, 1), "moccasin", A.SassColor$rgb(255, 228, 181, 1), "mistyrose", A.SassColor$rgb(255, 228, 225, 1), "mintcream", A.SassColor$rgb(245, 255, 250, 1), "midnightblue", A.SassColor$rgb(25, 25, 112, 1), "mediumvioletred", A.SassColor$rgb(199, 21, 133, 1), "mediumturquoise", A.SassColor$rgb(72, 209, 204, 1), "mediumspringgreen", A.SassColor$rgb(0, 250, 154, 1), "mediumslateblue", A.SassColor$rgb(123, 104, 238, 1), "mediumseagreen", A.SassColor$rgb(60, 179, 113, 1), "mediumpurple", A.SassColor$rgb(147, 112, 219, 1), "mediumorchid", A.SassColor$rgb(186, 85, 211, 1), "mediumblue", A.SassColor$rgb(0, 0, 205, 1), "mediumaquamarine", A.SassColor$rgb(102, 205, 170, 1), "maroon", A.SassColor$rgb(128, 0, 0, 1), "magenta", A.SassColor$rgb(255, 0, 255, 1), "linen", A.SassColor$rgb(250, 240, 230, 1), "limegreen", A.SassColor$rgb(50, 205, 50, 1), "lime", A.SassColor$rgb(0, 255, 0, 1), "lightyellow", A.SassColor$rgb(255, 255, 224, 1), "lightsteelblue", A.SassColor$rgb(176, 196, 222, 1), "lightslategrey", A.SassColor$rgb(119, 136, 153, 1), "lightslategray", A.SassColor$rgb(119, 136, 153, 1), "lightskyblue", A.SassColor$rgb(135, 206, 250, 1), "lightseagreen", A.SassColor$rgb(32, 178, 170, 1), "lightsalmon", A.SassColor$rgb(255, 160, 122, 1), "lightpink", A.SassColor$rgb(255, 182, 193, 1), "lightgrey", A.SassColor$rgb(211, 211, 211, 1), "lightgreen", A.SassColor$rgb(144, 238, 144, 1), "lightgray", A.SassColor$rgb(211, 211, 211, 1), "lightgoldenrodyellow", A.SassColor$rgb(250, 250, 210, 1), "lightcyan", A.SassColor$rgb(224, 255, 255, 1), "lightcoral", A.SassColor$rgb(240, 128, 128, 1), "lightblue", A.SassColor$rgb(173, 216, 230, 1), "lemonchiffon", A.SassColor$rgb(255, 250, 205, 1), "lawngreen", A.SassColor$rgb(124, 252, 0, 1), "lavenderblush", A.SassColor$rgb(255, 240, 245, 1), "lavender", A.SassColor$rgb(230, 230, 250, 1), "khaki", A.SassColor$rgb(240, 230, 140, 1), "ivory", A.SassColor$rgb(255, 255, 240, 1), "indigo", A.SassColor$rgb(75, 0, 130, 1), "indianred", A.SassColor$rgb(205, 92, 92, 1), "hotpink", A.SassColor$rgb(255, 105, 180, 1), "honeydew", A.SassColor$rgb(240, 255, 240, 1), "grey", A.SassColor$rgb(128, 128, 128, 1), "greenyellow", A.SassColor$rgb(173, 255, 47, 1), "green", A.SassColor$rgb(0, 128, 0, 1), "gray", A.SassColor$rgb(128, 128, 128, 1), "goldenrod", A.SassColor$rgb(218, 165, 32, 1), "gold", A.SassColor$rgb(255, 215, 0, 1), "ghostwhite", A.SassColor$rgb(248, 248, 255, 1), "gainsboro", A.SassColor$rgb(220, 220, 220, 1), "fuchsia", A.SassColor$rgb(255, 0, 255, 1), "forestgreen", A.SassColor$rgb(34, 139, 34, 1), "floralwhite", A.SassColor$rgb(255, 250, 240, 1), "firebrick", A.SassColor$rgb(178, 34, 34, 1), "dodgerblue", A.SassColor$rgb(30, 144, 255, 1), "dimgrey", A.SassColor$rgb(105, 105, 105, 1), "dimgray", A.SassColor$rgb(105, 105, 105, 1), "deepskyblue", A.SassColor$rgb(0, 191, 255, 1), "deeppink", A.SassColor$rgb(255, 20, 147, 1), "darkviolet", A.SassColor$rgb(148, 0, 211, 1), "darkturquoise", A.SassColor$rgb(0, 206, 209, 1), "darkslategrey", A.SassColor$rgb(47, 79, 79, 1), "darkslategray", A.SassColor$rgb(47, 79, 79, 1), "darkslateblue", A.SassColor$rgb(72, 61, 139, 1), "darkseagreen", A.SassColor$rgb(143, 188, 143, 1), "darksalmon", A.SassColor$rgb(233, 150, 122, 1), "darkred", A.SassColor$rgb(139, 0, 0, 1), "darkorchid", A.SassColor$rgb(153, 50, 204, 1), "darkorange", A.SassColor$rgb(255, 140, 0, 1), "darkolivegreen", A.SassColor$rgb(85, 107, 47, 1), "darkmagenta", A.SassColor$rgb(139, 0, 139, 1), "darkkhaki", A.SassColor$rgb(189, 183, 107, 1), "darkgrey", A.SassColor$rgb(169, 169, 169, 1), "darkgreen", A.SassColor$rgb(0, 100, 0, 1), "darkgray", A.SassColor$rgb(169, 169, 169, 1), "darkgoldenrod", A.SassColor$rgb(184, 134, 11, 1), "darkcyan", A.SassColor$rgb(0, 139, 139, 1), "darkblue", A.SassColor$rgb(0, 0, 139, 1), "cyan", A.SassColor$rgb(0, 255, 255, 1), "crimson", A.SassColor$rgb(220, 20, 60, 1), "cornsilk", A.SassColor$rgb(255, 248, 220, 1), "cornflowerblue", A.SassColor$rgb(100, 149, 237, 1), "coral", A.SassColor$rgb(255, 127, 80, 1), "chocolate", A.SassColor$rgb(210, 105, 30, 1), "chartreuse", A.SassColor$rgb(127, 255, 0, 1), "cadetblue", A.SassColor$rgb(95, 158, 160, 1), "burlywood", A.SassColor$rgb(222, 184, 135, 1), "brown", A.SassColor$rgb(165, 42, 42, 1), "blueviolet", A.SassColor$rgb(138, 43, 226, 1), "blue", A.SassColor$rgb(0, 0, 255, 1), "blanchedalmond", A.SassColor$rgb(255, 235, 205, 1), "black", A.SassColor$rgb(0, 0, 0, 1), "bisque", A.SassColor$rgb(255, 228, 196, 1), "beige", A.SassColor$rgb(245, 245, 220, 1), "azure", A.SassColor$rgb(240, 255, 255, 1), "aquamarine", A.SassColor$rgb(127, 255, 212, 1), "aqua", A.SassColor$rgb(0, 255, 255, 1), "antiquewhite", A.SassColor$rgb(250, 235, 215, 1), "aliceblue", A.SassColor$rgb(240, 248, 255, 1)], type$.String, type$.SassColor));
     _lazyFinal($, "namesByColor", "$get$namesByColor", () => {
-      var $name, color,
+      var $name,
         t1 = type$.SassColor,
         t2 = type$.String,
         t3 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t2);
       for (t1 = A.MapExtensions_get_pairs($.$get$colorsByName(), t2, t1), t1 = t1.get$iterator(t1); t1.moveNext$0();) {
         t2 = t1.get$current(t1);
         $name = t2._0;
-        color = t2._1;
-        t3.$indexSet(0, color, $name);
+        t3.$indexSet(0, t2._1, $name);
       }
       return t3;
     });
@@ -117492,6 +118171,11 @@ self.util = _cliPkgRequires.util;
     _lazyFinal($, "_toUpperCase", "$get$_toUpperCase", () => A._function("to-upper-case", "$string", new A._toUpperCase_closure()));
     _lazyFinal($, "_toLowerCase", "$get$_toLowerCase", () => A._function("to-lower-case", "$string", new A._toLowerCase_closure()));
     _lazyFinal($, "_uniqueId", "$get$_uniqueId", () => A._function("unique-id", "", new A._uniqueId_closure()));
+    _lazyFinal($, "FilesystemImporter_cwd", "$get$FilesystemImporter_cwd", () => {
+      var _null = null;
+      return new A.FilesystemImporter(A.absolute(".", _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null), true);
+    });
+    _lazyFinal($, "FilesystemImporter_noLoadPath", "$get$FilesystemImporter_noLoadPath", () => new A.FilesystemImporter(null, false));
     _lazyFinal($, "_jsThrow", "$get$_jsThrow0", () => new self.Function("error", "throw error;"));
     _lazyFinal($, "Logger_quiet", "$get$Logger_quiet", () => new A._QuietLogger());
     _lazyFinal($, "_disallowedFunctionNames", "$get$_disallowedFunctionNames", () => {
@@ -117519,14 +118203,13 @@ self.util = _cliPkgRequires.util;
     _lazyFinal($, "_noSourceUrl", "$get$_noSourceUrl", () => A.Uri_parse("-"));
     _lazyFinal($, "_traces", "$get$_traces", () => A.Expando$());
     _lazyFinal($, "_typesByUnit", "$get$_typesByUnit", () => {
-      var t3, type, units,
+      var t3, type,
         t1 = type$.String,
         t2 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1);
-      for (t1 = A.MapExtensions_get_pairs(B.Map_ws7dy, t1, type$.List_String), t1 = t1.get$iterator(t1); t1.moveNext$0();) {
+      for (t1 = A.MapExtensions_get_pairs(B.Map_397RH, t1, type$.List_String), t1 = t1.get$iterator(t1); t1.moveNext$0();) {
         t3 = t1.get$current(t1);
         type = t3._0;
-        units = t3._1;
-        for (t3 = J.get$iterator$ax(units); t3.moveNext$0();)
+        for (t3 = J.get$iterator$ax(t3._1); t3.moveNext$0();)
           t2.$indexSet(0, t3.get$current(t3), type);
       }
       return t2;
@@ -117535,9 +118218,9 @@ self.util = _cliPkgRequires.util;
       var _i, set, t2,
         t1 = A.LinkedHashMap_LinkedHashMap$_empty(type$.String, A.findType("Set<String>"));
       for (_i = 0; _i < 5; ++_i) {
-        set = B.List_gyp[_i];
+        set = B.List_Eeh[_i];
         for (t2 = set.get$iterator(set); t2.moveNext$0();)
-          t1.$indexSet(0, t2.get$current(t2), set);
+          t1.$indexSet(0, t2.get$current(0), set);
       }
       return t1;
     });
@@ -117565,7 +118248,6 @@ self.util = _cliPkgRequires.util;
     _lazyFinal($, "vmChainGap", "$get$vmChainGap", () => A.RegExp_RegExp("^<asynchronous suspension>\\n?$", true));
     _lazyFinal($, "_newlineRegExp", "$get$_newlineRegExp", () => A.RegExp_RegExp("\\r\\n?|\\n", false));
     _lazyFinal($, "argumentListClass", "$get$argumentListClass", () => new A.argumentListClass_closure().call$0());
-    _lazyFinal($, "_filesystemImporter", "$get$_filesystemImporter", () => A.FilesystemImporter$("."));
     _lazyFinal($, "booleanClass", "$get$booleanClass", () => new A.booleanClass_closure().call$0());
     _lazyFinal($, "legacyBooleanClass", "$get$legacyBooleanClass", () => new A.legacyBooleanClass_closure().call$0());
     _lazyFinal($, "calculationClass", "$get$calculationClass", () => new A.calculationClass_closure().call$0());
@@ -117611,18 +118293,20 @@ self.util = _cliPkgRequires.util;
     });
     _lazyFinal($, "colorsByName0", "$get$colorsByName0", () => A.LinkedHashMap_LinkedHashMap$_literal(["yellowgreen", A.SassColor$rgb0(154, 205, 50, 1), "yellow", A.SassColor$rgb0(255, 255, 0, 1), "whitesmoke", A.SassColor$rgb0(245, 245, 245, 1), "white", A.SassColor$rgb0(255, 255, 255, 1), "wheat", A.SassColor$rgb0(245, 222, 179, 1), "violet", A.SassColor$rgb0(238, 130, 238, 1), "turquoise", A.SassColor$rgb0(64, 224, 208, 1), "transparent", A.SassColor$rgb0(0, 0, 0, 0), "tomato", A.SassColor$rgb0(255, 99, 71, 1), "thistle", A.SassColor$rgb0(216, 191, 216, 1), "teal", A.SassColor$rgb0(0, 128, 128, 1), "tan", A.SassColor$rgb0(210, 180, 140, 1), "steelblue", A.SassColor$rgb0(70, 130, 180, 1), "springgreen", A.SassColor$rgb0(0, 255, 127, 1), "snow", A.SassColor$rgb0(255, 250, 250, 1), "slategrey", A.SassColor$rgb0(112, 128, 144, 1), "slategray", A.SassColor$rgb0(112, 128, 144, 1), "slateblue", A.SassColor$rgb0(106, 90, 205, 1), "skyblue", A.SassColor$rgb0(135, 206, 235, 1), "silver", A.SassColor$rgb0(192, 192, 192, 1), "sienna", A.SassColor$rgb0(160, 82, 45, 1), "seashell", A.SassColor$rgb0(255, 245, 238, 1), "seagreen", A.SassColor$rgb0(46, 139, 87, 1), "sandybrown", A.SassColor$rgb0(244, 164, 96, 1), "salmon", A.SassColor$rgb0(250, 128, 114, 1), "saddlebrown", A.SassColor$rgb0(139, 69, 19, 1), "royalblue", A.SassColor$rgb0(65, 105, 225, 1), "rosybrown", A.SassColor$rgb0(188, 143, 143, 1), "red", A.SassColor$rgb0(255, 0, 0, 1), "rebeccapurple", A.SassColor$rgb0(102, 51, 153, 1), "purple", A.SassColor$rgb0(128, 0, 128, 1), "powderblue", A.SassColor$rgb0(176, 224, 230, 1), "plum", A.SassColor$rgb0(221, 160, 221, 1), "pink", A.SassColor$rgb0(255, 192, 203, 1), "peru", A.SassColor$rgb0(205, 133, 63, 1), "peachpuff", A.SassColor$rgb0(255, 218, 185, 1), "papayawhip", A.SassColor$rgb0(255, 239, 213, 1), "palevioletred", A.SassColor$rgb0(219, 112, 147, 1), "paleturquoise", A.SassColor$rgb0(175, 238, 238, 1), "palegreen", A.SassColor$rgb0(152, 251, 152, 1), "palegoldenrod", A.SassColor$rgb0(238, 232, 170, 1), "orchid", A.SassColor$rgb0(218, 112, 214, 1), "orangered", A.SassColor$rgb0(255, 69, 0, 1), "orange", A.SassColor$rgb0(255, 165, 0, 1), "olivedrab", A.SassColor$rgb0(107, 142, 35, 1), "olive", A.SassColor$rgb0(128, 128, 0, 1), "oldlace", A.SassColor$rgb0(253, 245, 230, 1), "navy", A.SassColor$rgb0(0, 0, 128, 1), "navajowhite", A.SassColor$rgb0(255, 222, 173, 1), "moccasin", A.SassColor$rgb0(255, 228, 181, 1), "mistyrose", A.SassColor$rgb0(255, 228, 225, 1), "mintcream", A.SassColor$rgb0(245, 255, 250, 1), "midnightblue", A.SassColor$rgb0(25, 25, 112, 1), "mediumvioletred", A.SassColor$rgb0(199, 21, 133, 1), "mediumturquoise", A.SassColor$rgb0(72, 209, 204, 1), "mediumspringgreen", A.SassColor$rgb0(0, 250, 154, 1), "mediumslateblue", A.SassColor$rgb0(123, 104, 238, 1), "mediumseagreen", A.SassColor$rgb0(60, 179, 113, 1), "mediumpurple", A.SassColor$rgb0(147, 112, 219, 1), "mediumorchid", A.SassColor$rgb0(186, 85, 211, 1), "mediumblue", A.SassColor$rgb0(0, 0, 205, 1), "mediumaquamarine", A.SassColor$rgb0(102, 205, 170, 1), "maroon", A.SassColor$rgb0(128, 0, 0, 1), "magenta", A.SassColor$rgb0(255, 0, 255, 1), "linen", A.SassColor$rgb0(250, 240, 230, 1), "limegreen", A.SassColor$rgb0(50, 205, 50, 1), "lime", A.SassColor$rgb0(0, 255, 0, 1), "lightyellow", A.SassColor$rgb0(255, 255, 224, 1), "lightsteelblue", A.SassColor$rgb0(176, 196, 222, 1), "lightslategrey", A.SassColor$rgb0(119, 136, 153, 1), "lightslategray", A.SassColor$rgb0(119, 136, 153, 1), "lightskyblue", A.SassColor$rgb0(135, 206, 250, 1), "lightseagreen", A.SassColor$rgb0(32, 178, 170, 1), "lightsalmon", A.SassColor$rgb0(255, 160, 122, 1), "lightpink", A.SassColor$rgb0(255, 182, 193, 1), "lightgrey", A.SassColor$rgb0(211, 211, 211, 1), "lightgreen", A.SassColor$rgb0(144, 238, 144, 1), "lightgray", A.SassColor$rgb0(211, 211, 211, 1), "lightgoldenrodyellow", A.SassColor$rgb0(250, 250, 210, 1), "lightcyan", A.SassColor$rgb0(224, 255, 255, 1), "lightcoral", A.SassColor$rgb0(240, 128, 128, 1), "lightblue", A.SassColor$rgb0(173, 216, 230, 1), "lemonchiffon", A.SassColor$rgb0(255, 250, 205, 1), "lawngreen", A.SassColor$rgb0(124, 252, 0, 1), "lavenderblush", A.SassColor$rgb0(255, 240, 245, 1), "lavender", A.SassColor$rgb0(230, 230, 250, 1), "khaki", A.SassColor$rgb0(240, 230, 140, 1), "ivory", A.SassColor$rgb0(255, 255, 240, 1), "indigo", A.SassColor$rgb0(75, 0, 130, 1), "indianred", A.SassColor$rgb0(205, 92, 92, 1), "hotpink", A.SassColor$rgb0(255, 105, 180, 1), "honeydew", A.SassColor$rgb0(240, 255, 240, 1), "grey", A.SassColor$rgb0(128, 128, 128, 1), "greenyellow", A.SassColor$rgb0(173, 255, 47, 1), "green", A.SassColor$rgb0(0, 128, 0, 1), "gray", A.SassColor$rgb0(128, 128, 128, 1), "goldenrod", A.SassColor$rgb0(218, 165, 32, 1), "gold", A.SassColor$rgb0(255, 215, 0, 1), "ghostwhite", A.SassColor$rgb0(248, 248, 255, 1), "gainsboro", A.SassColor$rgb0(220, 220, 220, 1), "fuchsia", A.SassColor$rgb0(255, 0, 255, 1), "forestgreen", A.SassColor$rgb0(34, 139, 34, 1), "floralwhite", A.SassColor$rgb0(255, 250, 240, 1), "firebrick", A.SassColor$rgb0(178, 34, 34, 1), "dodgerblue", A.SassColor$rgb0(30, 144, 255, 1), "dimgrey", A.SassColor$rgb0(105, 105, 105, 1), "dimgray", A.SassColor$rgb0(105, 105, 105, 1), "deepskyblue", A.SassColor$rgb0(0, 191, 255, 1), "deeppink", A.SassColor$rgb0(255, 20, 147, 1), "darkviolet", A.SassColor$rgb0(148, 0, 211, 1), "darkturquoise", A.SassColor$rgb0(0, 206, 209, 1), "darkslategrey", A.SassColor$rgb0(47, 79, 79, 1), "darkslategray", A.SassColor$rgb0(47, 79, 79, 1), "darkslateblue", A.SassColor$rgb0(72, 61, 139, 1), "darkseagreen", A.SassColor$rgb0(143, 188, 143, 1), "darksalmon", A.SassColor$rgb0(233, 150, 122, 1), "darkred", A.SassColor$rgb0(139, 0, 0, 1), "darkorchid", A.SassColor$rgb0(153, 50, 204, 1), "darkorange", A.SassColor$rgb0(255, 140, 0, 1), "darkolivegreen", A.SassColor$rgb0(85, 107, 47, 1), "darkmagenta", A.SassColor$rgb0(139, 0, 139, 1), "darkkhaki", A.SassColor$rgb0(189, 183, 107, 1), "darkgrey", A.SassColor$rgb0(169, 169, 169, 1), "darkgreen", A.SassColor$rgb0(0, 100, 0, 1), "darkgray", A.SassColor$rgb0(169, 169, 169, 1), "darkgoldenrod", A.SassColor$rgb0(184, 134, 11, 1), "darkcyan", A.SassColor$rgb0(0, 139, 139, 1), "darkblue", A.SassColor$rgb0(0, 0, 139, 1), "cyan", A.SassColor$rgb0(0, 255, 255, 1), "crimson", A.SassColor$rgb0(220, 20, 60, 1), "cornsilk", A.SassColor$rgb0(255, 248, 220, 1), "cornflowerblue", A.SassColor$rgb0(100, 149, 237, 1), "coral", A.SassColor$rgb0(255, 127, 80, 1), "chocolate", A.SassColor$rgb0(210, 105, 30, 1), "chartreuse", A.SassColor$rgb0(127, 255, 0, 1), "cadetblue", A.SassColor$rgb0(95, 158, 160, 1), "burlywood", A.SassColor$rgb0(222, 184, 135, 1), "brown", A.SassColor$rgb0(165, 42, 42, 1), "blueviolet", A.SassColor$rgb0(138, 43, 226, 1), "blue", A.SassColor$rgb0(0, 0, 255, 1), "blanchedalmond", A.SassColor$rgb0(255, 235, 205, 1), "black", A.SassColor$rgb0(0, 0, 0, 1), "bisque", A.SassColor$rgb0(255, 228, 196, 1), "beige", A.SassColor$rgb0(245, 245, 220, 1), "azure", A.SassColor$rgb0(240, 255, 255, 1), "aquamarine", A.SassColor$rgb0(127, 255, 212, 1), "aqua", A.SassColor$rgb0(0, 255, 255, 1), "antiquewhite", A.SassColor$rgb0(250, 235, 215, 1), "aliceblue", A.SassColor$rgb0(240, 248, 255, 1)], type$.String, type$.SassColor_2));
     _lazyFinal($, "namesByColor0", "$get$namesByColor0", () => {
-      var $name, color,
+      var $name,
         t1 = type$.SassColor_2,
         t2 = type$.String,
         t3 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t2);
       for (t1 = A.MapExtensions_get_pairs0($.$get$colorsByName0(), t2, t1), t1 = t1.get$iterator(t1); t1.moveNext$0();) {
         t2 = t1.get$current(t1);
         $name = t2._0;
-        color = t2._1;
-        t3.$indexSet(0, color, $name);
+        t3.$indexSet(0, t2._1, $name);
       }
       return t3;
     });
+    _lazyFinal($, "nodePackageImporterClass", "$get$nodePackageImporterClass", () => new A.nodePackageImporterClass_closure().call$0());
+    _lazyFinal($, "compilerClass", "$get$compilerClass", () => new A.compilerClass_closure().call$0());
+    _lazyFinal($, "asyncCompilerClass", "$get$asyncCompilerClass", () => new A.asyncCompilerClass_closure().call$0());
     _lazyFinal($, "_disallowedFunctionNames0", "$get$_disallowedFunctionNames0", () => {
       var t1 = $.$get$globalFunctions0();
       t1 = t1.map$1$1(t1, new A._disallowedFunctionNames_closure0(), type$.String).toSet$0(0);
@@ -117642,8 +118326,24 @@ self.util = _cliPkgRequires.util;
       t1.remove$1(0, "abs");
       return t1;
     });
+    _lazyFinal($, "deprecations", "$get$deprecations", () => {
+      var _i, deprecation, t2,
+        t1 = A.LinkedHashMap_LinkedHashMap$_empty(type$.String, A.findType("Deprecation1?"));
+      for (_i = 0; _i < 19; ++_i) {
+        deprecation = B.List_wIq[_i];
+        if (deprecation !== B.Deprecation_Agq) {
+          t2 = deprecation.id;
+          t1.$indexSet(0, t2, {id: t2, status: new A.deprecations_closure(deprecation).call$0(), description: deprecation.description, deprecatedIn: deprecation.get$deprecatedIn(0), obsoleteIn: deprecation.get$deprecatedIn(0)});
+        }
+      }
+      return t1;
+    });
+    _lazyFinal($, "versionClass", "$get$versionClass", () => new A.versionClass_closure().call$0());
     _lazyFinal($, "exceptionClass", "$get$exceptionClass", () => new A.exceptionClass_closure().call$0());
-    _lazyFinal($, "_filesystemImporter0", "$get$_filesystemImporter0", () => A.FilesystemImporter$("."));
+    _lazyFinal($, "FilesystemImporter_cwd0", "$get$FilesystemImporter_cwd0", () => {
+      var _null = null;
+      return new A.FilesystemImporter0(A.absolute(".", _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null), true);
+    });
     _lazyFinal($, "functionClass", "$get$functionClass", () => new A.functionClass_closure().call$0());
     _lazyFinal($, "globalFunctions0", "$get$globalFunctions0", () => {
       var t1 = type$.BuiltInCallable_2,
@@ -117737,14 +118437,13 @@ self.util = _cliPkgRequires.util;
       return t1;
     });
     _lazyFinal($, "_typesByUnit0", "$get$_typesByUnit0", () => {
-      var t3, type, units,
+      var t3, type,
         t1 = type$.String,
         t2 = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1);
-      for (t1 = A.MapExtensions_get_pairs0(B.Map_ws7dy, t1, type$.List_String), t1 = t1.get$iterator(t1); t1.moveNext$0();) {
+      for (t1 = A.MapExtensions_get_pairs0(B.Map_397RH, t1, type$.List_String), t1 = t1.get$iterator(t1); t1.moveNext$0();) {
         t3 = t1.get$current(t1);
         type = t3._0;
-        units = t3._1;
-        for (t3 = J.get$iterator$ax(units); t3.moveNext$0();)
+        for (t3 = J.get$iterator$ax(t3._1); t3.moveNext$0();)
           t2.$indexSet(0, t3.get$current(t3), type);
       }
       return t2;
@@ -117763,9 +118462,9 @@ self.util = _cliPkgRequires.util;
       var _i, set, t2,
         t1 = A.LinkedHashMap_LinkedHashMap$_empty(type$.String, A.findType("Set<String>"));
       for (_i = 0; _i < 5; ++_i) {
-        set = B.List_gyp[_i];
+        set = B.List_Eeh[_i];
         for (t2 = set.get$iterator(set); t2.moveNext$0();)
-          t1.$indexSet(0, t2.get$current(t2), set);
+          t1.$indexSet(0, t2.get$current(0), set);
       }
       return t1;
     });
@@ -117892,19 +118591,22 @@ self.util = _cliPkgRequires.util;
     }
     var scripts = document.scripts;
     function onLoad(event) {
-      for (var i = 0; i < scripts.length; ++i)
+      for (var i = 0; i < scripts.length; ++i) {
         scripts[i].removeEventListener("load", onLoad, false);
+      }
       callback(event.target);
     }
-    for (var i = 0; i < scripts.length; ++i)
+    for (var i = 0; i < scripts.length; ++i) {
       scripts[i].addEventListener("load", onLoad, false);
+    }
   })(function(currentScript) {
     init.currentScript = currentScript;
     var callMain = A.main2;
-    if (typeof dartMainRunner === "function")
+    if (typeof dartMainRunner === "function") {
       dartMainRunner(callMain, []);
-    else
+    } else {
       callMain([]);
+    }
   });
 })();
 }
diff --git a/node_modules/sass/sass.default.js b/node_modules/sass/sass.default.js
index fffaeb9..77acae0 100644
--- a/node_modules/sass/sass.default.js
+++ b/node_modules/sass/sass.default.js
@@ -10,6 +10,10 @@ export const compile = _cliPkgExports.compile;
 export const compileAsync = _cliPkgExports.compileAsync;
 export const compileString = _cliPkgExports.compileString;
 export const compileStringAsync = _cliPkgExports.compileStringAsync;
+export const initCompiler = _cliPkgExports.initCompiler;
+export const initAsyncCompiler = _cliPkgExports.initAsyncCompiler;
+export const Compiler = _cliPkgExports.Compiler;
+export const AsyncCompiler = _cliPkgExports.AsyncCompiler;
 export const Logger = _cliPkgExports.Logger;
 export const SassArgumentList = _cliPkgExports.SassArgumentList;
 export const SassBoolean = _cliPkgExports.SassBoolean;
@@ -38,3 +42,6 @@ export const TRUE = _cliPkgExports.TRUE;
 export const FALSE = _cliPkgExports.FALSE;
 export const NULL = _cliPkgExports.NULL;
 export const types = _cliPkgExports.types;
+export const NodePackageImporter = _cliPkgExports.NodePackageImporter;
+export const deprecations = _cliPkgExports.deprecations;
+export const Version = _cliPkgExports.Version;
diff --git a/node_modules/sass/sass.js b/node_modules/sass/sass.js
index 3e731dd..992dbb5 100644
--- a/node_modules/sass/sass.js
+++ b/node_modules/sass/sass.js
@@ -9,6 +9,7 @@ library.load({
   chokidar: require("chokidar"),
   util: require("util"),
   stream: require("stream"),
+  nodeModule: require("module"),
   fs: require("fs"),
   immutable: require("immutable"),
 });
diff --git a/node_modules/sass/sass.node.js b/node_modules/sass/sass.node.js
index 8c22c7c..204ae2c 100644
--- a/node_modules/sass/sass.node.js
+++ b/node_modules/sass/sass.node.js
@@ -4,6 +4,7 @@ if (globalThis._cliPkgExports.length === 0) delete globalThis._cliPkgExports;
 library.load({
   util: require("util"),
   stream: require("stream"),
+  nodeModule: require("module"),
   fs: require("fs"),
   immutable: require("immutable"),
 });
diff --git a/node_modules/sass/sass.node.mjs b/node_modules/sass/sass.node.mjs
index 3e5a3d5..f59a3d8 100644
--- a/node_modules/sass/sass.node.mjs
+++ b/node_modules/sass/sass.node.mjs
@@ -4,6 +4,10 @@ export const compile = cjs.compile;
 export const compileAsync = cjs.compileAsync;
 export const compileString = cjs.compileString;
 export const compileStringAsync = cjs.compileStringAsync;
+export const initCompiler = cjs.initCompiler;
+export const initAsyncCompiler = cjs.initAsyncCompiler;
+export const Compiler = cjs.Compiler;
+export const AsyncCompiler = cjs.AsyncCompiler;
 export const Logger = cjs.Logger;
 export const SassArgumentList = cjs.SassArgumentList;
 export const SassBoolean = cjs.SassBoolean;
@@ -32,6 +36,9 @@ export const TRUE = cjs.TRUE;
 export const FALSE = cjs.FALSE;
 export const NULL = cjs.NULL;
 export const types = cjs.types;
+export const NodePackageImporter = cjs.NodePackageImporter;
+export const deprecations = cjs.deprecations;
+export const Version = cjs.Version;
 
 let printedDefaultExportDeprecation = false;
 function defaultExportDeprecation() {
@@ -59,6 +66,22 @@ export default {
     defaultExportDeprecation();
     return cjs.compileStringAsync;
   },
+  get initCompiler() {
+    defaultExportDeprecation();
+    return cjs.initCompiler;
+  },
+  get initAsyncCompiler() {
+    defaultExportDeprecation();
+    return cjs.initAsyncCompiler;
+  },
+  get Compiler() {
+    defaultExportDeprecation();
+    return cjs.Compiler;
+  },
+  get AsyncCompiler() {
+    defaultExportDeprecation();
+    return cjs.AsyncCompiler;
+  },
   get Logger() {
     defaultExportDeprecation();
     return cjs.Logger;
@@ -171,4 +194,16 @@ export default {
     defaultExportDeprecation();
     return cjs.types;
   },
+  get NodePackageImporter() {
+    defaultExportDeprecation();
+    return cjs.NodePackageImporter;
+  },
+  get deprecations() {
+    defaultExportDeprecation();
+    return cjs.deprecations;
+  },
+  get Version() {
+    defaultExportDeprecation();
+    return cjs.Version;
+  },
 };
diff --git a/node_modules/sass/types/compile.d.ts b/node_modules/sass/types/compile.d.ts
index e8a8ce6..872754c 100644
--- a/node_modules/sass/types/compile.d.ts
+++ b/node_modules/sass/types/compile.d.ts
@@ -37,6 +37,104 @@ export interface CompileResult {
   sourceMap?: RawSourceMap;
 }
 
+/**
+ * The result of creating a synchronous compiler. Returned by
+ * {@link initCompiler}.
+ *
+ * @category Compile
+ */
+export class Compiler {
+  /**
+   * Throws an error if constructed directly, instead of via
+   * {@link initCompiler}.
+   */
+  private constructor();
+
+  /**
+   * The {@link compile} method exposed through a Compiler instance while it is
+   * active. If this is called after {@link dispose} on the Compiler
+   * instance, an error will be thrown.
+   *
+   * During the Compiler instance's lifespan, given the same input, this will
+   * return an identical result to the {@link compile} method exposed at the
+   * module root.
+   */
+  compile(path: string, options?: Options<'sync'>): CompileResult;
+
+  /**
+   * The {@link compileString} method exposed through a Compiler instance while
+   * it is active. If this is called after {@link dispose} on the Compiler
+   * instance, an error will be thrown.
+   *
+   * During the Compiler instance's lifespan, given the same input, this will
+   * return an identical result to the {@link compileString} method exposed at
+   * the module root.
+   */
+  compileString(source: string, options?: StringOptions<'sync'>): CompileResult;
+
+  /**
+   * Ends the lifespan of this Compiler instance. After this is invoked, all
+   * calls to the Compiler instance's {@link compile} or {@link compileString}
+   * methods will result in an error.
+   */
+  dispose(): void;
+}
+
+/**
+ * The result of creating an asynchronous compiler. Returned by
+ * {@link initAsyncCompiler}.
+ *
+ * @category Compile
+ */
+export class AsyncCompiler {
+  /**
+   * Throws an error if constructed directly, instead of via
+   * {@link initAsyncCompiler}.
+   */
+  private constructor();
+
+  /**
+   * The {@link compileAsync} method exposed through an Async Compiler instance
+   * while it is active. If this is called after {@link dispose} on the Async
+   * Compiler instance, an error will be thrown.
+   *
+   * During the Async Compiler instance's lifespan, given the same input, this
+   * will return an identical result to the {@link compileAsync} method exposed
+   * at the module root.
+   */
+  compileAsync(
+    path: string,
+    options?: Options<'async'>
+  ): Promise<CompileResult>;
+
+  /**
+   * The {@link compileStringAsync} method exposed through an Async Compiler
+   * instance while it is active. If this is called after {@link dispose} on the
+   * Async Compiler instance, an error will be thrown.
+   *
+   * During the Async Compiler instance's lifespan, given the same input, this
+   * will return an identical result to the {@link compileStringAsync} method
+   * exposed at the module root.
+   */
+  compileStringAsync(
+    source: string,
+    options?: StringOptions<'async'>
+  ): Promise<CompileResult>;
+
+  /**
+   * Ends the lifespan of this Async Compiler instance. After this is invoked,
+   * all subsequent calls to the Compiler instance's `compileAsync` or
+   * `compileStringAsync` methods will result in an error.
+   *
+   * Any compilations that are submitted before `dispose` will not be cancelled,
+   * and will be allowed to settle.
+   *
+   * After all compilations have been settled and Sass completes any internal
+   * task cleanup, `dispose` will resolve its promise.
+   */
+  dispose(): Promise<void>;
+}
+
 /**
  * Synchronously compiles the Sass file at `path` to CSS. If it succeeds it
  * returns a {@link CompileResult}, and if it fails it throws an {@link
@@ -44,10 +142,16 @@ export interface CompileResult {
  *
  * This only allows synchronous {@link Importer}s and {@link CustomFunction}s.
  *
- * **Heads up!** When using the `sass-embedded` npm package,
- * **{@link compileAsync} is almost always faster than {@link compile}**, due to
- * the overhead of emulating synchronous messaging with worker threads and
- * concurrent compilations being blocked on main thread.
+ * **Heads up!** When using the [sass-embedded] npm package for single
+ * compilations, **{@link compileAsync} is almost always faster than
+ * {@link compile}**, due to the overhead of emulating synchronous messaging
+ * with worker threads and concurrent compilations being blocked on main thread.
+ *
+ * If you are running multiple compilations with the [sass-embedded] npm
+ * package, using a {@link Compiler} will provide some speed improvements over
+ * the module-level methods, and an {@link AsyncCompiler} will be much faster.
+ *
+ * [sass-embedded]: https://www.npmjs.com/package/sass-embedded
  *
  * @example
  *
@@ -99,12 +203,18 @@ export function compileAsync(
  *
  * This only allows synchronous {@link Importer}s and {@link CustomFunction}s.
  *
- * **Heads up!** When using the `sass-embedded` npm package,
- * **{@link compileStringAsync} is almost always faster than
+ * **Heads up!** When using the [sass-embedded] npm package for single
+ * compilations, **{@link compileStringAsync} is almost always faster than
  * {@link compileString}**, due to the overhead of emulating synchronous
  * messaging with worker threads and concurrent compilations being blocked on
  * main thread.
  *
+ * If you are running multiple compilations with the [sass-embedded] npm
+ * package, using a {@link Compiler} will provide some speed improvements over
+ * the module-level methods, and an {@link AsyncCompiler} will be much faster.
+ *
+ * [sass-embedded]: https://www.npmjs.com/package/sass-embedded
+ *
  * @example
  *
  * ```js
@@ -162,3 +272,71 @@ export function compileStringAsync(
   source: string,
   options?: StringOptions<'async'>
 ): Promise<CompileResult>;
+
+/**
+ * Creates a synchronous {@link Compiler}. Each compiler instance exposes the
+ * {@link compile} and {@link compileString} methods within the lifespan of the
+ * Compiler. Given identical input, these methods will return results identical
+ * to their counterparts exposed at the module root. To use asynchronous
+ * compilation, use {@link initAsyncCompiler}.
+ *
+ * When calling the compile functions multiple times, using a compiler instance
+ * with the [sass-embedded] npm package is much faster than using the top-level
+ * compilation methods or the [sass] npm package.
+ *
+ * [sass-embedded]: https://www.npmjs.com/package/sass-embedded
+ *
+ * [sass]: https://www.npmjs.com/package/sass
+ *
+ * @example
+ *
+ * ```js
+ * const sass = require('sass');
+ * function setup() {
+ *   const compiler = sass.initCompiler();
+ *   const result1 = compiler.compileString('a {b: c}').css;
+ *   const result2 = compiler.compileString('a {b: c}').css;
+ *   compiler.dispose();
+ *
+ *   // throws error
+ *   const result3 = sass.compileString('a {b: c}').css;
+ * }
+ * ```
+ * @category Compile
+ * @compatibility dart: "1.70.0", node: false
+ */
+export function initCompiler(): Compiler;
+
+/**
+ * Creates an asynchronous {@link AsyncCompiler}. Each compiler
+ * instance exposes the {@link compileAsync} and {@link compileStringAsync}
+ * methods within the lifespan of the Compiler. Given identical input, these
+ * methods will return results identical to their counterparts exposed at the
+ * module root. To use synchronous compilation, use {@link initCompiler};
+ *
+ * When calling the compile functions multiple times, using a compiler instance
+ * with the [sass-embedded] npm package is much faster than using the top-level
+ * compilation methods or the [sass] npm package.
+ *
+ * [sass-embedded]: https://www.npmjs.com/package/sass-embedded
+ *
+ * [sass]: https://www.npmjs.com/package/sass
+ *
+ * @example
+ *
+ * ```js
+ * const sass = require('sass');
+ * async function setup() {
+ *   const compiler = await sass.initAsyncCompiler();
+ *   const result1 = await compiler.compileStringAsync('a {b: c}').css;
+ *   const result2 = await compiler.compileStringAsync('a {b: c}').css;
+ *   await compiler.dispose();
+ *
+ *   // throws error
+ *   const result3 = await sass.compileStringAsync('a {b: c}').css;
+ * }
+ * ```
+ * @category Compile
+ * @compatibility dart: "1.70.0", node: false
+ */
+export function initAsyncCompiler(): Promise<AsyncCompiler>;
diff --git a/node_modules/sass/types/importer.d.ts b/node_modules/sass/types/importer.d.ts
index 7885488..dca4266 100644
--- a/node_modules/sass/types/importer.d.ts
+++ b/node_modules/sass/types/importer.d.ts
@@ -42,7 +42,7 @@ export interface CanonicalizeContext {
  * Like all importers, this implements custom Sass loading logic for [`@use`
  * rules](https://sass-lang.com/documentation/at-rules/use) and [`@import`
  * rules](https://sass-lang.com/documentation/at-rules/import). It can be passed
- * to {@link Options.importers} or {@link StringOptionsWithImporter.importer}.
+ * to {@link Options.importers} or {@link StringOptions.importer}.
  *
  * @typeParam sync - A `FileImporter<'sync'>`'s {@link findFileUrl} must return
  * synchronously, but in return it can be passed to {@link compile} and {@link
@@ -122,7 +122,7 @@ export interface FileImporter<
  * An object that implements custom Sass loading logic for [`@use`
  * rules](https://sass-lang.com/documentation/at-rules/use) and [`@import`
  * rules](https://sass-lang.com/documentation/at-rules/import). It can be passed
- * to {@link Options.importers} or {@link StringOptionsWithImporter.importer}.
+ * to {@link Options.importers} or {@link StringOptions.importer}.
  *
  * Importers that simply redirect to files on disk are encouraged to use the
  * {@link FileImporter} interface instead.
@@ -308,6 +308,139 @@ export interface Importer<sync extends 'sync' | 'async' = 'sync' | 'async'> {
   nonCanonicalScheme?: string | string[];
 }
 
+declare const nodePackageImporterKey: unique symbol;
+
+/**
+ * The built-in Node.js package importer. This loads pkg: URLs from node_modules
+ * according to the standard Node.js resolution algorithm.
+ *
+ * A Node.js package importer is exposed as a class that can be added to the
+ * `importers` option.
+ *
+ *```js
+ * const sass = require('sass');
+ * sass.compileString('@use "pkg:vuetify', {
+ *   importers: [new sass.NodePackageImporter()]
+ * });
+ *```
+ *
+ * ## Writing Sass packages
+ *
+ * Package authors can control what is exposed to their users through their
+ * `package.json` manifest. The recommended method is to add a `sass`
+ * conditional export to `package.json`.
+ *
+ * ```json
+ * // node_modules/uicomponents/package.json
+ * {
+ *   "exports": {
+ *     ".": {
+ *       "sass": "./src/scss/index.scss",
+ *       "import": "./dist/js/index.mjs",
+ *       "default": "./dist/js/index.js"
+ *     }
+ *   }
+ * }
+ * ```
+ *
+ * This allows a package user to write `@use "pkg:uicomponents"` to load the
+ * file at `node_modules/uicomponents/src/scss/index.scss`.
+ *
+ * The Node.js package importer supports the variety of formats supported by
+ * Node.js [package entry points], allowing authors to expose multiple subpaths.
+ *
+ * [package entry points]:
+ * https://nodejs.org/api/packages.html#package-entry-points
+ *
+ * ```json
+ * // node_modules/uicomponents/package.json
+ * {
+ *   "exports": {
+ *     ".": {
+ *       "sass": "./src/scss/index.scss",
+ *     },
+ *     "./colors.scss": {
+ *       "sass": "./src/scss/_colors.scss",
+ *     },
+ *     "./theme/*.scss": {
+ *       "sass": "./src/scss/theme/*.scss",
+ *     },
+ *   }
+ * }
+ * ```
+ *
+ * This allows a package user to write:
+ *
+ * - `@use "pkg:uicomponents";` to import the root export.
+ * - `@use "pkg:uicomponents/colors";` to import the colors partial.
+ * - `@use "pkg:uicomponents/theme/purple";` to import a purple theme.
+ *
+ * Note that while library users can rely on the importer to resolve
+ * [partials](https://sass-lang.com/documentation/at-rules/use#partials), [index
+ * files](https://sass-lang.com/documentation/at-rules/use#index-files), and
+ * extensions, library authors must specify the entire file path in `exports`.
+ *
+ * In addition to the `sass` condition, the `style` condition is also
+ * acceptable. Sass will match the `default` condition if it's a relevant file
+ * type, but authors are discouraged from relying on this. Notably, the key
+ * order matters, and the importer will resolve to the first value with a key
+ * that is `sass`, `style`, or `default`, so you should always put `default`
+ * last.
+ *
+ * To help package authors who haven't transitioned to package entry points
+ * using the `exports` field, the Node.js package importer provides several
+ * fallback options. If the `pkg:` URL does not have a subpath, the Node.js
+ * package importer will look for a `sass` or `style` key at the root of
+ * `package.json`.
+ *
+ * ```json
+ * // node_modules/uicomponents/package.json
+ * {
+ *   "sass": "./src/scss/index.scss",
+ * }
+ * ```
+ *
+ * This allows a user to write `@use "pkg:uicomponents";` to import the
+ * `index.scss` file.
+ *
+ * Finally, the Node.js package importer will look for an `index` file at the
+ * package root, resolving partials and extensions. For example, if the file
+ * `_index.scss` exists in the package root of `uicomponents`, a user can import
+ * that with `@use "pkg:uicomponents";`.
+ *
+ * If a `pkg:` URL includes a subpath that doesn't have a match in package entry
+ * points, the Node.js importer will attempt to find that file relative to the
+ * package root, resolving for file extensions, partials and index files. For
+ * example, if the file `src/sass/_colors.scss` exists in the `uicomponents`
+ * package, a user can import that file using `@use
+ * "pkg:uicomponents/src/sass/colors";`.
+ *
+ * @compatibility dart: "1.71.0", node: false
+ * @category Importer
+ */
+export class NodePackageImporter {
+  /** Used to distinguish this type from any arbitrary object. */
+  private readonly [nodePackageImporterKey]: true;
+
+  /**
+   * The NodePackageImporter has an optional `entryPointDirectory` option, which
+   * is the directory where the Node Package Importer should start when
+   * resolving `pkg:` URLs in sources other than files on disk. This will be
+   * used as the `parentURL` in the [Node Module
+   * Resolution](https://nodejs.org/api/esm.html#resolution-algorithm-specification)
+   * algorithm.
+   *
+   * In order to be found by the Node Package Importer, a package will need to
+   * be inside a node_modules folder located in the `entryPointDirectory`, or
+   * one of its parent directories, up to the filesystem root.
+   *
+   * Relative paths will be resolved relative to the current working directory.
+   * If a path is not provided, this defaults to the parent directory of the
+   * Node.js entrypoint. If that's not available, this will throw an error.
+   */
+  constructor(entryPointDirectory?: string);
+}
+
 /**
  * The result of successfully loading a stylesheet with an {@link Importer}.
  *
diff --git a/node_modules/sass/types/index.d.ts b/node_modules/sass/types/index.d.ts
index 2a41b58..f0df680 100644
--- a/node_modules/sass/types/index.d.ts
+++ b/node_modules/sass/types/index.d.ts
@@ -3,18 +3,31 @@
 // implementations.
 
 export {
+  AsyncCompiler,
   CompileResult,
+  Compiler,
   compile,
   compileAsync,
   compileString,
   compileStringAsync,
+  initCompiler,
+  initAsyncCompiler,
 } from './compile';
+export {
+  deprecations,
+  Deprecation,
+  Deprecations,
+  DeprecationOrId,
+  DeprecationStatus,
+  Version,
+} from './deprecations';
 export {Exception} from './exception';
 export {
   CanonicalizeContext,
   FileImporter,
   Importer,
   ImporterResult,
+  NodePackageImporter,
 } from './importer';
 export {Logger, SourceSpan, SourceLocation} from './logger';
 export {
diff --git a/node_modules/sass/types/legacy/options.d.ts b/node_modules/sass/types/legacy/options.d.ts
index 3096e97..788fc90 100644
--- a/node_modules/sass/types/legacy/options.d.ts
+++ b/node_modules/sass/types/legacy/options.d.ts
@@ -1,6 +1,7 @@
 import {Logger} from '../logger';
 import {LegacyImporter} from './importer';
 import {LegacyFunction} from './function';
+import {NodePackageImporter} from '../importer';
 
 /**
  * Options for {@link render} and {@link renderSync} that are shared between
@@ -508,6 +509,24 @@ export interface LegacySharedOptions<sync extends 'sync' | 'async'> {
    * @compatibility dart: "1.43.0", node: false
    */
   logger?: Logger;
+
+  /**
+   * If this option is set to an instance of `NodePackageImporter`, Sass will
+   * use the built-in Node.js package importer to resolve Sass files with a
+   * `pkg:` URL scheme. Details for library authors and users can be found in
+   * the {@link NodePackageImporter} documentation.
+   *
+   * @example
+   * ```js
+   * sass.renderSync({
+   *   data: '@use "pkg:vuetify";',
+   *   pkgImporter: new sass.NodePackageImporter()
+   * });
+   * ```
+   * @category Plugins
+   * @compatibility dart: "2.0", node: false
+   */
+  pkgImporter?: NodePackageImporter;
 }
 
 /**
diff --git a/node_modules/sass/types/logger/index.d.ts b/node_modules/sass/types/logger/index.d.ts
index 99196d2..937051e 100644
--- a/node_modules/sass/types/logger/index.d.ts
+++ b/node_modules/sass/types/logger/index.d.ts
@@ -1,3 +1,4 @@
+import {Deprecation} from '../deprecations';
 import {SourceSpan} from './source_span';
 
 export {SourceLocation} from './source_location';
@@ -43,17 +44,21 @@ export interface Logger {
    *
    * @param message - The warning message.
    * @param options.deprecation - Whether this is a deprecation warning.
+   * @param options.deprecationType - The type of deprecation this warning is
+   * for, if any.
    * @param options.span - The location in the Sass source code that generated this
    * warning.
    * @param options.stack - The Sass stack trace at the point the warning was issued.
    */
   warn?(
     message: string,
-    options: {
-      deprecation: boolean;
-      span?: SourceSpan;
-      stack?: string;
-    }
+    options: (
+      | {
+          deprecation: true;
+          deprecationType: Deprecation;
+        }
+      | {deprecation: false}
+    ) & {span?: SourceSpan; stack?: string}
   ): void;
 
   /**
diff --git a/node_modules/sass/types/options.d.ts b/node_modules/sass/types/options.d.ts
index 2b5def2..124bdb9 100644
--- a/node_modules/sass/types/options.d.ts
+++ b/node_modules/sass/types/options.d.ts
@@ -1,4 +1,5 @@
-import {FileImporter, Importer} from './importer';
+import {DeprecationOrId, Version} from './deprecations';
+import {FileImporter, Importer, NodePackageImporter} from './importer';
 import {Logger} from './logger';
 import {Value} from './value';
 import {PromiseOr} from './util/promise_or';
@@ -122,6 +123,20 @@ export interface Options<sync extends 'sync' | 'async'> {
    */
   charset?: boolean;
 
+  /**
+   * A set of deprecations to treat as fatal.
+   *
+   * If a deprecation warning of any provided type is encountered during
+   * compilation, the compiler will error instead.
+   *
+   * If a `Version` is provided, then all deprecations that were active in that
+   * compiler version will be treated as fatal.
+   *
+   * @category Messages
+   * @compatiblity dart: "1.74.0", node: false
+   */
+  fatalDeprecations?: (DeprecationOrId | Version)[];
+
   /**
    * Additional built-in Sass functions that are available in all stylesheets.
    * This option takes an object whose keys are Sass function signatures like
@@ -198,6 +213,17 @@ export interface Options<sync extends 'sync' | 'async'> {
    */
   functions?: Record<string, CustomFunction<sync>>;
 
+  /**
+   * A set of future deprecations to opt into early.
+   *
+   * Future deprecations passed here will be treated as active by the compiler,
+   * emitting warnings as necessary.
+   *
+   * @category Messages
+   * @compatiblity dart: "1.74.0", node: false
+   */
+  futureDeprecations?: DeprecationOrId[];
+
   /**
    * Custom importers that control how Sass resolves loads from rules like
    * [`@use`](https://sass-lang.com/documentation/at-rules/use) and
@@ -208,8 +234,8 @@ export interface Options<sync extends 'sync' | 'async'> {
    * - The importer that was used to load the current stylesheet, with the
    *   loaded URL resolved relative to the current stylesheet's canonical URL.
    *
-   * - Each {@link Importer} or {@link FileImporter} in {@link importers}, in
-   *   order.
+   * - Each {@link Importer}, {@link FileImporter}, or
+   *   {@link NodePackageImporter} in {@link importers}, in order.
    *
    * - Each load path in {@link loadPaths}, in order.
    *
@@ -218,7 +244,7 @@ export interface Options<sync extends 'sync' | 'async'> {
    *
    * @category Plugins
    */
-  importers?: (Importer<sync> | FileImporter<sync>)[];
+  importers?: (Importer<sync> | FileImporter<sync> | NodePackageImporter)[];
 
   /**
    * Paths in which to look for stylesheets loaded by rules like
@@ -266,16 +292,30 @@ export interface Options<sync extends 'sync' | 'async'> {
    * so that they can get fixed as soon as possible!
    *
    * **Heads up!** If {@link compileString} or {@link compileStringAsync} is
-   * called without {@link StringOptionsWithoutImporter.url}, <em>all</em>
-   * stylesheets it loads will be considered dependencies. Since it doesn’t have
-   * a path of its own, everything it loads is coming from a load path rather
-   * than a relative import.
+   * called without {@link StringOptions.url}, <em>all</em> stylesheets it loads
+   * will be considered dependencies. Since it doesn’t have a path of its own,
+   * everything it loads is coming from a load path rather than a relative
+   * import.
    *
    * @defaultValue `false`
    * @category Messages
    */
   quietDeps?: boolean;
 
+  /**
+   * A set of active deprecations to ignore.
+   *
+   * If a deprecation warning of any provided type is encountered during
+   * compilation, the compiler will ignore it instead.
+   *
+   * **Heads up!** The deprecated functionality you're depending on will
+   * eventually break.
+   *
+   * @category Messages
+   * @compatiblity dart: "1.74.0", node: false
+   */
+  silenceDeprecations?: DeprecationOrId[];
+
   /**
    * Whether or not Sass should generate a source map. If it does, the source
    * map will be available as {@link CompileResult.sourceMap}.
@@ -348,9 +388,10 @@ export interface Options<sync extends 'sync' | 'async'> {
  * Options that can be passed to {@link compileString} or {@link
  * compileStringAsync}.
  *
- * If the {@link StringOptionsWithImporter.importer} field isn't passed, the
- * entrypoint file can load files relative to itself if a `file://` URL is
- * passed to the {@link url} field.
+ * If the {@link StringOptions.importer} field isn't passed, the entrypoint file
+ * can load files relative to itself if a `file://` URL is passed to the {@link
+ * url} field. If it is passed, the entrypoint file uses it to load files
+ * relative to itself.
  *
  * @typeParam sync - This lets the TypeScript checker verify that asynchronous
  * {@link Importer}s, {@link FileImporter}s, and {@link CustomFunction}s aren't
@@ -358,7 +399,7 @@ export interface Options<sync extends 'sync' | 'async'> {
  *
  * @category Options
  */
-export interface StringOptionsWithoutImporter<sync extends 'sync' | 'async'>
+export interface StringOptions<sync extends 'sync' | 'async'>
   extends Options<sync> {
   /**
    * The {@link Syntax} to use to parse the entrypoint stylesheet.
@@ -369,6 +410,19 @@ export interface StringOptionsWithoutImporter<sync extends 'sync' | 'async'>
    */
   syntax?: Syntax;
 
+  /**
+   * The importer to use to handle loads that are relative to the entrypoint
+   * stylesheet.
+   *
+   * A relative load's URL is first resolved relative to {@link url}, then
+   * passed to {@link importer}. (It's passed as-is if {@link url} isn't
+   * passed.) If the importer doesn't recognize it, it's then passed to {@link
+   * importers} and {@link loadPaths}.
+   *
+   * @category Input
+   */
+  importer?: Importer<sync> | FileImporter<sync>;
+
   /**
    * The canonical URL of the entrypoint stylesheet.
    *
@@ -378,62 +432,24 @@ export interface StringOptionsWithoutImporter<sync extends 'sync' | 'async'>
    * loadPaths}.
    *
    * @category Input
+   * @compatibility feature: "Undefined URL with importer", dart: "1.75.0", node: false
+   *
+   * Earlier versions of Dart Sass required {@link url} to be defined when
+   * passing {@link StringOptions.importer}.
    */
   url?: URL;
 }
 
 /**
- * Options that can be passed to {@link compileString} or {@link
- * compileStringAsync}.
- *
- * If the {@link StringOptionsWithImporter.importer} field is passed, the
- * entrypoint file uses it to load files relative to itself and the {@link url}
- * field is mandatory.
- *
- * @typeParam sync - This lets the TypeScript checker verify that asynchronous
- * {@link Importer}s, {@link FileImporter}s, and {@link CustomFunction}s aren't
- * passed to {@link compile} or {@link compileString}.
- *
  * @category Options
+ * @deprecated Use {@link StringOptions} instead.
  */
-export interface StringOptionsWithImporter<sync extends 'sync' | 'async'>
-  extends StringOptionsWithoutImporter<sync> {
-  /**
-   * The importer to use to handle loads that are relative to the entrypoint
-   * stylesheet.
-   *
-   * A relative load's URL is first resolved relative to {@link url}, then
-   * passed to {@link importer}. If the importer doesn't recognize it, it's then
-   * passed to {@link importers} and {@link loadPaths}.
-   *
-   * @category Input
-   */
-  importer: Importer<sync> | FileImporter<sync>;
-
-  /**
-   * The canonical URL of the entrypoint stylesheet. If this is passed along
-   * with {@link importer}, it's used to resolve relative loads in the
-   * entrypoint stylesheet.
-   *
-   * @category Input
-   */
-  url: URL;
-}
+type StringOptionsWithoutImporter<sync extends 'sync' | 'async'> =
+  StringOptions<sync>;
 
 /**
- * Options that can be passed to {@link compileString} or {@link
- * compileStringAsync}.
- *
- * This is a {@link StringOptionsWithImporter} if it has a {@link
- * StringOptionsWithImporter.importer} field, and a {@link
- * StringOptionsWithoutImporter} otherwise.
- *
- * @typeParam sync - This lets the TypeScript checker verify that asynchronous
- * {@link Importer}s, {@link FileImporter}s, and {@link CustomFunction}s aren't
- * passed to {@link compile} or {@link compileString}.
- *
  * @category Options
+ * @deprecated Use {@link StringOptions} instead.
  */
-export type StringOptions<sync extends 'sync' | 'async'> =
-  | StringOptionsWithImporter<sync>
-  | StringOptionsWithoutImporter<sync>;
+type StringOptionsWithImporter<sync extends 'sync' | 'async'> =
+  StringOptions<sync>;
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..40ac4d7
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,1300 @@
+{
+  "name": "cashier_weapp",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "lodash": "^4.17.21"
+      },
+      "devDependencies": {
+        "sass": "^1.69.5",
+        "sass-loader": "^13.3.2"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@types/eslint": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmmirror.com/@types/eslint/-/eslint-9.6.0.tgz",
+      "integrity": "sha512-gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmmirror.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@types/node": {
+      "version": "22.0.0",
+      "resolved": "https://registry.npmmirror.com/@types/node/-/node-22.0.0.tgz",
+      "integrity": "sha512-VT7KSYudcPOzP5Q0wfbowyNLaVR8QWUdw+088uFWwfvpY6uCWaXpqV6ieLAu9WBcnTa7H4Z5RLK8I5t2FuOcqw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "undici-types": "~6.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/ast/-/ast-1.12.1.tgz",
+      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
+      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
+      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.12.1"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peer": true,
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
+      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-opt": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1",
+        "@webassemblyjs/wast-printer": "1.12.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
+      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
+      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
+      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
+      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "peer": true
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmmirror.com/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peer": true
+    },
+    "node_modules/acorn": {
+      "version": "8.12.1",
+      "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-import-attributes": {
+      "version": "1.9.5",
+      "resolved": "https://registry.npmmirror.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "peerDependencies": {
+        "acorn": "^8"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.23.2",
+      "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.23.2.tgz",
+      "integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001640",
+        "electron-to-chromium": "^1.4.820",
+        "node-releases": "^2.0.14",
+        "update-browserslist-db": "^1.1.0"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001644",
+      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001644.tgz",
+      "integrity": "sha512-YGvlOZB4QhZuiis+ETS0VXR+MExbFf4fZYYeMTEE0aTQd/RdIjkTyZjLrbYVKnHzppDvnOhritRVv+i7Go6mHw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "CC-BY-4.0",
+      "peer": true
+    },
+    "node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmmirror.com/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz",
+      "integrity": "sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==",
+      "dev": true,
+      "license": "ISC",
+      "peer": true
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.17.1",
+      "resolved": "https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/es-module-lexer": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmmirror.com/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
+      "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/escalade": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmmirror.com/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmmirror.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true,
+      "license": "ISC",
+      "peer": true
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/immutable": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmmirror.com/immutable/-/immutable-4.3.7.tgz",
+      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmmirror.com/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmmirror.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/loader-runner": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=6.11.5"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "license": "MIT"
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmmirror.com/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.18.tgz",
+      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+      "dev": true,
+      "license": "ISC",
+      "peer": true
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmmirror.com/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/sass": {
+      "version": "1.77.8",
+      "resolved": "https://registry.npmmirror.com/sass/-/sass-1.77.8.tgz",
+      "integrity": "sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chokidar": ">=3.0.0 <4.0.0",
+        "immutable": "^4.0.0",
+        "source-map-js": ">=0.6.2 <2.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-loader": {
+      "version": "13.3.3",
+      "resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-13.3.3.tgz",
+      "integrity": "sha512-mt5YN2F1MOZr3d/wBRcZxeFgwgkH44wVc2zohO2YF6JiOMkiXe4BYRZpSu2sO1g71mo/j16txzUhsKZlqjVGzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "neo-async": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "fibers": ">= 3.1.0",
+        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
+        "sass": "^1.3.0",
+        "sass-embedded": "*",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "fibers": {
+          "optional": true
+        },
+        "node-sass": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmmirror.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "peer": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmmirror.com/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/tapable": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmmirror.com/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.31.3",
+      "resolved": "https://registry.npmmirror.com/terser/-/terser-5.31.3.tgz",
+      "integrity": "sha512-pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin": {
+      "version": "5.3.10",
+      "resolved": "https://registry.npmmirror.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
+      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.20",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.1",
+        "terser": "^5.26.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "6.11.1",
+      "resolved": "https://registry.npmmirror.com/undici-types/-/undici-types-6.11.1.tgz",
+      "integrity": "sha512-mIDEX2ek50x0OlRgxryxsenE5XaQD4on5U2inY7RApK3SOJpofyw7uW2AyfMKkhAxXIceo2DeWGVGwyvng1GNQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmmirror.com/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/watchpack": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-2.4.1.tgz",
+      "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack": {
+      "version": "5.93.0",
+      "resolved": "https://registry.npmmirror.com/webpack/-/webpack-5.93.0.tgz",
+      "integrity": "sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^1.0.5",
+        "@webassemblyjs/ast": "^1.12.1",
+        "@webassemblyjs/wasm-edit": "^1.12.1",
+        "@webassemblyjs/wasm-parser": "^1.12.1",
+        "acorn": "^8.7.1",
+        "acorn-import-attributes": "^1.9.5",
+        "browserslist": "^4.21.10",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.17.0",
+        "es-module-lexer": "^1.2.1",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.11",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.2.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.3.10",
+        "watchpack": "^2.4.1",
+        "webpack-sources": "^3.2.3"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmmirror.com/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..98d5ac3
--- /dev/null
+++ b/package.json
@@ -0,0 +1,9 @@
+{
+  "devDependencies": {
+    "sass": "^1.69.5",
+    "sass-loader": "^13.3.2"
+  },
+  "dependencies": {
+    "lodash": "^4.17.21"
+  }
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 34a854a..5ab0d1d 100644
--- a/pages.json
+++ b/pages.json
@@ -85,8 +85,14 @@
 			"path": "pages/order/order",
 			"style": {
 				"navigationBarTitleText": "订单列表",
-				"navigationBarBackgroundColor": "#FFD158",
-				"navigationBarTextStyle": "white"
+				"navigationBarBackgroundColor": "#FFD158"
+			}
+		},
+		{
+			"path": "pages/order/confirm_order",
+			"style": {
+				"navigationBarTitleText": "确认订单",
+				"navigationBarBackgroundColor": "#E8AD7B"
 			}
 		},
 		{
@@ -156,23 +162,10 @@
 			"path": "pages/order_food/order_food",
 			"style": {
 				"navigationStyle": "custom",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/order_food/goodsList_scroll",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/order_food/goodsList_swiper",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "balck"
 			}
 		},
+	 
 		{
 			"path": "pages/make/list",
 			"style": {
diff --git a/pages/chooseasong/index.vue b/pages/chooseasong/index.vue
index 508a4ee..8531df7 100644
--- a/pages/chooseasong/index.vue
+++ b/pages/chooseasong/index.vue
@@ -1,8 +1,7 @@
 <template>
 	<view class="content">
 		<!-- 占位符导航栏 -->
-		<navseat :opacity='false' :title='"歌曲列表"' :titleshow='true' :heightshow='true' :namecolor='"#fff"'
-			:iconshow='false'></navseat>
+		<navseat :opacity='false' :title='"歌曲列表"' :titleshow='true' :heightshow='true' :namecolor='"#fff"' iconcolor='#fff'></navseat>
 		<view class="search flex-between">
 			<view class="searchinput flex-between">
 				<input type="text" class="searchinput_input" placeholder-style="color:#FFFFFF" @input="onInput"
@@ -140,14 +139,12 @@
 			if (e.q) {
 				this.shopId = this.getQueryString(decodeURIComponent(e.q), 'shopId')
 			}
-			uni.hideHomeButton();
-
 
 		},
 		computed: {},
 		mounted() {},
 		onShow() {
-			if (!uni.cache.get('miniAppOpenId')) {
+			if (!uni.cache.get('miniAppOpenId')) {//单独登录  
 				uni.login({
 					provider: 'weixin',
 					success: async (data) => {
diff --git a/pages/member/index.vue b/pages/member/index.vue
index c05f7d1..c159a44 100644
--- a/pages/member/index.vue
+++ b/pages/member/index.vue
@@ -75,6 +75,13 @@
 					});
 					return false;
 				}
+				if (this.amount <= 0) {
+					uni.showToast({
+						title: '金额必须大于0',
+						icon: 'none'
+					});
+					return false;
+				}
 				let res = await this.api.paymemeberIn({
 					shopId: this.shopId, // 判断显示哪家的作品,
 					amount: this.amount // 判断显示哪家的作品,
diff --git a/pages/order/confirm_order.vue b/pages/order/confirm_order.vue
new file mode 100644
index 0000000..1474243
--- /dev/null
+++ b/pages/order/confirm_order.vue
@@ -0,0 +1,1060 @@
+<template>
+	<view>
+		<!-- 占位符导航栏 -->
+		<!-- <navseat class="navbar" :opacity='opacitys' :backColor="'#E8AD7B'" :title='toplist.name' :titleshow='true'></navseat> -->
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- <view :style="{'height':HeighT.customBar+HeighT.heightBar+'px;background-color: #E8AD7B;position: fixed;top: 0;width: 100%;z-index: 9'}"></view> -->
+		<!-- <view :style="{'height':HeighT.customBar+HeighT.heightBar+'px;background-color: #E8AD7B;'}"></view> -->
+		<!-- #endif -->
+		<!-- 头部内容 -->
+		<view class="head">
+			<view class="head_bg"></view>
+			<view class="tips">
+				<image class="informIcon" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/informIcon.png" mode="widthFix"/>
+				<text class="informText">温馨提示：请适量点餐，避免浪费</text>
+			</view>
+			<!-- <view class="tabBox"> -->
+			<!-- 	<view class="tab">
+					<view :class="is_type==(index+1)?'tab_item'+is_type+' tab_item  active ':'tab_item'" v-for="(item,index) in is_typeList" :key="index" @click="tabClick(index+1)">
+						<view></view>
+						<image class="icon" :src="is_type==(index+1)?item.url_active:item.url" mode="aspectFill"/>
+						<text class="title" :class="{active:is_type==(index+1)}">{{item.title}}</text>
+					</view>
+				</view> -->
+				<!-- 送餐到桌 -->
+			<!-- 	<view class="table" v-if="is_type==1">
+					<view>
+						<text class="title">桌台</text>
+					</view>
+					<view class="value"> {{ tableValue }} </view>
+				</view> -->
+				<!-- 打包外带 -->
+				<!-- <view class="pack" v-else>
+					<view class="top">
+						<text class="title">后海&双屿</text>
+						<text class="address">浐灞生态区灞河东路东三环至欧亚大道段商业用房09号</text>
+					</view>
+					<view class="list">
+						<view class="item">
+							<view class="lable">取餐时间</view><view class="text">立即取餐</view>
+						</view>
+						<view class="item">
+							
+							<view class="lable">预留电话</view><view class="getPhone text"><u-input class="inputVal" v-model="order.phone" input-align="right" placeholder="请输入预留电话以便联系您" ></u-input><text class="getBtn">获取手机号</text></view>
+						</view>
+					</view>
+				</view> -->
+			<!-- </view> -->
+		</view>
+		<!-- 订单内容区域 -->
+		<view class="content_box">
+			<view class="content">
+				<view class="title"> {{ listinfo.name }} </view>
+				<view class="list_item" v-for="(item,index) in listinfo.details" :key="item.id">
+					<view class="left">
+						<image class="img" :src="item.coverImg || item.productImg || ''" mode="aspectFill"/>
+						<view class="center">
+							<text class="center_title"> {{item.name || item.productName || "" }} </text>
+							<text class="type"> {{ item.skuName || item.productSkuName || ""}} </text>
+							<text class="num"> X{{ item.totalNumber || item.num}} </text>
+						</view>
+					</view>
+					<view class="price"> ￥{{ item.totalAmount || item.priceAmount || 0}} </view>
+				</view>
+	<!-- 			<view class="favorable" v-for="(item,index) in favorable" :key="index">
+					<view class="favorable_left"> 
+						<image class="icon" :src="item.url" mode="aspectFill"/>
+						<text class="name"> {{ item.name }} </text>
+					</view>
+					<view class="favorable_right"><text class="favorable_right_text">暂无可用优惠券</text> <u-icon name="arrow-right" color="#575B66" size="28"></u-icon></view>
+				</view> -->
+				<view class="totalPrice">
+					<text style="margin-bottom: 5rpx;">小计￥</text>
+					<text class="totalPriceNum"> {{listinfo.payAmount}} </text>
+				</view>
+				<!-- <u-divider color="#fa3534" half-width="200" border-color="#6d6d6d">姑苏城外寒山寺</u-divider> -->
+			</view>
+		</view>
+		<!-- 订单备注 -->
+		<view class="remark">
+			<view class="remark_bg">
+				<view class="remark_title">订单备注</view>
+				<u-textarea class="remark_value"  placeholder="请填写口味、偏好等要求" :type="'textarea'" v-model="remark" :border="false" :clearable="true"/>
+			</view>
+		</view>
+		
+		<!-- 支付方式 -->
+		<view class="paymentMethod">
+			<view class="paymentMethod_content">
+				<view class="paymentMethod_title">支付方式</view>
+				<u-radio-group v-model="radiovalue" iconPlacement="right" @change="groupChange" :size="28"
+					placement="column">
+					<block v-for="(item,index) in paymentMethodList" :key="index">
+							<view class="method_list" @click="groupChange(index+1)">
+								<view class="method_list_top">
+									<view class="method_list_top_left">
+										<image class="icon" :src="item.url" mode="widthFix"/>
+										<text class="name"> {{ item.name }} </text>
+									</view>
+									<u-radio activeColor="#E8AD7B" icon-size="36" size="36" :name="index+1">
+									</u-radio>
+								</view>
+								<view class="method_list_bom" v-if="item.type == 1">
+									<text class="balance">会员卡余额 ￥{{amountVIP?amountVIP.amount:0}}</text>
+									<text class="topUpNow" @click="goRecharge">去充值</text>
+								</view>
+							</view>
+					</block>
+				</u-radio-group>
+			</view>
+		</view>
+		
+		<view class="bottom">
+			<view class="bottom_left">
+				<text style="margin-bottom: 5rpx;">实付金额</text>
+				<text class="totalAmount">￥{{ listinfo.payAmount }} </text>
+			</view>
+			<view class="paymentBtnText"  @tap="$u.debounce(showpopupclickdd, 500)" v-if="listinfoid && listinfo"> {{ paymentBtnText }} </view>
+			<view class="paymentBtnText"  @tap="$u.debounce(orderdetail, 500)" v-else> {{ paymentBtnText }} </view>
+		</view>
+		
+		<u-popup :show="ispws" :round="20" mode="bottom" @close="ispws = false" height="500" :safeAreaInsetBottom="false">
+			<view class="pay-info-wrap">
+				<view class="info-wrap flex-between">
+					<view class="close" @click="ispws = false">
+						<u-icon name="close" color="#999999" size="40"></u-icon>
+					</view>
+					<text class="title">请输入支付密码</text>
+					<view></view>
+				</view>
+				<view class="info-content">
+					<payPasswordtwo ref="payPwd" :payAmount="listinfo.payAmount" @accountPayevent="accountPayevent" v-if="ispws"></payPasswordtwo>
+				</view>
+			
+			</view>
+		</u-popup>
+		
+		<!-- 支付密码 -->
+		<!-- <payPasswordtwo ref="payPwd" :listinfo="listinfo" @accountPayevent="accountPayevent" v-if="ispws"></payPasswordtwo> -->
+	</view>
+</template>
+
+<script>
+	import navseat from '@/components/navseat.vue'
+	import webSocketUtils from '@/common/js/websocket.js'
+	import payPasswordtwo from '@/components/payPasswordtwo.vue'
+	// import cwxKeyboard from '@/components/cwx-keyboard/cwx-keyboard.vue'
+	
+	
+	export default {
+		components: {
+			payPasswordtwo,
+			navseat
+		},
+		data() {
+			return {
+				opacitys: false,
+				toplist: {
+					name: '确认订单'
+				},
+				is_type: 1,
+				is_typeList: [
+					{ title: "送餐到桌", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab1.png" , url_active: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab1_active.png"},
+					{ title: "打包外带", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab2.png" , url_active: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab2_active.png"},
+				],
+				favorable: [
+					{ name: "优惠券", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/coupon.png"},
+					{ name: "团购优惠", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/groupOffer.png"},
+				],
+				paymentMethodList:[
+					{ name: "会员卡支付", type: "1", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/wechat.png"},
+					{ name: "微信支付", type: "2", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png"},
+				],
+				order: {
+					phone: "",
+				},
+				cartLists: [],
+				listinfo: {
+					details: [],
+					payAmount: 0,
+					name: "",
+				},
+				tableValue: "A203",	// 桌台号
+				totalPrice: 0, 	// 小计金额
+				totalAmount: 20,	// 支付金额
+				remark: "",			// 备注
+				radiovalue: 1,		// 支付方式
+				ispws: false,  		// 输入支付密码 
+				payPasswordShow: false,
+				amountVIP: null,	// 会员信息
+				listinfoid: null,
+				paymentBtnText: "会员卡支付",
+			}
+		},
+		computed: {
+			HeighT() { //手机类型的尺寸
+				return this.$store.getters.is_BarHeight
+			},
+		},
+		onUnload() {
+			console.log(this)
+			this.socketTicket.Close()
+			uni.$off('getMessage')
+			this.ispws = false
+		},
+		onHide() {
+			this.socketTicket.Close()
+			uni.$off('message')
+		},
+		onLoad(e) {
+			this.listinfo.name = JSON.parse(e.storeInfo).shopName;
+		},
+		onShow() {
+			uni.$on('message', this.getMessage)
+			if (this.listinfoid) {
+				this.orderorderInfo()
+			} else {
+				this.handlemessage()
+			}
+			this.getAount()
+		},
+		methods: {
+			
+			/**
+			 * 消息监听
+			 * @param {Object} msg
+			 */
+			getMessage(msg) {
+				if (msg == 1) { // 网络在连接
+					return false
+				}
+				if (msg.type == 'heartbeat') { //后台心跳  处理返回  不然控制台一直报错
+					return false
+				}
+				if (msg.status != 'success') {
+					uni.showToast({
+						title: msg.msg,
+						icon: "none",
+					})
+					return false;
+			
+				} else {
+					switch (msg.type) {
+						case 'createOrder':
+							this.listinfoid = msg.data.id
+							console.log(msg)
+							this.listinfo.details = msg.data.detailList;
+							this.listinfo.payAmount = msg.data.amount;
+							uni.$off('getMessage')
+							this.orderorderInfo(1)
+							break;
+						case 'addCart':
+							console.log("商品列表===",msg)
+							
+							if (this.listinfoid) {
+								this.orderorderInfo()
+							} else {
+								this.listinfo.details = msg.data;
+								this.listinfo.payAmount = msg.amount;
+							}
+							break;
+						case 'order':
+							uni.navigateBack()
+							setTimeout(() => {
+								uni.showToast({
+									title: '您的小伙伴已下单了哦~~'
+								})
+							}, 1000)
+							break;
+						case 'addcart':
+							if (this.listinfoid) {
+								this.orderorderInfo()
+							} else {
+								this.listinfo.details = msg.data;
+								this.listinfo.payAmount = msg.amount;
+							}
+							break;
+					}
+					this.$set(this, 'cartLists', msg)
+				}
+			
+			},
+			
+			/**
+			 * 监听送餐/打包切换
+			 * @param {Object} val
+			 */
+			tabClick ( val ) {
+				this.is_type = val; 
+				console.log(this.is_type)
+			},
+			
+			/**
+			 * 监听支付方式切换
+			 * @param {Object} n
+			 */
+			groupChange(n) {
+				this.radiovalue = n;
+				this.paymentBtnText = n==1?'会员卡支付':'微信支付'
+			},
+			
+			/**
+			 * 初始化socket
+			 */
+			handlemessage() {
+				//调用前先判断是否有socket正在进行 先关闭后链接
+				this.socketTicket ? this.socketTicket.Close() : null 
+				this.socketTicket = new webSocketUtils(`${uni.conf.baseUrlwws}`, 5000, {
+					tableId: uni.cache.get('tableCode'),
+					shopId: uni.cache.get('shopUser'),
+					userId: uni.cache.get('userInfo').id,
+					"type": "connect",
+				})
+			},
+			
+			/**
+			 * 数据处理
+			 * @param {Object} data
+			 */
+			socketSendMsg(data) {
+				if (this.socketTicket) {
+					this.socketTicket.send(data);
+				}
+			},
+			
+			/**
+			 * 获取会员信息
+			 */
+			async getAount() {
+				let res = await this.api.shopUserInfo({
+					"shopId": uni.cache.get('shopUser'),
+					"userId": uni.cache.get('userInfo').id,
+				})
+				if (res.code == 0) {
+					console.log("会员信息===",res)
+					this.amountVIP = res.data
+				}
+			},
+			
+			/**
+			 * 查询订单信息
+			 * @param {Object} i
+			 */
+			async orderorderInfo(i) {
+				console.log(this.listinfo)
+				let res = await this.api.orderorderInfo({
+					orderId: this.listinfoid
+				})
+				if (res.code == 0) {
+					console.log(res)
+					this.listinfo = res.data
+					if (i == 1) { //请求完了详情在去调支付
+						this.showpopupclickdd()
+					}
+				}
+			},
+			
+			/**
+			 * 去充值
+			 */
+			goRecharge() {
+				// 判断是否绑定手机,只有下单时候有,会员列表肯定有
+				// console.log(this.amountVIP.isVip, '调试1')
+				if (this.amountVIP.isVip == 0) {
+					// 跳转到开通页面
+					uni.navigateTo({
+						url: '/pages/member/activatedmemberone?shopId=' + uni.cache.get('shopUser')
+					})
+				} else {
+					uni.pro.navigateTo('/pages/member/index', {
+						shopId: uni.cache.get('shopUser')
+					})
+				}
+			},
+			
+			/**
+			 *  生成订单
+			 */
+			orderdetail() {
+				console.log(this.listinfo.details)
+				if ( this.listinfo.details.length == 0) {
+					uni.showToast({
+						title: "购物车为空，请添加商品",
+						icon: "none",
+					})
+					return;
+				}
+				let data = {
+					"skuId": '',
+					"num": '', //数量
+					"type": "createOrder", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
+					"remark": this.remark,
+					"couponsId": '', //优惠券ID,
+					"isYhq": 0, // 是否使用优惠券（ 1： 使用， 0： 不使用）,
+					"isBuyYhq": 0, // 是否购买优惠券（ 1： 购买， 0： 不够买）
+					"productId": '', //商品id
+					"shopId": uni.cache.get('shopUser'),
+					"userId": uni.cache.get('userInfo').id,
+				}
+				uni.$u.debounce(this.socketSendMsg(data), 500)
+			},
+			
+			/**
+			 * 去支付
+			 */
+			showpopupclickdd() {
+				console.log(this.radiovalue)
+				if ( this.radiovalue == 2 && this.listinfo.payAmount <= 0 ) {
+					uni.showToast({
+						title: "支付金额必须大于0",
+						icon: 'none'
+					})
+					return;
+				}
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				// radiovalue为2是微信支付
+				if (this.radiovalue == 2) {
+					this.showpopupclickdds() //微信支付
+				} else {
+					// 先判断是否设置支付密码。0是没设置。没设置的情况下跳转到设置页面。有的话输入支付密码
+					// console.log(isPwd,'是否设置了支付密码')
+					if (uni.cache.get('userInfo').isPwd == 0) {
+						uni.pro.navigateTo('/pages/user/repairpassword', {
+							shopId_id: uni.cache.get('shopUser')
+						})
+					} else {
+						uni.hideLoading()
+						// this.payPasswordShow = false;
+						this.ispws = true
+						this.$nextTick(() => {
+							// this.$refs.payPwd.onPayUp();
+						})
+					}
+				}
+			},
+			
+			/**
+			 * 微信支付
+			 */
+			async showpopupclickdds() {
+				
+				
+				console.log(this.listinfoid)
+				let res = await this.api.payorderPay({
+					orderId: this.listinfoid
+				}) //判断是否支付成功
+				if (res.code == 0) {
+			
+					// #ifdef MP-WEIXIN
+					// 微信支付还是余额支付
+					uni.requestPayment({
+						provider: 'wxpay', //支付类型-固定值
+						partnerid: res.data.appId, // 微信支付商户号
+						timeStamp: res.data.timeStamp, // 时间戳（单位：秒）
+						nonceStr: res.data.nonceStr, // 随机字符串
+						package: res.data.package, // 固定值
+						signType: res.data.signType, //固定值
+						paySign: res.data.paySign, //签名
+						success: (res) => {
+							let _this = this
+							uni.requestSubscribeMessage({
+								tmplIds: ['z0fUG7-jhSfYCrw6poOvSRzh4_hgnPkm_5C7E5s5bCQ'],
+								complete() {
+									uni.showToast({
+										title: "支付成功"
+									})
+									// uni.cache.set('shopUser', '') //删除shopUser
+									_this.paymodfiyOrderInfo()
+									uni.redirectTo({
+										url: '/pages/order/order_detail?orderId=' + _this
+											.listinfoid
+									});
+								},
+							})
+						},
+						fail: () => {
+							uni.hideLoading()
+						}
+					});
+					// #endif	
+					uni.hideLoading()
+				}
+			},
+			
+			/**
+			 * 支付完成后请求
+			 */
+			async paymodfiyOrderInfo() { 
+				let res = await this.api.paymodfiyOrderInfo({
+					orderId: this.listinfoid,
+				})
+			},
+			
+			/**
+			 * 余额支付
+			 * @param {Object} pwd
+			 */
+			async accountPayevent(pwd) {
+				this.ispws = false;
+				console.log(pwd)
+				let res = await this.api.accountPay({
+					orderId: this.listinfoid,
+					memberId: this.amountVIP.id,
+					pwd: pwd
+				})
+				if (res.code == 0) {
+					// data ->1 支付成功
+					// ->2 余额不足
+					// ->3 未设置支付密码，
+					// ->4 不是会员，
+					if (res.data == 1) {
+						this.showToastUppop('支付成功')
+						let _this = this
+			
+						uni.requestSubscribeMessage({
+							tmplIds: ['z0fUG7-jhSfYCrw6poOvSRzh4_hgnPkm_5C7E5s5bCQ'],
+							complete() {
+								uni.redirectTo({
+									url: '/pages/order/order_detail?orderId=' + _this
+										.listinfoid
+								});
+							},
+						})
+			
+					} else if (res.data == 2) {
+						this.showToastUppop('余额不足')
+						setTimeout(() => {
+							// 去充值
+							this.goRecharge()
+						}, 1500)
+					} else if (res.data == 3) {
+						this.showToastUppop('未设置支付密码')
+						setTimeout(() => {
+							uni.pro.navigateTo('/pages/user/repairpassword', {
+								shopId_id: uni.cache.get('shopUser')
+							})
+						}, 1500)
+			
+					} else if (res.data == 4) {
+						this.showToastUppop('非会员请充值')
+						setTimeout(() => {
+							// 去充值
+							this.goRecharge()
+						}, 1500)
+					}
+			
+				}
+			
+			},
+
+			showToastUppop(title) {
+				uni.showToast({
+					icon: 'none',
+					title,
+					success: () => {
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.head{
+		width: 100%;
+		padding: $uni-spacing-row-base;
+		box-sizing: border-box;
+		position: relative;
+		.head_bg{
+			height: 456rpx;
+			background: linear-gradient( 180deg, #E8AD7B 0%, #F5F5F5 100%);
+			position: absolute;
+			left: 0;
+			right: 0;
+			top: 0;
+			margin: auto;
+		}
+		.tips{
+			width: 100%;
+			height: 64rpx;
+			line-height: 64rpx;
+			background: #FFF8E8;
+			border-radius: 8rpx 8rpx 8rpx 8rpx;
+			padding: 0 16rpx;
+			box-sizing: border-box;
+			position: relative;
+			z-index: 1;
+			display: flex;
+			align-items: center;
+			.informIcon{
+				width: 26.7rpx;
+				margin-right: 8rpx;
+			}
+			.informText{
+				font-size: $uni-font-size-base;
+				color: #FF803D;
+				font-weight: 400;
+			}
+		}
+		.tabBox{
+			width: 100%;
+			margin-top: 52rpx;
+			position: relative;
+			z-index: 1;
+			.tab{
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				border-radius: 22rpx;
+				background-color: $uni-bg-color;
+				.tab_item{
+					width: 50%;
+					height: 90rpx;
+					line-height: 90rpx;
+					display: flex;
+					align-items: center;
+					padding-left: 30rpx;
+					box-sizing: border-box;
+					background-color: #FEFBF8;
+					border-radius: 22rpx 22rpx 0 0;
+					position: relative;
+					.title{
+						font-weight: 500;
+						font-size: 28rpx;
+						color: #999999;
+						position:relative;
+						z-index: 1;
+					}
+					.title.active{
+						color: #E8AD7B;
+					}
+					.icon{ 
+						width: 48rpx;
+						height: 48rpx;
+						margin-right: 16rpx;
+						position:relative;
+						z-index: 1;
+					}
+				}
+				.tab_item.active{
+					background-color: #fff;
+				}
+				// .tab_item.active:after {
+				//  content: "";
+				//          position: absolute;
+				//          top: 0;
+				//          left: -4px;
+				//          width: 40px;
+				//          height: 26px;
+				//          background: orange;
+				// }
+				.tab_item.active:before {
+					content: "";
+				    position: absolute;
+				    top: -20rpx;
+				    left: 0;
+				    right: 0;
+				    bottom: 0;
+				    border-radius: 2px;
+				    background: #fff;
+				    transform: skewX(0deg);
+				}
+				.tab_item1.active:before{
+					border-radius: 22rpx 40rpx 0 0;
+				}
+				.tab_item2.active:before{
+					border-radius: 40rpx 22rpx 0 0;
+				}
+			}
+			.table{
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				padding: 0 30rpx;
+				box-sizing: border-box;
+				height: 90rpx;
+				background-color: $uni-bg-color;
+				border-radius: 0 0 22rpx 22rpx;
+				.title{
+					display: flex;
+					align-items: center;
+					color: #E8AD7B;
+				}
+				.value{
+					font-weight: 500;
+					font-size: 32rpx;
+					color: #333333;
+				}
+			}
+			
+			.pack{
+				display: flex;
+				flex-direction: column;
+				padding: 30rpx;
+				box-sizing: border-box;
+				background-color: $uni-bg-color;
+				border-radius: 0 0 22rpx 22rpx;
+				.top{
+					display: flex;
+					flex-direction: column;
+					margin-top: 8rpx;
+					.title{
+						font-size: 28rpx;
+						color: #333;
+						font-weight: bold;
+						margin-bottom: 16rpx;
+					}
+					.address{
+						font-size: 24rpx;
+						font-weight: 400;
+						color: #999;
+					}
+				}
+				
+				.list{
+					display: flex;
+					flex-direction: column;
+					.item{
+						height: 70rpx;
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						font-size: 28rpx;
+						.lable{
+							color: #666;
+							font-weight: 500;
+						}
+						.getPhone{
+							display: flex;
+							align-items: center;
+							.u-input{
+								width: 340rpx;
+								border: none;
+								input{
+									font-size: 24rpx;
+									color: #333;
+								
+								}
+								.input-placeholder{
+ 									font-size: 24rpx;
+								}
+							}
+						}
+						.text,.getBtn{
+							color: #E8AD7B;
+						}
+						.getBtn{
+							border-radius: 12rpx;
+							border: 2rpx solid #E8AD7B;
+							padding: 8rpx 20rpx;
+							box-sizing: border-box;
+						}
+					}
+				}
+					
+			}
+		}
+	}
+	
+	.content_box{
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		margin-top: 10rpx;
+		position: relative;
+		z-index: 1;
+		.content{
+			background-color: $uni-bg-color;
+			border-radius: 22rpx;
+			display: flex;
+			flex-direction: column;
+			padding: 30rpx 0;
+			box-sizing: border-box;
+			.title{ 
+				font-size: 28rpx;
+				color: #666;
+				margin-bottom: 32rpx;
+				padding: 0 30rpx;
+				box-sizing: border-box;
+			}
+			.list_item{
+				display: flex;
+				margin-bottom: 32rpx;
+				padding: 0 30rpx;
+				box-sizing: border-box;
+				.left{
+					width: 100%;
+					display: flex;
+					.img{
+						width: 142rpx;
+						height: 142rpx;
+						margin-right: 34rpx;
+						flex-shrink: 0;
+					}
+					.center{
+						width: 100%;
+						display: flex;
+						flex-direction: column;
+						.center_title{
+							font-size: 32rpx;
+							font-weight: 500;
+							color: #333;
+						}
+						.type{
+							margin: 12rpx 0 10rpx 0;
+						}
+						.type,.num{
+							font-size: 24rpx;
+							color: #999;
+						}
+						
+					}
+				}
+				.price{
+					font-size: 32rpx;
+					color: #333;
+					font-weight: 500;
+				}
+			}
+			.favorable{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 0 30rpx;
+				box-sizing: border-box;
+				margin-bottom: 32rpx;
+				.favorable_left{
+					display: flex;
+					align-items: center;
+					.icon{
+						width: 40rpx;
+						height: 40rpx;
+						margin-right: 16rpx;
+					}
+					.name{
+						font-size: 28rpx;
+						font-weight: 400rpx;
+						color: #333;
+					}
+				}
+				.favorable_right{
+					display: flex;
+					align-items: center;
+					.favorable_right_text{
+						font-size: 24rpx;
+						color: #999;
+						font-weight: 400rpx;
+					}
+				
+				}
+			}
+			.totalPrice{
+				padding: 32rpx 30rpx;
+				box-sizing: border-box;
+				border-top: 2rpx solid #E5E5E5;
+				display: flex;
+				justify-content: flex-end;
+				align-items: flex-end;
+				font-size: 32rpx;
+				color: #333;
+				font-weight: bold;
+				.totalPriceNum{
+					font-size: 40rpx;
+				}
+			}
+		}
+	}
+	
+	
+	.remark{
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		margin-top: 30rpx;
+		.remark_bg{
+			background-color: $uni-bg-color;
+			border-radius: 22rpx;
+			padding: 32rpx 30rpx;
+			box-sizing: border-box;
+			.remark_title{
+				font-size: 32rpx;
+				color: #333;
+				font-weight: 500;
+				margin-bottom: 16rpx;
+			}
+			.u-textarea{
+				height: 148rpx;
+				background-color: #f5f5f5;
+				border-radius: 10rpx;
+				padding: 32rpx 22rpx!important;
+				box-sizing: border-box;
+				textarea{
+					font-size: 24rpx;
+				}
+			}
+			
+		}
+	}
+	.paymentMethod{
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		margin-top: 30rpx;
+		padding-bottom: 246rpx;	
+		.paymentMethod_content{
+			background-color: $uni-bg-color;
+			border-radius: 22rpx;
+			padding:30rpx 0;
+			box-sizing: border-box;
+			.paymentMethod_title{
+				font-weight: 500;
+				font-size: 32rpx;
+				color: #333333;
+				margin-bottom: 30rpx;
+				padding: 0 30rpx;
+				box-sizing: border-box;
+			}
+			.method_list{
+				padding: 20rpx 30rpx;
+				box-sizing: border-box;
+				.method_list_top{
+					display: flex;
+					justify-content: space-between;
+					.method_list_top_left{
+						display: flex;
+						.icon{
+							width: 54rpx!important;
+							margin-right: 22rpx;
+						}
+						.name{
+							font-size: 32rpx;
+							font-weight: 500;
+							color: #333;
+						}
+					}
+				}
+				.method_list_bom{
+					display: flex;
+					.balance{
+						margin-right: 20rpx;
+						margin-left: 70rpx;
+						font-size: 24rpx;
+					}
+					.topUpNow{
+						color: #FF803D;
+						font-size: 28rpx;
+					}
+				}
+			}
+			.method_list:nth-child(odd){
+				border-bottom: 2rpx solid #ccc;
+			}
+		}
+	}
+	
+	.bottom{
+		width: 100%;
+		background: #FFFFFF;
+		box-shadow: 0rpx -6rpx 14rpx 2rpx rgba(0,0,0,0.1);
+		position: fixed;
+		bottom: 0;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 32rpx 50rpx 82rpx 50rpx;
+		box-sizing: border-box;
+		z-index: 9;
+		.bottom_left{
+			display: flex;
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #333;
+			align-items: flex-end;
+			.totalAmount{
+				font-size: 40rpx;
+				font-weight: bold;
+				margin-top: 5rpx;
+			}
+		}
+		.paymentBtnText{
+			width: 216rpx;
+			height: 76rpx;
+			line-height: 76rpx;
+			background: #E8AD7B;
+			border-radius: 36rpx 36rpx 36rpx 36rpx;
+			font-weight: 400;
+			font-size: 32rpx;
+			color: #FFFFFF;
+			text-align: center;
+		}
+	}
+	.page-total{
+			position: inherit;
+		}
+	.pay-info-wrap{
+		padding: 0;
+		box-sizing: border-box;
+		.info-wrap{
+			padding: 64rpx 30rpx 30rpx 30rpx;
+			box-sizing: border-box;
+			.title{
+				align-self: center;
+				font-size: 32rpx;
+				color: #333;
+				font-weight: bold;
+			}
+		}
+		
+		.info-content{
+			.pay-title {
+				display: flex;
+				align-items: flex-end;
+				justify-content: center;
+				font-weight: bold;
+				width: 100%;
+				font-size: 48rpx;
+				color: #333;
+				margin-top: 48rpx;
+				text {
+					font-size: 60rpx;
+					color: #333;
+				}
+			}
+			
+			.pay-password {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				margin-top: 64rpx;
+			
+				.list {
+					width: 88rpx;
+					height: 88rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					border: 2rpx solid #999;
+					border-radius: 8rpx;
+					text {
+						font-size: 32rpx;
+					}
+				}
+			
+			}
+			
+			.hint {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 100%;
+				height: 100rpx;
+			
+				text {
+					font-size: 28rpx;
+					color: #ccc;
+				}
+			}
+		}
+		
+	}
+</style>
diff --git a/pages/order_detail/indexs.vue b/pages/order_detail/indexs.vue
index f13addb..739cddd 100644
--- a/pages/order_detail/indexs.vue
+++ b/pages/order_detail/indexs.vue
@@ -257,7 +257,7 @@
 		},
 		onHide() {
 			this.socketTicket.Close()
-			uni.$off('message')
+			uni.$off('getMessage')
 		},
 		onShow() {
 			uni.$on('message', this.getMessage)
diff --git a/pages/order_food/goodsList.vue b/pages/order_food/goodsList.vue
deleted file mode 100644
index 8105b1d..0000000
--- a/pages/order_food/goodsList.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-	<view>
-		<view class="t1">点击下方链接体验</view>
-		<navigator url="goodsList_scroll" hover-class="hover">
-			<view class="title">
-				<text>滚动式联动</text>
-				<text class="link">立即体验</text></view>
-			<view class="content">
-				<view>
-					优点：滚动流畅度很好，全平台兼容
-				</view>
-				<view>
-					缺点：因为需要计算高度的原因，需要在页面初始化时将所有商品信息返回，若是有大量的数据，不太建议这样做，会影响到打开时的加载速度
-				</view>
-			</view>
-		</navigator>
-		<navigator url="goodsList_swiper" hover-class="hover">
-			<view class="title">
-				<text>轮播式联动</text>
-				<text class="link">立即体验</text>
-			</view>
-			<view class="content">
-				<view>
-					优点：左侧导航与主内容区域联动性好且可以随意调整右侧内容的高度
-				</view>
-				<view>
-					缺点：因H5平台浏览器众多，体验欠佳，不建议在H5平台使用。
-					<text style="color: red;">双向联动有BUG，仅支持左侧联动</text>	
-				</view>
-			</view>
-		</navigator>
-		<view class="t2">
-			<view>因数据不可控的原因，请各位开发者们选择适合自己的模板使用，各有优缺点，选择适合自己的才是最好的。</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-.t1{
-	padding-top: 30rpx;
-	text-align: center;
-	font-size: 36rpx;
-	color: #e50000;
-}
-.t2{
-	padding: 30rpx;
-	font-size: 24rpx;
-	color: #ee0000;
-	
-	>view{
-		margin-bottom: 10rpx;
-	}
-}
-navigator{
-	font-size: 28rpx;
-	margin: 30rpx;
-	padding: 20rpx;
-	background-color: #fff;
-	border:#e5e5e5 solid 1px;
-	
-	.title{
-		padding-bottom: 20rpx;
-		margin-bottom: 20rpx;
-		border-bottom:#e5e5e5 solid 1px;
-		color:#333;
-		font-size: 32rpx;
-		
-		.link{
-			color: #09f;
-			float: right;
-		}
-	}
-	
-	.content{
-		line-height: 48rpx;
-		color:#999;
-	}
-}
-</style>
diff --git a/pages/order_food/goodsList_swiper.vue b/pages/order_food/goodsList_swiper.vue
deleted file mode 100644
index 76c11f6..0000000
--- a/pages/order_food/goodsList_swiper.vue
+++ /dev/null
@@ -1,323 +0,0 @@
-<template>
-	<view class="container">
-		<!-- 顶部面板 -->
-		<view class="top--panel">
-			<!-- 顶部面板，可添加所需要放在页面顶部的内容代码。比如banner图 -->
-			<view style="background-color: #ffaa00;text-align: center;font-size: 28rpx;padding: 10px 0;color: #fff;">
-				<view>这里顶部内容占位区域，不需要则删除</view>
-				<view>可添加需放在页面顶部的内容，比如banner图</view>
-			</view>
-		</view>
-		<!-- 滚动区域 -->
-		<view class="scroll-panel" id="scroll-panel">
-			<view class="list-box">
-				<view class="left">
-					<scroll-view scroll-y="true" 
-					:style="{ 'height':scrollHeight }"
-					:scroll-into-view="leftIntoView"
-					:scroll-with-animation="true"
-					>
-						<view class="item" 
-							v-for="(item,index) in leftArray"
-							:key="index" 
-							:class="{ 'active':index==leftIndex }" 
-							:id="'left-'+index"
-							:data-index="index"
-							@tap="leftTap"
-						>{{item}}</view>
-			        </scroll-view>
-				</view>
-				<view class="main">
-					<swiper class="swiper" :style="{ 'height':scrollHeight }" 
-						:current="leftIndex" @change="swiperChange"
-						 :vertical="true" duration="200" :disable-touch="true">
-						<swiper-item v-for="(item,index) in mainArray" :key="index">
-							<scroll-view  scroll-y="true" :style="{ 'height':scrollHeight }">
-								<view class="item">
-									<view class="title">
-										<view>{{item.title}}</view>
-									</view>
-									<view class="goods" v-for="(item2,index2) in item.list" :key="index2">
-										<image src="/static/logo.png" mode=""></image>
-										<view>
-											<view>第{{index2+1}}个商品标题</view>
-											<view class="describe">第{{index2+1}}个商品的描述内容</view>
-											<view class="money">第{{index2+1}}个商品的价格</view>
-										</view>
-									</view>
-								</view>
-							</scroll-view>
-						</swiper-item>
-					</swiper>
-				</view>
-			</view>
-		</view>
-		<!-- 底部面板 -->
-		<view class="bottom-panel">
-			<!-- 底部面板，可添加所需要放在页面底部的内容代码。比如购物车栏目 -->
-			<view style="background-color: #ffaa00;text-align: center;font-size: 28rpx;padding: 10px 0;color: #fff;">
-				<view>这里底部内容占位区域，不需要则删除</view>
-				<view>可添加需放在页面底部的内容，比如购物车栏目</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				scrollHeight:'400px',
-				leftArray:[],
-				mainArray:[],
-				leftIndex:0
-			}
-		},
-		computed:{
-			/* 计算左侧滚动位置定位 */
-			leftIntoView(){
-				return `left-${this.leftIndex > 5 ? (this.leftIndex-5):0}`;
-			}
-		},
-		onReady(){
-			/* 在非H5平台，nextTick回调后有概率获取到错误的元素高度，则添加200ms的延迟来减少BUG的产生 */
-			setTimeout(()=>{
-				/* 等待滚动区域初始化完成 */
-				this.initScrollView().then(()=>{
-					/* 获取列表数据，你的代码从此处开始 */
-					this.getListData();
-				})
-			},100);
-		},
-		methods: {
-			/* 初始化滚动区域 */
-			initScrollView(){
-				return new Promise((resolve, reject)=>{
-					let view = uni.createSelectorQuery().select('#scroll-panel');
-					view.boundingClientRect(res => {
-						this.scrollHeight = `${res.height}px`;
-						setTimeout(()=>{
-							resolve();
-						},100);
-					}).exec();
-				});
-			},
-			/* 获取列表数据 */
-			getListData(){
-				// Promise 为 ES6 新增的API ，有疑问的请自行学习该方法的使用。
-				new Promise((resolve,reject)=>{
-					/* 因无真实数据，当前方法模拟数据。正式项目中将此处替换为 数据请求即可 */
-					uni.showLoading();
-					setTimeout(()=>{
-						/* 因无真实数据，当前方法模拟数据。正式项目中将此处替换为 数据请求即可 */
-						uni.showLoading();
-						
-						// 模拟数据
-						let mockData = ()=>{
-							let [left,main]=[[],[]];
-							
-							let size = Math.floor(Math.random()*40);
-							size = size < 20 ? 20 : size;
-							for(let i=0;i<size;i++){
-								left.push(`${i+1}类商品`);
-								
-								let list=[];
-								let r = Math.floor(Math.random()*10);
-								r = r < 20 ? 20 : r;
-								for(let j=0;j<r;j++){
-									list.push(j);
-								}
-								main.push({
-									title:`第${i+1}类商品标题`,
-									list
-								})
-							}
-							
-							return {
-								left,
-								main
-							}
-						}
-						setTimeout(()=>{
-							let res = mockData();
-							let {left,main} = res;
-							// 将请求接口返回的数据传递给 Promise 对象的 then 函数。
-							resolve({left,main});
-						},1000);
-					},1000);
-				}).then((res)=>{
-					console.log('-----------请求接口返回数据示例-------------');
-					console.log(res);
-					
-					uni.hideLoading();
-					this.leftArray=res.left;
-					this.mainArray=res.main;
-				});
-			},
-			/* 左侧导航点击 */
-			leftTap(e){
-				let index=e.currentTarget.dataset.index;
-				this.leftIndex=Number(index);
-			},
-			/* 轮播图切换 */
-			swiperChange(e){
-				let index=e.detail.current;
-				this.leftIndex=Number(index);
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-page{
-	height: 100vh;
-}
-.container{
-	height: 100%;
-}
-/* 容器 */
-.container{
-	display: flex;
-	flex-direction: column;
-	flex-wrap: nowrap;
-	justify-content: flex-start;
-	align-items: flex-start;
-	align-content: flex-start;
-	
-	&>view{
-		width: 100%;
-	}
-	
-	.scroll-panel{
-		flex-grow: 1;
-		height: 0;
-		overflow: hidden;
-	}
-	
-	.bottom-panel{
-		padding-bottom: 0;
-		padding-bottom: constant(safe-area-inset-bottom);  
-		padding-bottom: env(safe-area-inset-bottom);		
-	}
-}
-	
-	
-.list-box{
-	display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    justify-content: flex-start;
-    align-items: flex-start;
-    align-content: flex-start;
-	font-size: 28rpx;
-	
-	.left{
-		width: 200rpx;
-		background-color: #f6f6f6;
-		line-height: normal;
-		box-sizing: border-box;
-		font-size: 32rpx;
-		
-		.item{
-			padding: 30rpx;
-			position: relative;
-			
-			
-			& + .item{
-				margin-top: 1px;
-							
-				&::after {
-					content: '';
-					display: block;
-					height: 0;
-					border-top: #d6d6d6 solid 1px;
-					width: 620upx;
-					position: absolute;
-					top: -1px;
-					right: 0;
-					transform:scaleY(0.5);	/* 1px像素 */
-				}
-			}
-			
-			&.active{
-				color: #42b983;
-				background-color: #fff;
-				position: relative;
-				
-				&::before{
-					content: '';
-					display: block;
-					position: absolute;
-					top: 0;
-					left: 0;
-					border-left: #42b983 solid 4px;
-					height: 100%;
-					width: 0;
-				}
-			}
-		}
-		
-		.fill-last{
-			height: 0;
-			width: 100%;
-			background: none;
-		}
-	}
-	.main{
-		background-color: #fff;
-		padding-left: 20rpx;
-		width: 0;
-		flex-grow: 1;
-		box-sizing: border-box;
-		
-		
-		
-		.title{
-			line-height: normal;
-			padding: 30rpx 0;
-			font-size: 24rpx;
-			font-weight: bold;
-			color: #666;
-			background-color: #fff;
-			position: sticky;
-			top: 0;
-			z-index: 19;
-		}
-		
-		.item{
-			padding-bottom: 16rpx;
-			border-bottom: #eee solid 1px;
-		}
-		
-		.goods{
-			display: flex;
-			flex-direction: row;
-			flex-wrap: nowrap;
-			justify-content: flex-start;
-			align-items: center;
-			align-content: center;
-			
-			& + .goods{
-				margin-top: 16rpx;
-			}
-			
-			& > image{
-				width: 120rpx;
-				height: 120rpx;
-				margin-right: 16rpx;
-				margin-left: 2px;
-			}
-			
-			.describe{
-				font-size: 24rpx;
-				color: #999;
-			}
-			
-			.money{
-				font-size: 24rpx;
-				color: #efba21;
-			}
-		}
-	}
-}
-</style>
diff --git a/pages/order_food/order_food - 副本.vue b/pages/order_food/order_food - 副本.vue
index ece93bb..03e33d2 100644
--- a/pages/order_food/order_food - 副本.vue	
+++ b/pages/order_food/order_food - 副本.vue	
@@ -1,129 +1,186 @@
 <template>
-	<view id="wrapper">
+	<view class="container">
+		<!-- 占位符  接口请求完毕才显示 -->
 		<view v-if="fixedtrue"
 			style="height: 100vh; width: 100%; position: fixed; z-index: 999; top: 0; left: 0; background-color: #fff; display: flex; justify-content: center; align-items: center;">
 			<image style="width: 140rpx; height: 140rpx;" src="@/static/1.gif" mode="aspectFill"></image>
-			<text style="margin-left10rpx;font-size: 40rpx;color: #7d7d76;">加载中</text>
-			<!-- <u-loadmore status="loading" fontSize="50" iconSize="30"/> -->
+			<text style="margin-left:10rpx;font-size: 40rpx;color: #7d7d76;">加载中</text>
 		</view>
-		<view class="nav-wrap" :class="{ 'is-fixed': isFixed }"
-			:style="{ paddingTop: `${menuInfo.top}px`, paddingBottom: `${paddingBtmSize}px` }">
-			<view class="content" :style="{ height: `${menuInfo.height}px`, paddingLeft: `${paddingBtmSize}px` }">
-				<view class="left-btn">
-					<view class="btn" :style="{ width: `${menuInfo.height}px`, height: `${menuInfo.height}px` }"
-						@click="navClickHandle(1)">
-						<u-icon name="arrow-left" :color="isFixed ? '#333' : '#fff'" size="28"></u-icon>
-					</view>
-					<view class="btn" :style="{ width: `${menuInfo.height}px`, height: `${menuInfo.height}px` }"
-						@click="navClickHandle(2)">
-						<u-icon name="kefu-ermai" :color="isFixed ? '#333' : '#fff'" size="28"></u-icon>
-					</view>
+		<!-- 顶部面板 -->
+		<view class="top--panel">
+			<navseat :opacity='opacity' :titleshow='true' :heightshow='opacity'></navseat>
+			<!-- 顶部面板，可添加所需要放在页面顶部的内容代码。比如banner图 -->
+			<image class="panelimgbackground" :src="shopInfo.storeInfo.coverImg" mode="aspectFill">
+			</image>
+			<view class="panelone">
+				{{ shopInfo.storeInfo.shopName }}
+			</view>
+			<view class="paneltow">
+				距离您{{ shopInfo.distance }}
+			</view>
+			<view class="panelthere flex-between">
+				<view class="paneltheretext">
+					营业时间：{{ shopInfo.storeInfo.businessStartDay +'至'+ shopInfo.storeInfo.businessEndDay +' '+ shopInfo.storeInfo.businessTime }}
+				</view>
+				<view class="flex-start" @click="showShopClick">
+					<view style="margin-right: 14rpx;">查看</view>
+					<u-icon name="arrow-down" color="#999999" size="28"></u-icon>
 				</view>
 			</view>
-		</view>
-		<view class="shop-cover" :style="{ height: `${menuInfo.top + menuInfo.height + paddingBtmSize * 8}px` }">
-			<image class="img" :src="shopList.storeInfo.coverImg" mode="aspectFill"></image>
-		</view>
-		<view class="list-container">
-			<view class="header-wrap">
-				<text class="title">
-					<text class="t">{{ shopList.storeInfo.shopName }}</text>
-				</text>
-				<view class="cover">
-					<image class="img" :src="shopList.storeInfo.logo" mode="aspectFill"></image>
-				</view>
+			<view class="panelfour" v-if="shopProductList.hots && shopProductList.hots.length > 0">
+				本店招牌菜
 			</view>
-			<view class="tab-header"
-				:style="{ height: `${tabHeadHeight}px`, top: `${menuInfo.top + menuInfo.height + paddingBtmSize}px` }">
+			<view class="panelfive">
+				<scroll-view :scroll-x="true" :scroll-into-view="leftIntoView" :scroll-with-animation="false">
+					<view class="panelfive_list">
+						<view class="panelfiveitem" @click="clickspecifications(item,index,index,'热销')"
+							v-for="(item,index) in shopProductList.hots" :key="index">
+							<image class="panelfiveitemimage" :src="item.coverImg" mode="aspectFill"></image>
+							<view class="panelfiveitemone">
+								{{ item.name }}
+							</view>
+							<view class="panelfiveitemtow">
+								本店回头客第{{index+1}}名
+							</view>
+							<view class="panelfiveitemthere flex-start">
+								<text>招牌</text>
+							</view>
+							<view class="panelfiveitemfour">
+								{{item.shortTitle?item.shortTitle:''}}
+							</view>
+							<view class="panelfiveitemfive">
+								月售{{item.stockNumber}}
+							</view>
+							<view class="panelfiveitemsex flex-between">
+								<view class="panelfiveitemsex_oen">
+									<text>¥</text>
+									<text>{{item.lowPrice}}</text>
+									<text>/份</text>
+									<text>「{{item.suit}}份起点」</text>
+								</view>
+								<!-- <u-icon name="plus-circle-fill" color="#E9AB7A" size="40"></u-icon> -->
+
+							</view>
+							<view class="panelfiveitemNum">
+								<view class="sku-wrap flex-center" v-if="item.productSkuResult != null"
+									@click.stop="clickspecifications(item,index,index1)">
+									<text class="t">选规格</text>
+									<text class="dot num"
+										v-if="item.cartNumber != '0'">{{item.cartNumber<99?item.cartNumber:'99+'}}</text>
+								</view>
+								<view class="Controls" v-else>
+									<view v-if="item.cartNumber != '0'"
+										@click.stop="cartadd(item,'-',item.productSkuResult == null ? '单规格':'',$event)">
+										<u-icon name="minus-circle-fill" color="#E9AB7A" size="50"></u-icon>
+									</view>
+									<text class="num"> {{ item.cartNumber }} </text>
+									<view @click.stop="cartadd(item,'+',item.productSkuResult == null ? '单规格':'')">
+										<u-icon name="plus-circle-fill" color="#E9AB7A" size="50"></u-icon>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+
+			</view>
+		</view>
+		<!-- 滚动区域 -->
+		<view class="scroll-panel" id="scroll-panel">
+			<view class="list-box">
 				<view class="left">
-					<text class="t">选择</text>
+					<scroll-view :scroll-y="!isFixed" :style="{ 'height':scrollHeight + 'px' }"
+						:scroll-into-view="leftIntoView" :scroll-with-animation="false">
+						<view class="item" v-for="(item,index) in shopProductList.productInfo" :key="index"
+							:class="{ 'active':index==leftIndex }" :id="'left-'+index" :data-index="index"
+							@tap="leftTap">{{item.name}}</view>
+						<view class="items"></view>
+					</scroll-view>
 				</view>
-				<view class="right">
-					<text class="t">商家</text>
-					<text class="d">{{ shopList.shopTableInfo.name }}</text>
-				</view>
-			</view>
-			<view class="tab-content">
-				<view class="left-wrap">
-					<view class="left"
-						:style="{ top: `${menuInfo.top + menuInfo.height + paddingBtmSize + tabHeadHeight}px` }">
-						<view class="item" v-for="(item, index) in shopList.productInfo" :key="item.id"
-							:class="{ active: titleTopNumIndex == index }" @click="titleClickHandle(item.id)">
-							<text>{{ item.name }}</text>
-						</view>
-					</view>
-				</view>
-				<view class="list-wrap">
-					<view class="item-wrap" v-for="(item,index) in shopList.productInfo" :key="item.id">
-						<view class="title-wrap" :id="`title${item.id}`"></view>
-						<view class="title"
-							:style="{ top: `${menuInfo.top + menuInfo.height + paddingBtmSize + tabHeadHeight}px` }">
-							<!--  -->
-							<text>{{ item.name }}</text>
-						</view>
-						<view class="" v-if="item.products.length == 0">
-							空
-						</view>
-						<view class="shop-item" v-for="(item1,index1) in item.products" :key="item1.id">
-							<view class="cover langcover" style="width:180rpx; height: 180rpx;"
-								@click.stop="clickspecifications(item1,index,index1)">
-								<c-image style="position: absolute;z-index:2;"
-									:src="`${item1.coverImg}?x-oss-process=image/resize,m_lfit,w_90,h_90`" width="180"
-									height="180"></c-image>
+				<view class="main">
+					<scroll-view :scroll-y="!isFixed" :scroll-top="scrollHeight"
+						:style="{ 'height':scrollHeight + 'px' }" @scroll="mainScroll" :scroll-into-view="scrollInto"
+						:scroll-with-animation="false">
+						<view class="item main-item" v-for="(item,index) in shopProductList.productInfo" :key="index"
+							:id="'item-'+index">
+							<view class="title">
+								<view>{{item.name}}</view>
 							</view>
-							<view class="info" style="display: flex;flex-direction: column;justify-content: center;">
-								<view class="name">
-									{{ item1.name }}
+							<view class="goods" @click="clickspecifications(item1,index,index1)"
+								v-for="(item1,index1) in item.products" :key="index1">
+								<image class="goodsImg" v-if="item1.coverImg!=null" :lazy-load="true"
+									:src="`${item1.coverImg}?x-oss-process=image/resize,m_lfit,w_90,h_90`"></image>
+								<image class="goodsImg" src="@/static/1.gif" mode="" v-else :lazy-load="true"></image>
+								<view v-if="item.name=='热销'" class="topSort" :class="'c'+(index1+1)">TOP{{index1+1}}
 								</view>
-								<view class="price-wrap">
-									<view class="price">
-										<text class="i">￥</text>
-										<text class="num">{{ item1.lowPrice }}</text>
-										<text class="i">起</text>
-									</view>
-									<view class="sku-wrap" v-if="item1.productSkuResult != null"
-										@click.stop="clickspecifications(item1,index,index1)">
-										<text class="t">选规格</text>
-										<text class="dot num" v-if="item1.cartNumber != '0'">{{item1.cartNumber}}</text>
-									</view>
-									<view class="operation-wrap" v-else>
-										<view class="btn" v-if="item1.cartNumber != '0'"
-											@click.stop="cartadd(item1,index,index1,'-',item1.productSkuResult == null ? '单规格':'')">
-											<u-icon :name="require('@/static/icon_sub.png')" size="36"></u-icon>
+								<view class="goods_right">
+									<view class="name">{{ item1.name }}</view>
+									<view class="lookBack" v-if="item.name=='热销'">本店回头客第{{index1+1}}名</view>
+									<view class="describe"> {{item1.shortTitle?item1.shortTitle:''}} </view>
+									<view class="monthlySale">月售{{item1.stockNumber}}</view>
+									<view class="money">￥<text class="money_num">{{ item1.lowPrice }}</text>/份<text
+											class="suit">「{{item1.suit}}份起点」</text></view>
+
+									<view class="flex-end" v-if="item1.productSkuResult != null">
+										<view class="sku-wrap flex-center"
+											@click.stop="clickspecifications(item1,index,index1)">
+											<text class="t">选规格</text>
+											<text class="dot num"
+												v-if="item1.cartNumber != '0'">{{item1.cartNumber<99?item1.cartNumber:'99+'}}</text>
 										</view>
-										<text class="num">{{ item1.cartNumber }}</text>
-										<view class="btn"
-											@click.stop="cartadd(item1,index,index1,'+',item1.productSkuResult == null ? '单规格':'')">
-											<u-icon :name="require('@/static/icon_add.png')" size="36"></u-icon>
+									</view>
+
+									<view class="Controls" v-else>
+										<view v-if="item1.cartNumber != '0'"
+											@click.stop="cartadd(item1,'-',item1.productSkuResult == null ? '单规格':'',$event)">
+											<u-icon name="minus-circle-fill" color="#E9AB7A" size="50"></u-icon>
 										</view>
+										<text class="num"> {{ item1.cartNumber }} </text>
+										<view
+											@click.stop="cartadd(item1,'+',item1.productSkuResult == null ? '单规格':'')">
+											<u-icon name="plus-circle-fill" color="#E9AB7A" size="50"></u-icon>
+										</view>
+
 									</view>
 								</view>
 							</view>
 						</view>
-					</view>
+						<view class="fill-last" :style="{ 'height':fillHeight + 'px' }"></view>
+					</scroll-view>
 				</view>
 			</view>
 		</view>
-		<view class="cart-wrap">
+
+		<!-- 购物车悬浮条 -->
+		<view class="cart-wrap" v-if="cartListsdatashow">
 			<view class="cart-content">
 				<view class="left">
-					<image class="icon" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/icon_cart.png"
-						mode="aspectFit" @click="showCart = !showCart">
-					</image>
+					<view class="iconBox">
+						<image class="icon"
+							src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/shopIcon.png"
+							mode="aspectFill" @click="showCart = !showCart">
+						</image>
+						<text class="u-badge"> {{cartLists_count<99?cartLists_count:'99+'}} </text>
+					</view>
+
 					<text class="i">￥</text>
 					<text class="num">{{cartLists.amount||'0.00'}}</text>
 				</view>
 				<view class="btn" @tap="$u.debounce(orderdetail, 500)">
-					<text class="t">提交订单</text>
+					<text class="t">去结算</text>
 				</view>
 			</view>
 		</view>
-		<u-popup :show="showCart" :round="20" :zIndex="98" :overlayStyle="{ zIndex: 98 }" @close="showCart = false">
+
+		<!-- 购物车 -->
+		<u-popup :show="showCart" :round="20" :safeAreaInsetBottom="false" :zIndex="98" :overlayStyle="{ zIndex: 98 }"
+			@close="showCart = false">
 			<view class="cart-list-wrap">
-				<view class="cart-header">
+				<view class="cart-header flex-between">
+					<view class="num">已点 {{cartLists_count}} 份</view>
 					<view class="clear" @click="cartclear">
 						<u-icon name="trash" color="#999"></u-icon>
-						<text class="t">清空购物车</text>
+						<text class="t">清空</text>
 					</view>
 				</view>
 				<scroll-view scroll-y class="scroll-view">
@@ -133,25 +190,21 @@
 								<c-image :src="item.coverImg" width="120" height="120"></c-image>
 							</view>
 							<view class="info">
-								<view class="name">
-									{{ item.name }}
-								</view>
-								<view class="select-sku-wrap">
-									<text class="t">{{ item.skuName }}</text>
-								</view>
+								<view class="name"> {{ item.name }} </view>
+								<view class="select-sku-wrap"> {{ item.skuName }} </view>
+
 								<view class="price-wrap" style="padding-top: 0;">
 									<view class="price">
 										<text class="i">￥</text>
 										<text class="num">{{ item.salePrice }}</text>
-										<text class="i">起</text>
 									</view>
 									<view class="operation-wrap">
 										<view class="btn" v-if="item.number" @click="cartListadd(item,index,'-')">
-											<u-icon :name="require('@/static/icon_sub.png')" size="34"></u-icon>
+											<u-icon name="minus-circle-fill" color="#E9AB7A" size="50"></u-icon>
 										</view>
 										<text class="num" v-if="item.number">{{ item.number }}</text>
 										<view class="btn" @click="cartListadd(item,index,'+')">
-											<u-icon :name="require('@/static/icon_add.png')" size="34"></u-icon>
+											<u-icon name="plus-circle-fill" color="#E9AB7A" size="50"></u-icon>
 										</view>
 									</view>
 								</view>
@@ -161,39 +214,58 @@
 				</scroll-view>
 			</view>
 		</u-popup>
-		<u-popup :show="showShopInfo" :round="20" @close="showShopInfo = false">
+
+
+		<!-- 店铺详情 -->
+		<u-popup :show="showShopInfo" :round="20" mode="bottom" @close="showShopInfo = false" height="500">
 			<view class="shop-info-wrap">
-				<view class="info-wrap">
-					<image :src="shopList.storeInfo.coverImg" mode="aspectFill" class="img"></image>
-					<text class="t">{{ shopList.storeInfo.shopName }}</text>
+				<view class="info-wrap flex-between">
+					<view></view>
+					<text class="shopName">{{ shopInfo.storeInfo.shopName }}</text>
+					<view class="close" @click="showShopInfo = false">
+						<u-icon name="close" color="#999999" size="28"></u-icon>
+					</view>
 				</view>
+				<view class="info-wrap-title">商家信息</view>
+				<view class="row" style="margin-bottom: 20rpx;">
+					<view class="col">
+						<text class="l">营业时间：</text>
+						<text
+							class="t">{{ shopInfo.storeInfo.businessStartDay +'至'+ shopInfo.storeInfo.businessEndDay +' '+ shopInfo.storeInfo.businessTime }}</text>
+					</view>
+					<view class="col">
+						<text class="l">商家地址：</text>
+						<text class="t">{{ shopInfo.storeInfo.address }}</text>
+					</view>
+					<view class="col" @click="makePhoneCall(shopInfo.storeInfo.phone)">
+						<text class="l">商家电话：</text>
+						<text class="t">{{ shopInfo.storeInfo.phone }}</text>
+					</view>
+				</view>
+				<view class="info-wrap-title">商家公告</view>
 				<view class="row">
 					<view class="col">
-						<text class="t">{{ shopList.storeInfo.businessTime }}</text>
-					</view>
-					<view class="col" @click="makePhoneCall(shopList.storeInfo.phone)">
-						<text class="t">{{ shopList.storeInfo.phone }}</text>
-					</view>
-					<view class="col">
-						<text class="t">{{ shopList.storeInfo.address }}</text>
+						<text class="l">公告：</text>
+						<text class="t">{{ shopInfo.storeInfo.detail }}</text>
 					</view>
 				</view>
-				<view class="line"></view>
-				<view class="close" @click="showShopInfo = false">
-					<text class="t">关闭</text>
-				</view>
+
 			</view>
 		</u-popup>
-		<u-popup :show="showShopsku" :round="20" mode="center" @close="showShopsku = false"
+
+		<!-- 规格 -->
+		<u-popup :show="showShopsku" :round="20" mode="bottom" @close="showShopsku = false"
 			:safeAreaInsetBottom='false'>
-			<view class="shop_sku">
+			<view class="shop_sku" :style="{ 'max-height':scrollHeight + 'px' }">
 				<view class="positionabsolute">
-					<u-icon name="close-circle-fill" @click="showShopsku = false" color="#a3aaa3" size="60"></u-icon>
-				</view>
-				<image class="shop_skucimage" :src="specifications.coverImg" mode="widthFix"></image>
-				<view class="shop_sku_name">
-					{{specifications.name}}
+					<u-icon name="close-circle" @click="showShopsku = false" color="#000" size="50"></u-icon>
 				</view>
+				<image class="shop_skucimage" :src="specifications.coverImg" mode="aspectFill"></image>
+				<view class="shop_sku_name"> {{specifications.name}} </view>
+				<view class="shop_sku_returned" v-if="specifications.typeName&&specifications.typeName=='热销'">
+					本店回头客第{{specifications.indexb+1}}名 </view>
+				<view class="shop_sku_description"> {{specifications.shortTitle?specifications.shortTitle:''}} </view>
+
 				<view class="shop_sku_box" v-for="(item,index) in specifications.tagSnap" :key="index"
 					v-if="specifications.tagSnap">
 					<view class="shop_sku_box_name">
@@ -207,93 +279,112 @@
 						</view>
 					</view>
 				</view>
-				<view class="shop_skuselect flex-start" v-if="specifications.tagSnap">
-					已选规格：<view class="shop_skuselectname">{{skuidname.toString()}}</view>
-				</view>
-				<view class="shop_bottom flex-between">
-					<view class="price">
-						<text class="i">￥</text>
-						<text class="num">{{salePrice}}</text>
-						<text class="i">起</text>
-					</view>
-					<view class="operation-wrap">
-						<view class="btn"
-							@click="cartadd(specifications,specifications.indexa,specifications.indexb,'-',specifications.tagSnap == null ? '单规格':'')">
-							<u-icon :name="require('@/static/icon_sub.png')" size="34"></u-icon>
+
+
+				<view class="shop_bottom ">
+					<view class="flex-between">
+						<view class="price">
+							<text class="i">￥</text>
+							<text class="num">{{salePrice}}</text>
+							<text class="i">/杯</text>
 						</view>
-						<text class="num">{{amountcartNumber}}</text>
-						<view class="btn"
-							@click="cartadd(specifications,specifications.indexa,specifications.indexb,'+',specifications.tagSnap == null ? '单规格':'')">
-							<u-icon :name="require('@/static/icon_add.png')" size="34"></u-icon>
+						<view class="operation-wrap">
+
+							<view class="btn"
+								@click="shopAdd(specifications,specifications.indexa,specifications.indexb,'-',specifications.tagSnap == null ? '单规格':'')">
+								<u-icon name="minus-circle-fill" color="#E9AB7A" size="50"></u-icon>
+							</view>
+							<text class="num">{{amountcartNumber}}</text>
+							<view class="btn"
+								@click="shopAdd(specifications,specifications.indexa,specifications.indexb,'+',specifications.tagSnap == null ? '单规格':'')">
+								<u-icon name="plus-circle-fill" color="#E9AB7A" size="50"></u-icon>
+							</view>
 						</view>
 					</view>
+					<view class="shop_skuselect flex-start" v-if="specifications.tagSnap">
+						<view class="shop_skuselectname">{{skuidname.toString()}}</view>
+					</view>
+					<view class="addShopping" :class="amountcartNumber>0?'active':''"
+						@click="addShopping(specifications,specifications.indexa,specifications.indexb,'+',specifications.tagSnap == null ? '单规格':'')">
+						添加到购物车</view>
 				</view>
 			</view>
 		</u-popup>
-		<l-barrage ref="lBarrage" @end="onEnd" :minTop='8' :maxTop='20' :avatar='barrageavatar'></l-barrage>
 	</view>
-</template>
 
+</template>
 <script>
-	import _ from 'lodash';
+	import navseat from '@/components/navseat.vue'
 	import webSocketUtils from '@/common/js/websocket.js';
-	import orderdetail from '@/pages/order_detail/index';
-	import lBarrage from '@/components/l-barrage/l-barrage.vue'
 	export default {
 		components: {
-			orderdetail,
-			lBarrage
+			navseat
 		},
 		data() {
 			return {
+				fixedtrue: true,
 				userInfo: uni.cache.get('userInfo'), //个人信息
-				// #ifndef MP-WEIXIN
-				menuInfo: uni.getSystemInfo(),
-				// #endif
-				// #ifdef MP-WEIXIN
-				menuInfo: uni.getMenuButtonBoundingClientRect(),
-				// #endif
-				paddingBtmSize: 6,
-				tabHeadHeight: 50,
-				isFixed: false,
-				shopList: {}, //数据类型
-				active: 0,
-				showShopInfo: false,
-				showShopsku: false,
-				titleTopNumIndex: 0,
-				titleTopNums: [],
-				showCart: false,
-				tableCode: '', //code，
-				specifications: {},
-				skuidname: [],
+				opacity: false, //是否显示
+				scrollHeight: 1000,
+				scrollTopSize: 0, //距离顶部的高度
+				fillHeight: 0, // 填充高度，用于最后一项低于滚动区域时使用
+				leftArray: [],
+				mainArray: [],
+				topArr: [],
+				leftIndex: 0,
+				scrollInto: '',
+				isFixed: true,
+				showShopInfo: false, //店铺信息弹窗是否显示
+				showShopsku: false, //多规格弹窗是否显示
+				skuId: null, // 多规格ID
 				cartLists: {}, //购物车
-				orderdetailcartLists: {}, //提交订单
+				cartLists_count: 0,
+				shopInfo: {}, //店铺信息
+				shopProductList: {}, //商品信息
+				specifications: {
+
+				}, // 规格信息
 				socketTicket: null,
 				amountcartNumber: 0,
-				skuidsearch: '', //
+				skuNumber: 0,
+				skuSuit: 0,
 				salePrice: '', //钱数
-				fixedtrue: true,
-				datasocket: {}, //储存传参数据
-				radiovalue: '1', //选择支付方式
-				amountVIP: null, //余额
-				barrageavatar: '' //弹幕头像
-			};
+				cartListsdatashow: false, //是否显示购物车
+				showCart: false,
+			}
 		},
 		onPageScroll(e) {
-			if (e.scrollTop >= (this.menuInfo.top + this.menuInfo.height + this.paddingBtmSize) / 2) {
-				this.isFixed = true;
-				uni.setNavigationBarColor({
-					frontColor: '#000000',
-					backgroundColor: '#ffffff'
-				});
+			if (e.scrollTop <= 44) { //搜索导航栏显示影藏
+				this.opacity = false
 			} else {
-				this.isFixed = false;
-				uni.setNavigationBarColor({
-					frontColor: '#ffffff',
-					backgroundColor: '#000000'
-				});
+				this.opacity = true
 			}
-			this.countScrollTitle(e.scrollTop);
+			this.$u.debounce(() => {
+				if (e.scrollTop + 20 >= this.scrollTopSize) { //控制大图层
+					this.isFixed = false;
+				} else {
+					this.isFixed = true;
+				}
+			}, 10)
+
+		},
+		computed: {
+			/* 计算左侧滚动位置定位 */
+			leftIntoView() {
+				return `left-${this.leftIndex? this.leftIndex:0}`;
+			},
+			HeighT() { //手机类型的尺寸    导航栏高度
+				return this.$store.getters.is_BarHeight.heightBar + this.$store.getters.is_BarHeight.customBar
+			},
+		},
+		onReady() {
+			setTimeout(() => {
+				uni.getSystemInfo({
+					success: (data) => {
+						this.scrollHeight = data.windowHeight
+					}
+				})
+			}, 100);
 		},
 		onLoad(e) {
 			if (e.q) {
@@ -301,9 +392,7 @@
 				uni.cache.set('tableCode', this.tableCode)
 			}
 			uni.cache.set('types', 'types');
-			this.$nextTick(() => {
-				this.countTitleTopNum(); //导航栏
-			});
+
 		},
 		onUnload() {
 			this.socketTicket.Close()
@@ -315,112 +404,43 @@
 			this.fixedtrue = true
 		},
 		onShow() {
-			uni.$on('message', this.getMessage)
-			this.productqueryShopIdByTableCode() //获取shop User id
+			if (!uni.cache.get('token')) {
+				uni.login({
+					provider: 'weixin',
+					success: async (data) => {
+						try {
+							uni.getUserInfo({
+								provider: 'weixin',
+								success: async (infoRes) => {
+									uni.cache.set('weixincode', data.code);
+									let res = await this.api.userwxlogin({
+										code: uni.cache.get('weixincode'), //临时登录凭证
+										rawData: infoRes.rawData
+									})
+									if (res.code == 0) {
+										uni.cache.set('token', res.data.token);
+										uni.cache.set('miniAppOpenId', res.data.userInfo
+											.miniAppOpenId)
+										uni.cache.set('userInfo', res.data.userInfo);
+										uni.$on('message', this.getMessage)
+										this.productqueryShop();
+									}
+								},
+								fail: (err) => {}
+							});
+						} catch (e) {}
+					}
+				});
+			} else {
+				uni.$on('message', this.getMessage)
+				this.productqueryShop();
+			}
 		},
 		methods: {
-			onEnd() { //回调弹幕
-				console.log('一波结束')
-			},
-			// 单独获取他的shopUserid
-			async productqueryShopIdByTableCode() {
-				let res = await this.api.productqueryShopIdByTableCode({
-					code: uni.cache.get('tableCode')
-				})
-				if (res.code == 0) {
-					uni.cache.set('shopUser', res.data)
-					this.handlemessage() //监听websocket返回
-					this.productqueryProduct() //list  数据
-				} else {
-					setTimeout(() => {
-						uni.pro.switchTab('index/index')
-					}, 1000)
-				}
-			},
-			getMessage(msg) { //wss  回显数据
-				if (msg == 1) { // 网络在连接
-					this.fixedtrue = true
-					return false
-				}
-				this.fixedtrue = false
-				if (msg.type == 'heartbeat') { //后台心跳  处理返回  不然控制台一直报错
-					return false
-				}
-				try {
-					if (msg.status != 'success') {
-						uni.showToast({
-							title: msg.msg,
-							icon: "none",
-						})
-						if (msg.msg == '桌码不存在') { //卓码不存在直接退出
-							this.socketTicket.Close()
-							uni.$off('message')
-							uni.navigateBack()
-							return false;
-						}
-					} else {
-						switch (msg.type) {
-							case 'sku': // sku  数量 查询这个商品的价格和数量
-								this.$set(this, 'amountcartNumber', msg.amount)
-								this.productqueryProduct() //list  数据
-								break;
-							case 'clearCart':
-								this.cartLists = msg
-								this.productqueryProduct() //list  数据
-								this.skuidname = []
-								this.showCart = false
-								setTimeout(() => {
-									uni.showToast({
-										title: msg.msg,
-										icon: "none",
-									})
-								}, 500)
-								break;
-							case 'order':
-								this.skuidname = []
-								this.showCart = false
-								this.cartLists = msg
-								this.productqueryProduct() //list  数据
-								break;
-							case 'addCart': //初始化add
-								this.cartLists = msg
-								this.productqueryProduct() //list  数据
-								break;
-							case 'addcart':
-								this.cartLists = msg
-								console.log(msg, 1111)
-								this.productqueryProduct() //list  数据
-								try {
-									if (msg.data.length != 0) {
-										let nums = 0
-										msg.data.forEach((item, index, arr) => { //初始化skuidname的数据  选择第一个
-											if (item.skuId == this.skuidsearch) {
-												nums = item.number
-											}
-										})
-										this.$set(this, 'amountcartNumber', nums)
-									} else {
-										this.$set(this, 'amountcartNumber', 0)
-									}
-								} catch (e) {
-									//TODO handle the exception
-								}
-								try {
-									this.barrageavatar = msg.reqData.headImg
-									/*插入一条弹幕*/
-									this.$refs.lBarrage.add(
-										`${msg.reqData.nickName?msg.reqData.nickName:'微信用户'}${msg.reqData.num==-1?'取消了':'添加了'}${msg.reqData.name}(${msg.reqData.num})`
-									);
-								} catch (e) {
-									//TODO handle the exception
-								}
-								break;
-						}
-					}
-				} catch (e) {
-					//TODO handle the exception
-				}
-			},
+
+			/**
+			 * socket初始化
+			 */
 			handlemessage() {
 				this.socketTicket ? this.socketTicket.Close() : null //调用前先判断是否有socket正在进行 先关闭后链接
 				this.socketTicket = new webSocketUtils(`${uni.conf.baseUrlwws}`, 5000, {
@@ -430,60 +450,219 @@
 					"type": "connect",
 				})
 			},
-			// 数据处理
-			socketSendMsg(data) {
-				if (this.socketTicket) {
-					this.socketTicket.send(data);
+
+			/**
+			 * 通过桌码获取店铺信息
+			 */
+			async productqueryShop() {
+				let res = await this.api.productqueryShop({
+					code: uni.cache.get('tableCode'),
+					lng: uni.cache.get('getLocationstorage').lng,
+					lat: uni.cache.get('getLocationstorage').lat,
+				})
+				if (res.code == 0) {
+					uni.cache.set('shopUser', res.data.storeInfo.id)
+					this.shopInfo = res.data;
+					this.productqueryProduct() //list  数据
+					this.handlemessage() //监听websocket返回
+				} else {
+					setTimeout(() => {
+						uni.pro.switchTab('index/index')
+					}, 1000)
+				}
+
+			},
+
+			/**
+			 * 获取商品数据
+			 */
+			async productqueryProduct() {
+				let res = await this.api.productqueryProduct({
+					"shopId": uni.cache.get('shopUser'),
+					"productGroupId": ''
+				})
+				if (res.code == 0) {
+					this.shopProductList = res.data;
+					if (this.cartLists && this.cartLists.data && this.cartLists.data.length >= 0) {
+						this.setNumber()
+					}
+					setTimeout(() => {
+						this.getElementTop();
+					}, 100);
 				}
 			},
-			getQueryString(url, name) { //解码
-				var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i')
-				var r = url.substr(1).match(reg)
-				if (r != null) {
-					return r[2]
-				}
-				return null;
-			},
-			async cartadd(item, index, index1, a, b) { //列表添加 a传参加减号   b是判断单规格多规格
+
+			/**
+			 * 商品数量增加/减少
+			 * @param {Object} item
+			 * @param {Object} index
+			 * @param {Object} index1
+			 * @param {Object} a
+			 * @param {Object} b
+			 */
+			async cartadd(item, a, b) { //列表添加 a传参加减号   b是判断单规格多规格\
 				if (b == '单规格') { //没有规格为空
 					this.skuidname = []
 				}
-				this.hodgepodge(item, 1, a) //获取skuid  /1添加购物车
+				let cartNumber = a == '+' ? item.cartNumber + 1 : item.cartNumber - 1;
+				this.hodgepodge(item, 1, a, cartNumber) //获取skuid  /1添加购物车
 			},
-			async cartListadd(item, index, a) { //购物车加减
+
+			/**
+			 * 详情商品增减
+			 * @param {Object} item
+			 * @param {Object} index
+			 * @param {Object} index1
+			 * @param {Object} a
+			 * @param {Object} b
+			 */
+			shopAdd(item, index, index1, a, b) {
+				if ( a == "+" ){
+					if ( this.skuNumber < this.skuSuit && this.amountcartNumber < this.skuSuit) {
+						this.amountcartNumber = this.amountcartNumber + (item.suit==0?1:item.suit);
+					}else {
+						this.amountcartNumber++;
+					}
+				} else {
+
+					if (this.amountcartNumber > 0) {
+						console.log(item)
+						if ( this.skuNumber < this.skuSuit && this.amountcartNumber < this.skuSuit) {
+							this.amountcartNumber = this.amountcartNumber - (item.suit==0?1:item.suit);
+						} else {
+							this.amountcartNumber = this.amountcartNumber - 1;
+						}
+					}
+				}
+			},
+
+			/**
+			 * 添加购物车
+			 */
+			addShopping(item, index, index1, a, b) {
+				if (this.amountcartNumber <= 0) {
+					return;
+				}
+				let num = 0;
+				if (item.typeEnum == "normal") {
+					num = item.cartNumber + this.amountcartNumber;
+				} else {
+					num = this.skuNumber + this.amountcartNumber;
+				}
+				let params = {
+					"skuId": this.skuId,
+					"num": num, //数量
+					"type": a == '+' ? 1 : 0,
+					"productId": item.id, //商品id
+					"shopId": uni.cache.get('shopUser'),
+					"userId": uni.cache.get('userInfo').id,
+					"tableId": uni.cache.get('tableCode'),
+				}
+				this.addCart(params)
+			},
+
+			/**
+			 * 购物车加减
+			 * @param {Object} item
+			 * @param {Object} index
+			 * @param {Object} a
+			 */
+			async cartListadd(item, index, c) {
 				try {
-					const data = { //定义socket数据传参
-						"name": item.name,
+					let params = {
 						"skuId": item.skuId,
-						"num": a == '-' ? -1 : 1, //skuId
-						"type": "addcart", //“addcart:添加购物车，create0rder:生成订单，clearCart:清空购物车”，
+						"num": c == '+' ? item.number + 1 : item.number - 1, //数量
+						"type": c == '+' ? 1 : 0,
 						"productId": item.productId, //商品id
 						"shopId": uni.cache.get('shopUser'),
-						"userId": uni.cache.get('userInfo').id
-					};
-					this.datasocket = data
-					uni.$u.debounce(this.socketSendMsg(data), 500)
+						"userId": uni.cache.get('userInfo').id,
+						"tableId": uni.cache.get('tableCode'),
+					}
+					this.addCart(params);
 				} catch (e) {
 					//TODO handle the exception
 				}
 			},
-			async productqueryProduct() { //list  数据
-				let res = await this.api.productqueryProduct({
-					code: uni.cache.get('tableCode'),
-					productGroupId: ''
-				})
+
+
+			/**
+			 * 添加到购物车
+			 */
+			async addCart(data) {
+				let res = await this.api.cartAdd(data)
 				if (res.code == 0) {
-					this.shopList = res.data
-					this.$nextTick(() => {
-						this.countTitleTopNum();
-					});
+					this.showShopsku = false;
+					this.$set(this, 'amountcartNumber', 0)
 				}
 			},
-			clickspecifications(item1, index, index1) {
+
+			/**
+			 * 清空购物车
+			 */
+			async cartclear() {
+				let res = await this.api.cleanCart({
+					"shopId": uni.cache.get('shopUser'),
+					"tableId": uni.cache.get('tableCode'),
+				})
+			},
+
+
+			/**
+			 * 商品数量\购物车数量处理
+			 */
+			setNumber() {
+				// 处理购物车相同id的情况下  数量相加
+				var summedArray = this.cartLists.data.reduce((acc, current) => {
+					const existing = acc.find(item => item.productId === current.productId);
+					if (existing) {
+						existing.number += current.number;
+					} else {
+						acc.push({
+							...current
+						})
+					}
+					return acc;
+				}, []);
+				// 购物车总数据与列表页面互通
+				this.shopProductList.productInfo.forEach((item) => {
+					return item.products.filter(e => {
+						e.cartNumber = 0;
+						return summedArray.find(i => {
+							if (e.id == i.productId) {
+								e.cartNumber = i.number
+							}
+						})
+					})
+				})
+				// 处理招牌菜商品数量
+				this.shopProductList.hots.forEach((item) => {
+					item.cartNumber = 0;
+					return summedArray.find(i => {
+						if (item.id == i.productId) {
+							item.cartNumber = i.number
+						}
+					})
+				})
+				this.cartListsdatashow = this.cartLists.data.length == 0 ? false : true
+				if (this.cartLists.data.length > 0) {
+					this.cartLists_count = 0;
+					this.cartLists.data.forEach((v, e) => {
+						this.cartLists_count += v.number;
+					})
+				}
+			},
+			/**
+			 * 多规格选择
+			 * @param {Object} item1
+			 * @param {Object} index
+			 * @param {Object} index1
+			 */
+			clickspecifications(item1, index, index1, type) {
 				this.skuidname = []
 				this.specifications = item1
 				this.specifications.indexa = index
 				this.specifications.indexb = index1
+				this.specifications.typeName = type
 				try {
 					if (item1.productSkuResult == null) {
 						// 但但单个规格弹框的处理
@@ -509,57 +688,64 @@
 					//TODO handle the exception
 				}
 			},
+
+			/**
+			 * 规格选择监听
+			 * @param {Object} e
+			 * @param {Object} index
+			 * @param {Object} index1
+			 * @param {Object} item
+			 */
 			async morloe(e, index, index1, item) {
 				this.specifications.tagSnap[index]['start'] = index1
 				this.skuidname.splice(index, 1, e) //替换skuidname的数据
 				this.hodgepodge(item, 2)
 			},
-			async hodgepodge(item, a, c) { //此接口去获取商品id ！！！赋值库存  数量  价格等
+
+			/**
+			 * 获取规格信息
+			 * @param {Object} item
+			 * @param {Object} a
+			 * @param {Object} c
+			 * @param {Object} num
+			 */
+			async hodgepodge(item, a, c, num) { //此接口去获取商品id ！！！赋值库存  数量  价格等
 				try {
 					let res = await this.api.productqueryProductSku({
+						code: uni.cache.get('tableCode'),
 						shopId: uni.cache.get('shopUser'),
 						productId: item.id, //商品id
 						spec_tag: this.skuidname.join(",")
 					})
-					if (res.stockNumber == 0) {
-						uni.showToast({
-							title: '暂无库存',
-							icon: "none",
-						})
-					} else {
-						this.skuidsearch = res.data.id // 储存skuid   用于筛选数量
-						this.salePrice = res.data.salePrice // 价格
-						let data = null
-						if (a == 1) { //1添加购物车  2是websocket返回这个商品的价格(应为不同的多规格商品返回不同的价格)
-							data = { //定义socket数据传参
-								"nickName": this.userInfo.nickName,
-								"barrageavatar": this.userInfo.headImg,
-								'name': item.name,
-								"skuId": res.data.id,
-								"num": c == '-' ? -1 : 1, //数量
-								"type": "addcart", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
-								"productId": item.id, //商品id
-								"shopId": uni.cache.get('shopUser'),
-								"userId": uni.cache.get('userInfo').id
-							};
-						} else {
-							data = { //查询这个商品的价格
-								"name": item.name,
-								"skuId": res.data.id,
-								"num": '', //数量
-								"type": "sku", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
-								"productId": item.id, //商品id
-								"shopId": uni.cache.get('shopUser'),
-								"userId": uni.cache.get('userInfo').id
-							};
-							this.showShopsku = true //打开弹框
+					this.salePrice = res.data.salePrice // 价格
+					let data = null;
+					if (a == 1) { //1添加购物车  2是websocket返回这个商品的价格(应为不同的多规格商品返回不同的价格)
+						let params = {
+							"skuId": res.data.id,
+							"num": num, //数量
+							"type": c == '+' ? 1 : 0,
+							"productId": item.id, //商品id
+							"shopId": uni.cache.get('shopUser'),
+							"userId": uni.cache.get('userInfo').id,
+							"tableId": uni.cache.get('tableCode'),
 						}
-						this.datasocket = data
-						uni.$u.debounce(this.socketSendMsg(data), 500)
+						this.addCart(params);
+					} else {
+						this.skuId = res.data.id;
+						this.skuNumber = res.data.number;
+						this.skuSuit = res.data.suit;
+						this.showShopsku = true //打开弹框
 					}
+					this.$set(this, 'amountcartNumber', 0)
 				} catch (e) {}
 			},
-			orderdetail() { // 直接生成订单
+
+			/**
+			 * 结算直接生成订单
+			 */
+			orderdetail() {
+				console.log(this.cartLists)
+				console.log(this.shopInfo)
 				if (this.cartLists.data.length == 0) {
 					uni.showToast({
 						title: '请先添加商品',
@@ -568,387 +754,573 @@
 					return false
 				}
 				uni.navigateTo({
-					url: '/pages/order_detail/indexs?tableId=' + JSON.stringify(this.cartLists)
+					url: '/pages/order/confirm_order?storeInfo=' + JSON.stringify(this.shopInfo.storeInfo)
 				});
-				// let data = {
-				// 	"skuId": '',
-				// 	"num": '', //数量
-				// 	"type": "createOrder", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
-				// 	"couponsId": '', //优惠券ID,
-				// 	"isYhq": 0, // 是否使用优惠券（ 1： 使用， 0： 不使用）,
-				// 	"isBuyYhq": 0, // 是否购买优惠券（ 1： 购买， 0： 不够买）
-				// 	"productId": '', //商品id
-				// 	"shopId": uni.cache.get('shopUser'),
-				// 	"userId": uni.cache.get('userInfo').id,
-				// }
-				// this.datasocket = data
-				// uni.$u.debounce(this.socketSendMsg(data), 500)
+
 			},
-			async cartclear() { //清空购物车
+
+			/**
+			 * 商家信息显示
+			 */
+			showShopClick() {
+				this.showShopInfo = true;
+			},
+
+
+
+			/**
+			 * 获取消息
+			 * @param {Object} msg
+			 */
+			getMessage(msg) { //wss  回显数据
+				if (msg == 1) { // 网络在连接
+					this.fixedtrue = true
+					return false
+				}
+				this.fixedtrue = false
+				if (msg.type == 'heartbeat') { //后台心跳  处理返回  不然控制台一直报错
+					return false
+				}
 				try {
-					const data = { //定义socket数据传参
-						"skuId": '',
-						"num": '', //skuId
-						"type": "clearCart", //“addcart:添加购物车，create0rder:生成订单，clearCart:清空购物车”，
-						"productId": '', //商品id
-						"shopId": uni.cache.get('shopUser'),
-						"userId": uni.cache.get('userInfo').id
-					};
-					this.datasocket = data
-					uni.$u.debounce(this.socketSendMsg(data), 500)
+					if (msg.status != 'success') {
+						uni.showToast({
+							title: msg.msg,
+							icon: "none",
+						})
+						if (msg.msg == '桌码不存在') { //卓码不存在直接退出
+							this.socketTicket.Close()
+							uni.$off('message')
+							uni.navigateBack()
+							return false;
+						}
+					} else {
+						switch (msg.type) {
+							case 'sku': // sku  数量 查询这个商品的价格和数量
+								break;
+							case 'order':
+								this.cartLists_count = 0;
+								this.skuidname = [];
+								this.cartListsdatashow = false;
+								this.showCart = false;
+								this.cartLists = msg;
+								this.productqueryProduct() //list  数据
+								break;
+							case 'addCart': //初始化add
+								this.cartLists = msg
+								this.setNumber()
+								break;
+							case 'addcart':
+								this.cartLists = msg
+								try {
+									//购物车为空的情况
+									if (msg.data.length == 0) {
+										this.showCart = false;
+									}
+									this.setNumber()
+								} catch (e) {}
+								break;
+						}
+
+
+					}
 				} catch (e) {
 					//TODO handle the exception
 				}
 			},
-			// 导航栏点击
-			navClickHandle(t) {
-				switch (t) {
-					case 1:
-						// 返回
-						this.socketTicket.Close()
-						uni.switchTab({
-							url: '/pages/index/index'
-						})
-						break;
-					case 2:
-						// 显示商家信息
-						this.showShopInfo = true;
-						break;
-					default:
-						break;
+
+			// 数据处理
+			socketSendMsg(data) {
+				if (this.socketTicket) {
+					this.socketTicket.send(data);
 				}
 			},
-			//打电话
-			makePhoneCall(phone) {
-				uni.makePhoneCall({
-					phoneNumber: phone //仅为示例
+
+			/* 获取元素顶部信息 */
+			getElementTop() {
+				new Promise((resolve, reject) => {
+					let view = uni.createSelectorQuery().selectAll('.main-item');
+					view.boundingClientRect(async data => {
+						resolve(data);
+					}).exec();
+					this.$u.getRect('.scroll-panel').then(res => {
+						this.scrollTopSize = res.top; //元素距离顶部的距离  
+					})
+				}).then((res) => {
+					let topArr = res.map((item) => {
+						return item.top; /* 减去滚动容器距离顶部的距离 加导航栏高度*/
+					});
+					this.scrollHeight = this.scrollHeight - this.HeighT
+					this.topArr = topArr;
+					/* 获取最后一项的高度，设置填充高度。判断和填充时做了 +-20 的操作，是为了滚动时更好的定位 */
+					let last = res[res.length - 1].height;
+					if (last - 20 < this.scrollHeight) {
+						this.fillHeight = this.scrollHeight - last + 20; //这是吸到顶部的距离
+						// this.fillHeight = 200;
+					}
 				});
 			},
-			// 点击菜单商品滚动到指定为止
-			titleClickHandle(id) {
-				uni.createSelectorQuery()
-					.select('#wrapper')
-					.boundingClientRect((data) => {
-						//目标节点
-						uni.createSelectorQuery()
-							.select(`#title${id}`)
-							.boundingClientRect((res) => {
-								const scrollTop = res.top - data.top;
-								const offsetNum = this.menuInfo.top + this.menuInfo.height + this
-									.paddingBtmSize +
-									this.tabHeadHeight - 1;
-								//最外层盒子节点
-								uni.pageScrollTo({
-									scrollTop: scrollTop - offsetNum
-								});
-							})
-							.exec();
-					})
-					.exec();
-			},
-			// 计算滚动到那个标题
-			countScrollTitle: _.throttle(function(top) {
-				if (this.titleTopNums.length > 1) {
-					for (let i = 0; i <= this.titleTopNums.length - 1; i++) {
-						if (top >= this.titleTopNums[i] && top < this.titleTopNums[i + 1]) {
-							this.titleTopNumIndex = i;
+			/* 主区域滚动监听 */
+			mainScroll(e) {
+				console.log(e)
+				// 节流方法
+				clearTimeout(this.mainThrottle);
+				this.mainThrottle = setTimeout(() => {
+					scrollFn();
+				}, 10);
+
+				let scrollFn = () => {
+					let top = e.detail.scrollTop;
+					let index = 0;
+					/* 查找当前滚动距离 */
+					for (let i = (this.topArr.length - 1); i >= 0; i--) {
+						/* 在部分安卓设备上，因手机逻辑分辨率与rpx单位计算不是整数，滚动距离与有误差，增加2px来完善该问题 */
+						if ((top + 2) >= this.topArr[i] - this.scrollTopSize) {
+							index = i;
+							break;
 						}
 					}
-					if (top >= this.titleTopNums[this.titleTopNums.length - 1]) {
-						this.titleTopNumIndex = this.titleTopNums.length - 1;
-					}
+					this.leftIndex = (index < 0 ? 0 : index);
 				}
-			}, 100),
-			// 统计每个标题到顶部的距离
-			countTitleTopNum() {
-				let topNums = [];
-				for (let i of this.shopList.productInfo) {
-					uni.createSelectorQuery()
-						.select(`#title${i.id}`)
-						.boundingClientRect((res) => {
-							topNums.push(res.top + this.menuInfo.top + this.menuInfo.height + this
-								.paddingBtmSize -
-								this.tabHeadHeight - this.tabHeadHeight / 2);
-						})
-						.exec();
-				}
-				this.titleTopNums = topNums;
 			},
+			/* 左侧导航点击 */
+			leftTap(e) {
+				let HeighTdata = null
+				if (this.opacity) {
+					HeighTdata = this.HeighT
+				} else {
+					HeighTdata = this.HeighT * 2
+				}
+				console.log(this.scrollTopSize + HeighTdata, 11)
+				try {
+					uni.pageScrollTo({
+						scrollTop: this.scrollTopSize + HeighTdata, //滑动需要的距离  nav+列表距离的高度
+						duration: 0
+					});
+				} catch (e) {
+					//TODO handle the exception
+				}
+				setTimeout(() => {
+					let index = e.currentTarget.dataset.index;
+					this.scrollInto = `item-${index}`;
+				}, 300)
+			}
 		}
-	};
+	}
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 	$bg: #fafafa;
 	$tabLeft: 200upx;
 	$itemH: 100upx;
 	$cartH: 90upx;
 
-	.nav-wrap {
-		width: 100%;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 97;
+	/* 容器 */
+	.container {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		justify-content: flex-start;
+		align-items: flex-start;
+		align-content: flex-start;
 
-		&.is-fixed {
+		.navbarcontent .active {
 			background-color: #fff;
 		}
 
-		.content {
-			.left-btn {
-				display: flex;
+		&>view {
+			width: 100%;
+		}
 
-				.btn {
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					// margin-right: $paddingSize;
+		.top--panel {
+			padding: 0 20rpx;
+			background-color: #fff;
+
+			.panelimgbackground {
+				width: 382rpx;
+				margin: 82rpx auto 0 auto;
+				height: 158rpx;
+			}
+
+			.panelone {
+				margin-top: 32rpx;
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: 500;
+				font-size: 32rpx;
+				color: #333333;
+			}
+
+			.paneltow {
+				margin-top: 16rpx;
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #999999;
+			}
+
+			.panelthere {
+				margin-top: 32rpx;
+				margin-bottom: 50rpx;
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #999999;
+
+				.paneltheretext {
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #999999;
+				}
+
+				.flex-start {
+					view {
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 400;
+						font-size: 28rpx;
+						color: #999999;
+					}
 				}
 			}
-		}
-	}
 
-	.shop-cover {
-		position: relative;
-
-		&::after {
-			content: '';
-			width: 100%;
-			height: 100%;
-			position: absolute;
-			top: 0;
-			left: 0;
-			z-index: 2;
-			background-color: rgba(0, 0, 0, 0.3);
-		}
-
-		.img {
-			width: 100%;
-			height: 100%;
-			position: relative;
-			z-index: 1;
-		}
-	}
-
-	.list-container {
-		background-color: #fff;
-		border-radius: 20upx;
-		position: relative;
-		z-index: 96;
-		margin-top: -40upx;
-
-		.header-wrap {
-			$h: 120upx;
-			height: $h;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding: 0 $paddingSize;
-
-			.title {
+			.panelfour {
+				font-family: Source Han Sans CN, Source Han Sans CN;
 				font-weight: bold;
+				font-size: 32rpx;
+				color: #333333;
+			}
 
-				.t {
-					font-size: 42upx;
+			.panelfive {
+				width: 100%;
+
+				.panelfive_list {
+					display: flex;
 				}
-			}
 
-			.cover {
-				width: $h;
-				height: $h;
-				margin-top: -40upx;
-				background: #999;
-				position: relative;
+				.panelfiveitem {
+					margin-top: 16rpx;
+					width: 340rpx;
+					margin-right: 30rpx;
+					position: relative;
+					flex-shrink: 0;
 
-				.img {
-					width: 100%;
-					height: 100%;
-					border-radius: 12upx;
-				}
-			}
-		}
+					.panelfiveitemimage {
+						border-radius: 20rpx 20rpx 0rpx 0rpx;
+						width: 100%;
+						height: 204rpx;
+					}
 
-		.tab-header {
-			display: flex;
-			align-items: center;
-			background-color: $bg;
-			position: sticky;
-			z-index: 999;
+					.panelfiveitemone {
+						margin-top: 32rpx;
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 500;
+						font-size: 28rpx;
+						color: #333333;
+					}
 
-			.t {
-				font-size: 32upx;
-			}
+					.panelfiveitemtow {
+						margin-top: 16rpx;
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #FF534B;
+					}
 
-			.left {
-				width: $tabLeft;
-				display: flex;
-				padding-left: $paddingSize;
+					.panelfiveitemthere {
+						margin-top: 12rpx;
+						// text:nth-child(1) {
+						// 	margin-left: 0;
+						// }
 
-				.t {
-					font-weight: bold;
-				}
-			}
+						text {
+							padding: 4rpx 24rpx;
+							background: #F6F6F6;
+							border-radius: 8rpx 8rpx 8rpx 8rpx;
+							font-family: Source Han Sans CN, Source Han Sans CN;
+							font-weight: 400;
+							font-size: 20rpx;
+							color: #999999;
+						}
+					}
 
-			.right {
-				flex: 1;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				padding: 0 $paddingSize;
+					.panelfiveitemfour {
+						margin-top: 12rpx;
+						width: 100%;
+						height: 36rpx;
+						line-height: 36rpx;
+						overflow: hidden; //超出的文本隐藏
+						text-overflow: ellipsis; //溢出用省略号显示
+						white-space: nowrap; //溢出不换行
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #999999;
+					}
 
-				.d {
-					padding: 12upx 16upx;
-					background-color: #faf2b6;
-					border-radius: 12upx;
-				}
-			}
-		}
+					.panelfiveitemfive {
+						margin-top: 8rpx;
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #999999;
+					}
 
-		.tab-content {
-			display: flex;
-			position: relative;
+					.panelfiveitemsex {
 
-			.left-wrap {
-				width: $tabLeft;
-				background-color: $bg;
-				padding: 0 0 $paddingSize * 3 + $cartH 0;
+						.panelfiveitemsex_oen {
+							text:nth-child(1) {
+								font-family: Source Han Sans CN, Source Han Sans CN;
+								font-weight: 400;
+								font-size: 24rpx;
+								color: #333333;
+							}
 
-				.left {
-					width: $tabLeft;
-					position: sticky;
+							text:nth-child(2) {
+								font-family: Source Han Sans CN, Source Han Sans CN;
+								font-weight: bold;
+								font-size: 36rpx;
+								color: #333333;
+							}
 
-					.item {
-						height: $itemH;
+							text:nth-child(3) {
+								font-family: Source Han Sans CN, Source Han Sans CN;
+								font-weight: 400;
+								font-size: 36rpx;
+								color: #333333;
+							}
+
+							text:nth-child(4) {
+								font-family: Source Han Sans CN, Source Han Sans CN;
+								font-weight: 400;
+								font-size: 24rpx;
+								color: #666666;
+							}
+						}
+					}
+
+					.panelfiveitemNum {
+						// position: absolute;
+						// bottom: 82rpx;
+						// right: 0;
+						padding-bottom: 48rpx;
 						display: flex;
 						align-items: center;
-						padding: 0 $paddingSize;
-						justify-content: center;
+						justify-content: flex-end;
 
-						&.active {
-							background-color: #fff;
-							font-weight: bold;
+						.sku-wrap {
+							width: 138rpx;
+							height: 54rpx;
+							background: #E3AD7F;
+							border-radius: 32rpx;
+							position: relative;
+							align-items: center;
+
+							.t {
+								font-size: 28rpx;
+								color: #fff;
+							}
+
+							.dot {
+								position: absolute;
+								top: -15rpx;
+								right: -10rpx;
+								background-color: #FF4B33;
+								color: #fff;
+								border-radius: 58rpx;
+								padding: 5rpx 14rpx;
+								box-sizing: border-box;
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								font-size: 20rpx;
+							}
+						}
+
+						.Controls {
+							display: flex;
+							align-items: center;
+
+							.num {
+								margin: 8rpx 8rpx 0 8rpx;
+							}
 						}
 					}
 				}
 			}
+		}
 
-			.list-wrap {
-				flex: 1;
-				padding-left: $paddingSize;
-				padding-bottom: $paddingSize * 3 + $cartH;
+		.scroll-panel {
+			flex-grow: 1;
+			// height: 0;
+			overflow: hidden;
 
-				.item-wrap {
-					.title {
-						height: $itemH;
-						display: flex;
-						align-items: center;
-						position: sticky;
-						z-index: 10;
-						background-color: #fff;
+		}
+
+
+		.shop-info-wrap {
+			padding: 0 30rpx 50rpx;
+			box-sizing: border-box;
+
+			.info-wrap {
+				padding: 30rpx 0;
+				box-sizing: border-box;
+
+				.shopName {
+					align-self: center;
+					font-size: 32rpx;
+					color: #333;
+					font-weight: bold;
+				}
+			}
+
+			.info-wrap-title {
+				font-size: 32rpx;
+				font-weight: bold;
+				color: #333;
+			}
+
+			.row {
+				.col {
+					margin-bottom: 10rpx;
+				}
+
+				.l,
+				.t {
+					font-size: 24rpx;
+					color: #999;
+				}
+			}
+		}
+
+		.shop_sku {
+			width: 100%;
+			position: relative;
+			border-radius: 20rpx;
+			background: #fff;
+			overflow-y: auto;
+			padding-bottom: 320rpx;
+			box-sizing: border-box;
+
+			.positionabsolute {
+				position: absolute;
+				top: 30rpx;
+				right: 30rpx;
+			}
+
+			.shop_skucimage {
+				width: 100%;
+				height: 500rpx !important;
+				border-radius: 20rpx 20rpx 0 0;
+			}
+
+			.shop_sku_name {
+				padding: 0 $paddingSize;
+				margin-top: 20rpx;
+				font-weight: bold;
+				font-size: 32upx;
+				margin-bottom: 16rpx;
+			}
+
+			.shop_sku_returned {
+				padding: 0 $paddingSize;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #FF534B;
+			}
+
+			.shop_sku_description {
+				padding: 0 $paddingSize;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #999999;
+				margin-top: 16rpx;
+				padding-bottom: 32rpx;
+				box-sizing: border-box;
+				border-bottom: 2rpx solid #F0F0F0;
+			}
+
+
+			.shop_sku_box {
+				padding: 0 $paddingSize;
+
+				.shop_sku_box_name {
+					margin-top: 20rpx;
+					font-weight: 500;
+					font-size: 28upx;
+					color: #333;
+				}
+
+				.flex-start {
+					.shop_sku_box_item {
+						margin-top: 16rpx;
+						padding: 8rpx 24rpx;
+						border-radius: 8rpx;
+						font-size: 24upx;
+						margin-left: 56rpx;
+						background: #F5F5F5;
+					}
+
+					.shop_sku_box_item:nth-child(1) {
+						margin-left: 0;
+					}
+
+					.shop_sku_box_item_noselected {
+						color: #666;
+					}
+
+					.shop_sku_box_item_selected {
+						background: #FEFAF7;
+						border-radius: 8rpx;
+						border: 2rpx solid #E8AD7B;
+						color: #E8AD7B;
 					}
 				}
-			}
-		}
-	}
 
-	.shop-item {
-		display: flex;
-		padding-bottom: $paddingSize;
-
-		.langcover {
-			position: relative;
-		}
-
-		.langcover::after {
-			content: '加载中..';
-			position: absolute;
-			top: 0;
-			left: 0;
-			height: 100%;
-			width: 100%;
-			background-color: #e8e8e8;
-			color: #6b6b6b;
-			border-radius: 10rpx;
-			text-align: center;
-			line-height: 180rpx;
-			z-index: 1;
-		}
-
-		.info {
-			flex: 1;
-			padding-left: 20upx;
-			padding-right: $paddingSize;
-
-			.name {
-				font-size: 28upx;
-				font-weight: bold;
 			}
 
-			.select-sku-wrap {
-				.t {
-					color: #999;
-					font-size: 24upx;
+			.shop_skuselect {
+				margin-top: 16rpx;
+				width: 100%;
+				// background: #f7f7f7;
+				color: #999;
+				font-size: 24upx;
+
+				.shop_skuselectname {
+					color: #000;
+					font-size: 26upx;
 				}
 			}
 
-			.price-wrap {
-				padding-top: $paddingSize;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
+			.shop_bottom {
+				width: 100%;
+				box-sizing: border-box;
+				padding: 30rpx $paddingSize;
+				background-color: #fff;
+				box-shadow: 0rpx -6rpx 14rpx 2rpx rgba(0, 0, 0, 0.1);
+				position: fixed;
+				left: 0;
+				bottom: 0;
 
 				.price {
 					display: flex;
 					align-items: flex-end;
 
 					.i {
-						font-size: 20upx;
-						color: $numColor;
+						font-size: 28rpx;
+						color: #E8AD7B;
 						position: relative;
 						bottom: 4upx;
 						font-weight: bold;
 					}
 
 					.num {
-						font-size: 42upx;
-						color: $numColor;
+						font-size: 42rpx;
+						color: #E8AD7B;
 						position: relative;
 						top: 6upx;
 						padding: 0 4upx;
 					}
 				}
 
-				.sku-wrap {
-					padding: 6upx 16upx;
-					background-color: $color-priamry;
-					border-radius: 12upx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					position: relative;
-
-					.t {
-						font-size: 24upx;
-						font-weight: bold;
-					}
-
-					.dot {
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						font-size: 20upx;
-						position: absolute;
-						padding: 2upx 12upx;
-						border-radius: 8upx;
-						background-color: $numColor;
-						color: #fff;
-						position: absolute;
-						top: -14upx;
-						right: -8upx;
-					}
-				}
-
 				.operation-wrap {
 					display: flex;
 					align-items: center;
@@ -958,374 +1330,554 @@
 						padding: 0 16upx;
 					}
 
-					.btn {
+
+				}
+
+				.addShopping {
+					width: 100%;
+					height: 96rpx;
+					line-height: 96rpx;
+					text-align: center;
+					background: #ccc;
+					border-radius: 48rpx;
+					font-weight: 400;
+					font-size: 32rpx;
+					color: #FFFFFF;
+					margin-top: 36rpx;
+				}
+
+				.addShopping.active {
+					background: #E8AD7B;
+				}
+			}
+		}
+
+		.cart-wrap {
+			width: 100%;
+			padding: 0 20rpx;
+			box-sizing: border-box;
+			position: fixed;
+			bottom: 40rpx;
+			left: 0;
+			z-index: 99;
+
+			.cart-content {
+				display: flex;
+				align-items: center;
+				height: 128rpx;
+				background: #FFFFFF;
+				box-shadow: 0rpx 0rpx 20rpx 2rpx rgba(0, 0, 0, 0.15);
+				border-radius: 58rpx;
+				padding: 0 36rpx;
+				box-sizing: border-box;
+
+				.left {
+					flex: 1;
+					display: flex;
+					align-items: center;
+					position: relative;
+
+					.iconBox {
 						position: relative;
-						padding: 6upx 10upx;
-						background-color: $color-priamry;
-						border-radius: 12upx;
+					}
+
+					.icon {
+						width: 76rpx;
+						height: 88rpx;
+						margin-left: 22rpx;
+					}
+
+					.u-badge {
+						position: absolute;
+						top: -30rpx;
+						right: -30rpx;
+						background-color: #FF4B33;
+						color: #fff;
+						border-radius: 58rpx;
+						padding: 5rpx 14rpx;
+						box-sizing: border-box;
 						display: flex;
 						align-items: center;
 						justify-content: center;
-
-						&::after {
-							content: "";
-							position: absolute;
-							left: -10px;
-							top: -10px;
-							right: -10px;
-							bottom: -10px;
-
-						}
+						font-size: 20rpx;
 					}
-				}
-			}
-		}
-	}
 
-	.cart-wrap {
-		width: 100%;
-		padding: $paddingSize;
-		position: fixed;
-		bottom: $paddingSize;
-		left: 0;
-		z-index: 99;
+					.i,
+					.num {
+						color: #333;
+					}
 
-		.cart-content {
-			display: flex;
-			height: $cartH;
-			border-radius: $cartH;
+					.i {
+						font-size: 20upx;
+						position: relative;
+						top: 4upx;
+						margin-left: 64rpx;
+					}
 
-			.left {
-				flex: 1;
-				display: flex;
-				align-items: center;
-				background-color: #111;
-				padding-left: 120upx;
-				position: relative;
-				border-radius: $cartH 0 0 $cartH;
-
-				.icon {
-					width: 80upx;
-					height: 120upx;
-					position: absolute;
-					left: $paddingSize;
-					bottom: 20upx;
-				}
-
-				.i,
-				.num {
-					color: #fff;
-				}
-
-				.i {
-					font-size: 20upx;
-					position: relative;
-					top: 4upx;
-				}
-
-				.num {
-					font-size: 42upx;
-				}
-			}
-
-			.btn {
-				width: 200upx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				font-weight: bold;
-				background: $linear-color-priamry;
-				border-radius: 0 $cartH $cartH 0;
-			}
-		}
-	}
-
-	.cart-list-wrap {
-		.cart-header {
-			display: flex;
-			justify-content: space-between;
-			background-color: #f4eddf;
-			padding: 20upx $paddingSize;
-			border-radius: 20upx 20upx 0 0;
-
-			.clear {
-				display: flex;
-				align-items: center;
-
-				.t {
-					font-size: 24upx;
-					color: #999;
-					margin-left: 4upx;
-				}
-			}
-		}
-
-		.scroll-view {
-			max-height: 50vh;
-		}
-
-		.list-wrap {
-			padding: $paddingSize 0 $paddingSize * 2 + $cartH $paddingSize;
-		}
-	}
-
-	.shop_sku {
-		position: relative;
-		width: 700rpx;
-		border-radius: 20rpx;
-		background: #fff;
-
-		.positionabsolute {
-			position: absolute;
-			top: 10rpx;
-			left: 10rpx;
-		}
-
-		.shop_skucimage {
-			width: 100%;
-			height: 440rpx;
-			border-radius: 20rpx 20rpx 0 0;
-		}
-
-		.shop_sku_name {
-			padding: 0 $paddingSize;
-			margin-top: 20rpx;
-			font-weight: bold;
-			font-size: 32upx;
-		}
-
-		.shop_sku_box {
-			padding: 0 $paddingSize;
-
-			.shop_sku_box_name {
-				margin-top: 20rpx;
-				font-weight: 500;
-				font-size: 28upx;
-				color: #999;
-			}
-
-			.flex-start {
-				.shop_sku_box_item {
-					margin-top: 16rpx;
-					padding: 8rpx 24rpx;
-					border-radius: 24rpx;
-					font-size: 24upx;
-					margin-left: 16rpx;
-					background: #fbe3e3;
-				}
-
-				.shop_sku_box_item:nth-child(1) {
-					margin-left: 0;
-				}
-
-				.shop_sku_box_item_noselected {
-					color: #000;
-				}
-
-				.shop_sku_box_item_selected {
-					border: 1rpx solid red;
-					color: red;
-				}
-			}
-
-		}
-
-		.shop_skuselect {
-			padding: 10rpx $paddingSize;
-			margin-top: 28rpx;
-			width: 100%;
-			background: #f7f7f7;
-			color: #ada7a7;
-			font-size: 24upx;
-
-			.shop_skuselectname {
-				color: #000;
-				font-size: 26upx;
-			}
-		}
-
-		.shop_bottom {
-			box-sizing: border-box;
-			padding: 10rpx $paddingSize;
-			margin: 28rpx 0;
-
-			.price {
-				display: flex;
-				align-items: flex-end;
-
-				.i {
-					font-size: 20upx;
-					color: $numColor;
-					position: relative;
-					bottom: 4upx;
-					font-weight: bold;
-				}
-
-				.num {
-					font-size: 42upx;
-					color: $numColor;
-					position: relative;
-					top: 6upx;
-					padding: 0 4upx;
-				}
-			}
-
-			.operation-wrap {
-				display: flex;
-				align-items: center;
-
-				.num {
-					font-size: 32upx;
-					padding: 0 16upx;
+					.num {
+						font-size: 42upx;
+						font-weight: bold;
+					}
 				}
 
 				.btn {
-					position: relative;
-					padding: 16upx 20upx;
-					background-color: $color-priamry;
-					border-radius: 12upx;
+					width: 160rpx;
+					height: 64rpx;
+					background: #E7AE7B;
+					border-radius: 36rpx 36rpx 36rpx 36rpx;
+					border: 2rpx solid #E8AD7B;
 					display: flex;
 					align-items: center;
 					justify-content: center;
 
-					&::after {
-						content: "";
-						position: absolute;
-						left: -10px;
-						top: -10px;
-						right: -10px;
-						bottom: -10px;
-
+					.t {
+						font-weight: bold;
+						font-size: 28rpx;
+						color: #FFFFFF;
 					}
 				}
 			}
 		}
-	}
 
-
-	.classorderdetailshow {
-		position: relative;
-
-		.orderdetailuicon {
-			position: absolute;
-			top: 10rpx;
-			left: 10rpx;
-		}
-
-		.payType {
-			padding: 32rpx 34rpx;
-			margin-top: 48rpx;
-			background-color: #fff;
-
-			>view:first-child {
-				font-weight: 500;
-				font-size: 28rpx;
-				color: #333333;
-			}
-
-			>view:last-child {
-				margin-top: 32rpx;
-			}
-
-			.dfs {
+		.cart-list-wrap {
+			.cart-header {
 				display: flex;
+				height: 72rpx;
+				background-color: #F2F2F2;
 				align-items: center;
+				justify-content: space-between;
+				padding: 20upx $paddingSize;
+				border-radius: 20upx 20upx 0 0;
+
+				.num {
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #333333;
+				}
+
+				.clear {
+					display: flex;
+					align-items: center;
+
+					.t {
+						font-size: 24upx;
+						color: #999;
+						margin-left: 4upx;
+					}
+				}
 			}
 
-		}
+			.scroll-view {
+				max-height: 50vh;
+				margin-bottom: 190rpx;
+			}
 
-		.fixedview {
-			position: relative;
-			width: 100%;
+			.list-wrap {
+				padding: $paddingSize 0 0 $paddingSize;
+			}
 
-			.flex-between {
-				width: 100%;
-				padding: 24rpx 28rpx;
-				background: #FFFFFF;
-				flex-wrap: nowrap;
+			.shop-item {
+				display: flex;
+				padding-bottom: $paddingSize;
 
-				.fixedview_one {
-					.fixedview_oneone {
-						font-size: 28rpx;
-						font-family: SourceHanSansCN-Bold-, SourceHanSansCN-Bold;
-						font-weight: normal;
-						color: #333333;
-					}
+				.langcover {
+					position: relative;
+				}
 
-					.fixedview_onetow {
-						font-size: 44rpx;
-						font-family: SourceHanSansCN-Bold-, SourceHanSansCN-Bold;
-						font-weight: normal;
-						color: #F45C4C;
+				.langcover::after {
+					content: '加载中..';
+					position: absolute;
+					top: 0;
+					left: 0;
+					height: 100%;
+					width: 100%;
+					background-color: #e8e8e8;
+					color: #6b6b6b;
+					border-radius: 10rpx;
+					text-align: center;
+					line-height: 180rpx;
+					z-index: 1;
+				}
+
+				.info {
+					flex: 1;
+					padding-left: 20upx;
+					padding-right: $paddingSize;
+
+					.name {
+						font-size: 28upx;
 						font-weight: bold;
-
-						text {
-							font-size: 28rpx;
-						}
+						color: #333;
+						margin-bottom: 5rpx;
 					}
 
-					.fixedview_onethere {
-						font-family: Source Han Sans CN, Source Han Sans CN;
+					.select-sku-wrap {
 						font-weight: 400;
 						font-size: 24rpx;
 						color: #999999;
 					}
-				}
 
-				.fixedview_tow {
-					background: red;
-					border-radius: 34rpx;
-					padding: 10rpx 44rpx;
-					font-size: 32rpx;
-					font-family: PingFang SC-Bold, PingFang SC;
-					font-weight: bold;
-					color: #FFFFFF;
+					.price-wrap {
+						margin-top: 16rpx;
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+
+						.price {
+							display: flex;
+							align-items: flex-end;
+
+							.i,
+							.num {
+								font-weight: bold;
+								font-size: 32rpx;
+								color: #333333;
+							}
+
+							.i {
+								position: relative;
+								bottom: 4upx;
+							}
+
+							.num {}
+						}
+
+						.sku-wrap {
+							padding: 6upx 16upx;
+							background-color: $color-priamry;
+							border-radius: 12upx;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							position: relative;
+
+							.t {
+								font-size: 24upx;
+								font-weight: bold;
+							}
+
+							.dot {
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								font-size: 20upx;
+								position: absolute;
+								padding: 2upx 12upx;
+								border-radius: 8upx;
+								background-color: $numColor;
+								color: #fff;
+								position: absolute;
+								top: -14upx;
+								right: -8upx;
+							}
+
+						}
+
+						.operation-wrap {
+							display: flex;
+							align-items: center;
+
+							.num {
+								font-size: 32upx;
+								padding: 0 16upx;
+							}
+
+							.btn {
+								position: relative;
+								display: flex;
+								align-items: center;
+								justify-content: center;
+
+
+							}
+						}
+					}
 				}
 			}
+
 		}
+
+
 	}
 
-	.shop-info-wrap {
-		.info-wrap {
-			padding: $paddingSize * 2 0;
-			display: flex;
-			align-items: center;
-			flex-direction: column;
-			border-bottom: 1upx solid #f2f2f2;
 
-			.img {
-				width: 100upx;
-				height: 100upx;
-				border-radius: 12upx;
-			}
+	.list-box {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		justify-content: flex-start;
+		align-items: flex-start;
+		align-content: flex-start;
+		font-size: 28rpx;
+		position: relative;
 
-			.t {
-				font-size: 32upx;
-				padding-top: 8upx;
-			}
-		}
+		.left {
+			width: 200rpx;
+			background-color: #f6f6f6;
+			line-height: normal;
+			box-sizing: border-box;
+			font-size: 32rpx;
 
-		.row {
-			padding: 0 $paddingSize $paddingSize;
+			// padding-bottom: 200rpx;
+			.item {
+				padding: 0 30rpx;
+				height: 92rpx;
+				line-height: 92rpx;
+				position: relative;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #333333;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
 
-			.col {
-				padding-top: $paddingSize;
+				&+.item {
+					margin-top: 1px;
 
-				.t {
-					color: #999;
+					&::after {
+						// content: '';
+						// display: block;
+						// height: 0;
+						// border-top: #d6d6d6 solid 1px;
+						// width: 620upx;
+						// position: absolute;
+						// top: -1px;
+						// right: 0;
+						// transform: scaleY(0.5);
+						/* 1px像素 */
+					}
+				}
+
+				&.active {
+					color: #333;
+					background-color: #fff;
+					position: relative;
+
+					&::before {
+						content: '';
+						display: block;
+						position: absolute;
+						top: 0;
+						left: 0;
+						border-left: #7E5C23 solid 4px;
+						height: 100%;
+						width: 0;
+					}
+
+					&::after {
+						content: '';
+						display: block;
+						position: absolute;
+						top: 0;
+						left: -15rpx;
+						bottom: 0;
+						margin: auto;
+						height: 30rpx;
+						width: 30rpx;
+						border-radius: 50%;
+						background-color: #7E5C23;
+					}
 				}
 			}
+
+			.items {
+				height: 180rpx;
+				position: relative;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #333333;
+			}
+
+			.fill-last {
+				height: 0;
+				width: 100%;
+				background: none;
+			}
 		}
 
-		.line {
-			height: 12upx;
-			background-color: #f2f2f2;
-		}
+		.main {
+			background-color: #fff;
+			padding-left: 20rpx;
+			width: 0;
+			flex-grow: 1;
+			box-sizing: border-box;
+			position: relative;
 
-		.close {
-			padding: $paddingSize 0;
-			display: flex;
-			justify-content: center;
+
+			.title {
+				line-height: normal;
+				padding: 30rpx 0;
+				font-size: 24rpx;
+				font-weight: bold;
+				color: #666;
+				background-color: #fff;
+				position: sticky;
+				top: 0;
+				z-index: 19;
+			}
+
+			.item {
+				padding-bottom: 16rpx;
+				border-bottom: #eee solid 1px;
+			}
+
+			.goods {
+				display: flex;
+				flex-direction: row;
+				flex-wrap: nowrap;
+				justify-content: flex-start;
+				align-content: center;
+				position: relative;
+
+				&+.goods {
+					margin-top: 16rpx;
+				}
+
+				&>image {
+					width: 120rpx;
+					height: 120rpx;
+					margin-right: 18rpx;
+					margin-left: 2px;
+				}
+
+				.goodsImg {
+					width: 200rpx;
+					height: 200rpx;
+					border-radius: 18rpx;
+					flex-shrink: 0;
+				}
+
+				.topSort {
+					width: 92rpx;
+					height: 38rpx;
+					text-align: center;
+					line-height: 38rpx;
+					position: absolute;
+					top: 0;
+					left: 0;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #FFFFFF;
+					border-radius: 20rpx 0rpx 20rpx 0rpx;
+
+				}
+
+				.topSort.c1 {
+					background: #FC5C2E;
+				}
+
+				.topSort.c2 {
+					background: #EF994E;
+				}
+
+				.topSort.c3 {
+					background: #F4B951;
+				}
+
+				.goods_right {
+					width: 100%;
+					display: flex;
+					flex-direction: column;
+					position: relative;
+					padding-top: 5rpx;
+					padding-right: 20rpx;
+					box-sizing: border-box;
+
+					.name {
+						font-size: 28rpx;
+						color: #333;
+						font-weight: bold;
+						margin-bottom: 8rpx;
+					}
+
+					.describe,
+					.monthlySale,
+					.lookBack {
+						font-weight: 400;
+						font-size: 20rpx;
+						color: #999999;
+						margin-bottom: 8rpx;
+					}
+
+					.describe,
+					.name {
+						width: 270rpx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+					}
+
+
+					.lookBack {
+						color: #FF534B;
+					}
+
+					.money {
+						font-weight: bold;
+						font-size: 24rpx;
+						color: #333;
+
+						.money_num {
+							font-size: 28rpx;
+							color: #333;
+							font-weight: bold;
+						}
+					}
+
+					.suit {
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #666666;
+					}
+
+					.sku-wrap {
+						width: 138rpx;
+						height: 54rpx;
+						background: #E3AD7F;
+						border-radius: 32rpx;
+						// position: absolute;
+						// bottom: 10rpx;
+						// right: 20rpx;
+						align-items: center;
+						position: relative;
+
+						.t {
+							font-size: 28rpx;
+							color: #fff;
+						}
+
+						.dot {
+							position: absolute;
+							top: -15rpx;
+							right: -10rpx;
+							background-color: #FF4B33;
+							color: #fff;
+							border-radius: 58rpx;
+							padding: 5rpx 14rpx;
+							box-sizing: border-box;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							font-size: 20rpx;
+						}
+					}
+
+					.Controls {
+						display: flex;
+						align-items: center;
+						justify-content: flex-end;
+
+						// position: absolute;
+						// bottom: 10rpx;
+						// right: 20rpx;
+						.num {
+							margin: auto 8rpx;
+						}
+					}
+				}
+
+
+			}
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue
index 74e7620..129c248 100644
--- a/pages/order_food/order_food.vue
+++ b/pages/order_food/order_food.vue
@@ -1,135 +1,188 @@
 <template>
-	<view id="wrapper">
+	<page-meta :page-style="'overflow:'+(pagemetashow?'hidden':'visible')"></page-meta>
+	<view class="container">
+		<!-- 占位符  接口请求完毕才显示 -->
 		<view v-if="fixedtrue"
 			style="height: 100vh; width: 100%; position: fixed; z-index: 999; top: 0; left: 0; background-color: #fff; display: flex; justify-content: center; align-items: center;">
 			<image style="width: 140rpx; height: 140rpx;" src="@/static/1.gif" mode="aspectFill"></image>
-			<text style="margin-left10rpx;font-size: 40rpx;color: #7d7d76;">加载中</text>
-			<!-- <u-loadmore status="loading" fontSize="50" iconSize="30"/> -->
+			<text style="margin-left:10rpx;font-size: 40rpx;color: #7d7d76;">加载中</text>
 		</view>
-		<view class="nav-wrap" :class="{ 'is-fixed': isFixed }"
-			:style="{ paddingTop: `${menuInfo.top}px`, paddingBottom: `${paddingBtmSize}px` }">
-			<view class="content" :style="{ height: `${menuInfo.height}px`, paddingLeft: `${paddingBtmSize}px` }">
-				<view class="left-btn">
-					<view class="btn" :style="{ width: `${menuInfo.height}px`, height: `${menuInfo.height}px` }"
-						@click="navClickHandle(1)">
-						<u-icon name="arrow-left" :color="isFixed ? '#333' : '#fff'" size="28"></u-icon>
-					</view>
-					<view class="btn" :style="{ width: `${menuInfo.height}px`, height: `${menuInfo.height}px` }"
-						@click="navClickHandle(2)">
-						<u-icon name="kefu-ermai" :color="isFixed ? '#333' : '#fff'" size="28"></u-icon>
-					</view>
+		<!-- 顶部面板 -->
+		<view class="top--panel" @touchmove.stop.prevent="stopRoll">
+			<navseat :opacity='opacity' :titleshow='true' @navigateBacknav='navigateBacknav'
+				:navigateBacknavtitle='true'></navseat>
+			<!-- 顶部面板，可添加所需要放在页面顶部的内容代码。比如banner图 -->
+			<image class="panelimgbackground"
+				:src="shopInfo.storeInfo.coverImg||'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/topBanner.png'"
+				mode="aspectFill">
+			</image>
+			<view class="panelone">
+				{{ shopInfo.storeInfo.shopName }}
+			</view>
+			<view class="paneltow">
+				距离您{{ shopInfo.distance }}
+			</view>
+			<view class="panelthere flex-between">
+				<view class="paneltheretext">
+					营业时间：{{ (shopInfo.storeInfo.businessStartDay || '——') +'至'+ (shopInfo.storeInfo.businessEndDay || '——') +' '+ (shopInfo.storeInfo.businessTime || '')}}
+				</view>
+				<view class="flex-start" @click="showShopClick">
+					<view style="margin-right: 14rpx;">查看</view>
+					<u-icon name="arrow-down" color="#999999" size="28"></u-icon>
 				</view>
 			</view>
-		</view>
-		<view class="shop-cover" :style="{ height: `${menuInfo.top + menuInfo.height + paddingBtmSize * 8}px` }">
-			<image class="img" :src="shopList.storeInfo.coverImg" mode="aspectFill"></image>
-		</view>
-		<view class="list-container">
-			<view class="header-wrap">
-				<text class="title">
-					<text class="t">{{ shopList.storeInfo.shopName }}</text>
-				</text>
-				<view class="cover">
-					<image class="img" :src="shopList.storeInfo.logo" mode="aspectFill"></image>
-				</view>
+			<view class="panelfour" v-if="shopProductList.hots && shopProductList.hots.length > 0">
+				本店招牌菜
 			</view>
-			<view class="tab-header"
-				:style="{ height: `${tabHeadHeight}px`, top: `${menuInfo.top + menuInfo.height + paddingBtmSize}px` }">
-				<view class="left">
-					<text class="t">选择</text>
-				</view>
-				<view class="right">
-					<text class="t">商家</text>
-					<text class="d">{{ shopList.shopTableInfo.name }}</text>
-				</view>
-			</view>
-			<view class="tab-content">
-				<view class="left-wrap">
-					<view class="left"
-						:style="{ top: `${menuInfo.top + menuInfo.height + paddingBtmSize + tabHeadHeight}px` }">
-						<view class="item" v-for="(item, index) in shopList.productInfo" :key="item.id"
-							:class="{ active: titleTopNumIndex == index }" @click="titleClickHandle(item.id,index)">
-							<text>{{ item.name }}</text>
-						</view>
-					</view>
-				</view>
-				<view class="list-wrap">
-					<view class="item-wrap" v-for="(item,index) in shopList.productInfo" :key="item.id">
-						<view class="title-wrap" :id="`title${item.id}`"></view>
-						<view class="title"
-							:style="{ top: `${menuInfo.top + menuInfo.height + paddingBtmSize + tabHeadHeight}px` }">
-							<!--  -->
-							<text>{{ item.name }}</text>
-						</view>
-						<view class="" v-if="item.products.length == 0">
-							空
-						</view>
-						<view class="shop-item" v-for="(item1,index1) in item.products" :key="item1.id">
-							<view class="cover langcover" style="width:180rpx; height: 180rpx;"
-								@click.stop="clickspecifications(item1,index,index1)">
-								<!-- <c-image style="position: absolute;z-index:2;"
-									:src="`${item1.coverImg}?x-oss-process=image/resize,m_lfit,w_90,h_90`" width="180"
-									height="180"></c-image> -->
-								<image style="position: absolute;z-index:2;width: 180rpx; height: 180rpx;"
-									:src="`${item1.coverImg}?x-oss-process=image/resize,m_lfit,w_90,h_90`"
-									:lazy-load='true'></image>
+			<view class="panelfive">
+				<scroll-view :scroll-x="true" :scroll-into-view="leftIntoView" :scroll-with-animation="false">
+					<view class="panelfive_list">
+						<view class="panelfiveitem" @click="clickspecifications(item,index,index,'热销')"
+							v-for="(item,index) in shopProductList.hots" :key="index">
+							<image class="panelfiveitemimage" :src="item.coverImg" mode="aspectFill"></image>
+							<view class="panelfiveitemone">
+								{{ item.name }}
 							</view>
-							<view class="info" style="display: flex;flex-direction: column;justify-content: center;">
-								<view class="name">
-									{{ item1.name }}
+							<view class="panelfiveitemtow">
+								本店回头客第{{index+1}}名
+							</view>
+							<view class="panelfiveitemthere flex-start">
+								<text>招牌</text>
+							</view>
+							<!-- 	<view class="panelfiveitemfour">
+								{{item.shortTitle?item.shortTitle:''}}
+							</view> -->
+							<view class="panelfiveitemfive">
+								月售{{item.stockNumber}}
+							</view>
+							<view class="panelfiveitemsex flex-between">
+								<view class="panelfiveitemsex_oen">
+									<text>¥</text>
+									<text>{{item.lowPrice}}</text>
+									<text>/份</text>
+									<text v-if="item1.suit > 1">「{{item.suit}}份起点」</text>
 								</view>
-								<view class="namess" v-if="item1.suit>1">
-									起售：{{ item1.suit }}
+								<!-- <u-icon name="plus-circle-fill" color="#E9AB7A" size="40"></u-icon> -->
+
+							</view>
+							<view class="panelfiveitemNum">
+								<view class="sku-wrap flex-center" v-if="item.productSkuResult != null"
+									@click.stop="clickspecifications(item,index,index1)">
+									<text class="t">选规格</text>
+									<text class="dot num"
+										v-if="item.cartNumber != '0'">{{item.cartNumber<99?item.cartNumber:'99+'}}</text>
 								</view>
-								<view class="price-wrap">
-									<view class="price">
-										<text class="i">￥</text>
-										<text class="num">{{ item1.lowPrice }}</text>
-										<text class="i">起</text>
+								<view class="Controls" v-else>
+									<view v-if="item.cartNumber != '0'"
+										@click.stop="cartadd(item,'-',item.productSkuResult == null ? '单规格':'',$event)">
+										<u-icon name="minus-circle-fill" color="#E9AB7A" size="50"></u-icon>
 									</view>
-									<view class="sku-wrap" v-if="item1.productSkuResult != null"
-										@click.stop="clickspecifications(item1,index,index1)">
-										<text class="t">选规格</text>
-										<text class="dot num" v-if="item1.cartNumber != '0'">{{item1.cartNumber}}</text>
-									</view>
-									<view class="operation-wrap" v-else>
-										<view class="btn" v-if="item1.cartNumber != '0'"
-											@click.stop="cartadd(item1,index,index1,'-',item1.productSkuResult == null ? '单规格':'')">
-											<u-icon :name="require('@/static/icon_sub.png')" size="36"></u-icon>
-										</view>
-										<text class="num">{{ item1.cartNumber }}</text>
-										<view class="btn"
-											@click.stop="cartadd(item1,index,index1,'+',item1.productSkuResult == null ? '单规格':'')">
-											<u-icon :name="require('@/static/icon_add.png')" size="36"></u-icon>
-										</view>
+									<text class="num"> {{ item.cartNumber }} </text>
+									<view @click.stop="cartadd(item,'+',item.productSkuResult == null ? '单规格':'')">
+										<u-icon name="plus-circle-fill" color="#E9AB7A" size="50"></u-icon>
 									</view>
 								</view>
 							</view>
 						</view>
 					</view>
+				</scroll-view>
+			</view>
+		</view>
+		<!-- 滚动区域 -->
+		<view class="scroll-panel" id="scroll-panel">
+			<view class="list-box">
+				<view class="left" :style="{top: `${HeighT}px`}">
+					<scroll-view :scroll-into-view="leftIntoView" :scroll-with-animation="false">
+						<view class="item" v-for="(item,index) in shopProductList.productInfo" :key="index"
+							:class="{ 'active':index==leftIndex }" :id="'left-'+index" :data-index="index"
+							@click="leftTap(index)"><text>{{item.name}}</text></view>
+						<view class="items"></view>
+					</scroll-view>
+				</view>
+				<view class="main">
+					<view>
+						<view class="item main-item" v-for="(item,index) in shopProductList.productInfo" :key="index"
+							:id="'item-'+index">
+							<view class="title">
+								<view>{{item.name}}</view>
+							</view>
+							<view class="goods" @click="clickspecifications(item1,index,index1)"
+								v-for="(item1,index1) in item.products" :key="index1">
+							<!-- 	<image class="goodsImg" v-if="item1.coverImg!=null" :lazy-load="true"
+									:src="`${item1.coverImg}?x-oss-process=image/resize,m_lfit,w_150,h_150`" mode="aspectFill"></image> -->
+								<image class="goodsImg" v-if="item1.coverImg!=null" :lazy-load="true"
+									:src="`${item1.coverImg}`" mode="aspectFill"></image>
+								<image class="goodsImg" src="@/static/1.gif" mode="" v-else :lazy-load="true"></image>
+								<view v-if="item.name=='热销'" class="topSort" :class="'c'+(index1+1)">TOP{{index1+1}}
+								</view>
+								<view class="goods_right">
+									<view class="name">{{ item1.name }}</view>
+									<view class="lookBack" v-if="item.name=='热销'">本店回头客第{{index1+1}}名</view>
+									<view class="describe"> {{item1.shortTitle?item1.shortTitle:''}} </view>
+									<view class="monthlySale">月售{{item1.stockNumber}}</view>
+									<view class="money">￥<text class="money_num">{{ item1.lowPrice }}</text>/份<text
+											class="suit" v-if="item1.suit > 1">「{{item1.suit}}份起点」</text></view>
+
+									<view class="flex-end" v-if="item1.productSkuResult != null">
+										<view class="sku-wrap flex-center"
+											@click.stop="clickspecifications(item1,index,index1)">
+											<text class="t">选规格</text>
+											<text class="dot num"
+												v-if="item1.cartNumber != '0'">{{item1.cartNumber<99?item1.cartNumber:'99+'}}</text>
+										</view>
+									</view>
+
+									<view class="Controls" v-else>
+										<view v-if="item1.cartNumber != '0'"
+											@click.stop="cartadd(item1,'-',item1.productSkuResult == null ? '单规格':'',$event)">
+											<u-icon name="minus-circle-fill" color="#E9AB7A" size="50"></u-icon>
+										</view>
+										<text class="num"> {{ item1.cartNumber }} </text>
+										<view
+											@click.stop="cartadd(item1,'+',item1.productSkuResult == null ? '单规格':'')">
+											<u-icon name="plus-circle-fill" color="#E9AB7A" size="50"></u-icon>
+										</view>
+
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="fill-last" :style="{ 'height':fillHeight + 'px' }"></view>
+					</view>
 				</view>
 			</view>
 		</view>
+
+		<!-- 购物车悬浮条 -->
 		<view class="cart-wrap" v-if="cartListsdatashow">
 			<view class="cart-content">
 				<view class="left">
-					<image class="icon" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/icon_cart.png"
-						mode="aspectFit" @click="showCart = !showCart">
-					</image>
+					<view class="iconBox">
+						<image class="icon"
+							src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/shopIcon.png"
+							mode="aspectFill" @click="showCart = !showCart">
+						</image>
+						<text class="u-badge"> {{cartLists_count<99?cartLists_count:'99+'}} </text>
+					</view>
+
 					<text class="i">￥</text>
 					<text class="num">{{cartLists.amount||'0.00'}}</text>
 				</view>
 				<view class="btn" @tap="$u.debounce(orderdetail, 500)">
-					<text class="t">提交订单</text>
+					<text class="t">去结算</text>
 				</view>
 			</view>
 		</view>
-		<u-popup :show="showCart" :round="20" :zIndex="98" :overlayStyle="{ zIndex: 98 }" @close="showCart = false">
+
+		<!-- 购物车 -->
+		<u-popup :show="showCart" :round="20" :safeAreaInsetBottom="false" :zIndex="98" :overlayStyle="{ zIndex: 98 }"
+			@close="showCart = false">
 			<view class="cart-list-wrap">
-				<view class="cart-header">
+				<view class="cart-header flex-between">
+					<view class="num">已点 {{cartLists_count}} 份</view>
 					<view class="clear" @click="cartclear">
 						<u-icon name="trash" color="#999"></u-icon>
-						<text class="t">清空购物车</text>
+						<text class="t">清空</text>
 					</view>
 				</view>
 				<scroll-view scroll-y class="scroll-view">
@@ -139,25 +192,21 @@
 								<c-image :src="item.coverImg" width="120" height="120"></c-image>
 							</view>
 							<view class="info">
-								<view class="name">
-									{{ item.name }}
-								</view>
-								<view class="select-sku-wrap">
-									<text class="t">{{ item.skuName }}</text>
-								</view>
+								<view class="name"> {{ item.name }} </view>
+								<view class="select-sku-wrap"> {{ item.skuName }} </view>
+
 								<view class="price-wrap" style="padding-top: 0;">
 									<view class="price">
 										<text class="i">￥</text>
 										<text class="num">{{ item.salePrice }}</text>
-										<text class="i">起</text>
 									</view>
 									<view class="operation-wrap">
 										<view class="btn" v-if="item.number" @click="cartListadd(item,index,'-')">
-											<u-icon :name="require('@/static/icon_sub.png')" size="34"></u-icon>
+											<u-icon name="minus-circle-fill" color="#E9AB7A" size="50"></u-icon>
 										</view>
 										<text class="num" v-if="item.number">{{ item.number }}</text>
 										<view class="btn" @click="cartListadd(item,index,'+')">
-											<u-icon :name="require('@/static/icon_add.png')" size="34"></u-icon>
+											<u-icon name="plus-circle-fill" color="#E9AB7A" size="50"></u-icon>
 										</view>
 									</view>
 								</view>
@@ -167,39 +216,59 @@
 				</scroll-view>
 			</view>
 		</u-popup>
-		<u-popup :show="showShopInfo" :round="20" @close="showShopInfo = false">
+
+
+		<!-- 店铺详情 -->
+		<u-popup :show="showShopInfo" :round="20" mode="bottom" @close="showShopInfo = false" height="500">
 			<view class="shop-info-wrap">
-				<view class="info-wrap">
-					<image :src="shopList.storeInfo.coverImg" mode="aspectFill" class="img"></image>
-					<text class="t">{{ shopList.storeInfo.shopName }}</text>
+				<view class="info-wrap flex-between">
+					<view></view>
+					<text class="shopName">{{ shopInfo.storeInfo.shopName }}</text>
+					<view class="close" @click="showShopInfo = false">
+						<u-icon name="close" color="#999999" size="28"></u-icon>
+					</view>
 				</view>
+				<view class="info-wrap-title">商家信息</view>
+				<view class="row" style="margin-bottom: 20rpx;">
+					<view class="col">
+						<text class="l">营业时间：</text>
+						<text
+							class="t">{{ (shopInfo.storeInfo.businessStartDay || '——') +'至'+ (shopInfo.storeInfo.businessEndDay || '——') +' '+ (shopInfo.storeInfo.businessTime || '')}}</text>
+					</view>
+					<view class="col">
+						<text class="l">商家地址：</text>
+						<text class="t">{{ shopInfo.storeInfo.address }}</text>
+					</view>
+					<view class="col" @click="makePhoneCall(shopInfo.storeInfo.phone)">
+						<text class="l">商家电话：</text>
+						<text class="t">{{ shopInfo.storeInfo.phone }}</text>
+					</view>
+				</view>
+				<view class="info-wrap-title">商家公告</view>
 				<view class="row">
 					<view class="col">
-						<text class="t">{{ shopList.storeInfo.businessTime }}</text>
-					</view>
-					<view class="col" @click="makePhoneCall(shopList.storeInfo.phone)">
-						<text class="t">{{ shopList.storeInfo.phone }}</text>
-					</view>
-					<view class="col">
-						<text class="t">{{ shopList.storeInfo.address }}</text>
+						<text class="l">公告：</text>
+						<text class="t">{{ shopInfo.storeInfo.detail }}</text>
 					</view>
 				</view>
-				<view class="line"></view>
-				<view class="close" @click="showShopInfo = false">
-					<text class="t">关闭</text>
-				</view>
+
 			</view>
 		</u-popup>
-		<u-popup :show="showShopsku" :round="20" mode="center" @close="showShopsku = false"
+
+		<!-- 规格 -->
+		<u-popup :show="showShopsku" :round="20" mode="bottom" @close="showShopsku = false;pagemetashow=false"
 			:safeAreaInsetBottom='false'>
-			<view class="shop_sku">
+			<view class="shop_sku" :style="{ 'max-height': '80vh;' }">
 				<view class="positionabsolute">
-					<u-icon name="close-circle-fill" @click="showShopsku = false" color="#a3aaa3" size="60"></u-icon>
-				</view>
-				<image class="shop_skucimage" :src="specifications.coverImg" mode="widthFix"></image>
-				<view class="shop_sku_name">
-					{{specifications.name}}
+					<u-icon name="close-circle" @click="showShopsku = false;pagemetashow=false" color="#000"
+						size="50"></u-icon>
 				</view>
+				<image class="shop_skucimage" :src="specifications.coverImg" mode="aspectFill"></image>
+				<view class="shop_sku_name"> {{specifications.name}} </view>
+				<view class="shop_sku_returned" v-if="specifications.typeName&&specifications.typeName=='热销'">
+					本店回头客第{{specifications.indexb+1}}名 </view>
+				<view class="shop_sku_description"> {{specifications.shortTitle?specifications.shortTitle:''}} </view>
+
 				<view class="shop_sku_box" v-for="(item,index) in specifications.tagSnap" :key="index"
 					v-if="specifications.tagSnap">
 					<view class="shop_sku_box_name">
@@ -213,97 +282,105 @@
 						</view>
 					</view>
 				</view>
-				<view class="shop_skuselect flex-start" v-if="specifications.tagSnap">
-					已选规格：<view class="shop_skuselectname">{{skuidname.toString()}}</view>
-				</view>
-				<view class="shop_bottom flex-between">
-					<view class="price">
-						<text class="i">￥</text>
-						<text class="num">{{salePrice}}</text>
-						<text class="i">起</text>
-					</view>
-					<view class="operation-wrap">
-						<view class="btn"
-							@click="cartadd(specifications,specifications.indexa,specifications.indexb,'-',specifications.tagSnap == null ? '单规格':'')">
-							<u-icon :name="require('@/static/icon_sub.png')" size="34"></u-icon>
+
+
+				<view class="shop_bottom ">
+					<view class="flex-between">
+						<view class="price">
+							<text class="i">￥</text>
+							<text class="num">{{salePrice}}</text>
+							<text class="i">/杯</text>
 						</view>
-						<text class="num">{{amountcartNumber}}</text>
-						<view class="btn"
-							@click="cartadd(specifications,specifications.indexa,specifications.indexb,'+',specifications.tagSnap == null ? '单规格':'')">
-							<u-icon :name="require('@/static/icon_add.png')" size="34"></u-icon>
+						<view class="operation-wrap">
+
+							<view class="btn"
+								@click="shopAdd(specifications,specifications.indexa,specifications.indexb,'-',specifications.tagSnap == null ? '单规格':'')">
+								<u-icon name="minus-circle-fill" color="#E9AB7A" size="50"></u-icon>
+							</view>
+							<text class="num">{{amountcartNumber}}</text>
+							<view class="btn"
+								@click="shopAdd(specifications,specifications.indexa,specifications.indexb,'+',specifications.tagSnap == null ? '单规格':'')">
+								<u-icon name="plus-circle-fill" color="#E9AB7A" size="50"></u-icon>
+							</view>
 						</view>
 					</view>
+					<view class="shop_skuselect flex-start" v-if="specifications.tagSnap">
+						<view class="shop_skuselectname">{{skuidname.toString()}}</view>
+					</view>
+					<view class="addShopping" :class="amountcartNumber>0?'active':''"
+						@click="addShopping(specifications,specifications.indexa,specifications.indexb,'+',specifications.tagSnap == null ? '单规格':'')">
+						添加到购物车</view>
 				</view>
 			</view>
 		</u-popup>
-		<l-barrage ref="lBarrage" @end="onEnd" :minTop='8' :maxTop='20' :avatar='barrageavatar'></l-barrage>
 	</view>
-</template>
 
+</template>
 <script>
-	import _ from 'lodash';
+	import navseat from '@/components/navseat.vue'
 	import webSocketUtils from '@/common/js/websocket.js';
-	import orderdetail from '@/pages/order_detail/index';
-	import lBarrage from '@/components/l-barrage/l-barrage.vue'
 	export default {
 		components: {
-			orderdetail,
-			lBarrage
+			navseat
 		},
 		data() {
 			return {
+				pagemetashow: false,
+				fixedtrue: true,
 				userInfo: uni.cache.get('userInfo'), //个人信息
-				// #ifndef MP-WEIXIN
-				menuInfo: uni.getSystemInfo(),
-				// #endif
-				// #ifdef MP-WEIXIN
-				menuInfo: uni.getMenuButtonBoundingClientRect(),
-				// #endif
-				paddingBtmSize: 6,
-				tabHeadHeight: 50,
+				opacity: false, //是否显示
+				scrollHeight: 1000,
+				scrollTopSize: 0, //距离顶部的高度
+				fillHeight: 0, // 填充高度，用于最后一项低于滚动区域时使用
+				leftArray: [],
+				mainArray: [],
+				topArr: [],
+				leftIndex: 0,
 				isFixed: false,
-				shopList: {}, //数据类型
-				active: 0,
-				showShopInfo: false,
-				showShopsku: false,
-				titleTopNumIndex: 0,
-				titleTopNumIndexFalg: true,
-				timer: null,
-				titleTopNums: [],
-				showCart: false,
-				tableCode: '', //code，
-				specifications: {},
-				skuidname: [],
+				showShopInfo: false, //店铺信息弹窗是否显示
+				showShopsku: false, //多规格弹窗是否显示
+				skuId: null, // 多规格ID
 				cartLists: {}, //购物车
-				orderdetailcartLists: {}, //提交订单
+				cartLists_count: 0,
+				shopInfo: {}, //店铺信息
+				shopProductList: {}, //商品信息
+				specifications: {
+
+				}, // 规格信息
 				socketTicket: null,
 				amountcartNumber: 0,
-				skuidsearch: '', //
+				skuNumber: 0,
+				skuSuit: 0,
 				salePrice: '', //钱数
-				fixedtrue: true,
-				datasocket: {}, //储存传参数据
-				radiovalue: '1', //选择支付方式
-				amountVIP: null, //余额
-				barrageavatar: '', //弹幕头像
-				cartListsdatashow: false //是否显示购物车
-			};
+				cartListsdatashow: false, //是否显示购物车
+				showCart: false,
+			}
 		},
 		onPageScroll(e) {
-			if (e.scrollTop >= (this.menuInfo.top + this.menuInfo.height + this.paddingBtmSize) / 2) {
-				this.isFixed = true;
-				uni.setNavigationBarColor({
-					frontColor: '#000000',
-					backgroundColor: '#ffffff'
-				});
+			if (e.scrollTop <= 44) { //搜索导航栏显示影藏
+				this.opacity = false
 			} else {
-				this.isFixed = false;
-				uni.setNavigationBarColor({
-					frontColor: '#ffffff',
-					backgroundColor: '#000000'
-				});
+				this.opacity = true
 			}
-			
-			this.countScrollTitle(e.scrollTop);
+			this.mainScroll(e)
+		},
+		computed: {
+			/* 计算左侧滚动位置定位 */
+			leftIntoView() {
+				return `left-${this.leftIndex? this.leftIndex:0}`;
+			},
+			HeighT() { //手机类型的尺寸    导航栏高度
+				return this.$store.getters.is_BarHeight.heightBar + this.$store.getters.is_BarHeight.customBar
+			},
+		},
+		onReady() {
+			setTimeout(() => {
+				uni.getSystemInfo({
+					success: (data) => {
+						this.scrollHeight = data.windowHeight
+					}
+				})
+			}, 100);
 		},
 		onLoad(e) {
 			if (e.q) {
@@ -311,9 +388,7 @@
 				uni.cache.set('tableCode', this.tableCode)
 			}
 			uni.cache.set('types', 'types');
-			this.$nextTick(() => {
-				this.countTitleTopNum(); //导航栏
-			});
+
 		},
 		onUnload() {
 			this.socketTicket.Close()
@@ -325,6 +400,11 @@
 			this.fixedtrue = true
 		},
 		onShow() {
+			uni.pageScrollTo({
+				scrollTop: 0,
+				duration: 0
+			});
+			console.log(!uni.cache.get('token'))
 			if (!uni.cache.get('token')) {
 				uni.login({
 					provider: 'weixin',
@@ -344,7 +424,7 @@
 											.miniAppOpenId)
 										uni.cache.set('userInfo', res.data.userInfo);
 										uni.$on('message', this.getMessage)
-										this.productqueryShopIdByTableCode() //获取shop User id
+										this.productqueryShop();
 									}
 								},
 								fail: (err) => {}
@@ -354,128 +434,12 @@
 				});
 			} else {
 				uni.$on('message', this.getMessage)
-				this.productqueryShopIdByTableCode() //获取shop User id
+				this.productqueryShop();
 			}
 		},
 		methods: {
-			onEnd() { //回调弹幕
-				console.log('一波结束')
-			},
-			// 单独获取他的shopUserid
-			async productqueryShopIdByTableCode() {
-				let res = await this.api.productqueryShopIdByTableCode({
-					code: uni.cache.get('tableCode')
-				})
-				if (res.code == 0) {
-					uni.cache.set('shopUser', res.data)
-					this.handlemessage() //监听websocket返回
-					// this.productqueryProduct() //list  数据
-				} else {
-					setTimeout(() => {
-						uni.pro.switchTab('index/index')
-					}, 1000)
-				}
-			},
-			getMessage(msg) { //wss  回显数据
-				if (msg == 1) { // 网络在连接
-					this.fixedtrue = true
-					return false
-				}
-				this.fixedtrue = false
-				if (msg.type == 'heartbeat') { //后台心跳  处理返回  不然控制台一直报错
-					return false
-				}
-				try {
-					if (msg.status != 'success') {
-						uni.showToast({
-							title: msg.msg,
-							icon: "none",
-						})
-						if (msg.msg == '桌码不存在') { //卓码不存在直接退出
-							this.socketTicket.Close()
-							uni.$off('message')
-							uni.navigateBack()
-							return false;
-						}
-					} else {
-						switch (msg.type) {
-							case 'sku': // sku  数量 查询这个商品的价格和数量
-								this.$set(this, 'amountcartNumber', msg.amount)
-								this.productqueryProduct() //list  数据
-								break;
-							case 'clearCart':
-								this.cartLists = msg
-								this.productqueryProduct() //list  数据
-								this.skuidname = []
-								this.showCart = false
-								setTimeout(() => {
-									uni.showToast({
-										title: msg.msg,
-										icon: "none",
-									})
-								}, 500)
-								break;
-							case 'order':
-								this.skuidname = []
-								this.showCart = false
-								this.cartLists = msg
-								this.productqueryProduct() //list  数据
-								break;
-							case 'addCart': //初始化add
-								this.cartLists = msg
-								this.productqueryProduct() //list  数据
-								break;
-							case 'addcart':
-								this.cartLists = msg
-								// console.log(msg, 1111)
-								this.productqueryProduct() //list  数据
-								try {
-									if (msg.data.length != 0) {
-										let nums = 0
-										msg.data.forEach((item, index, arr) => { //初始化skuidname的数据  选择第一个
-											if (item.skuId == this.skuidsearch) {
-												nums = item.number
-											}
-										})
-										this.$set(this, 'amountcartNumber', nums)
-									} else {
-										this.$set(this, 'amountcartNumber', 0)
-									}
-								} catch (e) {
-									//TODO handle the exception
-								}
-								try {
-									this.barrageavatar = msg.reqData.headImg
-									/*插入一条弹幕*/
-									this.$refs.lBarrage.add(
-										`${msg.reqData.nickName?msg.reqData.nickName:'微信用户'}${msg.reqData.num==-1?'取消了':'添加了'}${msg.reqData.name}(${msg.reqData.num})`
-									);
-								} catch (e) {
-									//TODO handle the exception
-								}
-								break;
-						}
-						// console.log(this.cartLists.data, 1111111)
-						this.cartListsdatashow = this.cartLists.data.length == 0 ? false : true
-					}
-				} catch (e) {
-					//TODO handle the exception
-				}
-			},
-			handlemessage() {
-				this.socketTicket ? this.socketTicket.Close() : null //调用前先判断是否有socket正在进行 先关闭后链接
-				this.socketTicket = new webSocketUtils(`${uni.conf.baseUrlwws}`, 5000, {
-					tableId: uni.cache.get('tableCode'),
-					shopId: uni.cache.get('shopUser'),
-					userId: uni.cache.get('userInfo').id,
-					"type": "connect",
-				})
-			},
-			// 数据处理
-			socketSendMsg(data) {
-				if (this.socketTicket) {
-					this.socketTicket.send(data);
-				}
+			navigateBacknav() {
+				uni.pro.switchTab('index/index')
 			},
 			getQueryString(url, name) { //解码
 				var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i')
@@ -485,46 +449,215 @@
 				}
 				return null;
 			},
-			async cartadd(item, index, index1, a, b) { //列表添加 a传参加减号   b是判断单规格多规格
+			/**
+			 * socket初始化
+			 */
+			handlemessage() {
+				this.socketTicket ? this.socketTicket.Close() : null //调用前先判断是否有socket正在进行 先关闭后链接
+				this.socketTicket = new webSocketUtils(`${uni.conf.baseUrlwws}`, 5000, {
+					tableId: uni.cache.get('tableCode'),
+					shopId: uni.cache.get('shopUser'),
+					userId: uni.cache.get('userInfo').id,
+					"type": "connect",
+				})
+			},
+
+			/**
+			 * 通过桌码获取店铺信息
+			 */
+			async productqueryShop() {
+				let res = await this.api.productqueryShop({
+					code: uni.cache.get('tableCode'),
+					lng: uni.cache.get('getLocationstorage').lng,
+					lat: uni.cache.get('getLocationstorage').lat,
+				})
+				if (res.code == 0) {
+					uni.cache.set('shopUser', res.data.storeInfo.id)
+					this.shopInfo = res.data;
+					this.productqueryProduct() //list  数据
+					this.handlemessage() //监听websocket返回
+				} else {
+					setTimeout(() => {
+						uni.pro.switchTab('index/index')
+					}, 1000)
+				}
+
+			},
+			/**
+			 * 商品数量增加/减少
+			 * @param {Object} item
+			 * @param {Object} index
+			 * @param {Object} index1
+			 * @param {Object} a
+			 * @param {Object} b
+			 */
+			async cartadd(item, a, b) { //列表添加 a传参加减号   b是判断单规格多规格\
 				if (b == '单规格') { //没有规格为空
 					this.skuidname = []
 				}
-				this.hodgepodge(item, 1, a) //获取skuid  /1添加购物车
+				let cartNumber = a == '+' ? item.cartNumber + 1 : item.cartNumber - 1;
+				this.hodgepodge(item, 1, a, cartNumber) //获取skuid  /1添加购物车
 			},
-			async cartListadd(item, index, a) { //购物车加减
+
+			/**
+			 * 详情商品增减
+			 * @param {Object} item
+			 * @param {Object} index
+			 * @param {Object} index1
+			 * @param {Object} a
+			 * @param {Object} b
+			 */
+			shopAdd(item, index, index1, a, b) {
+				if (a == "+") {
+
+					if (this.skuNumber < this.skuSuit && this.amountcartNumber < this.skuSuit) {
+						this.amountcartNumber = this.amountcartNumber + (this.skuSuit == 0 ? 1 : this.skuSuit);
+					} else {
+						this.amountcartNumber++;
+					}
+				} else {
+
+					if (this.amountcartNumber > 0) {
+						console.log(item)
+						if (this.skuNumber < this.skuSuit && this.amountcartNumber <= this.skuSuit) {
+							this.amountcartNumber = this.amountcartNumber - (this.skuSuit == 0 ? 1 : this.skuSuit);
+						} else {
+							this.amountcartNumber = this.amountcartNumber - 1;
+						}
+					}
+				}
+			},
+
+			/**
+			 * 添加购物车
+			 */
+			addShopping(item, index, index1, a, b) {
+				if (this.amountcartNumber <= 0) {
+					return;
+				}
+				let num = 0;
+				if (item.typeEnum == "normal") {
+					num = item.cartNumber + this.amountcartNumber;
+				} else {
+					num = this.skuNumber + this.amountcartNumber;
+				}
+				let params = {
+					"skuId": this.skuId,
+					"num": num, //数量
+					"type": a == '+' ? 1 : 0,
+					"productId": item.id, //商品id
+					"shopId": uni.cache.get('shopUser'),
+					"userId": uni.cache.get('userInfo').id,
+					"tableId": uni.cache.get('tableCode'),
+				}
+				this.addCart(params)
+			},
+
+			/**
+			 * 购物车加减
+			 * @param {Object} item
+			 * @param {Object} index
+			 * @param {Object} a
+			 */
+			async cartListadd(item, index, c) {
 				try {
-					const data = { //定义socket数据传参
-						"name": item.name,
+					let params = {
 						"skuId": item.skuId,
-						"num": a == '-' ? -1 : 1, //skuId
-						"type": "addcart", //“addcart:添加购物车，create0rder:生成订单，clearCart:清空购物车”，
+						"num": c == '+' ? item.number + 1 : item.number - 1, //数量
+						"type": c == '+' ? 1 : 0,
 						"productId": item.productId, //商品id
 						"shopId": uni.cache.get('shopUser'),
-						"userId": uni.cache.get('userInfo').id
-					};
-					this.datasocket = data
-					uni.$u.debounce(this.socketSendMsg(data), 500)
+						"userId": uni.cache.get('userInfo').id,
+						"tableId": uni.cache.get('tableCode'),
+					}
+					this.addCart(params);
 				} catch (e) {
 					//TODO handle the exception
 				}
 			},
-			async productqueryProduct() { //list  数据
-				let res = await this.api.productqueryProduct({
-					code: uni.cache.get('tableCode'),
-					productGroupId: ''
-				})
+
+
+			/**
+			 * 添加到购物车
+			 */
+			async addCart(data) {
+				let res = await this.api.cartAdd(data)
 				if (res.code == 0) {
-					this.shopList = res.data
-					this.$nextTick(() => {
-						this.countTitleTopNum();
-					});
+					this.showShopsku = false;
+					this.pagemetashow = false;
+					this.$set(this, 'amountcartNumber', 0)
 				}
 			},
-			clickspecifications(item1, index, index1) {
+
+			/**
+			 * 清空购物车
+			 */
+			async cartclear() {
+				let res = await this.api.cleanCart({
+					"shopId": uni.cache.get('shopUser'),
+					"tableId": uni.cache.get('tableCode'),
+				})
+			},
+
+
+			/**
+			 * 商品数量\购物车数量处理
+			 */
+			setNumber() {
+				// 处理购物车相同id的情况下  数量相加
+				var summedArray = this.cartLists.data.reduce((acc, current) => {
+					const existing = acc.find(item => item.productId === current.productId);
+					if (existing) {
+						existing.number += current.number;
+					} else {
+						acc.push({
+							...current
+						})
+					}
+					return acc;
+				}, []);
+				// 购物车总数据与列表页面互通
+				this.shopProductList.productInfo.forEach((item) => {
+					return item.products.filter(e => {
+						e.cartNumber = 0;
+						return summedArray.find(i => {
+							if (e.id == i.productId) {
+								e.cartNumber = i.number
+							}
+						})
+					})
+				})
+				// 处理招牌菜商品数量
+				this.shopProductList.hots.forEach((item) => {
+					item.cartNumber = 0;
+					return summedArray.find(i => {
+						if (item.id == i.productId) {
+							item.cartNumber = i.number
+						}
+					})
+				})
+				this.cartListsdatashow = this.cartLists.data.length == 0 ? false : true
+				if (this.cartLists.data.length > 0) {
+					this.cartLists_count = 0;
+					this.cartLists.data.forEach((v, e) => {
+						this.cartLists_count += v.number;
+					})
+				} else {
+					this.cartLists_count = 0;
+				}
+			},
+			/**
+			 * 多规格选择
+			 * @param {Object} item1
+			 * @param {Object} index
+			 * @param {Object} index1
+			 */
+			clickspecifications(item1, index, index1, type) {
 				this.skuidname = []
 				this.specifications = item1
 				this.specifications.indexa = index
 				this.specifications.indexb = index1
+				this.specifications.typeName = type
 				try {
 					if (item1.productSkuResult == null) {
 						// 但但单个规格弹框的处理
@@ -550,57 +683,65 @@
 					//TODO handle the exception
 				}
 			},
+
+			/**
+			 * 规格选择监听
+			 * @param {Object} e
+			 * @param {Object} index
+			 * @param {Object} index1
+			 * @param {Object} item
+			 */
 			async morloe(e, index, index1, item) {
 				this.specifications.tagSnap[index]['start'] = index1
 				this.skuidname.splice(index, 1, e) //替换skuidname的数据
 				this.hodgepodge(item, 2)
 			},
-			async hodgepodge(item, a, c) { //此接口去获取商品id ！！！赋值库存  数量  价格等
+
+			/**
+			 * 获取规格信息
+			 * @param {Object} item
+			 * @param {Object} a
+			 * @param {Object} c
+			 * @param {Object} num
+			 */
+			async hodgepodge(item, a, c, num) { //此接口去获取商品id ！！！赋值库存  数量  价格等
 				try {
 					let res = await this.api.productqueryProductSku({
+						code: uni.cache.get('tableCode'),
 						shopId: uni.cache.get('shopUser'),
 						productId: item.id, //商品id
 						spec_tag: this.skuidname.join(",")
 					})
-					if (res.stockNumber == 0) {
-						uni.showToast({
-							title: '暂无库存',
-							icon: "none",
-						})
-					} else {
-						this.skuidsearch = res.data.id // 储存skuid   用于筛选数量
-						this.salePrice = res.data.salePrice // 价格
-						let data = null
-						if (a == 1) { //1添加购物车  2是websocket返回这个商品的价格(应为不同的多规格商品返回不同的价格)
-							data = { //定义socket数据传参
-								"nickName": this.userInfo.nickName,
-								"barrageavatar": this.userInfo.headImg,
-								'name': item.name,
-								"skuId": res.data.id,
-								"num": c == '-' ? -1 : 1, //数量
-								"type": "addcart", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
-								"productId": item.id, //商品id
-								"shopId": uni.cache.get('shopUser'),
-								"userId": uni.cache.get('userInfo').id
-							};
-						} else {
-							data = { //查询这个商品的价格
-								"name": item.name,
-								"skuId": res.data.id,
-								"num": '', //数量
-								"type": "sku", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
-								"productId": item.id, //商品id
-								"shopId": uni.cache.get('shopUser'),
-								"userId": uni.cache.get('userInfo').id
-							};
-							this.showShopsku = true //打开弹框
+					this.salePrice = res.data.salePrice // 价格
+					let data = null;
+					if (a == 1) { //1添加购物车  2是websocket返回这个商品的价格(应为不同的多规格商品返回不同的价格)
+						let params = {
+							"skuId": res.data.id,
+							"num": num, //数量
+							"type": c == '+' ? 1 : 0,
+							"productId": item.id, //商品id
+							"shopId": uni.cache.get('shopUser'),
+							"userId": uni.cache.get('userInfo').id,
+							"tableId": uni.cache.get('tableCode'),
 						}
-						this.datasocket = data
-						uni.$u.debounce(this.socketSendMsg(data), 500)
+						this.addCart(params);
+					} else {
+						this.skuId = res.data.id;
+						this.skuNumber = res.data.number || 0;
+						this.skuSuit = res.data.suit;
+						this.showShopsku = true //打开弹框
+						this.pagemetashow = true
 					}
+					this.$set(this, 'amountcartNumber', 0)
 				} catch (e) {}
 			},
-			orderdetail() { // 直接生成订单
+
+			/**
+			 * 结算直接生成订单
+			 */
+			orderdetail() {
+				console.log(this.cartLists)
+				console.log(this.shopInfo)
 				if (this.cartLists.data.length == 0) {
 					uni.showToast({
 						title: '请先添加商品',
@@ -609,404 +750,587 @@
 					return false
 				}
 				uni.navigateTo({
-					url: '/pages/order_detail/indexs?tableId=' + JSON.stringify(this.cartLists)
+					url: '/pages/order/confirm_order?storeInfo=' + JSON.stringify(this.shopInfo.storeInfo)
 				});
-				// let data = {
-				// 	"skuId": '',
-				// 	"num": '', //数量
-				// 	"type": "createOrder", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
-				// 	"couponsId": '', //优惠券ID,
-				// 	"isYhq": 0, // 是否使用优惠券（ 1： 使用， 0： 不使用）,
-				// 	"isBuyYhq": 0, // 是否购买优惠券（ 1： 购买， 0： 不够买）
-				// 	"productId": '', //商品id
-				// 	"shopId": uni.cache.get('shopUser'),
-				// 	"userId": uni.cache.get('userInfo').id,
-				// }
-				// this.datasocket = data
-				// uni.$u.debounce(this.socketSendMsg(data), 500)
+
 			},
-			async cartclear() { //清空购物车
+
+			/**
+			 * 商家信息显示
+			 */
+			showShopClick() {
+				this.showShopInfo = true;
+			},
+
+			/**
+			 * 获取消息
+			 * @param {Object} msg
+			 */
+			getMessage(msg) { //wss  回显数据
+				if (msg == 1) { // 网络在连接
+					this.fixedtrue = true
+					return false
+				}
+				this.fixedtrue = false
+				if (msg.type == 'heartbeat') { //后台心跳  处理返回  不然控制台一直报错
+					return false
+				}
 				try {
-					const data = { //定义socket数据传参
-						"skuId": '',
-						"num": '', //skuId
-						"type": "clearCart", //“addcart:添加购物车，create0rder:生成订单，clearCart:清空购物车”，
-						"productId": '', //商品id
-						"shopId": uni.cache.get('shopUser'),
-						"userId": uni.cache.get('userInfo').id
-					};
-					this.datasocket = data
-					uni.$u.debounce(this.socketSendMsg(data), 500)
+					if (msg.status != 'success') {
+						uni.showToast({
+							title: msg.msg,
+							icon: "none",
+						})
+						if (msg.msg == '桌码不存在') { //卓码不存在直接退出
+							this.socketTicket.Close()
+							uni.$off('message')
+							uni.navigateBack()
+							return false;
+						}
+					} else {
+						switch (msg.type) {
+							case 'sku': // sku  数量 查询这个商品的价格和数量
+								break;
+							case 'order':
+								this.cartLists_count = 0;
+								this.skuidname = [];
+								this.cartListsdatashow = false;
+								this.showCart = false;
+								this.cartLists = msg;
+								this.productqueryProduct() //list  数据
+								break;
+							case 'addCart': //初始化add
+								this.cartLists = msg
+								this.setNumber()
+								break;
+							case 'addcart':
+								this.cartLists = msg
+								try {
+									//购物车为空的情况
+									if (msg.data.length == 0) {
+										this.showCart = false;
+									}
+									this.setNumber()
+								} catch (e) {}
+								break;
+						}
+
+
+					}
 				} catch (e) {
 					//TODO handle the exception
 				}
 			},
-			// 导航栏点击
-			navClickHandle(t) {
-				switch (t) {
-					case 1:
-						// 返回
-						this.socketTicket.Close()
-						uni.switchTab({
-							url: '/pages/index/index'
-						})
-						break;
-					case 2:
-						// 显示商家信息
-						this.showShopInfo = true;
-						break;
-					default:
-						break;
+
+			// 数据处理
+			socketSendMsg(data) {
+				if (this.socketTicket) {
+					this.socketTicket.send(data);
 				}
 			},
-			//打电话
-			makePhoneCall(phone) {
-				uni.makePhoneCall({
-					phoneNumber: phone //仅为示例
+			/**
+			 * 获取商品数据
+			 */
+			async productqueryProduct() {
+				let res = await this.api.productqueryProduct({
+					"shopId": uni.cache.get('shopUser'),
+					"productGroupId": ''
+				})
+				if (res.code == 0) {
+					this.shopProductList = res.data;
+					if (this.cartLists && this.cartLists.data && this.cartLists.data.length >= 0) {
+						this.setNumber()
+					}
+					this.scrollTopSize = 0
+					this.scrollHeight = 1000
+					this.topArr = []
+					setTimeout(() => {
+						this.getElementTop();
+					}, 500);
+				}
+			},
+
+			/* 获取元素顶部信息 */
+			getElementTop() {
+				new Promise((resolve, reject) => {
+					let view = uni.createSelectorQuery().selectAll('.main-item');
+					view.boundingClientRect(async data => {
+						resolve(data);
+					}).exec();
+					this.$u.getRect('.scroll-panel').then(res => {
+						this.scrollTopSize = res.top; //元素距离顶部的距离  
+					})
+				}).then((res) => {
+					let topArr = res.map((item) => {
+						return item.top; /* 减去滚动容器距离顶部的距离 加导航栏高度*/
+					});
+					this.scrollHeight = this.scrollHeight - this.HeighT
+					this.topArr = topArr;
+					/* 获取最后一项的高度，设置填充高度。判断和填充时做了 +-20 的操作，是为了滚动时更好的定位 */
+					let last = res[res.length - 1].height;
+					if (last - 20 < this.scrollHeight) {
+						// this.fillHeight = this.scrollHeight - last + 20; //这是吸到顶部的距离
+						this.fillHeight = 200;
+					}
 				});
 			},
-			// 点击菜单商品滚动到指定为止
-			titleClickHandle(id,index) {
-				this.titleTopNumIndexFalg = false;
-				this.titleTopNumIndex = index;
-				uni.createSelectorQuery()
-					.select('#wrapper')
-					.boundingClientRect((data) => {
-						//目标节点
-						uni.createSelectorQuery()
-							.select(`#title${id}`)
-							.boundingClientRect((res) => {
-								const scrollTop = res.top - data.top;
-								const offsetNum = this.menuInfo.top + this.menuInfo.height + this
-									.paddingBtmSize +
-									this.tabHeadHeight - 1;
-								//最外层盒子节点
-								uni.pageScrollTo({
-									scrollTop: scrollTop - offsetNum
-								});
-							})
-							.exec();
-					})
-					.exec();
-			},
-			// 计算滚动到那个标题
-			countScrollTitle: _.throttle(function(top) {
-				
-				if (this.titleTopNums.length > 1 && this.titleTopNumIndexFalg) {
-					for (let i = 0; i <= this.titleTopNums.length - 1; i++) {
-						if (top >= this.titleTopNums[i] && top < this.titleTopNums[i + 1]) {
-							this.titleTopNumIndex = i;
+			/* 主区域滚动监听 */
+			mainScroll(e) {
+				// 节流方法
+				clearTimeout(this.mainThrottle);
+				this.mainThrottle = setTimeout(() => {
+					scrollFn();
+				}, 10);
+				let scrollFn = () => {
+					let top = e.scrollTop;
+					let index = 0;
+					/* 查找当前滚动距离 */
+					for (let i = (this.topArr.length - 1); i >= 0; i--) {
+						/* 在部分安卓设备上，因手机逻辑分辨率与rpx单位计算不是整数，滚动距离与有误差，增加2px来完善该问题 */
+						if ((top + 2) >= this.topArr[i] - this.HeighT) {
+							index = i;
+							break;
 						}
 					}
-					if (top >= this.titleTopNums[this.titleTopNums.length - 1]) {
-						this.titleTopNumIndex = this.titleTopNums.length - 1;
+					const lastElement = this.topArr[this.topArr.length - 1];
+					const currentElement = this.topArr[index];
+					const diff = lastElement - currentElement;
+					console.log(diff)
+					if (diff > this.scrollHeight) {
+						this.leftIndex = (index < 0 ? 0 : index);
+					} else {
+						this.leftIndex = this.leftIndex
 					}
 				}
-				//这里必须要每次滚动前 清除一次
-				clearTimeout(this.timer) 
-				// 如果停留则表示滚动结束  一旦空了1s就判定为滚动结束
-				this.timer = setTimeout(() => {
-					this.titleTopNumIndexFalg = true;
-					// console.log('结束滚动')
-				}, 1000)
-			}, 100),
-			// 统计每个标题到顶部的距离
-			countTitleTopNum() {
-				let topNums = [];
-				for (let i of this.shopList.productInfo) {
-					uni.createSelectorQuery()
-						.select(`#title${i.id}`)
-						.boundingClientRect((res) => {
-							topNums.push(res.top - this.menuInfo.top - this.menuInfo.height - this
-								.paddingBtmSize*8 - 
-								this.tabHeadHeight + 40);
-						})
-						.exec();
-				}
-				this.titleTopNums = topNums;
 			},
+			/* 左侧导航点击 */
+			leftTap(index) {
+				uni.pageScrollTo({
+					scrollTop: this.topArr[index] - this.HeighT,
+					duration: 0
+				});
+				this.leftIndex = index
+			}
 		}
-	};
+	}
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 	$bg: #fafafa;
 	$tabLeft: 200upx;
 	$itemH: 100upx;
 	$cartH: 90upx;
 
-	.nav-wrap {
-		width: 100%;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 97;
+	/* 容器 */
+	.container {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		justify-content: flex-start;
+		align-items: flex-start;
+		align-content: flex-start;
 
-		&.is-fixed {
+		.navbarcontent .active {
 			background-color: #fff;
 		}
 
-		.content {
-			.left-btn {
-				display: flex;
+		&>view {
+			width: 100%;
+		}
 
-				.btn {
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					// margin-right: $paddingSize;
+		.top--panel {
+			// padding: 0 20rpx;
+			background-color: #fff;
+
+			.panelimgbackground {
+				width: 100%;
+				height: 272rpx;
+			}
+
+			.panelone {
+				padding: 20rpx 20rpx 0 20rpx;
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: 500;
+				font-size: 32rpx;
+				color: #333333;
+			}
+
+			.paneltow {
+				padding: 0 20rpx;
+				margin-top: 16rpx;
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #999999;
+			}
+
+			.panelthere {
+				margin-top: 32rpx;
+				margin-bottom: 50rpx;
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #999999;
+				padding: 0 20rpx;
+
+				.paneltheretext {
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #999999;
+				}
+
+				.flex-start {
+					view {
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #999999;
+					}
 				}
 			}
-		}
-	}
 
-	.shop-cover {
-		position: relative;
-
-		&::after {
-			content: '';
-			width: 100%;
-			height: 100%;
-			position: absolute;
-			top: 0;
-			left: 0;
-			z-index: 2;
-			background-color: rgba(0, 0, 0, 0.3);
-		}
-
-		.img {
-			width: 100%;
-			height: 100%;
-			position: relative;
-			z-index: 1;
-		}
-	}
-
-	.list-container {
-		background-color: #fff;
-		border-radius: 20upx;
-		position: relative;
-		z-index: 96;
-		margin-top: -40upx;
-
-		.header-wrap {
-			$h: 120upx;
-			height: $h;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding: 0 $paddingSize;
-
-			.title {
+			.panelfour {
+				font-family: Source Han Sans CN, Source Han Sans CN;
 				font-weight: bold;
+				font-size: 32rpx;
+				color: #333333;
+				padding: 0 20rpx;
+			}
 
-				.t {
-					font-size: 42upx;
+			.panelfive {
+				width: 100%;
+				padding: 0 20rpx;
+
+				.panelfive_list {
+					display: flex;
 				}
-			}
 
-			.cover {
-				width: $h;
-				height: $h;
-				margin-top: -40upx;
-				background: #999;
-				position: relative;
+				.panelfiveitem {
+					margin-top: 16rpx;
+					width: 340rpx;
+					margin-right: 30rpx;
+					position: relative;
+					flex-shrink: 0;
 
-				.img {
-					width: 100%;
-					height: 100%;
-					border-radius: 12upx;
-				}
-			}
-		}
+					.panelfiveitemimage {
+						border-radius: 20rpx 20rpx 0rpx 0rpx;
+						width: 100%;
+						height: 204rpx;
+					}
 
-		.tab-header {
-			display: flex;
-			align-items: center;
-			background-color: $bg;
-			position: sticky;
-			z-index: 999;
+					.panelfiveitemone {
+						margin-top: 32rpx;
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 500;
+						font-size: 28rpx;
+						color: #333333;
+					}
 
-			.t {
-				font-size: 32upx;
-			}
+					.panelfiveitemtow {
+						margin-top: 16rpx;
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #FF534B;
+					}
 
-			.left {
-				width: $tabLeft;
-				display: flex;
-				padding-left: $paddingSize;
+					.panelfiveitemthere {
+						margin-top: 12rpx;
+						// text:nth-child(1) {
+						// 	margin-left: 0;
+						// }
 
-				.t {
-					font-weight: bold;
-				}
-			}
+						text {
+							padding: 4rpx 24rpx;
+							background: #F6F6F6;
+							border-radius: 8rpx 8rpx 8rpx 8rpx;
+							font-family: Source Han Sans CN, Source Han Sans CN;
+							font-weight: 400;
+							font-size: 20rpx;
+							color: #999999;
+						}
+					}
 
-			.right {
-				flex: 1;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				padding: 0 $paddingSize;
+					.panelfiveitemfour {
+						margin-top: 12rpx;
+						width: 100%;
+						height: 36rpx;
+						line-height: 36rpx;
+						overflow: hidden; //超出的文本隐藏
+						text-overflow: ellipsis; //溢出用省略号显示
+						white-space: nowrap; //溢出不换行
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #999999;
+					}
 
-				.d {
-					padding: 12upx 16upx;
-					background-color: #faf2b6;
-					border-radius: 12upx;
-				}
-			}
-		}
+					.panelfiveitemfive {
+						margin-top: 8rpx;
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #999999;
+					}
 
-		.tab-content {
-			display: flex;
-			position: relative;
+					.panelfiveitemsex {
+						margin-top: 32rpx;
+						.panelfiveitemsex_oen {
+							text:nth-child(1) {
+								font-family: Source Han Sans CN, Source Han Sans CN;
+								font-weight: 400;
+								font-size: 24rpx;
+								color: #333333;
+							}
 
-			.left-wrap {
-				width: $tabLeft;
-				background-color: $bg;
-				padding: 0 0 $paddingSize * 3 + $cartH 0;
+							text:nth-child(2) {
+								font-family: Source Han Sans CN, Source Han Sans CN;
+								font-weight: bold;
+								font-size: 36rpx;
+								color: #333333;
+							}
 
-				.left {
-					width: $tabLeft;
-					position: sticky;
+							text:nth-child(3) {
+								font-family: Source Han Sans CN, Source Han Sans CN;
+								font-weight: 400;
+								font-size: 36rpx;
+								color: #333333;
+							}
 
-					.item {
-						height: $itemH;
+							text:nth-child(4) {
+								font-family: Source Han Sans CN, Source Han Sans CN;
+								font-weight: 400;
+								font-size: 24rpx;
+								color: #666666;
+							}
+						}
+					}
+
+					.panelfiveitemNum {
+						// position: absolute;
+						// bottom: 82rpx;
+						// right: 0;
+						padding-bottom: 48rpx;
 						display: flex;
 						align-items: center;
-						padding: 0 $paddingSize;
-						justify-content: center;
+						justify-content: flex-end;
 
-						&.active {
-							background-color: #fff;
-							font-weight: bold;
+						.sku-wrap {
+							width: 138rpx;
+							height: 54rpx;
+							background: #E3AD7F;
+							border-radius: 32rpx;
+							position: relative;
+							align-items: center;
+
+							.t {
+								font-size: 28rpx;
+								color: #fff;
+							}
+
+							.dot {
+								position: absolute;
+								top: -15rpx;
+								right: -10rpx;
+								background-color: #FF4B33;
+								color: #fff;
+								border-radius: 58rpx;
+								padding: 5rpx 14rpx;
+								box-sizing: border-box;
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								font-size: 20rpx;
+							}
+						}
+
+						.Controls {
+							display: flex;
+							align-items: center;
+
+							.num {
+								margin: 8rpx 8rpx 0 8rpx;
+							}
 						}
 					}
 				}
 			}
+		}
 
-			.list-wrap {
-				flex: 1;
-				padding-left: $paddingSize;
-				padding-bottom: $paddingSize * 3 + $cartH;
+		.scroll-panel {
+			// flex-grow: 1;
+			// height: 0;
+			// overflow: hidden;
 
-				.item-wrap {
-					.title {
-						height: $itemH;
-						display: flex;
-						align-items: center;
-						position: sticky;
-						z-index: 10;
-						background-color: #fff;
+		}
+
+
+		.shop-info-wrap {
+			padding: 0 30rpx 50rpx;
+			box-sizing: border-box;
+
+			.info-wrap {
+				padding: 30rpx 0;
+				box-sizing: border-box;
+
+				.shopName {
+					align-self: center;
+					font-size: 32rpx;
+					color: #333;
+					font-weight: bold;
+				}
+			}
+
+			.info-wrap-title {
+				font-size: 32rpx;
+				font-weight: bold;
+				color: #333;
+			}
+
+			.row {
+				.col {
+					margin-bottom: 10rpx;
+				}
+
+				.l,
+				.t {
+					font-size: 24rpx;
+					color: #999;
+				}
+			}
+		}
+
+		.shop_sku {
+			width: 100%;
+			position: relative;
+			border-radius: 20rpx;
+			background: #fff;
+			overflow-y: auto;
+			padding-bottom: 320rpx;
+			box-sizing: border-box;
+
+			.positionabsolute {
+				position: absolute;
+				top: 30rpx;
+				right: 30rpx;
+			}
+
+			.shop_skucimage {
+				width: 100%;
+				height: 500rpx !important;
+				border-radius: 20rpx 20rpx 0 0;
+			}
+
+			.shop_sku_name {
+				padding: 0 $paddingSize;
+				margin-top: 20rpx;
+				font-weight: bold;
+				font-size: 32upx;
+				margin-bottom: 16rpx;
+			}
+
+			.shop_sku_returned {
+				padding: 0 $paddingSize;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #FF534B;
+			}
+
+			.shop_sku_description {
+				padding: 0 $paddingSize;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #999999;
+				margin-top: 16rpx;
+				padding-bottom: 32rpx;
+				box-sizing: border-box;
+				border-bottom: 2rpx solid #F0F0F0;
+			}
+
+
+			.shop_sku_box {
+				padding: 0 $paddingSize;
+
+				.shop_sku_box_name {
+					margin-top: 20rpx;
+					font-weight: 500;
+					font-size: 28upx;
+					color: #333;
+				}
+
+				.flex-start {
+					.shop_sku_box_item {
+						margin-top: 16rpx;
+						padding: 8rpx 24rpx;
+						border-radius: 8rpx;
+						font-size: 24upx;
+						margin-left: 56rpx;
+						background: #F5F5F5;
+					}
+
+					.shop_sku_box_item:nth-child(1) {
+						margin-left: 0;
+					}
+
+					.shop_sku_box_item_noselected {
+						color: #666;
+					}
+
+					.shop_sku_box_item_selected {
+						background: #FEFAF7;
+						border-radius: 8rpx;
+						border: 2rpx solid #E8AD7B;
+						color: #E8AD7B;
 					}
 				}
-			}
-		}
-	}
 
-	.shop-item {
-		display: flex;
-		padding-bottom: $paddingSize;
-
-		.langcover {
-			position: relative;
-		}
-
-		.langcover::after {
-			content: '加载中..';
-			position: absolute;
-			top: 0;
-			left: 0;
-			height: 100%;
-			width: 100%;
-			background-color: #e8e8e8;
-			color: #6b6b6b;
-			border-radius: 10rpx;
-			text-align: center;
-			line-height: 180rpx;
-			z-index: 1;
-		}
-
-		.info {
-			flex: 1;
-			padding-left: 20upx;
-			padding-right: $paddingSize;
-
-			.name {
-				font-size: 28upx;
-				font-weight: bold;
 			}
 
-			.namess {
+			.shop_skuselect {
 				margin-top: 16rpx;
+				width: 100%;
+				// background: #f7f7f7;
+				color: #999;
 				font-size: 24upx;
-				font-weight: 300;
-				color: #a5a5a5;
-			}
 
-			.select-sku-wrap {
-				.t {
-					color: #999;
-					font-size: 24upx;
+				.shop_skuselectname {
+					color: #000;
+					font-size: 26upx;
 				}
 			}
 
-			.price-wrap {
-				margin-top: 16rpx;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
+			.shop_bottom {
+				width: 100%;
+				box-sizing: border-box;
+				padding: 30rpx $paddingSize;
+				background-color: #fff;
+				box-shadow: 0rpx -6rpx 14rpx 2rpx rgba(0, 0, 0, 0.1);
+				position: fixed;
+				left: 0;
+				bottom: 0;
 
 				.price {
 					display: flex;
 					align-items: flex-end;
 
 					.i {
-						font-size: 20upx;
-						color: $numColor;
+						font-size: 28rpx;
+						color: #E8AD7B;
 						position: relative;
 						bottom: 4upx;
 						font-weight: bold;
 					}
 
 					.num {
-						font-size: 42upx;
-						color: $numColor;
+						font-size: 42rpx;
+						color: #E8AD7B;
 						position: relative;
 						top: 6upx;
 						padding: 0 4upx;
 					}
 				}
 
-				.sku-wrap {
-					padding: 6upx 16upx;
-					background-color: $color-priamry;
-					border-radius: 12upx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					position: relative;
-
-					.t {
-						font-size: 24upx;
-						font-weight: bold;
-					}
-
-					.dot {
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						font-size: 20upx;
-						position: absolute;
-						padding: 2upx 12upx;
-						border-radius: 8upx;
-						background-color: $numColor;
-						color: #fff;
-						position: absolute;
-						top: -14upx;
-						right: -8upx;
-					}
-				}
-
 				.operation-wrap {
 					display: flex;
 					align-items: center;
@@ -1016,374 +1340,558 @@
 						padding: 0 16upx;
 					}
 
-					.btn {
+
+				}
+
+				.addShopping {
+					width: 100%;
+					height: 96rpx;
+					line-height: 96rpx;
+					text-align: center;
+					background: #ccc;
+					border-radius: 48rpx;
+					font-weight: 400;
+					font-size: 32rpx;
+					color: #FFFFFF;
+					margin-top: 36rpx;
+				}
+
+				.addShopping.active {
+					background: #E8AD7B;
+				}
+			}
+		}
+
+		.cart-wrap {
+			width: 100%;
+			padding: 0 20rpx;
+			box-sizing: border-box;
+			position: fixed;
+			bottom: 40rpx;
+			left: 0;
+			z-index: 99;
+
+			.cart-content {
+				display: flex;
+				align-items: center;
+				height: 128rpx;
+				background: #FFFFFF;
+				box-shadow: 0rpx 0rpx 20rpx 2rpx rgba(0, 0, 0, 0.15);
+				border-radius: 58rpx;
+				padding: 0 36rpx;
+				box-sizing: border-box;
+
+				.left {
+					flex: 1;
+					display: flex;
+					align-items: center;
+					position: relative;
+
+					.iconBox {
 						position: relative;
-						padding: 6upx 10upx;
-						background-color: $color-priamry;
-						border-radius: 12upx;
+					}
+
+					.icon {
+						width: 76rpx;
+						height: 88rpx;
+						margin-left: 22rpx;
+					}
+
+					.u-badge {
+						position: absolute;
+						top: -30rpx;
+						right: -30rpx;
+						background-color: #FF4B33;
+						color: #fff;
+						border-radius: 58rpx;
+						padding: 5rpx 14rpx;
+						box-sizing: border-box;
 						display: flex;
 						align-items: center;
 						justify-content: center;
-
-						&::after {
-							content: "";
-							position: absolute;
-							left: -10px;
-							top: -10px;
-							right: -10px;
-							bottom: -10px;
-
-						}
+						font-size: 20rpx;
 					}
-				}
-			}
-		}
-	}
 
-	.cart-wrap {
-		width: 100%;
-		padding: $paddingSize;
-		position: fixed;
-		bottom: $paddingSize;
-		left: 0;
-		z-index: 99;
+					.i,
+					.num {
+						color: #333;
+					}
 
-		.cart-content {
-			display: flex;
-			height: $cartH;
-			border-radius: $cartH;
+					.i {
+						font-size: 20upx;
+						position: relative;
+						top: 4upx;
+						margin-left: 64rpx;
+					}
 
-			.left {
-				flex: 1;
-				display: flex;
-				align-items: center;
-				background-color: #111;
-				padding-left: 120upx;
-				position: relative;
-				border-radius: $cartH 0 0 $cartH;
-
-				.icon {
-					width: 80upx;
-					height: 120upx;
-					position: absolute;
-					left: $paddingSize;
-					bottom: 20upx;
-				}
-
-				.i,
-				.num {
-					color: #fff;
-				}
-
-				.i {
-					font-size: 20upx;
-					position: relative;
-					top: 4upx;
-				}
-
-				.num {
-					font-size: 42upx;
-				}
-			}
-
-			.btn {
-				width: 200upx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				font-weight: bold;
-				background: $linear-color-priamry;
-				border-radius: 0 $cartH $cartH 0;
-			}
-		}
-	}
-
-	.cart-list-wrap {
-		.cart-header {
-			display: flex;
-			justify-content: space-between;
-			background-color: #f4eddf;
-			padding: 20upx $paddingSize;
-			border-radius: 20upx 20upx 0 0;
-
-			.clear {
-				display: flex;
-				align-items: center;
-
-				.t {
-					font-size: 24upx;
-					color: #999;
-					margin-left: 4upx;
-				}
-			}
-		}
-
-		.scroll-view {
-			max-height: 50vh;
-		}
-
-		.list-wrap {
-			padding: $paddingSize 0 $paddingSize * 2 + $cartH $paddingSize;
-		}
-	}
-
-	.shop_sku {
-		position: relative;
-		width: 700rpx;
-		border-radius: 20rpx;
-		background: #fff;
-
-		.positionabsolute {
-			position: absolute;
-			top: 10rpx;
-			left: 10rpx;
-		}
-
-		.shop_skucimage {
-			width: 100%;
-			height: 440rpx;
-			border-radius: 20rpx 20rpx 0 0;
-		}
-
-		.shop_sku_name {
-			padding: 0 $paddingSize;
-			margin-top: 20rpx;
-			font-weight: bold;
-			font-size: 32upx;
-		}
-
-		.shop_sku_box {
-			padding: 0 $paddingSize;
-
-			.shop_sku_box_name {
-				margin-top: 20rpx;
-				font-weight: 500;
-				font-size: 28upx;
-				color: #999;
-			}
-
-			.flex-start {
-				.shop_sku_box_item {
-					margin-top: 16rpx;
-					padding: 8rpx 24rpx;
-					border-radius: 24rpx;
-					font-size: 24upx;
-					margin-left: 16rpx;
-					background: #fbe3e3;
-				}
-
-				.shop_sku_box_item:nth-child(1) {
-					margin-left: 0;
-				}
-
-				.shop_sku_box_item_noselected {
-					color: #000;
-				}
-
-				.shop_sku_box_item_selected {
-					border: 1rpx solid red;
-					color: red;
-				}
-			}
-
-		}
-
-		.shop_skuselect {
-			padding: 10rpx $paddingSize;
-			margin-top: 28rpx;
-			width: 100%;
-			background: #f7f7f7;
-			color: #ada7a7;
-			font-size: 24upx;
-
-			.shop_skuselectname {
-				color: #000;
-				font-size: 26upx;
-			}
-		}
-
-		.shop_bottom {
-			box-sizing: border-box;
-			padding: 10rpx $paddingSize;
-			margin: 28rpx 0;
-
-			.price {
-				display: flex;
-				align-items: flex-end;
-
-				.i {
-					font-size: 20upx;
-					color: $numColor;
-					position: relative;
-					bottom: 4upx;
-					font-weight: bold;
-				}
-
-				.num {
-					font-size: 42upx;
-					color: $numColor;
-					position: relative;
-					top: 6upx;
-					padding: 0 4upx;
-				}
-			}
-
-			.operation-wrap {
-				display: flex;
-				align-items: center;
-
-				.num {
-					font-size: 32upx;
-					padding: 0 16upx;
+					.num {
+						font-size: 42upx;
+						font-weight: bold;
+					}
 				}
 
 				.btn {
-					position: relative;
-					padding: 16upx 20upx;
-					background-color: $color-priamry;
-					border-radius: 12upx;
+					width: 160rpx;
+					height: 64rpx;
+					background: #E7AE7B;
+					border-radius: 36rpx 36rpx 36rpx 36rpx;
+					border: 2rpx solid #E8AD7B;
 					display: flex;
 					align-items: center;
 					justify-content: center;
 
-					&::after {
-						content: "";
-						position: absolute;
-						left: -10px;
-						top: -10px;
-						right: -10px;
-						bottom: -10px;
-
+					.t {
+						font-weight: bold;
+						font-size: 28rpx;
+						color: #FFFFFF;
 					}
 				}
 			}
 		}
-	}
 
-
-	.classorderdetailshow {
-		position: relative;
-
-		.orderdetailuicon {
-			position: absolute;
-			top: 10rpx;
-			left: 10rpx;
-		}
-
-		.payType {
-			padding: 32rpx 34rpx;
-			margin-top: 48rpx;
-			background-color: #fff;
-
-			>view:first-child {
-				font-weight: 500;
-				font-size: 28rpx;
-				color: #333333;
-			}
-
-			>view:last-child {
-				margin-top: 32rpx;
-			}
-
-			.dfs {
+		.cart-list-wrap {
+			.cart-header {
 				display: flex;
+				height: 72rpx;
+				background-color: #F2F2F2;
 				align-items: center;
+				justify-content: space-between;
+				padding: 20upx $paddingSize;
+				border-radius: 20upx 20upx 0 0;
+
+				.num {
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #333333;
+				}
+
+				.clear {
+					display: flex;
+					align-items: center;
+
+					.t {
+						font-size: 24upx;
+						color: #999;
+						margin-left: 4upx;
+					}
+				}
 			}
 
-		}
+			.scroll-view {
+				max-height: 50vh;
+				margin-bottom: 190rpx;
+			}
 
-		.fixedview {
-			position: relative;
-			width: 100%;
+			.list-wrap {
+				padding: $paddingSize 0 0 $paddingSize;
+			}
 
-			.flex-between {
-				width: 100%;
-				padding: 24rpx 28rpx;
-				background: #FFFFFF;
-				flex-wrap: nowrap;
+			.shop-item {
+				display: flex;
+				padding-bottom: $paddingSize;
 
-				.fixedview_one {
-					.fixedview_oneone {
-						font-size: 28rpx;
-						font-family: SourceHanSansCN-Bold-, SourceHanSansCN-Bold;
-						font-weight: normal;
-						color: #333333;
-					}
+				.langcover {
+					position: relative;
+				}
 
-					.fixedview_onetow {
-						font-size: 44rpx;
-						font-family: SourceHanSansCN-Bold-, SourceHanSansCN-Bold;
-						font-weight: normal;
-						color: #F45C4C;
+				.langcover::after {
+					content: '加载中..';
+					position: absolute;
+					top: 0;
+					left: 0;
+					height: 100%;
+					width: 100%;
+					background-color: #e8e8e8;
+					color: #6b6b6b;
+					border-radius: 10rpx;
+					text-align: center;
+					line-height: 180rpx;
+					z-index: 1;
+				}
+
+				.info {
+					flex: 1;
+					padding-left: 20upx;
+					padding-right: $paddingSize;
+
+					.name {
+						font-size: 28upx;
 						font-weight: bold;
-
-						text {
-							font-size: 28rpx;
-						}
+						color: #333;
+						margin-bottom: 5rpx;
 					}
 
-					.fixedview_onethere {
-						font-family: Source Han Sans CN, Source Han Sans CN;
+					.select-sku-wrap {
 						font-weight: 400;
 						font-size: 24rpx;
 						color: #999999;
 					}
-				}
 
-				.fixedview_tow {
-					background: red;
-					border-radius: 34rpx;
-					padding: 10rpx 44rpx;
-					font-size: 32rpx;
-					font-family: PingFang SC-Bold, PingFang SC;
-					font-weight: bold;
-					color: #FFFFFF;
+					.price-wrap {
+						margin-top: 16rpx;
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+
+						.price {
+							display: flex;
+							align-items: flex-end;
+
+							.i,
+							.num {
+								font-weight: bold;
+								font-size: 32rpx;
+								color: #333333;
+							}
+
+							.i {
+								position: relative;
+								bottom: 4upx;
+							}
+
+							.num {}
+						}
+
+						.sku-wrap {
+							padding: 6upx 16upx;
+							background-color: $color-priamry;
+							border-radius: 12upx;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							position: relative;
+
+							.t {
+								font-size: 24upx;
+								font-weight: bold;
+							}
+
+							.dot {
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								font-size: 20upx;
+								position: absolute;
+								padding: 2upx 12upx;
+								border-radius: 8upx;
+								background-color: $numColor;
+								color: #fff;
+								position: absolute;
+								top: -14upx;
+								right: -8upx;
+							}
+
+						}
+
+						.operation-wrap {
+							display: flex;
+							align-items: center;
+
+							.num {
+								font-size: 32upx;
+								padding: 0 16upx;
+							}
+
+							.btn {
+								position: relative;
+								display: flex;
+								align-items: center;
+								justify-content: center;
+
+
+							}
+						}
+					}
 				}
 			}
+
 		}
+
+
 	}
 
-	.shop-info-wrap {
-		.info-wrap {
-			padding: $paddingSize * 2 0;
-			display: flex;
-			align-items: center;
-			flex-direction: column;
-			border-bottom: 1upx solid #f2f2f2;
 
-			.img {
-				width: 100upx;
-				height: 100upx;
-				border-radius: 12upx;
-			}
+	.list-box {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		justify-content: flex-start;
+		align-items: flex-start;
+		align-content: flex-start;
+		font-size: 28rpx;
+		position: relative;
 
-			.t {
-				font-size: 32upx;
-				padding-top: 8upx;
-			}
-		}
+		.left {
+			width: 200rpx;
+			background-color: #f6f6f6;
+			line-height: normal;
+			box-sizing: border-box;
+			font-size: 32rpx;
+			position: sticky;
+			top: 0;
 
-		.row {
-			padding: 0 $paddingSize $paddingSize;
+			// padding-bottom: 200rpx;
+			.item {
+				padding: 30rpx 30rpx;
+				// height: 92rpx;
+				// line-height: 92rpx;
+				position: relative;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #333333;
+				display: flex;
+				align-items: center;
+				// overflow: hidden;
+				// text-overflow: ellipsis;
+				// white-space: nowrap;
 
-			.col {
-				padding-top: $paddingSize;
+				&+.item {
+					margin-top: 1px;
 
-				.t {
-					color: #999;
+					&::after {
+						// content: '';
+						// display: block;
+						// height: 0;
+						// border-top: #d6d6d6 solid 1px;
+						// width: 620upx;
+						// position: absolute;
+						// top: -1px;
+						// right: 0;
+						// transform: scaleY(0.5);
+						/* 1px像素 */
+					}
+				}
+
+				&.active {
+					color: #333;
+					background-color: #fff;
+					position: relative;
+
+					&::before {
+						content: '';
+						display: block;
+						position: absolute;
+						top: 0;
+						left: 0;
+						border-left: #7E5C23 solid 4px;
+						height: 100%;
+						width: 0;
+					}
+
+					&::after {
+						content: '';
+						display: block;
+						position: absolute;
+						top: 0;
+						left: -15rpx;
+						bottom: 0;
+						margin: auto;
+						height: 30rpx;
+						width: 30rpx;
+						border-radius: 50%;
+						background-color: #7E5C23;
+					}
 				}
 			}
+
+			.items {
+				height: 180rpx;
+				position: relative;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #333333;
+			}
+
+			.fill-last {
+				height: 0;
+				width: 100%;
+				background: none;
+			}
 		}
 
-		.line {
-			height: 12upx;
-			background-color: #f2f2f2;
-		}
+		.main {
+			background-color: #fff;
+			padding-left: 20rpx;
+			width: 0;
+			flex-grow: 1;
+			box-sizing: border-box;
+			position: relative;
 
-		.close {
-			padding: $paddingSize 0;
-			display: flex;
-			justify-content: center;
+
+			.title {
+				line-height: normal;
+				padding: 30rpx 0;
+				font-size: 24rpx;
+				font-weight: bold;
+				color: #666;
+				background-color: #fff;
+				position: sticky;
+				top: 0;
+				z-index: 19;
+			}
+
+			.item {
+				padding-bottom: 16rpx;
+				border-bottom: #eee solid 1px;
+			}
+
+			.goods {
+				display: flex;
+				flex-direction: row;
+				flex-wrap: nowrap;
+				justify-content: flex-start;
+				align-content: center;
+				position: relative;
+
+				&+.goods {
+					margin-top: 16rpx;
+				}
+
+				&>image {
+					width: 120rpx;
+					height: 120rpx;
+					margin-right: 18rpx;
+					margin-left: 2px;
+				}
+
+				.goodsImg {
+					width: 200rpx;
+					height: 200rpx;
+					border-radius: 18rpx;
+					flex-shrink: 0;
+				}
+
+				.topSort {
+					width: 92rpx;
+					height: 38rpx;
+					text-align: center;
+					line-height: 38rpx;
+					position: absolute;
+					top: 0;
+					left: 0;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #FFFFFF;
+					border-radius: 20rpx 0rpx 20rpx 0rpx;
+
+				}
+
+				.topSort.c1 {
+					background: #FC5C2E;
+				}
+
+				.topSort.c2 {
+					background: #EF994E;
+				}
+
+				.topSort.c3 {
+					background: #F4B951;
+				}
+
+				.goods_right {
+					width: 100%;
+					display: flex;
+					flex-direction: column;
+					position: relative;
+					padding-top: 5rpx;
+					padding-right: 20rpx;
+					box-sizing: border-box;
+
+					.name {
+						font-size: 28rpx;
+						color: #333;
+						font-weight: bold;
+						margin-bottom: 8rpx;
+					}
+
+					.describe,
+					.monthlySale,
+					.lookBack {
+						font-weight: 400;
+						font-size: 20rpx;
+						color: #999999;
+						margin-bottom: 8rpx;
+					}
+
+					.describe,
+					.name {
+						width: 270rpx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+					}
+
+
+					.lookBack {
+						color: #FF534B;
+					}
+
+					.money {
+						font-weight: bold;
+						font-size: 24rpx;
+						color: #333;
+
+						.money_num {
+							font-size: 28rpx;
+							color: #333;
+							font-weight: bold;
+						}
+					}
+
+					.suit {
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #666666;
+					}
+
+					.sku-wrap {
+						width: 138rpx;
+						height: 54rpx;
+						background: #E3AD7F;
+						border-radius: 32rpx;
+						// position: absolute;
+						// bottom: 10rpx;
+						// right: 20rpx;
+						align-items: center;
+						position: relative;
+
+						.t {
+							font-size: 28rpx;
+							color: #fff;
+						}
+
+						.dot {
+							position: absolute;
+							top: -15rpx;
+							right: -10rpx;
+							background-color: #FF4B33;
+							color: #fff;
+							border-radius: 58rpx;
+							padding: 5rpx 14rpx;
+							box-sizing: border-box;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							font-size: 20rpx;
+						}
+					}
+
+					.Controls {
+						display: flex;
+						align-items: center;
+						justify-content: flex-end;
+
+						// position: absolute;
+						// bottom: 10rpx;
+						// right: 20rpx;
+						.num {
+							margin: auto 8rpx;
+						}
+					}
+				}
+
+
+			}
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/order_food/order_foodscroll-view.vue b/pages/order_food/order_foodscroll-view.vue
new file mode 100644
index 0000000..9d2b37c
--- /dev/null
+++ b/pages/order_food/order_foodscroll-view.vue
@@ -0,0 +1,1899 @@
+<template>
+	<view class="container">
+		<!-- 占位符  接口请求完毕才显示 -->
+		<view v-if="fixedtrue"
+			style="height: 100vh; width: 100%; position: fixed; z-index: 999; top: 0; left: 0; background-color: #fff; display: flex; justify-content: center; align-items: center;">
+			<image style="width: 140rpx; height: 140rpx;" src="@/static/1.gif" mode="aspectFill"></image>
+			<text style="margin-left:10rpx;font-size: 40rpx;color: #7d7d76;">加载中</text>
+		</view>
+		<!-- 顶部面板 -->
+		<view class="top--panel">
+			<navseat :opacity='opacity' :titleshow='true' :heightshow='opacity'></navseat>
+			<!-- 顶部面板，可添加所需要放在页面顶部的内容代码。比如banner图 -->
+			<image class="panelimgbackground" :src="shopInfo.storeInfo.coverImg" mode="aspectFill">
+			</image>
+			<view class="panelone">
+				{{ shopInfo.storeInfo.shopName }}
+			</view>
+			<view class="paneltow">
+				距离您{{ shopInfo.distance }}
+			</view>
+			<view class="panelthere flex-between">
+				<view class="paneltheretext">
+					营业时间：{{ shopInfo.storeInfo.businessStartDay +'至'+ shopInfo.storeInfo.businessEndDay +' '+ shopInfo.storeInfo.businessTime }}
+				</view>
+				<view class="flex-start" @click="showShopClick">
+					<view style="margin-right: 14rpx;">查看</view>
+					<u-icon name="arrow-down" color="#999999" size="28"></u-icon>
+				</view>
+			</view>
+			<view class="panelfour" v-if="shopProductList.hots && shopProductList.hots.length > 0">
+				本店招牌菜
+			</view>
+			<view class="panelfive">
+				<scroll-view :scroll-x="true" :scroll-into-view="leftIntoView" :scroll-with-animation="false">
+					<view class="panelfive_list">
+						<view class="panelfiveitem" @click="clickspecifications(item,index,index,'热销')"
+							v-for="(item,index) in shopProductList.hots" :key="index">
+							<image class="panelfiveitemimage" :src="item.coverImg" mode="aspectFill"></image>
+							<view class="panelfiveitemone">
+								{{ item.name }}
+							</view>
+							<view class="panelfiveitemtow">
+								本店回头客第{{index+1}}名
+							</view>
+							<view class="panelfiveitemthere flex-start">
+								<text>招牌</text>
+							</view>
+							<view class="panelfiveitemfour">
+								{{item.shortTitle?item.shortTitle:''}}
+							</view>
+							<view class="panelfiveitemfive">
+								月售{{item.stockNumber}}
+							</view>
+							<view class="panelfiveitemsex flex-between">
+								<view class="panelfiveitemsex_oen">
+									<text>¥</text>
+									<text>{{item.lowPrice}}</text>
+									<text>/份</text>
+									<text>「{{item.suit}}份起点」</text>
+								</view>
+								<!-- <u-icon name="plus-circle-fill" color="#E9AB7A" size="40"></u-icon> -->
+
+							</view>
+							<view class="panelfiveitemNum">
+								<view class="sku-wrap flex-center" v-if="item.productSkuResult != null"
+									@click.stop="clickspecifications(item,index,index1)">
+									<text class="t">选规格</text>
+									<text class="dot num"
+										v-if="item.cartNumber != '0'">{{item.cartNumber<99?item.cartNumber:'99+'}}</text>
+								</view>
+								<view class="Controls" v-else>
+									<view v-if="item.cartNumber != '0'"
+										@click.stop="cartadd(item,'-',item.productSkuResult == null ? '单规格':'',$event)">
+										<u-icon name="minus-circle-fill" color="#E9AB7A" size="50"></u-icon>
+									</view>
+									<text class="num"> {{ item.cartNumber }} </text>
+									<view @click.stop="cartadd(item,'+',item.productSkuResult == null ? '单规格':'')">
+										<u-icon name="plus-circle-fill" color="#E9AB7A" size="50"></u-icon>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+
+			</view>
+		</view>
+		<!-- 滚动区域 -->
+		<view class="scroll-panel" id="scroll-panel">
+			<view class="list-box">
+				<view class="left">
+					<scroll-view :scroll-y="!isFixed" :style="{ 'height':scrollHeight + 'px' }"
+						:scroll-into-view="leftIntoView" :scroll-with-animation="false">
+						<view class="item" v-for="(item,index) in shopProductList.productInfo" :key="index"
+							:class="{ 'active':index==leftIndex }" :id="'left-'+index" :data-index="index"
+							@click="leftTap(index)">{{item.name}}</view>
+						<view class="items"></view>
+					</scroll-view>
+				</view>
+				<view class="main">
+					<scroll-view :scroll-y="!isFixed" :scroll-top="scrollHeight"
+						:style="{ 'height':scrollHeight + 'px' }" @scroll="mainScroll" :scroll-into-view="scrollInto"
+						:scroll-with-animation="false">
+						<view class="item main-item" v-for="(item,index) in shopProductList.productInfo" :key="index"
+							:id="'item-'+index">
+							<view class="title">
+								<view>{{item.name}}</view>
+							</view>
+							<view class="goods" @click="clickspecifications(item1,index,index1)"
+								v-for="(item1,index1) in item.products" :key="index1">
+								<image class="goodsImg" v-if="item1.coverImg!=null" :lazy-load="true"
+									:src="`${item1.coverImg}?x-oss-process=image/resize,m_lfit,w_90,h_90`"></image>
+								<image class="goodsImg" src="@/static/1.gif" mode="" v-else :lazy-load="true"></image>
+								<view v-if="item.name=='热销'" class="topSort" :class="'c'+(index1+1)">TOP{{index1+1}}
+								</view>
+								<view class="goods_right">
+									<view class="name">{{ item1.name }}</view>
+									<view class="lookBack" v-if="item.name=='热销'">本店回头客第{{index1+1}}名</view>
+									<view class="describe"> {{item1.shortTitle?item1.shortTitle:''}} </view>
+									<view class="monthlySale">月售{{item1.stockNumber}}</view>
+									<view class="money">￥<text class="money_num">{{ item1.lowPrice }}</text>/份<text
+											class="suit">「{{item1.suit}}份起点」</text></view>
+
+									<view class="flex-end" v-if="item1.productSkuResult != null">
+										<view class="sku-wrap flex-center"
+											@click.stop="clickspecifications(item1,index,index1)">
+											<text class="t">选规格</text>
+											<text class="dot num"
+												v-if="item1.cartNumber != '0'">{{item1.cartNumber<99?item1.cartNumber:'99+'}}</text>
+										</view>
+									</view>
+
+									<view class="Controls" v-else>
+										<view v-if="item1.cartNumber != '0'"
+											@click.stop="cartadd(item1,'-',item1.productSkuResult == null ? '单规格':'',$event)">
+											<u-icon name="minus-circle-fill" color="#E9AB7A" size="50"></u-icon>
+										</view>
+										<text class="num"> {{ item1.cartNumber }} </text>
+										<view
+											@click.stop="cartadd(item1,'+',item1.productSkuResult == null ? '单规格':'')">
+											<u-icon name="plus-circle-fill" color="#E9AB7A" size="50"></u-icon>
+										</view>
+
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="fill-last" :style="{ 'height':fillHeight + 'px' }"></view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 购物车悬浮条 -->
+		<view class="cart-wrap" v-if="cartListsdatashow">
+			<view class="cart-content">
+				<view class="left">
+					<view class="iconBox">
+						<image class="icon"
+							src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/shopIcon.png"
+							mode="aspectFill" @click="showCart = !showCart">
+						</image>
+						<text class="u-badge"> {{cartLists_count<99?cartLists_count:'99+'}} </text>
+					</view>
+
+					<text class="i">￥</text>
+					<text class="num">{{cartLists.amount||'0.00'}}</text>
+				</view>
+				<view class="btn" @tap="$u.debounce(orderdetail, 500)">
+					<text class="t">去结算</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 购物车 -->
+		<u-popup :show="showCart" :round="20" :safeAreaInsetBottom="false" :zIndex="98" :overlayStyle="{ zIndex: 98 }"
+			@close="showCart = false">
+			<view class="cart-list-wrap">
+				<view class="cart-header flex-between">
+					<view class="num">已点 {{cartLists_count}} 份</view>
+					<view class="clear" @click="cartclear">
+						<u-icon name="trash" color="#999"></u-icon>
+						<text class="t">清空</text>
+					</view>
+				</view>
+				<scroll-view scroll-y class="scroll-view">
+					<view class="list-wrap">
+						<view class="shop-item" v-for="(item,index) in cartLists.data" :key="item.id">
+							<view class="cover">
+								<c-image :src="item.coverImg" width="120" height="120"></c-image>
+							</view>
+							<view class="info">
+								<view class="name"> {{ item.name }} </view>
+								<view class="select-sku-wrap"> {{ item.skuName }} </view>
+
+								<view class="price-wrap" style="padding-top: 0;">
+									<view class="price">
+										<text class="i">￥</text>
+										<text class="num">{{ item.salePrice }}</text>
+									</view>
+									<view class="operation-wrap">
+										<view class="btn" v-if="item.number" @click="cartListadd(item,index,'-')">
+											<u-icon name="minus-circle-fill" color="#E9AB7A" size="50"></u-icon>
+										</view>
+										<text class="num" v-if="item.number">{{ item.number }}</text>
+										<view class="btn" @click="cartListadd(item,index,'+')">
+											<u-icon name="plus-circle-fill" color="#E9AB7A" size="50"></u-icon>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</u-popup>
+
+
+		<!-- 店铺详情 -->
+		<u-popup :show="showShopInfo" :round="20" mode="bottom" @close="showShopInfo = false" height="500">
+			<view class="shop-info-wrap">
+				<view class="info-wrap flex-between">
+					<view></view>
+					<text class="shopName">{{ shopInfo.storeInfo.shopName }}</text>
+					<view class="close" @click="showShopInfo = false">
+						<u-icon name="close" color="#999999" size="28"></u-icon>
+					</view>
+				</view>
+				<view class="info-wrap-title">商家信息</view>
+				<view class="row" style="margin-bottom: 20rpx;">
+					<view class="col">
+						<text class="l">营业时间：</text>
+						<text
+							class="t">{{ shopInfo.storeInfo.businessStartDay +'至'+ shopInfo.storeInfo.businessEndDay +' '+ shopInfo.storeInfo.businessTime }}</text>
+					</view>
+					<view class="col">
+						<text class="l">商家地址：</text>
+						<text class="t">{{ shopInfo.storeInfo.address }}</text>
+					</view>
+					<view class="col" @click="makePhoneCall(shopInfo.storeInfo.phone)">
+						<text class="l">商家电话：</text>
+						<text class="t">{{ shopInfo.storeInfo.phone }}</text>
+					</view>
+				</view>
+				<view class="info-wrap-title">商家公告</view>
+				<view class="row">
+					<view class="col">
+						<text class="l">公告：</text>
+						<text class="t">{{ shopInfo.storeInfo.detail }}</text>
+					</view>
+				</view>
+
+			</view>
+		</u-popup>
+
+		<!-- 规格 -->
+		<u-popup :show="showShopsku" :round="20" mode="bottom" @close="showShopsku = false"
+			:safeAreaInsetBottom='false'>
+			<view class="shop_sku" :style="{ 'max-height':scrollHeight + 'px' }">
+				<view class="positionabsolute">
+					<u-icon name="close-circle" @click="showShopsku = false" color="#000" size="50"></u-icon>
+				</view>
+				<image class="shop_skucimage" :src="specifications.coverImg" mode="aspectFill"></image>
+				<view class="shop_sku_name"> {{specifications.name}} </view>
+				<view class="shop_sku_returned" v-if="specifications.typeName&&specifications.typeName=='热销'">
+					本店回头客第{{specifications.indexb+1}}名 </view>
+				<view class="shop_sku_description"> {{specifications.shortTitle?specifications.shortTitle:''}} </view>
+
+				<view class="shop_sku_box" v-for="(item,index) in specifications.tagSnap" :key="index"
+					v-if="specifications.tagSnap">
+					<view class="shop_sku_box_name">
+						{{item.name}}
+					</view>
+					<view class="flex-start">
+						<view class="shop_sku_box_item" v-for="(item1,index1) in item.children" :key="index1"
+							@click="morloe(item1,index,index1,item)"
+							:class=" item.start === index1 ?'shop_sku_box_item_selected':'' ">
+							{{item1}}
+						</view>
+					</view>
+				</view>
+
+
+				<view class="shop_bottom ">
+					<view class="flex-between">
+						<view class="price">
+							<text class="i">￥</text>
+							<text class="num">{{salePrice}}</text>
+							<text class="i">/杯</text>
+						</view>
+						<view class="operation-wrap">
+
+							<view class="btn"
+								@click="shopAdd(specifications,specifications.indexa,specifications.indexb,'-',specifications.tagSnap == null ? '单规格':'')">
+								<u-icon name="minus-circle-fill" color="#E9AB7A" size="40"></u-icon>
+							</view>
+							<text class="num">{{amountcartNumber}}</text>
+							<view class="btn"
+								@click="shopAdd(specifications,specifications.indexa,specifications.indexb,'+',specifications.tagSnap == null ? '单规格':'')">
+								<u-icon name="plus-circle-fill" color="#E9AB7A" size="40"></u-icon>
+							</view>
+						</view>
+					</view>
+					<view class="shop_skuselect flex-start" v-if="specifications.tagSnap">
+						<view class="shop_skuselectname">{{skuidname.toString()}}</view>
+					</view>
+					<view class="addShopping" :class="amountcartNumber>0?'active':''"
+						@click="addShopping(specifications,specifications.indexa,specifications.indexb,'+',specifications.tagSnap == null ? '单规格':'')">
+						添加到购物车</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+
+</template>
+<script>
+	import navseat from '@/components/navseat.vue'
+	import webSocketUtils from '@/common/js/websocket.js';
+	export default {
+		components: {
+			navseat
+		},
+		data() {
+			return {
+				fixedtrue: true,
+				userInfo: uni.cache.get('userInfo'), //个人信息
+				opacity: false, //是否显示
+				scrollHeight: 1000,
+				scrollTopSize: 0, //距离顶部的高度
+				fillHeight: 0, // 填充高度，用于最后一项低于滚动区域时使用
+				leftArray: [],
+				mainArray: [],
+				topArr: [],
+				leftIndex: 0,
+				scrollInto: '',
+				isFixed: true,
+				showShopInfo: false, //店铺信息弹窗是否显示
+				showShopsku: false, //多规格弹窗是否显示
+				skuId: null, // 多规格ID
+				cartLists: {}, //购物车
+				cartLists_count: 0,
+				shopInfo: {}, //店铺信息
+				shopProductList: {}, //商品信息
+				specifications: {
+
+				}, // 规格信息
+				socketTicket: null,
+				amountcartNumber: 0,
+				skuNumber: 0,
+				skuSuit: 0,
+				salePrice: '', //钱数
+				cartListsdatashow: false, //是否显示购物车
+				showCart: false,
+			}
+		},
+		onPageScroll(e) {
+			if (e.scrollTop <= 44) { //搜索导航栏显示影藏
+				this.opacity = false
+			} else {
+				this.opacity = true
+			}
+			this.$u.debounce(() => {
+				if (e.scrollTop + 20 >= this.scrollTopSize) { //控制大图层
+					this.isFixed = false;
+				} else {
+					this.isFixed = true;
+				}
+			}, 10)
+
+		},
+		computed: {
+			/* 计算左侧滚动位置定位 */
+			leftIntoView() {
+				return `left-${this.leftIndex? this.leftIndex:0}`;
+			},
+			HeighT() { //手机类型的尺寸    导航栏高度
+				return this.$store.getters.is_BarHeight.heightBar + this.$store.getters.is_BarHeight.customBar
+			},
+		},
+		onReady() {
+			setTimeout(() => {
+				uni.getSystemInfo({
+					success: (data) => {
+						this.scrollHeight = data.windowHeight
+					}
+				})
+			}, 100);
+		},
+		onLoad(e) {
+			if (e.q) {
+				this.tableCode = this.getQueryString(decodeURIComponent(e.q), 'code')
+				uni.cache.set('tableCode', this.tableCode)
+			}
+			uni.cache.set('types', 'types');
+
+		},
+		onUnload() {
+			this.socketTicket.Close()
+			uni.$off('message')
+		},
+		onHide() {
+			this.socketTicket.Close()
+			uni.$off('message')
+			this.fixedtrue = true
+		},
+		onShow() {
+			if (!uni.cache.get('token')) {
+				uni.login({
+					provider: 'weixin',
+					success: async (data) => {
+						try {
+							uni.getUserInfo({
+								provider: 'weixin',
+								success: async (infoRes) => {
+									uni.cache.set('weixincode', data.code);
+									let res = await this.api.userwxlogin({
+										code: uni.cache.get('weixincode'), //临时登录凭证
+										rawData: infoRes.rawData
+									})
+									if (res.code == 0) {
+										uni.cache.set('token', res.data.token);
+										uni.cache.set('miniAppOpenId', res.data.userInfo
+											.miniAppOpenId)
+										uni.cache.set('userInfo', res.data.userInfo);
+										uni.$on('message', this.getMessage)
+										this.productqueryShop();
+									}
+								},
+								fail: (err) => {}
+							});
+						} catch (e) {}
+					}
+				});
+			} else {
+				uni.$on('message', this.getMessage)
+				this.productqueryShop();
+			}
+		},
+		methods: {
+
+			/**
+			 * socket初始化
+			 */
+			handlemessage() {
+				this.socketTicket ? this.socketTicket.Close() : null //调用前先判断是否有socket正在进行 先关闭后链接
+				this.socketTicket = new webSocketUtils(`${uni.conf.baseUrlwws}`, 5000, {
+					tableId: uni.cache.get('tableCode'),
+					shopId: uni.cache.get('shopUser'),
+					userId: uni.cache.get('userInfo').id,
+					"type": "connect",
+				})
+			},
+
+			/**
+			 * 通过桌码获取店铺信息
+			 */
+			async productqueryShop() {
+				let res = await this.api.productqueryShop({
+					code: uni.cache.get('tableCode'),
+					lng: uni.cache.get('getLocationstorage').lng,
+					lat: uni.cache.get('getLocationstorage').lat,
+				})
+				if (res.code == 0) {
+					uni.cache.set('shopUser', res.data.storeInfo.id)
+					this.shopInfo = res.data;
+					this.productqueryProduct() //list  数据
+					this.handlemessage() //监听websocket返回
+				} else {
+					setTimeout(() => {
+						uni.pro.switchTab('index/index')
+					}, 1000)
+				}
+
+			},
+
+			/**
+			 * 获取商品数据
+			 */
+			async productqueryProduct() {
+				let res = await this.api.productqueryProduct({
+					"shopId": uni.cache.get('shopUser'),
+					"productGroupId": ''
+				})
+				if (res.code == 0) {
+					this.shopProductList = res.data;
+					if (this.cartLists && this.cartLists.data && this.cartLists.data.length >= 0) {
+						this.setNumber()
+					}
+					setTimeout(() => {
+						this.getElementTop();
+					}, 100);
+				}
+			},
+
+			/**
+			 * 商品数量增加/减少
+			 * @param {Object} item
+			 * @param {Object} index
+			 * @param {Object} index1
+			 * @param {Object} a
+			 * @param {Object} b
+			 */
+			async cartadd(item, a, b) { //列表添加 a传参加减号   b是判断单规格多规格\
+				if (b == '单规格') { //没有规格为空
+					this.skuidname = []
+				}
+				let cartNumber = a == '+' ? item.cartNumber + 1 : item.cartNumber - 1;
+				this.hodgepodge(item, 1, a, cartNumber) //获取skuid  /1添加购物车
+			},
+
+			/**
+			 * 详情商品增减
+			 * @param {Object} item
+			 * @param {Object} index
+			 * @param {Object} index1
+			 * @param {Object} a
+			 * @param {Object} b
+			 */
+			shopAdd(item, index, index1, a, b) {
+				if (a == "+") {
+					if (this.skuNumber < this.skuSuit) {
+						this.amountcartNumber = this.amountcartNumber + (item.suit == 0 ? 1 : item.suit);
+					} else {
+						this.amountcartNumber++;
+					}
+				} else {
+
+					if (this.amountcartNumber > 0) {
+						console.log(item)
+						if (this.skuNumber < this.skuSuit) {
+							this.amountcartNumber = this.amountcartNumber - (item.suit == 0 ? 1 : item.suit);
+						} else {
+							this.amountcartNumber = this.amountcartNumber - 1;
+						}
+					}
+				}
+			},
+
+			/**
+			 * 添加购物车
+			 */
+			addShopping(item, index, index1, a, b) {
+				if (this.amountcartNumber <= 0) {
+					return;
+				}
+				let num = 0;
+				if (item.typeEnum == "normal") {
+					num = item.cartNumber + this.amountcartNumber;
+				} else {
+					num = this.skuNumber + this.amountcartNumber;
+				}
+				let params = {
+					"skuId": this.skuId,
+					"num": num, //数量
+					"type": a == '+' ? 1 : 0,
+					"productId": item.id, //商品id
+					"shopId": uni.cache.get('shopUser'),
+					"userId": uni.cache.get('userInfo').id,
+					"tableId": uni.cache.get('tableCode'),
+				}
+				this.addCart(params)
+			},
+
+			/**
+			 * 购物车加减
+			 * @param {Object} item
+			 * @param {Object} index
+			 * @param {Object} a
+			 */
+			async cartListadd(item, index, c) {
+				try {
+					let params = {
+						"skuId": item.skuId,
+						"num": c == '+' ? item.number + 1 : item.number - 1, //数量
+						"type": c == '+' ? 1 : 0,
+						"productId": item.productId, //商品id
+						"shopId": uni.cache.get('shopUser'),
+						"userId": uni.cache.get('userInfo').id,
+						"tableId": uni.cache.get('tableCode'),
+					}
+					this.addCart(params);
+				} catch (e) {
+					//TODO handle the exception
+				}
+			},
+
+
+			/**
+			 * 添加到购物车
+			 */
+			async addCart(data) {
+				let res = await this.api.cartAdd(data)
+				if (res.code == 0) {
+					this.showShopsku = false;
+					this.$set(this, 'amountcartNumber', 0)
+				}
+			},
+
+			/**
+			 * 清空购物车
+			 */
+			async cartclear() {
+				let res = await this.api.cleanCart({
+					"shopId": uni.cache.get('shopUser'),
+					"tableId": uni.cache.get('tableCode'),
+				})
+			},
+
+
+			/**
+			 * 商品数量\购物车数量处理
+			 */
+			setNumber() {
+				// 处理购物车相同id的情况下  数量相加
+				var summedArray = this.cartLists.data.reduce((acc, current) => {
+					const existing = acc.find(item => item.productId === current.productId);
+					if (existing) {
+						existing.number += current.number;
+					} else {
+						acc.push({
+							...current
+						})
+					}
+					return acc;
+				}, []);
+				// 购物车总数据与列表页面互通
+				this.shopProductList.productInfo.forEach((item) => {
+					return item.products.filter(e => {
+						e.cartNumber = 0;
+						return summedArray.find(i => {
+							if (e.id == i.productId) {
+								e.cartNumber = i.number
+							}
+						})
+					})
+				})
+				// 处理招牌菜商品数量
+				this.shopProductList.hots.forEach((item) => {
+					item.cartNumber = 0;
+					return summedArray.find(i => {
+						if (item.id == i.productId) {
+							item.cartNumber = i.number
+						}
+					})
+				})
+				this.cartListsdatashow = this.cartLists.data.length == 0 ? false : true
+				if (this.cartLists.data.length > 0) {
+					this.cartLists_count = 0;
+					this.cartLists.data.forEach((v, e) => {
+						this.cartLists_count += v.number;
+					})
+				}
+			},
+			/**
+			 * 多规格选择
+			 * @param {Object} item1
+			 * @param {Object} index
+			 * @param {Object} index1
+			 */
+			clickspecifications(item1, index, index1, type) {
+				this.skuidname = []
+				this.specifications = item1
+				this.specifications.indexa = index
+				this.specifications.indexb = index1
+				this.specifications.typeName = type
+				try {
+					if (item1.productSkuResult == null) {
+						// 但但单个规格弹框的处理
+						this.hodgepodge(this.specifications, 2) //获取skuid /2查找价格和数量
+					} else {
+						// 多规格数据处理
+						this.specifications.tagSnap = JSON.parse(item1.productSkuResult.tagSnap).map((item) => {
+							let res = {
+								id: item1.id, //商品id
+								name: item.name,
+								start: 0,
+								children: item.value.split(",")
+							}
+							return res
+						})
+						this.specifications.tagSnap.forEach((val, index, arr) => { //初始化skuidname的数据  选择第一个
+							this.skuidname.push(val.children[0])
+						})
+						this.hodgepodge(this.specifications.tagSnap[0], 2) //获取skuid /2查找价格和数量
+					}
+
+				} catch (e) {
+					//TODO handle the exception
+				}
+			},
+
+			/**
+			 * 规格选择监听
+			 * @param {Object} e
+			 * @param {Object} index
+			 * @param {Object} index1
+			 * @param {Object} item
+			 */
+			async morloe(e, index, index1, item) {
+				this.specifications.tagSnap[index]['start'] = index1
+				this.skuidname.splice(index, 1, e) //替换skuidname的数据
+				this.hodgepodge(item, 2)
+			},
+
+			/**
+			 * 获取规格信息
+			 * @param {Object} item
+			 * @param {Object} a
+			 * @param {Object} c
+			 * @param {Object} num
+			 */
+			async hodgepodge(item, a, c, num) { //此接口去获取商品id ！！！赋值库存  数量  价格等
+				try {
+					let res = await this.api.productqueryProductSku({
+						code: uni.cache.get('tableCode'),
+						shopId: uni.cache.get('shopUser'),
+						productId: item.id, //商品id
+						spec_tag: this.skuidname.join(",")
+					})
+					this.salePrice = res.data.salePrice // 价格
+					let data = null;
+					if (a == 1) { //1添加购物车  2是websocket返回这个商品的价格(应为不同的多规格商品返回不同的价格)
+						let params = {
+							"skuId": res.data.id,
+							"num": num, //数量
+							"type": c == '+' ? 1 : 0,
+							"productId": item.id, //商品id
+							"shopId": uni.cache.get('shopUser'),
+							"userId": uni.cache.get('userInfo').id,
+							"tableId": uni.cache.get('tableCode'),
+						}
+						this.addCart(params);
+					} else {
+						this.skuId = res.data.id;
+						this.skuNumber = res.data.number;
+						this.skuSuit = res.data.suit;
+						this.showShopsku = true //打开弹框
+					}
+					this.$set(this, 'amountcartNumber', 0)
+				} catch (e) {}
+			},
+
+			/**
+			 * 结算直接生成订单
+			 */
+			orderdetail() {
+				console.log(this.cartLists)
+				console.log(this.shopInfo)
+				if (this.cartLists.data.length == 0) {
+					uni.showToast({
+						title: '请先添加商品',
+						icon: 'none'
+					})
+					return false
+				}
+				uni.navigateTo({
+					url: '/pages/order/confirm_order?storeInfo=' + JSON.stringify(this.shopInfo.storeInfo)
+				});
+
+			},
+
+			/**
+			 * 商家信息显示
+			 */
+			showShopClick() {
+				this.showShopInfo = true;
+			},
+
+
+
+			/**
+			 * 获取消息
+			 * @param {Object} msg
+			 */
+			getMessage(msg) { //wss  回显数据
+				if (msg == 1) { // 网络在连接
+					this.fixedtrue = true
+					return false
+				}
+				this.fixedtrue = false
+				if (msg.type == 'heartbeat') { //后台心跳  处理返回  不然控制台一直报错
+					return false
+				}
+				try {
+					if (msg.status != 'success') {
+						uni.showToast({
+							title: msg.msg,
+							icon: "none",
+						})
+						if (msg.msg == '桌码不存在') { //卓码不存在直接退出
+							this.socketTicket.Close()
+							uni.$off('message')
+							uni.navigateBack()
+							return false;
+						}
+					} else {
+						switch (msg.type) {
+							case 'sku': // sku  数量 查询这个商品的价格和数量
+								break;
+							case 'order':
+								this.skuidname = []
+								this.showCart = false
+								this.cartLists = msg
+								break;
+							case 'addCart': //初始化add
+								this.cartLists = msg
+								this.setNumber()
+								break;
+							case 'addcart':
+								this.cartLists = msg
+								try {
+									//购物车为空的情况
+									if (msg.data.length == 0) {
+										this.showCart = false;
+									}
+									this.setNumber()
+								} catch (e) {}
+								break;
+						}
+
+
+					}
+				} catch (e) {
+					//TODO handle the exception
+				}
+			},
+
+			// 数据处理
+			socketSendMsg(data) {
+				if (this.socketTicket) {
+					this.socketTicket.send(data);
+				}
+			},
+
+			/* 获取元素顶部信息 */
+			getElementTop() {
+				new Promise((resolve, reject) => {
+					let view = uni.createSelectorQuery().selectAll('.main-item');
+					view.boundingClientRect(async data => {
+						resolve(data);
+					}).exec();
+					this.$u.getRect('.scroll-panel').then(res => {
+						this.scrollTopSize = res.top; //元素距离顶部的距离  
+					})
+				}).then((res) => {
+					let topArr = res.map((item) => {
+						return item.top; /* 减去滚动容器距离顶部的距离 加导航栏高度*/
+					});
+					this.scrollHeight = this.scrollHeight - this.HeighT
+					this.topArr = topArr;
+					/* 获取最后一项的高度，设置填充高度。判断和填充时做了 +-20 的操作，是为了滚动时更好的定位 */
+					let last = res[res.length - 1].height;
+					if (last - 20 < this.scrollHeight) {
+						// this.fillHeight = this.scrollHeight - last + 20; //这是吸到顶部的距离
+						// this.fillHeight = 200;
+					}
+				});
+			},
+			/* 主区域滚动监听 */
+			mainScroll(e) {
+				console.log(e)
+				// 节流方法
+				clearTimeout(this.mainThrottle);
+				this.mainThrottle = setTimeout(() => {
+					scrollFn();
+				}, 10);
+
+				let scrollFn = () => {
+					let top = e.detail.scrollTop;
+					let index = 0;
+					/* 查找当前滚动距离 */
+					for (let i = (this.topArr.length - 1); i >= 0; i--) {
+						/* 在部分安卓设备上，因手机逻辑分辨率与rpx单位计算不是整数，滚动距离与有误差，增加2px来完善该问题 */
+						if ((top + 2) >= this.topArr[i] - this.scrollTopSize) {
+							index = i;
+							break;
+						}
+					}
+					const calculateDeltas = (arr) => {
+						return arr.map((item, index, array) => {
+							if (index === 0) {
+								// 第一个元素前无下标，返回当前元素后下标与第一个元素的差
+								return array[index + 1] - item;
+							} else if (index === array.length - 1) {
+								// 最后一个元素后无下标，返回当前元素前下标与最后一个元素的差
+								return item - array[index - 1];
+							} else {
+								// 计算当前元素前后下标的差
+								return array[index + 1] - item || item - array[index - 1];
+							}
+						});
+					};
+					// 计算前后下标差
+					const deltas = calculateDeltas(this.topArr);
+					console.log(deltas);
+					this.leftIndex = (index < 0 ? 0 : index);
+				}
+			},
+
+
+
+			/* 左侧导航点击 */
+			leftTap(index) {
+				let HeighTdata = null
+				if (this.opacity) {
+					HeighTdata = this.HeighT //一个导航栏高度
+				} else {
+					HeighTdata = this.HeighT * 2 //顶部的时候两个导航栏高度
+				}
+				try {
+					uni.pageScrollTo({
+						scrollTop: this.scrollTopSize + HeighTdata, //滑动需要的距离  nav+列表距离的高度
+						duration: 0
+					});
+				} catch (e) {
+					//TODO handle the exception
+				}
+				setTimeout(() => {
+					this.scrollInto = `item-${index}`;
+					this.leftIndex = (index < 0 ? 0 : index);
+				}, 100)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$bg: #fafafa;
+	$tabLeft: 200upx;
+	$itemH: 100upx;
+	$cartH: 90upx;
+
+	/* 容器 */
+	.container {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		justify-content: flex-start;
+		align-items: flex-start;
+		align-content: flex-start;
+
+		.navbarcontent .active {
+			background-color: #fff;
+		}
+
+		&>view {
+			width: 100%;
+		}
+
+		.top--panel {
+			padding: 0 20rpx;
+			background-color: #fff;
+
+			.panelimgbackground {
+				width: 382rpx;
+				margin: 82rpx auto 0 auto;
+				height: 158rpx;
+			}
+
+			.panelone {
+				margin-top: 32rpx;
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: 500;
+				font-size: 32rpx;
+				color: #333333;
+			}
+
+			.paneltow {
+				margin-top: 16rpx;
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #999999;
+			}
+
+			.panelthere {
+				margin-top: 32rpx;
+				margin-bottom: 50rpx;
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #999999;
+
+				.paneltheretext {
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #999999;
+				}
+
+				.flex-start {
+					view {
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 400;
+						font-size: 28rpx;
+						color: #999999;
+					}
+				}
+			}
+
+			.panelfour {
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: bold;
+				font-size: 32rpx;
+				color: #333333;
+			}
+
+			.panelfive {
+				width: 100%;
+
+				.panelfive_list {
+					display: flex;
+				}
+
+				.panelfiveitem {
+					margin-top: 16rpx;
+					width: 340rpx;
+					margin-right: 30rpx;
+					position: relative;
+					flex-shrink: 0;
+
+					.panelfiveitemimage {
+						border-radius: 20rpx 20rpx 0rpx 0rpx;
+						width: 100%;
+						height: 204rpx;
+					}
+
+					.panelfiveitemone {
+						margin-top: 32rpx;
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 500;
+						font-size: 28rpx;
+						color: #333333;
+					}
+
+					.panelfiveitemtow {
+						margin-top: 16rpx;
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #FF534B;
+					}
+
+					.panelfiveitemthere {
+						margin-top: 12rpx;
+						// text:nth-child(1) {
+						// 	margin-left: 0;
+						// }
+
+						text {
+							padding: 4rpx 24rpx;
+							background: #F6F6F6;
+							border-radius: 8rpx 8rpx 8rpx 8rpx;
+							font-family: Source Han Sans CN, Source Han Sans CN;
+							font-weight: 400;
+							font-size: 20rpx;
+							color: #999999;
+						}
+					}
+
+					.panelfiveitemfour {
+						margin-top: 12rpx;
+						width: 100%;
+						height: 36rpx;
+						line-height: 36rpx;
+						overflow: hidden; //超出的文本隐藏
+						text-overflow: ellipsis; //溢出用省略号显示
+						white-space: nowrap; //溢出不换行
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #999999;
+					}
+
+					.panelfiveitemfive {
+						margin-top: 8rpx;
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #999999;
+					}
+
+					.panelfiveitemsex {
+
+						.panelfiveitemsex_oen {
+							text:nth-child(1) {
+								font-family: Source Han Sans CN, Source Han Sans CN;
+								font-weight: 400;
+								font-size: 24rpx;
+								color: #333333;
+							}
+
+							text:nth-child(2) {
+								font-family: Source Han Sans CN, Source Han Sans CN;
+								font-weight: bold;
+								font-size: 36rpx;
+								color: #333333;
+							}
+
+							text:nth-child(3) {
+								font-family: Source Han Sans CN, Source Han Sans CN;
+								font-weight: 400;
+								font-size: 36rpx;
+								color: #333333;
+							}
+
+							text:nth-child(4) {
+								font-family: Source Han Sans CN, Source Han Sans CN;
+								font-weight: 400;
+								font-size: 24rpx;
+								color: #666666;
+							}
+						}
+					}
+
+					.panelfiveitemNum {
+						// position: absolute;
+						// bottom: 82rpx;
+						// right: 0;
+						padding-bottom: 48rpx;
+						display: flex;
+						align-items: center;
+						justify-content: flex-end;
+
+						.sku-wrap {
+							width: 138rpx;
+							height: 54rpx;
+							background: #E3AD7F;
+							border-radius: 32rpx;
+							position: relative;
+							align-items: center;
+
+							.t {
+								font-size: 28rpx;
+								color: #fff;
+							}
+
+							.dot {
+								position: absolute;
+								top: -15rpx;
+								right: -10rpx;
+								background-color: #FF4B33;
+								color: #fff;
+								border-radius: 58rpx;
+								padding: 5rpx 14rpx;
+								box-sizing: border-box;
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								font-size: 20rpx;
+							}
+						}
+
+						.Controls {
+							display: flex;
+							align-items: center;
+
+							.num {
+								margin: 8rpx 8rpx 0 8rpx;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		.scroll-panel {
+			flex-grow: 1;
+			// height: 0;
+			overflow: hidden;
+
+		}
+
+
+		.shop-info-wrap {
+			padding: 0 30rpx 50rpx;
+			box-sizing: border-box;
+
+			.info-wrap {
+				padding: 30rpx 0;
+				box-sizing: border-box;
+
+				.shopName {
+					align-self: center;
+					font-size: 32rpx;
+					color: #333;
+					font-weight: bold;
+				}
+			}
+
+			.info-wrap-title {
+				font-size: 32rpx;
+				font-weight: bold;
+				color: #333;
+			}
+
+			.row {
+				.col {
+					margin-bottom: 10rpx;
+				}
+
+				.l,
+				.t {
+					font-size: 24rpx;
+					color: #999;
+				}
+			}
+		}
+
+		.shop_sku {
+			width: 100%;
+			position: relative;
+			border-radius: 20rpx;
+			background: #fff;
+			overflow-y: auto;
+			padding-bottom: 320rpx;
+			box-sizing: border-box;
+
+			.positionabsolute {
+				position: absolute;
+				top: 30rpx;
+				right: 30rpx;
+			}
+
+			.shop_skucimage {
+				width: 100%;
+				height: 500rpx !important;
+				border-radius: 20rpx 20rpx 0 0;
+			}
+
+			.shop_sku_name {
+				padding: 0 $paddingSize;
+				margin-top: 20rpx;
+				font-weight: bold;
+				font-size: 32upx;
+				margin-bottom: 16rpx;
+			}
+
+			.shop_sku_returned {
+				padding: 0 $paddingSize;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #FF534B;
+			}
+
+			.shop_sku_description {
+				padding: 0 $paddingSize;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #999999;
+				margin-top: 16rpx;
+				padding-bottom: 32rpx;
+				box-sizing: border-box;
+				border-bottom: 2rpx solid #F0F0F0;
+			}
+
+
+			.shop_sku_box {
+				padding: 0 $paddingSize;
+
+				.shop_sku_box_name {
+					margin-top: 20rpx;
+					font-weight: 500;
+					font-size: 28upx;
+					color: #333;
+				}
+
+				.flex-start {
+					.shop_sku_box_item {
+						margin-top: 16rpx;
+						padding: 8rpx 24rpx;
+						border-radius: 8rpx;
+						font-size: 24upx;
+						margin-left: 56rpx;
+						background: #F5F5F5;
+					}
+
+					.shop_sku_box_item:nth-child(1) {
+						margin-left: 0;
+					}
+
+					.shop_sku_box_item_noselected {
+						color: #666;
+					}
+
+					.shop_sku_box_item_selected {
+						background: #FEFAF7;
+						border-radius: 8rpx;
+						border: 2rpx solid #E8AD7B;
+						color: #E8AD7B;
+					}
+				}
+
+			}
+
+			.shop_skuselect {
+				margin-top: 16rpx;
+				width: 100%;
+				// background: #f7f7f7;
+				color: #999;
+				font-size: 24upx;
+
+				.shop_skuselectname {
+					color: #000;
+					font-size: 26upx;
+				}
+			}
+
+			.shop_bottom {
+				width: 100%;
+				box-sizing: border-box;
+				padding: 30rpx $paddingSize;
+				background-color: #fff;
+				box-shadow: 0rpx -6rpx 14rpx 2rpx rgba(0, 0, 0, 0.1);
+				position: fixed;
+				left: 0;
+				bottom: 0;
+
+				.price {
+					display: flex;
+					align-items: flex-end;
+
+					.i {
+						font-size: 28rpx;
+						color: #E8AD7B;
+						position: relative;
+						bottom: 4upx;
+						font-weight: bold;
+					}
+
+					.num {
+						font-size: 42rpx;
+						color: #E8AD7B;
+						position: relative;
+						top: 6upx;
+						padding: 0 4upx;
+					}
+				}
+
+				.operation-wrap {
+					display: flex;
+					align-items: center;
+
+					.num {
+						font-size: 32upx;
+						padding: 0 16upx;
+					}
+
+
+				}
+
+				.addShopping {
+					width: 100%;
+					height: 96rpx;
+					line-height: 96rpx;
+					text-align: center;
+					background: #ccc;
+					border-radius: 48rpx;
+					font-weight: 400;
+					font-size: 32rpx;
+					color: #FFFFFF;
+					margin-top: 36rpx;
+				}
+
+				.addShopping.active {
+					background: #E8AD7B;
+				}
+			}
+		}
+
+		.cart-wrap {
+			width: 100%;
+			padding: 0 20rpx;
+			box-sizing: border-box;
+			position: fixed;
+			bottom: 40rpx;
+			left: 0;
+			z-index: 99;
+
+			.cart-content {
+				display: flex;
+				align-items: center;
+				height: 128rpx;
+				background: #FFFFFF;
+				box-shadow: 0rpx 0rpx 20rpx 2rpx rgba(0, 0, 0, 0.15);
+				border-radius: 58rpx;
+				padding: 0 36rpx;
+				box-sizing: border-box;
+
+				.left {
+					flex: 1;
+					display: flex;
+					align-items: center;
+					position: relative;
+
+					.iconBox {
+						position: relative;
+					}
+
+					.icon {
+						width: 76rpx;
+						height: 88rpx;
+						margin-left: 22rpx;
+					}
+
+					.u-badge {
+						position: absolute;
+						top: -30rpx;
+						right: -30rpx;
+						background-color: #FF4B33;
+						color: #fff;
+						border-radius: 58rpx;
+						padding: 5rpx 14rpx;
+						box-sizing: border-box;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						font-size: 20rpx;
+					}
+
+					.i,
+					.num {
+						color: #333;
+					}
+
+					.i {
+						font-size: 20upx;
+						position: relative;
+						top: 4upx;
+						margin-left: 64rpx;
+					}
+
+					.num {
+						font-size: 42upx;
+						font-weight: bold;
+					}
+				}
+
+				.btn {
+					width: 160rpx;
+					height: 64rpx;
+					background: #E7AE7B;
+					border-radius: 36rpx 36rpx 36rpx 36rpx;
+					border: 2rpx solid #E8AD7B;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+
+					.t {
+						font-weight: bold;
+						font-size: 28rpx;
+						color: #FFFFFF;
+					}
+				}
+			}
+		}
+
+		.cart-list-wrap {
+			.cart-header {
+				display: flex;
+				height: 72rpx;
+				background-color: #F2F2F2;
+				align-items: center;
+				justify-content: space-between;
+				padding: 20upx $paddingSize;
+				border-radius: 20upx 20upx 0 0;
+
+				.num {
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #333333;
+				}
+
+				.clear {
+					display: flex;
+					align-items: center;
+
+					.t {
+						font-size: 24upx;
+						color: #999;
+						margin-left: 4upx;
+					}
+				}
+			}
+
+			.scroll-view {
+				max-height: 50vh;
+				margin-bottom: 190rpx;
+			}
+
+			.list-wrap {
+				padding: $paddingSize 0 0 $paddingSize;
+			}
+
+			.shop-item {
+				display: flex;
+				padding-bottom: $paddingSize;
+
+				.langcover {
+					position: relative;
+				}
+
+				.langcover::after {
+					content: '加载中..';
+					position: absolute;
+					top: 0;
+					left: 0;
+					height: 100%;
+					width: 100%;
+					background-color: #e8e8e8;
+					color: #6b6b6b;
+					border-radius: 10rpx;
+					text-align: center;
+					line-height: 180rpx;
+					z-index: 1;
+				}
+
+				.info {
+					flex: 1;
+					padding-left: 20upx;
+					padding-right: $paddingSize;
+
+					.name {
+						font-size: 28upx;
+						font-weight: bold;
+						color: #333;
+						margin-bottom: 5rpx;
+					}
+
+					.select-sku-wrap {
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #999999;
+					}
+
+					.price-wrap {
+						margin-top: 16rpx;
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+
+						.price {
+							display: flex;
+							align-items: flex-end;
+
+							.i,
+							.num {
+								font-weight: bold;
+								font-size: 32rpx;
+								color: #333333;
+							}
+
+							.i {
+								position: relative;
+								bottom: 4upx;
+							}
+
+							.num {}
+						}
+
+						.sku-wrap {
+							padding: 6upx 16upx;
+							background-color: $color-priamry;
+							border-radius: 12upx;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							position: relative;
+
+							.t {
+								font-size: 24upx;
+								font-weight: bold;
+							}
+
+							.dot {
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								font-size: 20upx;
+								position: absolute;
+								padding: 2upx 12upx;
+								border-radius: 8upx;
+								background-color: $numColor;
+								color: #fff;
+								position: absolute;
+								top: -14upx;
+								right: -8upx;
+							}
+
+						}
+
+						.operation-wrap {
+							display: flex;
+							align-items: center;
+
+							.num {
+								font-size: 32upx;
+								padding: 0 16upx;
+							}
+
+							.btn {
+								position: relative;
+								display: flex;
+								align-items: center;
+								justify-content: center;
+
+
+							}
+						}
+					}
+				}
+			}
+
+		}
+
+
+	}
+
+
+	.list-box {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		justify-content: flex-start;
+		align-items: flex-start;
+		align-content: flex-start;
+		font-size: 28rpx;
+		position: relative;
+
+		.left {
+			width: 200rpx;
+			background-color: #f6f6f6;
+			line-height: normal;
+			box-sizing: border-box;
+			font-size: 32rpx;
+
+			// padding-bottom: 200rpx;
+			.item {
+				padding: 0 30rpx;
+				height: 92rpx;
+				line-height: 92rpx;
+				position: relative;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #333333;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+
+				&+.item {
+					margin-top: 1px;
+
+					&::after {
+						// content: '';
+						// display: block;
+						// height: 0;
+						// border-top: #d6d6d6 solid 1px;
+						// width: 620upx;
+						// position: absolute;
+						// top: -1px;
+						// right: 0;
+						// transform: scaleY(0.5);
+						/* 1px像素 */
+					}
+				}
+
+				&.active {
+					color: #333;
+					background-color: #fff;
+					position: relative;
+
+					&::before {
+						content: '';
+						display: block;
+						position: absolute;
+						top: 0;
+						left: 0;
+						border-left: #7E5C23 solid 4px;
+						height: 100%;
+						width: 0;
+					}
+
+					&::after {
+						content: '';
+						display: block;
+						position: absolute;
+						top: 0;
+						left: -15rpx;
+						bottom: 0;
+						margin: auto;
+						height: 30rpx;
+						width: 30rpx;
+						border-radius: 50%;
+						background-color: #7E5C23;
+					}
+				}
+			}
+
+			.items {
+				height: 180rpx;
+				position: relative;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #333333;
+			}
+
+			.fill-last {
+				height: 0;
+				width: 100%;
+				background: none;
+			}
+		}
+
+		.main {
+			background-color: #fff;
+			padding-left: 20rpx;
+			width: 0;
+			flex-grow: 1;
+			box-sizing: border-box;
+			position: relative;
+
+
+			.title {
+				line-height: normal;
+				padding: 30rpx 0;
+				font-size: 24rpx;
+				font-weight: bold;
+				color: #666;
+				background-color: #fff;
+				position: sticky;
+				top: 0;
+				z-index: 19;
+			}
+
+			.item {
+				padding-bottom: 16rpx;
+				border-bottom: #eee solid 1px;
+			}
+
+			.goods {
+				display: flex;
+				flex-direction: row;
+				flex-wrap: nowrap;
+				justify-content: flex-start;
+				align-content: center;
+				position: relative;
+
+				&+.goods {
+					margin-top: 16rpx;
+				}
+
+				&>image {
+					width: 120rpx;
+					height: 120rpx;
+					margin-right: 18rpx;
+					margin-left: 2px;
+				}
+
+				.goodsImg {
+					width: 200rpx;
+					height: 200rpx;
+					border-radius: 18rpx;
+					flex-shrink: 0;
+				}
+
+				.topSort {
+					width: 92rpx;
+					height: 38rpx;
+					text-align: center;
+					line-height: 38rpx;
+					position: absolute;
+					top: 0;
+					left: 0;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #FFFFFF;
+					border-radius: 20rpx 0rpx 20rpx 0rpx;
+
+				}
+
+				.topSort.c1 {
+					background: #FC5C2E;
+				}
+
+				.topSort.c2 {
+					background: #EF994E;
+				}
+
+				.topSort.c3 {
+					background: #F4B951;
+				}
+
+				.goods_right {
+					width: 100%;
+					display: flex;
+					flex-direction: column;
+					position: relative;
+					padding-top: 5rpx;
+					padding-right: 20rpx;
+					box-sizing: border-box;
+
+					.name {
+						font-size: 28rpx;
+						color: #333;
+						font-weight: bold;
+						margin-bottom: 8rpx;
+					}
+
+					.describe,
+					.monthlySale,
+					.lookBack {
+						font-weight: 400;
+						font-size: 20rpx;
+						color: #999999;
+						margin-bottom: 8rpx;
+					}
+
+					.describe,
+					.name {
+						width: 270rpx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+					}
+
+
+					.lookBack {
+						color: #FF534B;
+					}
+
+					.money {
+						font-weight: bold;
+						font-size: 24rpx;
+						color: #333;
+
+						.money_num {
+							font-size: 28rpx;
+							color: #333;
+							font-weight: bold;
+						}
+					}
+
+					.suit {
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #666666;
+					}
+
+					.sku-wrap {
+						width: 138rpx;
+						height: 54rpx;
+						background: #E3AD7F;
+						border-radius: 32rpx;
+						// position: absolute;
+						// bottom: 10rpx;
+						// right: 20rpx;
+						align-items: center;
+						position: relative;
+
+						.t {
+							font-size: 28rpx;
+							color: #fff;
+						}
+
+						.dot {
+							position: absolute;
+							top: -15rpx;
+							right: -10rpx;
+							background-color: #FF4B33;
+							color: #fff;
+							border-radius: 58rpx;
+							padding: 5rpx 14rpx;
+							box-sizing: border-box;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							font-size: 20rpx;
+						}
+					}
+
+					.Controls {
+						display: flex;
+						align-items: center;
+						justify-content: flex-end;
+
+						// position: absolute;
+						// bottom: 10rpx;
+						// right: 20rpx;
+						.num {
+							margin: auto 8rpx;
+						}
+					}
+				}
+
+
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/user/repairpassword - 副本.vue b/pages/user/repairpasswordtwo.vue
similarity index 100%
rename from pages/user/repairpassword - 副本.vue
rename to pages/user/repairpasswordtwo.vue