tailwindcss 0.0.0-oxide-insiders.a7fe2fe → 0.0.0-oxide-insiders.7f555c4

package/lib/lib/expandTailwindAtRules.js

@@ -1,104 +1,274 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), Object.defineProperty(exports, "default", {
-    enumerable: !0,
-    get: ()=>expandTailwindAtRules
-}), require("fs"), require("quick-lru");
-const _sharedState = function(obj, nodeInterop) {
-    if (!nodeInterop && obj && obj.__esModule) return obj;
-    if (null === obj || "object" != typeof obj && "function" != typeof obj) return {
-        default: obj
-    };
-    var cache = _getRequireWildcardCache(nodeInterop);
-    if (cache && cache.has(obj)) return cache.get(obj);
-    var newObj = {}, hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-    for(var key in obj)if ("default" !== key && Object.prototype.hasOwnProperty.call(obj, key)) {
-        var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-        desc && (desc.get || desc.set) ? Object.defineProperty(newObj, key, desc) : newObj[key] = obj[key];
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return expandTailwindAtRules;
     }
-    return newObj.default = obj, cache && cache.set(obj, newObj), newObj;
-}(require("./sharedState")), _generateRules = require("./generateRules"), _log = _interopRequireDefault(require("../util/log")), _cloneNodes = _interopRequireDefault(require("../util/cloneNodes")), _defaultExtractor = require("./defaultExtractor");
-function _interopRequireDefault(obj) {
+});
+const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
+const _quicklru = /*#__PURE__*/ _interop_require_default(require("@alloc/quick-lru"));
+const _sharedState = /*#__PURE__*/ _interop_require_wildcard(require("./sharedState"));
+const _generateRules = require("./generateRules");
+const _log = /*#__PURE__*/ _interop_require_default(require("../util/log"));
+const _cloneNodes = /*#__PURE__*/ _interop_require_default(require("../util/cloneNodes"));
+const _defaultExtractor = require("./defaultExtractor");
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
 function _getRequireWildcardCache(nodeInterop) {
-    if ("function" != typeof WeakMap) return null;
-    var cacheBabelInterop = new WeakMap(), cacheNodeInterop = new WeakMap();
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
     return (_getRequireWildcardCache = function(nodeInterop) {
         return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
     })(nodeInterop);
 }
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) {
+        return obj;
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {};
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
+            }
+        }
+    }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
+}
 let env = _sharedState.env;
+const builtInExtractors = {
+    DEFAULT: _defaultExtractor.defaultExtractor
+};
+const builtInTransformers = {
+    DEFAULT: (content)=>content,
+    svelte: (content)=>content.replace(/(?:^|\s)class:/g, " ")
+};
+function getExtractor(context, fileExtension) {
+    let extractors = context.tailwindConfig.content.extract;
+    return extractors[fileExtension] || extractors.DEFAULT || builtInExtractors[fileExtension] || builtInExtractors.DEFAULT(context);
+}
+function getTransformer(tailwindConfig, fileExtension) {
+    let transformers = tailwindConfig.content.transform;
+    return transformers[fileExtension] || transformers.DEFAULT || builtInTransformers[fileExtension] || builtInTransformers.DEFAULT;
+}
+let extractorCache = new WeakMap();
+// Scans template contents for possible classes. This is a hot path on initial build but
+// not too important for subsequent builds. The faster the better though — if we can speed
+// up these regexes by 50% that could cut initial build time by like 20%.
+function getClassCandidates(content, extractor, candidates, seen) {
+    if (!extractorCache.has(extractor)) {
+        extractorCache.set(extractor, new _quicklru.default({
+            maxSize: 25000
+        }));
+    }
+    for (let line of content.split("\n")){
+        line = line.trim();
+        if (seen.has(line)) {
+            continue;
+        }
+        seen.add(line);
+        if (extractorCache.get(extractor).has(line)) {
+            for (let match of extractorCache.get(extractor).get(line)){
+                candidates.add(match);
+            }
+        } else {
+            let extractorMatches = extractor(line).filter((s)=>s !== "!*");
+            let lineMatchesSet = new Set(extractorMatches);
+            for (let match of lineMatchesSet){
+                candidates.add(match);
+            }
+            extractorCache.get(extractor).set(line, lineMatchesSet);
+        }
+    }
+}
+/**
+ *
+ * @param {[import('./offsets.js').RuleOffset, import('postcss').Node][]} rules
+ * @param {*} context
+ */ function buildStylesheet(rules, context) {
+    let sortedRules = context.offsets.sort(rules);
+    let returnValue = {
+        base: new Set(),
+        defaults: new Set(),
+        components: new Set(),
+        utilities: new Set(),
+        variants: new Set()
+    };
+    for (let [sort, rule] of sortedRules){
+        returnValue[sort.layer].add(rule);
+    }
+    return returnValue;
+}
 function expandTailwindAtRules(context) {
     return (root)=>{
-        var _context_candidates;
         let layerNodes = {
             base: null,
             components: null,
             utilities: null,
             variants: null
         };
-        if (root.walkAtRules((rule)=>{
-            "tailwind" === rule.name && Object.keys(layerNodes).includes(rule.params) && (layerNodes[rule.params] = rule);
-        }), Object.values(layerNodes).every((n)=>null === n)) return root;
+        root.walkAtRules((rule)=>{
+            // Make sure this file contains Tailwind directives. If not, we can save
+            // a lot of work and bail early. Also we don't have to register our touch
+            // file as a dependency since the output of this CSS does not depend on
+            // the source of any templates. Think Vue <style> blocks for example.
+            if (rule.name === "tailwind") {
+                if (Object.keys(layerNodes).includes(rule.params)) {
+                    layerNodes[rule.params] = rule;
+                }
+            }
+        });
+        if (Object.values(layerNodes).every((n)=>n === null)) {
+            return root;
+        }
+        var _context_candidates;
+        // ---
+        // Find potential rules in changed files
         let candidates = new Set([
-            ...null !== (_context_candidates = context.candidates) && void 0 !== _context_candidates ? _context_candidates : [],
+            ...(_context_candidates = context.candidates) !== null && _context_candidates !== void 0 ? _context_candidates : [],
             _sharedState.NOT_ON_DEMAND
         ]);
-        for (let candidate of (env.DEBUG && console.time("Reading changed files"), require("@tailwindcss/oxide").parseCandidateStringsFromFiles(context.changedContent)))candidates.add(candidate);
+        let seen = new Set();
+        env.DEBUG && console.time("Reading changed files");
+        if (true) {
+            // TODO: Pass through or implement `extractor`
+            for (let candidate of require("@tailwindcss/oxide").parseCandidateStringsFromFiles(context.changedContent)){
+                candidates.add(candidate);
+            }
+        // for (let { file, content, extension } of context.changedContent) {
+        //   let transformer = getTransformer(context.tailwindConfig, extension)
+        //   let extractor = getExtractor(context, extension)
+        //   getClassCandidatesOxide(file, transformer(content), extractor, candidates, seen)
+        // }
+        } else {
+            for (let { file , content , extension  } of context.changedContent){
+                let transformer = getTransformer(context.tailwindConfig, extension);
+                let extractor = getExtractor(context, extension);
+                content = file ? _fs.default.readFileSync(file, "utf8") : content;
+                getClassCandidates(transformer(content), extractor, candidates, seen);
+            }
+        }
         env.DEBUG && console.timeEnd("Reading changed files");
+        // ---
+        // Generate the actual CSS
         let classCacheCount = context.classCache.size;
-        env.DEBUG && console.time("Generate rules"), env.DEBUG && console.time("Sorting candidates"), env.DEBUG && console.timeEnd("Sorting candidates"), (0, _generateRules.generateRules)(candidates, context), env.DEBUG && console.timeEnd("Generate rules"), env.DEBUG && console.time("Build stylesheet"), (null === context.stylesheetCache || context.classCache.size !== classCacheCount) && (context.stylesheetCache = function(rules, context) {
-            let sortedRules = context.offsets.sort(rules), returnValue = {
-                base: new Set(),
-                defaults: new Set(),
-                components: new Set(),
-                utilities: new Set(),
-                variants: new Set()
-            };
-            for (let [sort, rule] of sortedRules)returnValue[sort.layer].add(rule);
-            return returnValue;
-        }([
-            ...context.ruleCache
-        ], context)), env.DEBUG && console.timeEnd("Build stylesheet");
+        env.DEBUG && console.time("Generate rules");
+        env.DEBUG && console.time("Sorting candidates");
+        let sortedCandidates = true ? candidates : new Set([
+            ...candidates
+        ].sort((a, z)=>{
+            if (a === z) return 0;
+            if (a < z) return -1;
+            return 1;
+        }));
+        env.DEBUG && console.timeEnd("Sorting candidates");
+        (0, _generateRules.generateRules)(sortedCandidates, context);
+        env.DEBUG && console.timeEnd("Generate rules");
+        // We only ever add to the classCache, so if it didn't grow, there is nothing new.
+        env.DEBUG && console.time("Build stylesheet");
+        if (context.stylesheetCache === null || context.classCache.size !== classCacheCount) {
+            context.stylesheetCache = buildStylesheet([
+                ...context.ruleCache
+            ], context);
+        }
+        env.DEBUG && console.timeEnd("Build stylesheet");
         let { defaults: defaultNodes , base: baseNodes , components: componentNodes , utilities: utilityNodes , variants: screenNodes  } = context.stylesheetCache;
-        layerNodes.base && (layerNodes.base.before((0, _cloneNodes.default)([
-            ...baseNodes,
-            ...defaultNodes
-        ], layerNodes.base.source, {
-            layer: "base"
-        })), layerNodes.base.remove()), layerNodes.components && (layerNodes.components.before((0, _cloneNodes.default)([
-            ...componentNodes
-        ], layerNodes.components.source, {
-            layer: "components"
-        })), layerNodes.components.remove()), layerNodes.utilities && (layerNodes.utilities.before((0, _cloneNodes.default)([
-            ...utilityNodes
-        ], layerNodes.utilities.source, {
-            layer: "utilities"
-        })), layerNodes.utilities.remove());
-        let variantNodes = Array.from(screenNodes).filter((node)=>{
+        // ---
+        // Replace any Tailwind directives with generated CSS
+        if (layerNodes.base) {
+            layerNodes.base.before((0, _cloneNodes.default)([
+                ...baseNodes,
+                ...defaultNodes
+            ], layerNodes.base.source, {
+                layer: "base"
+            }));
+            layerNodes.base.remove();
+        }
+        if (layerNodes.components) {
+            layerNodes.components.before((0, _cloneNodes.default)([
+                ...componentNodes
+            ], layerNodes.components.source, {
+                layer: "components"
+            }));
+            layerNodes.components.remove();
+        }
+        if (layerNodes.utilities) {
+            layerNodes.utilities.before((0, _cloneNodes.default)([
+                ...utilityNodes
+            ], layerNodes.utilities.source, {
+                layer: "utilities"
+            }));
+            layerNodes.utilities.remove();
+        }
+        // We do post-filtering to not alter the emitted order of the variants
+        const variantNodes = Array.from(screenNodes).filter((node)=>{
             var _node_raws_tailwind;
-            let parentLayer = null === (_node_raws_tailwind = node.raws.tailwind) || void 0 === _node_raws_tailwind ? void 0 : _node_raws_tailwind.parentLayer;
-            return "components" === parentLayer ? null !== layerNodes.components : "utilities" !== parentLayer || null !== layerNodes.utilities;
+            const parentLayer = (_node_raws_tailwind = node.raws.tailwind) === null || _node_raws_tailwind === void 0 ? void 0 : _node_raws_tailwind.parentLayer;
+            if (parentLayer === "components") {
+                return layerNodes.components !== null;
+            }
+            if (parentLayer === "utilities") {
+                return layerNodes.utilities !== null;
+            }
+            return true;
         });
-        layerNodes.variants ? (layerNodes.variants.before((0, _cloneNodes.default)(variantNodes, layerNodes.variants.source, {
-            layer: "variants"
-        })), layerNodes.variants.remove()) : variantNodes.length > 0 && root.append((0, _cloneNodes.default)(variantNodes, root.source, {
-            layer: "variants"
-        }));
-        let hasUtilityVariants = variantNodes.some((node)=>{
+        if (layerNodes.variants) {
+            layerNodes.variants.before((0, _cloneNodes.default)(variantNodes, layerNodes.variants.source, {
+                layer: "variants"
+            }));
+            layerNodes.variants.remove();
+        } else if (variantNodes.length > 0) {
+            root.append((0, _cloneNodes.default)(variantNodes, root.source, {
+                layer: "variants"
+            }));
+        }
+        // If we've got a utility layer and no utilities are generated there's likely something wrong
+        const hasUtilityVariants = variantNodes.some((node)=>{
             var _node_raws_tailwind;
-            return (null === (_node_raws_tailwind = node.raws.tailwind) || void 0 === _node_raws_tailwind ? void 0 : _node_raws_tailwind.parentLayer) === "utilities";
+            return ((_node_raws_tailwind = node.raws.tailwind) === null || _node_raws_tailwind === void 0 ? void 0 : _node_raws_tailwind.parentLayer) === "utilities";
         });
-        layerNodes.utilities && 0 === utilityNodes.size && !hasUtilityVariants && _log.default.warn("content-problems", [
-            "No utility classes were detected in your source files. If this is unexpected, double-check the `content` option in your Tailwind CSS configuration.",
-            "https://tailwindcss.com/docs/content-configuration"
-        ]), env.DEBUG && (console.log("Potential classes: ", candidates.size), console.log("Active contexts: ", _sharedState.contextSourcesMap.size)), context.changedContent = [], root.walkAtRules("layer", (rule)=>{
-            Object.keys(layerNodes).includes(rule.params) && rule.remove();
+        if (layerNodes.utilities && utilityNodes.size === 0 && !hasUtilityVariants) {
+            _log.default.warn("content-problems", [
+                "No utility classes were detected in your source files. If this is unexpected, double-check the `content` option in your Tailwind CSS configuration.",
+                "https://tailwindcss.com/docs/content-configuration"
+            ]);
+        }
+        // ---
+        if (env.DEBUG) {
+            console.log("Potential classes: ", candidates.size);
+            console.log("Active contexts: ", _sharedState.contextSourcesMap.size);
+        }
+        // Clear the cache for the changed files
+        context.changedContent = [];
+        // Cleanup any leftover @layer atrules
+        root.walkAtRules("layer", (rule)=>{
+            if (Object.keys(layerNodes).includes(rule.params)) {
+                rule.remove();
+            }
         });
     };
 }
-_defaultExtractor.defaultExtractor, new WeakMap();

package/lib/lib/findAtConfigPath.js

@@ -1,27 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), Object.defineProperty(exports, "findAtConfigPath", {
-    enumerable: !0,
-    get: ()=>findAtConfigPath
+    value: true
 });
-const _fs = _interopRequireDefault(require("fs")), _path = _interopRequireDefault(require("path"));
-function _interopRequireDefault(obj) {
+Object.defineProperty(exports, "findAtConfigPath", {
+    enumerable: true,
+    get: function() {
+        return findAtConfigPath;
+    }
+});
+const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
+const _path = /*#__PURE__*/ _interop_require_default(require("path"));
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
 function findAtConfigPath(root, result) {
-    let configPath = null, relativeTo = null;
-    return root.walkAtRules("config", (rule)=>{
-        var _rule_source, _rule_source_input_file, _ref;
-        if (null === (relativeTo = null !== (_ref = null !== (_rule_source_input_file = null === (_rule_source = rule.source) || void 0 === _rule_source ? void 0 : _rule_source.input.file) && void 0 !== _rule_source_input_file ? _rule_source_input_file : result.opts.from) && void 0 !== _ref ? _ref : null)) throw rule.error("The `@config` directive cannot be used without setting `from` in your PostCSS config.");
-        if (configPath) throw rule.error("Only one `@config` directive is allowed per file.");
+    let configPath = null;
+    let relativeTo = null;
+    root.walkAtRules("config", (rule)=>{
+        var _rule_source;
+        var _rule_source_input_file, _ref;
+        relativeTo = (_ref = (_rule_source_input_file = (_rule_source = rule.source) === null || _rule_source === void 0 ? void 0 : _rule_source.input.file) !== null && _rule_source_input_file !== void 0 ? _rule_source_input_file : result.opts.from) !== null && _ref !== void 0 ? _ref : null;
+        if (relativeTo === null) {
+            throw rule.error("The `@config` directive cannot be used without setting `from` in your PostCSS config.");
+        }
+        if (configPath) {
+            throw rule.error("Only one `@config` directive is allowed per file.");
+        }
         let matches = rule.params.match(/(['"])(.*?)\1/);
-        if (!matches) throw rule.error("A path is required when using the `@config` directive.");
+        if (!matches) {
+            throw rule.error("A path is required when using the `@config` directive.");
+        }
         let inputPath = matches[2];
-        if (_path.default.isAbsolute(inputPath)) throw rule.error("The `@config` directive cannot be used with an absolute path.");
-        if (configPath = _path.default.resolve(_path.default.dirname(relativeTo), inputPath), !_fs.default.existsSync(configPath)) throw rule.error(`The config file at "${inputPath}" does not exist. Make sure the path is correct and the file exists.`);
+        if (_path.default.isAbsolute(inputPath)) {
+            throw rule.error("The `@config` directive cannot be used with an absolute path.");
+        }
+        configPath = _path.default.resolve(_path.default.dirname(relativeTo), inputPath);
+        if (!_fs.default.existsSync(configPath)) {
+            throw rule.error(`The config file at "${inputPath}" does not exist. Make sure the path is correct and the file exists.`);
+        }
         rule.remove();
-    }), configPath || null;
+    });
+    return configPath ? configPath : null;
 }