More test coverage

Author: matthew-dean

packages/less/scripts/coverage-lines.js

@@ -203,5 +203,5 @@ const jsonOutput = {
 };
 
 fs.writeFileSync(jsonOutputPath, JSON.stringify(jsonOutput, null, 2), 'utf8');
-console.log(`\n📄 Uncovered lines data written to: coverage/uncovered-lines.json\n`);
+console.log('\n📄 Uncovered lines data written to: coverage/uncovered-lines.json\n');
 

packages/less/src/less/contexts.js

@@ -25,7 +25,6 @@ const parseCopyProperties = [
     'dumpLineNumbers',  // option - @deprecated The dumpLineNumbers option is deprecated. Use sourcemaps instead. All modes ('comments', 'mediaquery', 'all') will be removed in a future version.
     'compress',         // option - whether to compress
     'syncImport',       // option - whether to import synchronously
-    'chunkInput',       // option - whether to chunk input. more performant but causes parse issues.
     'mime',             // browser only - mime type for sheet import
     'useFileCache',     // browser only - whether to use the per file session cache
     // context

packages/less/src/less/parser/chunker.js

@@ -1,5 +1,3 @@
-import chunker from './chunker';
-
 export default () => {
     let // Less input string
         input;
@@ -351,26 +349,11 @@ export default () => {
         return (c > CHARCODE_9 || c < CHARCODE_PLUS) || c === CHARCODE_FORWARD_SLASH || c === CHARCODE_COMMA;
     };
 
-    parserInput.start = (str, chunkInput, failFunction) => {
+    parserInput.start = (str) => {
         input = str;
         parserInput.i = j = currentPos = furthest = 0;
 
-        // chunking apparently makes things quicker (but my tests indicate
-        // it might actually make things slower in node at least)
-        // and it is a non-perfect parse - it can't recognise
-        // unquoted urls, meaning it can't distinguish comments
-        // meaning comments with quotes or {}() in them get 'counted'
-        // and then lead to parse errors.
-        // In addition if the chunking chunks in the wrong place we might
-        // not be able to parse a parser statement in one go
-        // this is officially deprecated but can be switched on via an option
-        // in the case it causes too much performance issues.
-        if (chunkInput) {
-            chunks = chunker(str, failFunction);
-        } else {
-            chunks = [str];
-        }
-
+        chunks = [str];
         current = chunks[0];
 
         skipWhitespace(0);

packages/less/src/less/parser/parser-input.js

@@ -124,12 +124,7 @@ const Parser = function Parser(context, imports, fileInfo, currentIndex) {
         const parser = parserInput;
 
         try {
-            parser.start(str, false, function fail(msg, index) {
-                callback({
-                    message: msg,
-                    index: index + currentIndex
-                });
-            });
+            parser.start(str);
             for (let x = 0, p; (p = parseList[x]); x++) {
                 result = parsers[p]();
                 returnNodes.push(result || null);
@@ -209,14 +204,7 @@ const Parser = function Parser(context, imports, fileInfo, currentIndex) {
             // with the `root` property set to true, so no `{}` are
             // output. The callback is called when the input is parsed.
             try {
-                parserInput.start(str, context.chunkInput, function fail(msg, index) {
-                    throw new LessError({
-                        index,
-                        type: 'Parse',
-                        message: msg,
-                        filename: fileInfo.filename
-                    }, imports);
-                });
+                parserInput.start(str);
 
                 tree.Node.prototype.parse = this;
                 root = new tree.Ruleset(null, this.parsers.primary());

packages/less/src/less/parser/parser.js

@@ -0,0 +1,112 @@
+// Test at-rule evaluation paths (eval, evalRoot, genCSS, accept, etc.)
+
+// Test keywordList - @media with keyword list
+@media screen, print, handheld {
+  body {
+    font-size: 12pt;
+  }
+}
+
+// Test declarationsBlock with mergeable=true (nested ruleset with declarations)
+@media screen {
+  .container {
+    color: red;
+    background: blue;
+  }
+}
+
+// Test simpleBlock optimization with allRulesetDeclarations (single ruleset)
+@media screen {
+  .test {
+    color: red;
+    background: blue;
+  }
+}
+
+// Test eval with value evaluation and keywordList conversion
+@breakpoint: screen;
+@media @breakpoint, print {
+  body {
+    margin: 0;
+  }
+}
+
+// Test evalRoot with ampersand handling
+.container {
+  @media screen {
+    & {
+      color: red;
+    }
+    .child {
+      color: blue;
+    }
+  }
+}
+
+// Test evalRoot with mixed ampersands
+.wrapper {
+  .inner {
+    @media screen {
+      & {
+        color: green;
+      }
+    }
+  }
+}
+
+// Test genCSS with value
+@charset "UTF-8";
+
+// Test genCSS with simpleBlock
+@page {
+  margin: 2cm;
+  size: A4;
+}
+
+// Test genCSS with rules (non-simpleBlock)
+@supports (display: grid) {
+  .grid {
+    display: grid;
+  }
+  .flex {
+    display: flex;
+  }
+}
+
+// Test isCharset
+@charset "UTF-8";
+
+// Test isRulesetLike (non-charset)
+@media screen {
+  body {
+    color: black;
+  }
+}
+
+// Test compressed output (outputRuleset compressed path)
+@layer base {
+  body {
+    margin: 0;
+  }
+  p {
+    padding: 0;
+  }
+}
+
+// Test variable/find/rulesets delegation
+@media screen {
+  @var: value;
+  .test {
+    color: @var;
+  }
+}
+
+// Test eval with media bubbling
+@media screen {
+  @media print {
+    body {
+      color: black;
+    }
+  }
+}
+

packages/test-data/tests-config/at-rules-compressed-evaluation/at-rules-compressed-evaluation.css

@@ -0,0 +1,8 @@
+module.exports = {
+    language: {
+        less: {
+            compress: true
+        }
+    }
+};
+

packages/test-data/tests-config/at-rules-compressed-evaluation/at-rules-compressed-evaluation.less

@@ -0,0 +1,9 @@
+.test {
+  prop-name: color;
+  my: background;
+  value: width;
+  color: red;
+  border-color-width: 2px;
+  *-z-color: 1px dashed blue;
+  background-color-width: green;
+}

packages/test-data/tests-config/at-rules-compressed-evaluation/styles.config.cjs

@@ -0,0 +1,28 @@
+// Test for ruleProperty parser with ${prop} interpolation (line 2640)
+// This tests complex property names using ${property} interpolation in property NAMES
+// ${prop} uses the VALUE of a plain property (not a variable) as the property name
+// Note: This is different from @{var} which uses variables
+
+.test {
+  // Define properties - their VALUES will be used as property names
+  prop-name: color;
+  my: background;
+  value: width;
+  
+  // Simple ${prop} interpolation in property name (ruleProperty parser line 2640)
+  // ${prop-name} uses the value of prop-name ("color") as the property name
+  // This triggers the branch at line 2640: new(tree.Property)(`$${s.slice(2, -1)}`, ...)
+  ${prop-name}: red;
+  
+  // Multiple interpolations with literal parts
+  // border-${prop-name} becomes "border-color" (since prop-name's value is "color")
+  border-${prop-name}-width: 2px;
+  
+  // Complex property name with ${prop}
+  *-z-${prop-name}: 1px dashed blue;
+  
+  // Multiple ${prop} in same property name
+  // ${my}-${prop-name}-${value} becomes "background-color-width"
+  ${my}-${prop-name}-${value}: green;
+}
+