fela-font-renderer - npm Package Compare versions

Comparing version 4.1.2 to 4.2.0

dist/fela-font-renderer.js

@@ -52,2 +52,3 @@ (function (global, factory) {
   /*  weak */
+  /* eslint-disable import/no-mutable-exports */
   var warning = function warning() {
@@ -105,3 +106,7 @@ return true;
   function cssifyMediaQueryRules(mediaQuery, mediaQueryRules) {
-    return '@media ' + mediaQuery + '{' + mediaQueryRules + '}';
+    if (mediaQueryRules) {
+      return '@media ' + mediaQuery + '{' + mediaQueryRules + '}';
+    }
+
+    return '';
   }
@@ -111,3 +116,3 @@
   function generateAnimationName(id) {
-    return 'k' + id;
+    return "k" + id;
   }
@@ -135,3 +140,3 @@
     }
-    return currentMediaQuery + ' and ' + nestedMediaQuery;
+    return currentMediaQuery + " and " + nestedMediaQuery;
   }
@@ -141,3 +146,3 @@
   function generateCSSRule(selector, cssDeclaration) {
-    return selector + '{' + cssDeclaration + '}';
+    return selector + "{" + cssDeclaration + "}";
   }
@@ -157,4 +162,3 @@
 
-  /*  weak */
-  function processStyleWithPlugins(style, plugins, type) {
+  function processStyleWithPlugins(plugins, style, type) {
     for (var i = 0; i < plugins.length; ++i) {
@@ -179,3 +183,3 @@ style = plugins[i](style, type);
 
-    var processedStaticStyle = processStyleWithPlugins(staticStyle, plugins, STATIC_TYPE);
+    var processedStaticStyle = processStyleWithPlugins(plugins, staticStyle, STATIC_TYPE);
     return cssifyObject(processedStaticStyle);
@@ -194,23 +198,22 @@ }
   /*  weak */
-  function isAttributeSelector(property) {
-    return property.charAt(0) === '[';
+  function isMediaQuery(property) {
+    return property.substr(0, 6) === '@media';
   }
 
   /*  weak */
-  function isPseudoSelector(property) {
-    return property.charAt(0) === ':';
+  function isNestedSelector(property) {
+    return property.match(/^(:|\[|>|&)/g) !== null;
   }
 
-  /*  weak */
-  function isChildSelector(property) {
-    return property.charAt(0) === '>';
+  function isUndefinedValue(value) {
+    return value === undefined || typeof value === 'string' && value.indexOf('undefined') > -1;
   }
 
   /*  weak */
-  function isMediaQuery(property) {
-    return property.substr(0, 6) === '@media';
-  }
+  function normalizeNestedProperty(nestedProperty) {
+    if (nestedProperty.charAt(0) === '&') {
+      return nestedProperty.slice(1);
+    }
 
-  function isUndefinedValue(value) {
-    return value === undefined || typeof value === 'string' && value.indexOf('undefined') > -1;
+    return nestedProperty;
   }
@@ -254,4 +257,4 @@
     }
-
     // TODO: warning: wrong font format
+    return undefined;
   }
@@ -266,3 +269,2 @@
       plugins: config.plugins || [],
-
       // prettySelectors is currently useless, might reimplement better DX classNames later
@@ -272,3 +274,2 @@ // prettySelectors: config.prettySelectors && process.env.NODE_ENV !== 'production',
       selectorPrefix: config.selectorPrefix || '',
-
       clear: function clear() {
@@ -295,3 +296,3 @@ renderer.fontFaces = '';
 
-        var processedStyle = processStyleWithPlugins(rule(props), renderer.plugins, RULE_TYPE);
+        var processedStyle = processStyleWithPlugins(renderer.plugins, rule(props), RULE_TYPE);
         return renderer._renderStyleToClassNames(processedStyle).slice(1);
@@ -308,4 +309,4 @@ },
           if (value instanceof Object) {
-            if (isPseudoSelector(property) || isAttributeSelector(property) || isChildSelector(property)) {
-              classNames += renderer._renderStyleToClassNames(value, pseudo + property, media);
+            if (isNestedSelector(property)) {
+              classNames += renderer._renderStyleToClassNames(value, pseudo + normalizeNestedProperty(property), media);
             } else if (isMediaQuery(property)) {
@@ -368,3 +369,3 @@ var combinedMediaQuery = generateCombinedMediaQuery(media, property.slice(6).trim());
 
-          var processedKeyframe = processStyleWithPlugins(resolvedKeyframe, renderer.plugins, KEYFRAME_TYPE);
+          var processedKeyframe = processStyleWithPlugins(renderer.plugins, resolvedKeyframe, KEYFRAME_TYPE);
           var cssKeyframe = cssifyKeyframe(processedKeyframe, animationName, renderer.keyframePrefixes);
@@ -447,7 +448,5 @@ renderer.cache[keyframeReference] = animationName;
         renderer.listeners.push(callback);
-        return {
-          unsubscribe: function unsubscribe() {
+        return { unsubscribe: function unsubscribe() {
             return renderer.listeners.splice(renderer.listeners.indexOf(callback), 1);
-          }
-        };
+          } };
       },
@@ -495,6 +494,7 @@ _emitChange: function _emitChange(change) {
 
-    // warns if the DOM node either is not a valid <style> element thus the styles do not get applied as Expected
-    // or if the node already got the data-fela-stylesheet attribute applied suggesting it is already used by another Renderer
+    // warns if the DOM node either is not a valid <style> element
+    // thus the styles do not get applied as Expected
+    // or if the node already got the data-fela-stylesheet attribute applied
+    // suggesting it is already used by another Renderer
     warning$1(mountNode.nodeName === 'STYLE', 'You are using a node other than `<style>`. Your styles might not get applied correctly.');
-    warning$1(!mountNode.hasAttribute('data-fela-stylesheet'), 'This node is already used by another renderer. Rendering might overwrite other styles.');
 
@@ -501,0 +501,0 @@ // mark and clean the DOM node to prevent side-effects

dist/fela-font-renderer.min.js

@@ -1,1 +0,1 @@
-!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n(require("hyphenate-style-name")):"function"==typeof define&&define.amd?define(["hyphenate-style-name"],n):e.FelaFontRenderer=n(e.hyphenateStyleName)}(this,function(e){"use strict";function n(n,r){return e(n)+":"+r}function r(e){var r="";for(var t in e)r&&(r+=";"),r+=n(t,e[t]);return r}function t(e){return"@font-face{"+r(e)+"}"}function i(e,n){var t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[""],i=Object.keys(e).reduce(function(n,t){return n+t+"{"+r(e[t])+"}"},"");return t.reduce(function(e,r){return e+"@"+r+"keyframes "+n+"{"+i+"}"},"")}function o(e,n){return"@media "+e+"{"+n+"}"}function u(e){return"k"+e}function a(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return e<=w?j[e-1]+n:a(e/w|0,j[e%w]+n)}function f(e,n){return 0===e.length?n:e+" and "+n}function c(e,n){return e+"{"+n+"}"}function s(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return"."+e+n}function l(e){return e.replace(/\s{2,}/g,"")}function d(e,n,r){for(var t=0;t<n.length;++t)e=n[t](e,r);return e}function y(e,n){if("string"==typeof e)return l(e);var t=d(e,n,A);return r(t)}function h(e,n){return"string"==typeof e?e:n+JSON.stringify(e)}function m(e){return"["===e.charAt(0)}function v(e){return":"===e.charAt(0)}function p(e){return">"===e.charAt(0)}function g(e){return"@media"===e.substr(0,6)}function b(e){return void 0===e||"string"==typeof e&&e.indexOf("undefined")>-1}function x(e){for(var n={},r=0,t=e.length;r<t;++r)n[e[r]]="";return n}function O(e){return'"'===e.charAt(0)?e:'"'+e+'"'}function S(e){for(var n=0,r=K.length;n<r;++n){var t=K[n];if(e.indexOf(t)!==-1)return J[t]}}function R(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},r={listeners:[],keyframePrefixes:e.keyframePrefixes||["-webkit-","-moz-"],plugins:e.plugins||[],mediaQueryOrder:e.mediaQueryOrder||[],selectorPrefix:e.selectorPrefix||"",clear:function(){r.fontFaces="",r.keyframes="",r.statics="",r.rules="",r.mediaRules=x(r.mediaQueryOrder),r.rendered=[],r.uniqueRuleIdentifier=0,r.uniqueKeyframeIdentifier=0,r.cache={},r._emitChange({type:I})},renderRule:function(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},t=d(e(n),r.plugins,T);return r._renderStyleToClassNames(t).slice(1)},_renderStyleToClassNames:function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"",o="";for(var u in e){var l=e[u];if(l instanceof Object){if(v(u)||m(u)||p(u))o+=r._renderStyleToClassNames(l,t+u,i);else if(g(u)){var d=f(i,u.slice(6).trim());o+=r._renderStyleToClassNames(l,t,d)}}else{var y=i+t+u+l;if(!r.cache[y]){if(b(l)){r.cache[y]="";continue}var h=r.selectorPrefix+a(++r.uniqueRuleIdentifier);r.cache[y]=h;var x=n(u,l),O=s(h,t),S=c(O,x);i?(r.mediaRules.hasOwnProperty(i)||(r.mediaRules[i]=""),r.mediaRules[i]+=S):r.rules+=S,r._emitChange({selector:O,declaration:x,media:i,type:T})}o+=" "+r.cache[y]}}return o},renderKeyframe:function(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},t=e(n),o=JSON.stringify(t);if(!r.cache[o]){var a=u(++r.uniqueKeyframeIdentifier),f=d(t,r.plugins,N),c=i(f,a,r.keyframePrefixes);r.cache[o]=a,r.keyframes+=c,r._emitChange({name:a,keyframe:c,type:N})}return r.cache[o]},renderFont:function(e,n){var i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},o=e+JSON.stringify(i);if(!r.cache[o]){var u=O(e),a=_.extends({},i,{src:n.map(function(e){return"url('"+e+"') format('"+S(e)+"')"}).join(","),fontFamily:u}),f=t(a);r.cache[o]=u,r.fontFaces+=f,r._emitChange({fontFamily:u,fontFace:f,type:q})}return r.cache[o]},renderStatic:function(e,n){var t=h(e,n);if(!r.cache[t]){var i=y(e,r.plugins);r.cache[t]=!0,"string"==typeof e?(r.statics+=i,r._emitChange({type:A,css:i})):(r.statics+=c(n,i),r._emitChange({selector:n,declaration:i,type:T,media:""}))}},renderToString:function(){var e=r.fontFaces+r.statics+r.keyframes+r.rules;for(var n in r.mediaRules)e+=o(n,r.mediaRules[n]);return e},subscribe:function(e){return r.listeners.push(e),{unsubscribe:function(){return r.listeners.splice(r.listeners.indexOf(e),1)}}},_emitChange:function(e){for(var n=0,t=r.listeners.length;n<t;++n)r.listeners[n](e)}};if(r.keyframePrefixes.push(""),r.clear(),e.enhancers)for(var l=0,R=e.enhancers.length;l<R;++l)r=e.enhancers[l](r);return r}function k(e,n){return function(r){r.type!==T||r.media?n.textContent=e.renderToString():n.sheet.insertRule(r.selector+"{"+r.declaration+"}",n.sheet.cssRules.length)}}function C(e){return e&&1===e.nodeType}function F(e,n){if(!C(n))throw new Error("You need to specify a valid element node (nodeType = 1) to render into.");n.setAttribute("data-fela-stylesheet","");var r=k(e,n);e.subscribe(r);var t=e.renderToString();n.textContent!==t&&(n.textContent=t)}function P(e,n){return e.fontRenderer=R(),n&&F(e.fontRenderer,n),e.renderFont=function(n,r,t){return e.fontRenderer.renderFont(n,r,t)},e}e="default"in e?e.default:e;var _={};_.typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},_.defineProperty=function(e,n,r){return n in e?Object.defineProperty(e,n,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[n]=r,e},_.extends=Object.assign||function(e){for(var n=1;n<arguments.length;n++){var r=arguments[n];for(var t in r)Object.prototype.hasOwnProperty.call(r,t)&&(e[t]=r[t])}return e};var j="abcdefghijklmnopqrstuvwxyz",w=j.length,T=1,N=2,q=3,A=4,I=5,J={".woff":"woff",".eot":"eot",".ttf":"truetype",".svg":"svg"},K=Object.keys(J),Q=function(e){return function(n){return P(n,e)}};return Q});
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n(require("hyphenate-style-name")):"function"==typeof define&&define.amd?define(["hyphenate-style-name"],n):e.FelaFontRenderer=n(e.hyphenateStyleName)}(this,function(e){"use strict";function n(n,r){return e(n)+":"+r}function r(e){var r="";for(var t in e)r&&(r+=";"),r+=n(t,e[t]);return r}function t(e){return"@font-face{"+r(e)+"}"}function i(e,n){var t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[""],i=Object.keys(e).reduce(function(n,t){return n+t+"{"+r(e[t])+"}"},"");return t.reduce(function(e,r){return e+"@"+r+"keyframes "+n+"{"+i+"}"},"")}function o(e,n){return n?"@media "+e+"{"+n+"}":""}function u(e){return"k"+e}function a(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return e<=j?_[e-1]+n:a(e/j|0,_[e%j]+n)}function f(e,n){return 0===e.length?n:e+" and "+n}function c(e,n){return e+"{"+n+"}"}function s(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return"."+e+n}function l(e){return e.replace(/\s{2,}/g,"")}function d(e,n,r){for(var t=0;t<e.length;++t)n=e[t](n,r);return n}function y(e,n){if("string"==typeof e)return l(e);var t=d(n,e,q);return r(t)}function m(e,n){return"string"==typeof e?e:n+JSON.stringify(e)}function h(e){return"@media"===e.substr(0,6)}function v(e){return null!==e.match(/^(:|\[|>|&)/g)}function p(e){return void 0===e||"string"==typeof e&&e.indexOf("undefined")>-1}function g(e){return"&"===e.charAt(0)?e.slice(1):e}function b(e){for(var n={},r=0,t=e.length;r<t;++r)n[e[r]]="";return n}function x(e){return'"'===e.charAt(0)?e:'"'+e+'"'}function O(e){for(var n=0,r=J.length;n<r;++n){var t=J[n];if(e.indexOf(t)!==-1)return A[t]}}function S(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},r={listeners:[],keyframePrefixes:e.keyframePrefixes||["-webkit-","-moz-"],plugins:e.plugins||[],mediaQueryOrder:e.mediaQueryOrder||[],selectorPrefix:e.selectorPrefix||"",clear:function(){r.fontFaces="",r.keyframes="",r.statics="",r.rules="",r.mediaRules=b(r.mediaQueryOrder),r.rendered=[],r.uniqueRuleIdentifier=0,r.uniqueKeyframeIdentifier=0,r.cache={},r._emitChange({type:I})},renderRule:function(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},t=d(r.plugins,e(n),w);return r._renderStyleToClassNames(t).slice(1)},_renderStyleToClassNames:function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"",o="";for(var u in e){var l=e[u];if(l instanceof Object){if(v(u))o+=r._renderStyleToClassNames(l,t+g(u),i);else if(h(u)){var d=f(i,u.slice(6).trim());o+=r._renderStyleToClassNames(l,t,d)}}else{var y=i+t+u+l;if(!r.cache[y]){if(p(l)){r.cache[y]="";continue}var m=r.selectorPrefix+a(++r.uniqueRuleIdentifier);r.cache[y]=m;var b=n(u,l),x=s(m,t),O=c(x,b);i?(r.mediaRules.hasOwnProperty(i)||(r.mediaRules[i]=""),r.mediaRules[i]+=O):r.rules+=O,r._emitChange({selector:x,declaration:b,media:i,type:w})}o+=" "+r.cache[y]}}return o},renderKeyframe:function(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},t=e(n),o=JSON.stringify(t);if(!r.cache[o]){var a=u(++r.uniqueKeyframeIdentifier),f=d(r.plugins,t,T),c=i(f,a,r.keyframePrefixes);r.cache[o]=a,r.keyframes+=c,r._emitChange({name:a,keyframe:c,type:T})}return r.cache[o]},renderFont:function(e,n){var i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},o=e+JSON.stringify(i);if(!r.cache[o]){var u=x(e),a=P.extends({},i,{src:n.map(function(e){return"url('"+e+"') format('"+O(e)+"')"}).join(","),fontFamily:u}),f=t(a);r.cache[o]=u,r.fontFaces+=f,r._emitChange({fontFamily:u,fontFace:f,type:N})}return r.cache[o]},renderStatic:function(e,n){var t=m(e,n);if(!r.cache[t]){var i=y(e,r.plugins);r.cache[t]=!0,"string"==typeof e?(r.statics+=i,r._emitChange({type:q,css:i})):(r.statics+=c(n,i),r._emitChange({selector:n,declaration:i,type:w,media:""}))}},renderToString:function(){var e=r.fontFaces+r.statics+r.keyframes+r.rules;for(var n in r.mediaRules)e+=o(n,r.mediaRules[n]);return e},subscribe:function(e){return r.listeners.push(e),{unsubscribe:function(){return r.listeners.splice(r.listeners.indexOf(e),1)}}},_emitChange:function(e){for(var n=0,t=r.listeners.length;n<t;++n)r.listeners[n](e)}};if(r.keyframePrefixes.push(""),r.clear(),e.enhancers)for(var l=0,S=e.enhancers.length;l<S;++l)r=e.enhancers[l](r);return r}function R(e,n){return function(r){r.type!==w||r.media?n.textContent=e.renderToString():n.sheet.insertRule(r.selector+"{"+r.declaration+"}",n.sheet.cssRules.length)}}function k(e){return e&&1===e.nodeType}function C(e,n){if(!k(n))throw new Error("You need to specify a valid element node (nodeType = 1) to render into.");n.setAttribute("data-fela-stylesheet","");var r=R(e,n);e.subscribe(r);var t=e.renderToString();n.textContent!==t&&(n.textContent=t)}function F(e,n){return e.fontRenderer=S(),n&&C(e.fontRenderer,n),e.renderFont=function(n,r,t){return e.fontRenderer.renderFont(n,r,t)},e}e="default"in e?e.default:e;var P={};P.typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},P.defineProperty=function(e,n,r){return n in e?Object.defineProperty(e,n,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[n]=r,e},P.extends=Object.assign||function(e){for(var n=1;n<arguments.length;n++){var r=arguments[n];for(var t in r)Object.prototype.hasOwnProperty.call(r,t)&&(e[t]=r[t])}return e};var _="abcdefghijklmnopqrstuvwxyz",j=_.length,w=1,T=2,N=3,q=4,I=5,A={".woff":"woff",".eot":"eot",".ttf":"truetype",".svg":"svg"},J=Object.keys(A),K=function(e){return function(n){return F(n,e)}};return K});

package.json

 {
   "name": "fela-font-renderer",
-  "version": "4.1.2",
+  "version": "4.2.0",
   "description": "Fela enhancer to render fonts into a separate stylesheet",
@@ -24,4 +24,4 @@ "main": "index.js",
   "peerDependencies": {
-    "fela": "4.1.2"
+    "fela": "4.2.0"
   }
 }

README.md

 # fela-font-renderer
 
 <img alt="npm downloads" src="https://img.shields.io/npm/dm/fela-font-renderer.svg">
-<img alt="gzipped size" src="https://img.shields.io/badge/gzipped-2.19kb-brightgreen.svg">
+<img alt="gzipped size" src="https://img.shields.io/badge/gzipped-2.21kb-brightgreen.svg">
 
@@ -16,5 +16,5 @@ Allocates all `renderFont` calls to a separate renderer which renders into a separate `mountNode` to prevent refetching the `@font-face` every time.
 <!-- Fela (Development): Unminified version including all warnings -->
-<script src="https://unpkg.com/fela-font-renderer@4.1.2/dist/fela-font-renderer.js"></script>
+<script src="https://unpkg.com/fela-font-renderer@4.2.0/dist/fela-font-renderer.js"></script>
 <!-- Fela (Production): Minified version -->
-<script src="https://unpkg.com/fela-font-renderer@4.1.2/dist/fela-font-renderer.min.js"></script>
+<script src="https://unpkg.com/fela-font-renderer@4.2.0/dist/fela-font-renderer.min.js"></script>
 ```
@@ -21,0 +21,0 @@

No alert changes

Improved metrics

Lines of code

425

increased by0.47%

Worsened metrics

Total package byte prevSize

58867

decreased by-0.88%

No dependency changes