From a387389ee8285b7464f5c9bf2a6142428890a4e1 Mon Sep 17 00:00:00 2001
From: Michael <akiliev@outlook.com>
Date: Tue, 9 Apr 2019 12:51:26 +0300
Subject: [PATCH] 2.6.0.beta1: trailing colons fix.

---
 dist/bundle.esm.js |  2 +-
 dist/bundle.js     |  2 +-
 package.json       |  4 ++--
 src/css-lit.ts     |  2 +-
 test/specs/lit.ts  | 12 ++++++++++++
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/dist/bundle.esm.js b/dist/bundle.esm.js
index 1891b6c..16433c7 100644
--- a/dist/bundle.esm.js
+++ b/dist/bundle.esm.js
@@ -1 +1 @@
-import{createRenderer as e,combineRules as r}from"fela";import{renderToMarkup as n,rehydrate as t,render as o}from"fela-dom";import i from"fela-plugin-embedded";import u from"fela-plugin-prefixer";import c from"fela-plugin-fallback-value";import f from"fela-plugin-unit";var a=function(){return(a=Object.assign||function(e){for(var r,n=1,t=arguments.length;n<t;n++)for(var o in r=arguments[n])Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);return e}).apply(this,arguments)};var s,p,l,h,d,g=function(e){return e},m=function(e){return e.replace(/-(\w)/gu,function(e,r){return r.toUpperCase()})},v=function(e){var r,n=!1;return function(){return n?r:(n=!0,r=e())}},y=(s=/^([\w-]+)(: *| +)(.*)$/,p=/^(([@>\*\.:&\(\)\^="\-\[\]]+).*[ ,]*)+:?$/,l=/\s*,\s*/g,h=/(.*):[\n\r]/g,function(e,r,n){var t,o,i=(o=e)[o.length-1];switch(!0){case"{"==r:var u={};n.forEach(function(e){return i[e]=u}),e.push(u);break;case"}"==r:e.pop();break;case null!=(t=s.exec(r)):i[m(t[1])]=isNaN(t[3])?t[3]:+t[3];break;case null!=(t=p.exec(r)):n.splice(0),n.push.apply(n,r.split(l).map(function(r){return"."==(r=r.replace(h,"$1"))[0]&&(r=e.length>1?"& "+r:r.slice(1)),r}))}}),b=function(){var e=["\n","\r",";"],r=function(r){return e.includes(r)},n=new RegExp("["+e.join("")+"]","g");return function(e){for(var t=[],o=1;o<arguments.length;o++)t[o-1]=arguments[o];var i={},u=[],c=[i];return function(e,r){for(var n=e.length,t="",o=0;o<n;o++)t+=e[o]+(null==r[o]?"":r[o]);return t}(e,t).replace(/(\{|\})/g,function(e,n,t,o){return r(o[t-1])||(n=";"+n),r(o[t+1])||(n+=";"),n}).split(n).forEach(function(e){if((e=e.trim())&&y(c,e,u),!c.length)throw new Error("lit-css parse error: unbalanced {} braces !")}),i}}(),w=Object.freeze({}),O=function(){try{return"object"==typeof window}catch(e){return!1}}(),j={method:"f",defStyles:void 0,plugins:[],enhancers:[],preset:{unit:[]},ssr:!1},x=Object.freeze({f:"function",o:"object",s:"string"}),k=(d=function(e,r){return e[r]||e[m(r)]},function(e,r,n){switch(r||(r=w),typeof n){case x.f:return[n];case x.o:return[(t=n,function(){return t})];case x.s:return function(e,r,n){return n.split(/[,\s\t]+/g).map(function(n){return d(r,n)||d(e(),n)||w})}(e,r,n).reduce(function(n,t){return n.push.apply(n,k(e,r,t)),n},[]);default:return[g]}var t}),P=function(){function s(n){var s,p,l,h;void 0===n&&(n={});var d=a({},j,n),g=d.method,m=d.ssr,y=d.preset,b=d.plugins,P=d.enhancers,E=function(e,r){var n={};for(var t in e)Object.prototype.hasOwnProperty.call(e,t)&&r.indexOf(t)<0&&(n[t]=e[t]);if(null!=e&&"function"==typeof Object.getOwnPropertySymbols){var o=0;for(t=Object.getOwnPropertySymbols(e);o<t.length;o++)r.indexOf(t[o])<0&&(n[t[o]]=e[t[o]])}return n}(d,["method","ssr","preset","plugins","enhancers"]),S=a({},j.preset,y||{});if(n.fdef)throw new Error("fela-vue: Change deprecated `fdef` to `defStyles`!");this.renderer=e(a({},E,{enhancers:P,plugins:[i(),u(),c(),f.apply(void 0,S.unit)].concat(b)}));var z,$,C=this.renderer,N=n.defStyles;switch(typeof N){case x.o:z=(s=[N.key,N.value])[0],$=s[1];break;case x.f:z=(p=["fdef",N])[0],$=p[1]}O&&(m?t(C):o(C)),this._mixin={methods:(l={},l[g]=function(e,n){var t=this;return void 0===n&&(n={}),C.renderRule(r.apply(void 0,k(v(function(){return $?$(t):w}),this.style,e)),n)||void 0},l),computed:N?(h={},h[z]=function(){return $(this)},h):{}}}return Object.defineProperty(s.prototype,"mixin",{get:function(){return Object.freeze(this._mixin)},enumerable:!0,configurable:!0}),Object.defineProperty(s.prototype,"style",{get:function(){return n(this.renderer)},enumerable:!0,configurable:!0}),s}();export{P as Renderer,b as css};
+import{createRenderer as e,combineRules as r}from"fela";import{renderToMarkup as n,rehydrate as t,render as o}from"fela-dom";import i from"fela-plugin-embedded";import u from"fela-plugin-prefixer";import c from"fela-plugin-fallback-value";import f from"fela-plugin-unit";var a=function(){return(a=Object.assign||function(e){for(var r,n=1,t=arguments.length;n<t;n++)for(var o in r=arguments[n])Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);return e}).apply(this,arguments)};var s,p,l,h,d,g=function(e){return e},m=function(e){return e.replace(/-(\w)/gu,function(e,r){return r.toUpperCase()})},v=function(e){var r,n=!1;return function(){return n?r:(n=!0,r=e())}},y=(s=/^([\w-]+)(: *| +)(.*)$/,p=/^(([@>\*\.:&\(\)\^="\-\[\]]+).*[ ,]*)+:?$/,l=/\s*,\s*/g,h=/(.*):$/,function(e,r,n){var t,o,i=(o=e)[o.length-1];switch(!0){case"{"==r:var u={};n.forEach(function(e){return i[e]=u}),e.push(u);break;case"}"==r:e.pop();break;case null!=(t=s.exec(r)):i[m(t[1])]=isNaN(t[3])?t[3]:+t[3];break;case null!=(t=p.exec(r)):n.splice(0),n.push.apply(n,r.split(l).map(function(r){return"."==(r=r.replace(h,"$1"))[0]&&(r=e.length>1?"& "+r:r.slice(1)),r}))}}),b=function(){var e=["\n","\r",";"],r=function(r){return e.includes(r)},n=new RegExp("["+e.join("")+"]","g");return function(e){for(var t=[],o=1;o<arguments.length;o++)t[o-1]=arguments[o];var i={},u=[],c=[i];return function(e,r){for(var n=e.length,t="",o=0;o<n;o++)t+=e[o]+(null==r[o]?"":r[o]);return t}(e,t).replace(/(\{|\})/g,function(e,n,t,o){return r(o[t-1])||(n=";"+n),r(o[t+1])||(n+=";"),n}).split(n).forEach(function(e){if((e=e.trim())&&y(c,e,u),!c.length)throw new Error("lit-css parse error: unbalanced {} braces !")}),i}}(),w=Object.freeze({}),O=function(){try{return"object"==typeof window}catch(e){return!1}}(),j={method:"f",defStyles:void 0,plugins:[],enhancers:[],preset:{unit:[]},ssr:!1},x=Object.freeze({f:"function",o:"object",s:"string"}),k=(d=function(e,r){return e[r]||e[m(r)]},function(e,r,n){switch(r||(r=w),typeof n){case x.f:return[n];case x.o:return[(t=n,function(){return t})];case x.s:return function(e,r,n){return n.split(/[,\s\t]+/g).map(function(n){return d(r,n)||d(e(),n)||w})}(e,r,n).reduce(function(n,t){return n.push.apply(n,k(e,r,t)),n},[]);default:return[g]}var t}),P=function(){function s(n){var s,p,l,h;void 0===n&&(n={});var d=a({},j,n),g=d.method,m=d.ssr,y=d.preset,b=d.plugins,P=d.enhancers,E=function(e,r){var n={};for(var t in e)Object.prototype.hasOwnProperty.call(e,t)&&r.indexOf(t)<0&&(n[t]=e[t]);if(null!=e&&"function"==typeof Object.getOwnPropertySymbols){var o=0;for(t=Object.getOwnPropertySymbols(e);o<t.length;o++)r.indexOf(t[o])<0&&(n[t[o]]=e[t[o]])}return n}(d,["method","ssr","preset","plugins","enhancers"]),S=a({},j.preset,y||{});if(n.fdef)throw new Error("fela-vue: Change deprecated `fdef` to `defStyles`!");this.renderer=e(a({},E,{enhancers:P,plugins:[i(),u(),c(),f.apply(void 0,S.unit)].concat(b)}));var $,z,C=this.renderer,N=n.defStyles;switch(typeof N){case x.o:$=(s=[N.key,N.value])[0],z=s[1];break;case x.f:$=(p=["fdef",N])[0],z=p[1]}O&&(m?t(C):o(C)),this._mixin={methods:(l={},l[g]=function(e,n){var t=this;return void 0===n&&(n={}),C.renderRule(r.apply(void 0,k(v(function(){return z?z(t):w}),this.style,e)),n)||void 0},l),computed:N?(h={},h[$]=function(){return z(this)},h):{}}}return Object.defineProperty(s.prototype,"mixin",{get:function(){return Object.freeze(this._mixin)},enumerable:!0,configurable:!0}),Object.defineProperty(s.prototype,"style",{get:function(){return n(this.renderer)},enumerable:!0,configurable:!0}),s}();export{P as Renderer,b as css};
diff --git a/dist/bundle.js b/dist/bundle.js
index 750d123..a85c115 100644
--- a/dist/bundle.js
+++ b/dist/bundle.js
@@ -1 +1 @@
-"use strict";function _interopDefault(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(exports,"__esModule",{value:!0});var fela=require("fela"),felaDom=require("fela-dom"),embedded=_interopDefault(require("fela-plugin-embedded")),prefixer=_interopDefault(require("fela-plugin-prefixer")),fallback=_interopDefault(require("fela-plugin-fallback-value")),unit=_interopDefault(require("fela-plugin-unit")),__assign=function(){return(__assign=Object.assign||function(e){for(var r,t=1,n=arguments.length;t<n;t++)for(var i in r=arguments[t])Object.prototype.hasOwnProperty.call(r,i)&&(e[i]=r[i]);return e}).apply(this,arguments)};function __rest(e,r){var t={};for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&r.indexOf(n)<0&&(t[n]=e[n]);if(null!=e&&"function"==typeof Object.getOwnPropertySymbols){var i=0;for(n=Object.getOwnPropertySymbols(e);i<n.length;i++)r.indexOf(n[i])<0&&(t[n[i]]=e[n[i]])}return t}var always=function(e){return function(){return e}},reflect=function(e){return e},camelify=function(e){return e.replace(/-(\w)/gu,function(e,r){return r.toUpperCase()})},last=function(e){return e[e.length-1]},memoize=function(e){var r,t=!1;return function(){return t?r:(t=!0,r=e())}},join=function(e,r){for(var t=e.length,n="",i=0;i<t;i++)n+=e[i]+(null==r[i]?"":r[i]);return n},analyseLine=function(){var e=/^([\w-]+)(: *| +)(.*)$/,r=/^(([@>\*\.:&\(\)\^="\-\[\]]+).*[ ,]*)+:?$/,t=/\s*,\s*/g,n=/(.*):[\n\r]/g;return function(i,u,a){var o,s=last(i);switch(!0){case"{"==u:var f={};a.forEach(function(e){return s[e]=f}),i.push(f);break;case"}"==u:i.pop();break;case null!=(o=e.exec(u)):s[camelify(o[1])]=isNaN(o[3])?o[3]:+o[3];break;case null!=(o=r.exec(u)):a.splice(0),a.push.apply(a,u.split(t).map(function(e){return"."==(e=e.replace(n,"$1"))[0]&&(e=i.length>1?"& "+e:e.slice(1)),e}))}}}(),css=function(){var e=["\n","\r",";"],r=function(r){return e.includes(r)},t=new RegExp("["+e.join("")+"]","g");return function(e){for(var n=[],i=1;i<arguments.length;i++)n[i-1]=arguments[i];var u={},a=[],o=[u];return join(e,n).replace(/(\{|\})/g,function(e,t,n,i){return r(i[n-1])||(t=";"+t),r(i[n+1])||(t+=";"),t}).split(t).forEach(function(e){if((e=e.trim())&&analyseLine(o,e,a),!o.length)throw new Error("lit-css parse error: unbalanced {} braces !")}),u}}(),isObject=function(e){return"object"==typeof e},emptyObject=Object.freeze({}),isBrowser=function(){try{return isObject(window)}catch(e){return!1}}(),defaultOpts={method:"f",defStyles:void 0,plugins:[],enhancers:[],preset:{unit:[]},ssr:!1},types=Object.freeze({f:"function",o:"object",s:"string"}),getRules=function(){var e=function(e,r){return e[r]||e[camelify(r)]};return function(r,t,n){switch(t||(t=emptyObject),typeof n){case types.f:return[n];case types.o:return[always(n)];case types.s:return function(r,t,n){return n.split(/[,\s\t]+/g).map(function(n){return e(t,n)||e(r(),n)||emptyObject})}(r,t,n).reduce(function(e,n){return e.push.apply(e,getRules(r,t,n)),e},[]);default:return[reflect]}}}(),Renderer=function(){function e(e){var r,t,n,i;void 0===e&&(e={});var u=__assign({},defaultOpts,e),a=u.method,o=u.ssr,s=u.preset,f=u.plugins,c=u.enhancers,l=__rest(u,["method","ssr","preset","plugins","enhancers"]),p=__assign({},defaultOpts.preset,s||{});if(e.fdef)throw new Error("fela-vue: Change deprecated `fdef` to `defStyles`!");this.renderer=fela.createRenderer(__assign({},l,{enhancers:c,plugins:[embedded(),prefixer(),fallback(),unit.apply(void 0,p.unit)].concat(f)}));var d,y,b=this.renderer,g=e.defStyles;switch(typeof g){case types.o:d=(r=[g.key,g.value])[0],y=r[1];break;case types.f:d=(t=["fdef",g])[0],y=t[1]}isBrowser&&(o?felaDom.rehydrate(b):felaDom.render(b)),this._mixin={methods:(n={},n[a]=function(e,r){var t=this;return void 0===r&&(r={}),b.renderRule(fela.combineRules.apply(void 0,getRules(memoize(function(){return y?y(t):emptyObject}),this.style,e)),r)||void 0},n),computed:g?(i={},i[d]=function(){return y(this)},i):{}}}return Object.defineProperty(e.prototype,"mixin",{get:function(){return Object.freeze(this._mixin)},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"style",{get:function(){return felaDom.renderToMarkup(this.renderer)},enumerable:!0,configurable:!0}),e}();exports.Renderer=Renderer,exports.css=css;
+"use strict";function _interopDefault(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(exports,"__esModule",{value:!0});var fela=require("fela"),felaDom=require("fela-dom"),embedded=_interopDefault(require("fela-plugin-embedded")),prefixer=_interopDefault(require("fela-plugin-prefixer")),fallback=_interopDefault(require("fela-plugin-fallback-value")),unit=_interopDefault(require("fela-plugin-unit")),__assign=function(){return(__assign=Object.assign||function(e){for(var r,t=1,n=arguments.length;t<n;t++)for(var i in r=arguments[t])Object.prototype.hasOwnProperty.call(r,i)&&(e[i]=r[i]);return e}).apply(this,arguments)};function __rest(e,r){var t={};for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&r.indexOf(n)<0&&(t[n]=e[n]);if(null!=e&&"function"==typeof Object.getOwnPropertySymbols){var i=0;for(n=Object.getOwnPropertySymbols(e);i<n.length;i++)r.indexOf(n[i])<0&&(t[n[i]]=e[n[i]])}return t}var always=function(e){return function(){return e}},reflect=function(e){return e},camelify=function(e){return e.replace(/-(\w)/gu,function(e,r){return r.toUpperCase()})},last=function(e){return e[e.length-1]},memoize=function(e){var r,t=!1;return function(){return t?r:(t=!0,r=e())}},join=function(e,r){for(var t=e.length,n="",i=0;i<t;i++)n+=e[i]+(null==r[i]?"":r[i]);return n},analyseLine=function(){var e=/^([\w-]+)(: *| +)(.*)$/,r=/^(([@>\*\.:&\(\)\^="\-\[\]]+).*[ ,]*)+:?$/,t=/\s*,\s*/g,n=/(.*):$/;return function(i,u,a){var o,s=last(i);switch(!0){case"{"==u:var f={};a.forEach(function(e){return s[e]=f}),i.push(f);break;case"}"==u:i.pop();break;case null!=(o=e.exec(u)):s[camelify(o[1])]=isNaN(o[3])?o[3]:+o[3];break;case null!=(o=r.exec(u)):a.splice(0),a.push.apply(a,u.split(t).map(function(e){return"."==(e=e.replace(n,"$1"))[0]&&(e=i.length>1?"& "+e:e.slice(1)),e}))}}}(),css=function(){var e=["\n","\r",";"],r=function(r){return e.includes(r)},t=new RegExp("["+e.join("")+"]","g");return function(e){for(var n=[],i=1;i<arguments.length;i++)n[i-1]=arguments[i];var u={},a=[],o=[u];return join(e,n).replace(/(\{|\})/g,function(e,t,n,i){return r(i[n-1])||(t=";"+t),r(i[n+1])||(t+=";"),t}).split(t).forEach(function(e){if((e=e.trim())&&analyseLine(o,e,a),!o.length)throw new Error("lit-css parse error: unbalanced {} braces !")}),u}}(),isObject=function(e){return"object"==typeof e},emptyObject=Object.freeze({}),isBrowser=function(){try{return isObject(window)}catch(e){return!1}}(),defaultOpts={method:"f",defStyles:void 0,plugins:[],enhancers:[],preset:{unit:[]},ssr:!1},types=Object.freeze({f:"function",o:"object",s:"string"}),getRules=function(){var e=function(e,r){return e[r]||e[camelify(r)]};return function(r,t,n){switch(t||(t=emptyObject),typeof n){case types.f:return[n];case types.o:return[always(n)];case types.s:return function(r,t,n){return n.split(/[,\s\t]+/g).map(function(n){return e(t,n)||e(r(),n)||emptyObject})}(r,t,n).reduce(function(e,n){return e.push.apply(e,getRules(r,t,n)),e},[]);default:return[reflect]}}}(),Renderer=function(){function e(e){var r,t,n,i;void 0===e&&(e={});var u=__assign({},defaultOpts,e),a=u.method,o=u.ssr,s=u.preset,f=u.plugins,c=u.enhancers,l=__rest(u,["method","ssr","preset","plugins","enhancers"]),p=__assign({},defaultOpts.preset,s||{});if(e.fdef)throw new Error("fela-vue: Change deprecated `fdef` to `defStyles`!");this.renderer=fela.createRenderer(__assign({},l,{enhancers:c,plugins:[embedded(),prefixer(),fallback(),unit.apply(void 0,p.unit)].concat(f)}));var d,y,b=this.renderer,h=e.defStyles;switch(typeof h){case types.o:d=(r=[h.key,h.value])[0],y=r[1];break;case types.f:d=(t=["fdef",h])[0],y=t[1]}isBrowser&&(o?felaDom.rehydrate(b):felaDom.render(b)),this._mixin={methods:(n={},n[a]=function(e,r){var t=this;return void 0===r&&(r={}),b.renderRule(fela.combineRules.apply(void 0,getRules(memoize(function(){return y?y(t):emptyObject}),this.style,e)),r)||void 0},n),computed:h?(i={},i[d]=function(){return y(this)},i):{}}}return Object.defineProperty(e.prototype,"mixin",{get:function(){return Object.freeze(this._mixin)},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"style",{get:function(){return felaDom.renderToMarkup(this.renderer)},enumerable:!0,configurable:!0}),e}();exports.Renderer=Renderer,exports.css=css;
diff --git a/package.json b/package.json
index 4216d66..2411e01 100644
--- a/package.json
+++ b/package.json
@@ -37,12 +37,12 @@
     "test:report": "nyc npm test && nyc report --reporter=text-lcov > coverage.lcov && codecov",
     "test:lazy": "ava",
     "gentypes": "dts-bundle-generator -o dist/bundle.d.ts src/main.ts",
-    "dev": "cross-env NODE_ENV=development rollup -c",
+    "dev": "cross-env NODE_ENV=development BUILD=es rollup -c",
     "prod:cjs": "cross-env NODE_ENV=production BUILD=cjs rollup -c",
     "prod:es": "cross-env NODE_ENV=production BUILD=es rollup -c",
     "prod": "npm run gentypes && npm run prod:es && npm run prod:cjs"
   },
-  "version": "2.6.0beta.0",
+  "version": "2.6.0beta.1",
   "ava": {
     "files": [
       "./test/specs/*.ts"
diff --git a/src/css-lit.ts b/src/css-lit.ts
index 2f9653d..bea6b55 100644
--- a/src/css-lit.ts
+++ b/src/css-lit.ts
@@ -14,7 +14,7 @@ const analyseLine = (() => {
   const ruleRE = /^([\w-]+)(: *| +)(.*)$/
   const selectorRE = /^(([@>\*\.:&\(\)\^="\-\[\]]+).*[ ,]*)+:?$/
   const delimRE = /\s*,\s*/g
-  const trailingColonRE = /(.*):[\n\r]/g
+  const trailingColonRE = /(.*):$/
   return (levels: AnyObject[], line: string, names: string[]) => {
     let groups: string[]
     const current = last(levels)
diff --git a/test/specs/lit.ts b/test/specs/lit.ts
index bfe0cb9..256b375 100644
--- a/test/specs/lit.ts
+++ b/test/specs/lit.ts
@@ -18,6 +18,14 @@ test('lit-css', (t) => {
           '& .inner': {
             left: 42
           }
+        },
+        cls: {
+         '& .red': {
+           padding: 5
+         },
+         '& .green': {
+            padding: 5
+          }
         }
       }
       const rule = () => css`
@@ -31,6 +39,10 @@ test('lit-css', (t) => {
             left: 42
           }
         }
+        .cls: {
+         .red, .green: {
+           padding: 5
+        }
       `
 
       ff(t.deepEqual(rule(), obj))