Galerie und tage

node_modules/csso/lib/index.js

@@ -1,7 +1,8 @@
-var csstree = require('css-tree');
-var parse = csstree.parse;
-var compress = require('./compress');
-var generate = csstree.generate;
+var parse = require('./parser');
+var compress = require('./compressor');
+var translate = require('./utils/translate');
+var translateWithSourceMap = require('./utils/translateWithSourceMap');
+var walkers = require('./utils/walk');
 
 function debugOutput(name, options, startTime, data) {
     if (options.debug) {
@@ -22,7 +23,7 @@ function createDefaultLogger(level) {
         }
 
         if (level > 1 && ast) {
-            var css = generate(ast);
+            var css = translate(ast, true);
 
             // when level 2, limit css to 256 symbols
             if (level === 2 && css.length > 256) {
@@ -57,16 +58,6 @@ function buildCompressOptions(options) {
     return options;
 }
 
-function runHandler(ast, options, handlers) {
-    if (!Array.isArray(handlers)) {
-        handlers = [handlers];
-    }
-
-    handlers.forEach(function(fn) {
-        fn(ast, options);
-    });
-}
-
 function minify(context, source, options) {
     options = options || {};
 
@@ -82,36 +73,22 @@ function minify(context, source, options) {
         })
     );
 
-    // before compress handlers
-    if (options.beforeCompress) {
-        debugOutput('beforeCompress', options, Date.now(),
-            runHandler(ast, options, options.beforeCompress)
-        );
-    }
-
     // compress
     var compressResult = debugOutput('compress', options, Date.now(),
         compress(ast, buildCompressOptions(options))
     );
 
-    // after compress handlers
-    if (options.afterCompress) {
-        debugOutput('afterCompress', options, Date.now(),
-            runHandler(compressResult, options, options.afterCompress)
-        );
-    }
-
-    // generate
+    // translate
     if (options.sourceMap) {
-        result = debugOutput('generate(sourceMap: true)', options, Date.now(), (function() {
-            var tmp = generate(compressResult.ast, { sourceMap: true });
+        result = debugOutput('translateWithSourceMap', options, Date.now(), (function() {
+            var tmp = translateWithSourceMap(compressResult.ast);
             tmp.map._file = filename; // since other tools can relay on file in source map transform chain
             tmp.map.setSourceContent(filename, source);
             return tmp;
-        }()));
+        })());
     } else {
-        result = debugOutput('generate', options, Date.now(), {
-            css: generate(compressResult.ast),
+        result = debugOutput('translate', options, Date.now(), {
+            css: translate(compressResult.ast),
             map: null
         });
     }
@@ -121,10 +98,10 @@ function minify(context, source, options) {
 
 function minifyStylesheet(source, options) {
     return minify('stylesheet', source, options);
-}
+};
 
 function minifyBlock(source, options) {
-    return minify('declarationList', source, options);
+    return minify('block', source, options);
 }
 
 module.exports = {
@@ -134,8 +111,14 @@ module.exports = {
     minify: minifyStylesheet,
     minifyBlock: minifyBlock,
 
-    // css syntax parser/walkers/generator/etc
-    syntax: Object.assign({
-        compress: compress
-    }, csstree)
+    // step by step
+    parse: parse,
+    compress: compress,
+    translate: translate,
+    translateWithSourceMap: translateWithSourceMap,
+
+    // walkers
+    walk: walkers.all,
+    walkRules: walkers.rules,
+    walkRulesRight: walkers.rulesRight
 };