improved runtime

Author: sokra

runtime/index.js

@@ -1,25 +1,37 @@
-export function a(array) {
+export function create(items) {
+  var array = [];
+  items.forEach(function(elements) {
+    elements.forEach(function(item) {
+      array.push(item);
+    });
+  });
   array.toString = function() {
-    // T O D O
-    return this;
+    return this.map(function(item) {
+      if(item[2]) {
+        return '@media ' + item[2] + '{' + item[1] + '}';
+      }
+      return item[1]
+    }).join('\n');
   }
 }
 
-export function b(id, source, sourceMap) {
-  return [id, source, "", sourceMap];
+export function moduleWithSourceMap(id, source, sourceMap) {
+  return [[id, source, '', sourceMap]];
 }
 
-export function c(id, source) {
-  return b(id, source, null);
+export function moduleWithoutSourceMap(id, source) {
+  return moduleWithSourceMap(id, source, null);
 }
 
-export function d(data, mediaQuery) {
+export function importStylesheet(data, mediaQuery) {
+  if(typeof data === 'string')
+    return moduleWithoutSourceMap(null, data);
   return data.map(function(item) {
     return [item[0], item[1], joinMediaQuery(item[2], mediaQuery), item[3]];
   })
 }
 
 function joinMediaQuery(itemA, itemB) {
-  if(itemA && itemB) return "(" + itemA + ") and (" + itemB + ")";
-  return itemA || itemB || "";
+  if(itemA && itemB) return '(' + itemA + ') and (' + itemB + ')';
+  return itemA || itemB || '';
 }

src/index.js

@@ -99,16 +99,16 @@ export default function loader(source, map) {
     declarations.join('\n'),
     '',
     '// CSS',
-    'export default runtime.a([',
+    'export default runtime.create([',
   ].concat(
     includedStylesheetsArray.map((include) => {
       if(!include.mediaQuery) return `  ${include.name},`;
-      return `  runtime.d(${include.name}, ${JSON.stringify(include.mediaQuery)},`;
+      return `  runtime.importStylesheet(${include.name}, ${JSON.stringify(include.mediaQuery)},`;
     })
   ).concat([
     sourceMap ?
-    `  runtime.b(module.id, ${cssJs}, ${sourceMap})` :
-    `  runtime.c(module.id, ${cssJs})`,
+    `  runtime.moduleWithSourceMap(module.id, ${cssJs}, ${sourceMap})` :
+    `  runtime.moduleWithoutSourceMap(module.id, ${cssJs})`,
     ']);'
   ]).join('\n');
 }