tailwindcss 0.0.0-insiders.df011dc → 0.0.0-insiders.e2d5f21

package/lib/lib/evaluateTailwindFunctions.js

@@ -1,192 +1,171 @@
 "use strict";
-
 Object.defineProperty(exports, "__esModule", {
-  value: true
+    value: true
 });
 exports.default = _default;
-
 var _dlv = _interopRequireDefault(require("dlv"));
-
 var _didyoumean = _interopRequireDefault(require("didyoumean"));
-
 var _transformThemeValue = _interopRequireDefault(require("../util/transformThemeValue"));
-
 var _postcssValueParser = _interopRequireDefault(require("postcss-value-parser"));
-
+var _normalizeScreens = require("../util/normalizeScreens");
 var _buildMediaQuery = _interopRequireDefault(require("../util/buildMediaQuery"));
-
 var _toPath = require("../util/toPath");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
 function isObject(input) {
-  return typeof input === 'object' && input !== null;
+    return typeof input === 'object' && input !== null;
 }
-
 function findClosestExistingPath(theme, path) {
-  let parts = (0, _toPath.toPath)(path);
-
-  do {
-    parts.pop();
-    if ((0, _dlv.default)(theme, parts) !== undefined) break;
-  } while (parts.length);
-
-  return parts.length ? parts : undefined;
+    let parts = (0, _toPath).toPath(path);
+    do {
+        parts.pop();
+        if ((0, _dlv).default(theme, parts) !== undefined) break;
+    }while (parts.length)
+    return parts.length ? parts : undefined;
 }
-
 function pathToString(path) {
-  if (typeof path === 'string') return path;
-  return path.reduce((acc, cur, i) => {
-    if (cur.includes('.')) return `${acc}[${cur}]`;
-    return i === 0 ? cur : `${acc}.${cur}`;
-  }, '');
+    if (typeof path === 'string') return path;
+    return path.reduce((acc, cur, i)=>{
+        if (cur.includes('.')) return `${acc}[${cur}]`;
+        return i === 0 ? cur : `${acc}.${cur}`;
+    }, '');
 }
-
 function list(items) {
-  return items.map(key => `'${key}'`).join(', ');
+    return items.map((key)=>`'${key}'`
+    ).join(', ');
 }
-
 function listKeys(obj) {
-  return list(Object.keys(obj));
+    return list(Object.keys(obj));
 }
-
 function validatePath(config, path, defaultValue) {
-  const pathString = Array.isArray(path) ? pathToString(path) : path.replace(/^['"]+/g, '').replace(/['"]+$/g, '');
-  const pathSegments = Array.isArray(path) ? path : (0, _toPath.toPath)(pathString);
-  const value = (0, _dlv.default)(config.theme, pathString, defaultValue);
-
-  if (value === undefined) {
-    let error = `'${pathString}' does not exist in your theme config.`;
-    const parentSegments = pathSegments.slice(0, -1);
-    const parentValue = (0, _dlv.default)(config.theme, parentSegments);
-
-    if (isObject(parentValue)) {
-      const validKeys = Object.keys(parentValue).filter(key => validatePath(config, [...parentSegments, key]).isValid);
-      const suggestion = (0, _didyoumean.default)(pathSegments[pathSegments.length - 1], validKeys);
-
-      if (suggestion) {
-        error += ` Did you mean '${pathToString([...parentSegments, suggestion])}'?`;
-      } else if (validKeys.length > 0) {
-        error += ` '${pathToString(parentSegments)}' has the following valid keys: ${list(validKeys)}`;
-      }
-    } else {
-      const closestPath = findClosestExistingPath(config.theme, pathString);
-
-      if (closestPath) {
-        const closestValue = (0, _dlv.default)(config.theme, closestPath);
-
-        if (isObject(closestValue)) {
-          error += ` '${pathToString(closestPath)}' has the following keys: ${listKeys(closestValue)}`;
+    const pathString = Array.isArray(path) ? pathToString(path) : path.replace(/^['"]+/g, '').replace(/['"]+$/g, '');
+    const pathSegments = Array.isArray(path) ? path : (0, _toPath).toPath(pathString);
+    const value = (0, _dlv).default(config.theme, pathString, defaultValue);
+    if (value === undefined) {
+        let error = `'${pathString}' does not exist in your theme config.`;
+        const parentSegments = pathSegments.slice(0, -1);
+        const parentValue = (0, _dlv).default(config.theme, parentSegments);
+        if (isObject(parentValue)) {
+            const validKeys = Object.keys(parentValue).filter((key)=>validatePath(config, [
+                    ...parentSegments,
+                    key
+                ]).isValid
+            );
+            const suggestion = (0, _didyoumean).default(pathSegments[pathSegments.length - 1], validKeys);
+            if (suggestion) {
+                error += ` Did you mean '${pathToString([
+                    ...parentSegments,
+                    suggestion
+                ])}'?`;
+            } else if (validKeys.length > 0) {
+                error += ` '${pathToString(parentSegments)}' has the following valid keys: ${list(validKeys)}`;
+            }
         } else {
-          error += ` '${pathToString(closestPath)}' is not an object.`;
+            const closestPath = findClosestExistingPath(config.theme, pathString);
+            if (closestPath) {
+                const closestValue = (0, _dlv).default(config.theme, closestPath);
+                if (isObject(closestValue)) {
+                    error += ` '${pathToString(closestPath)}' has the following keys: ${listKeys(closestValue)}`;
+                } else {
+                    error += ` '${pathToString(closestPath)}' is not an object.`;
+                }
+            } else {
+                error += ` Your theme has the following top-level keys: ${listKeys(config.theme)}`;
+            }
         }
-      } else {
-        error += ` Your theme has the following top-level keys: ${listKeys(config.theme)}`;
-      }
+        return {
+            isValid: false,
+            error
+        };
     }
-
-    return {
-      isValid: false,
-      error
-    };
-  }
-
-  if (!(typeof value === 'string' || typeof value === 'number' || typeof value === 'function' || value instanceof String || value instanceof Number || Array.isArray(value))) {
-    let error = `'${pathString}' was found but does not resolve to a string.`;
-
-    if (isObject(value)) {
-      let validKeys = Object.keys(value).filter(key => validatePath(config, [...pathSegments, key]).isValid);
-
-      if (validKeys.length) {
-        error += ` Did you mean something like '${pathToString([...pathSegments, validKeys[0]])}'?`;
-      }
+    if (!(typeof value === 'string' || typeof value === 'number' || typeof value === 'function' || value instanceof String || value instanceof Number || Array.isArray(value))) {
+        let error = `'${pathString}' was found but does not resolve to a string.`;
+        if (isObject(value)) {
+            let validKeys = Object.keys(value).filter((key)=>validatePath(config, [
+                    ...pathSegments,
+                    key
+                ]).isValid
+            );
+            if (validKeys.length) {
+                error += ` Did you mean something like '${pathToString([
+                    ...pathSegments,
+                    validKeys[0]
+                ])}'?`;
+            }
+        }
+        return {
+            isValid: false,
+            error
+        };
     }
-
+    const [themeSection] = pathSegments;
     return {
-      isValid: false,
-      error
+        isValid: true,
+        value: (0, _transformThemeValue).default(themeSection)(value)
     };
-  }
-
-  const [themeSection] = pathSegments;
-  return {
-    isValid: true,
-    value: (0, _transformThemeValue.default)(themeSection)(value)
-  };
 }
-
 function extractArgs(node, vNodes, functions) {
-  vNodes = vNodes.map(vNode => resolveVNode(node, vNode, functions));
-  let args = [''];
-
-  for (let vNode of vNodes) {
-    if (vNode.type === 'div' && vNode.value === ',') {
-      args.push('');
-    } else {
-      args[args.length - 1] += _postcssValueParser.default.stringify(vNode);
+    vNodes = vNodes.map((vNode)=>resolveVNode(node, vNode, functions)
+    );
+    let args = [
+        ''
+    ];
+    for (let vNode1 of vNodes){
+        if (vNode1.type === 'div' && vNode1.value === ',') {
+            args.push('');
+        } else {
+            args[args.length - 1] += _postcssValueParser.default.stringify(vNode1);
+        }
     }
-  }
-
-  return args;
+    return args;
 }
-
 function resolveVNode(node, vNode, functions) {
-  if (vNode.type === 'function' && functions[vNode.value] !== undefined) {
-    let args = extractArgs(node, vNode.nodes, functions);
-    vNode.type = 'word';
-    vNode.value = functions[vNode.value](node, ...args);
-  }
-
-  return vNode;
+    if (vNode.type === 'function' && functions[vNode.value] !== undefined) {
+        let args = extractArgs(node, vNode.nodes, functions);
+        vNode.type = 'word';
+        vNode.value = functions[vNode.value](node, ...args);
+    }
+    return vNode;
 }
-
 function resolveFunctions(node, input, functions) {
-  return (0, _postcssValueParser.default)(input).walk(vNode => {
-    resolveVNode(node, vNode, functions);
-  }).toString();
+    return (0, _postcssValueParser).default(input).walk((vNode)=>{
+        resolveVNode(node, vNode, functions);
+    }).toString();
 }
-
 let nodeTypePropertyMap = {
-  atrule: 'params',
-  decl: 'value'
+    atrule: 'params',
+    decl: 'value'
 };
-
-function _default({
-  tailwindConfig: config
-}) {
-  let functions = {
-    theme: (node, path, ...defaultValue) => {
-      const {
-        isValid,
-        value,
-        error
-      } = validatePath(config, path, defaultValue.length ? defaultValue : undefined);
-
-      if (!isValid) {
-        throw node.error(error);
-      }
-
-      return value;
-    },
-    screen: (node, screen) => {
-      screen = screen.replace(/^['"]+/g, '').replace(/['"]+$/g, '');
-
-      if (config.theme.screens[screen] === undefined) {
-        throw node.error(`The '${screen}' screen does not exist in your theme.`);
-      }
-
-      return (0, _buildMediaQuery.default)(config.theme.screens[screen]);
-    }
-  };
-  return root => {
-    root.walk(node => {
-      let property = nodeTypePropertyMap[node.type];
-
-      if (property === undefined) {
-        return;
-      }
-
-      node[property] = resolveFunctions(node, node[property], functions);
-    });
-  };
-}
+function _default({ tailwindConfig: config  }) {
+    let functions = {
+        theme: (node, path, ...defaultValue)=>{
+            const { isValid , value , error  } = validatePath(config, path, defaultValue.length ? defaultValue : undefined);
+            if (!isValid) {
+                throw node.error(error);
+            }
+            return value;
+        },
+        screen: (node, screen)=>{
+            screen = screen.replace(/^['"]+/g, '').replace(/['"]+$/g, '');
+            let screens = (0, _normalizeScreens).normalizeScreens(config.theme.screens);
+            let screenDefinition = screens.find(({ name  })=>name === screen
+            );
+            if (!screenDefinition) {
+                throw node.error(`The '${screen}' screen does not exist in your theme.`);
+            }
+            return (0, _buildMediaQuery).default(screenDefinition);
+        }
+    };
+    return (root)=>{
+        root.walk((node)=>{
+            let property = nodeTypePropertyMap[node.type];
+            if (property === undefined) {
+                return;
+            }
+            node[property] = resolveFunctions(node, node[property], functions);
+        });
+    };
+}