@thejaredwilcurt/csslop 0.0.45 → 0.0.46

package/package.json

@@ -2,7 +2,7 @@
   "name": "@thejaredwilcurt/csslop",
   "main": "index.js",
   "type": "module",
-  "version": "0.0.45",
+  "version": "0.0.46",
   "description": "Experimental CSS minification",
   "scripts": {
     "prestart": "node ./scripts/pre/start.js",
@@ -23,9 +23,9 @@
     "proto": "proto pin node latest --resolve --tool-native && proto pin npm latest --resolve --tool-native && git status"
   },
   "devDependencies": {
-    "@codemirror/autocomplete": "^6.20.3",
+    "@codemirror/autocomplete": "^6.20.4",
     "@codemirror/lang-css": "^6.3.1",
-    "@codemirror/view": "^6.43.14",
+    "@codemirror/view": "^6.43.15",
     "@eslint/js": "^10.0.1",
     "@node-projects/css-parser": "^5.2.0",
     "@stylistic/eslint-plugin": "^5.10.0",
@@ -35,7 +35,7 @@
     "eslint-config-tjw-import-x": "^1.0.1",
     "eslint-config-tjw-jsdoc": "^2.0.1",
     "eslint-plugin-import-x": "^4.17.0",
-    "eslint-plugin-jsdoc": "^65.3.11",
+    "eslint-plugin-jsdoc": "^65.4.0",
     "fflate": "^0.8.3",
     "globals": "^17.13.0",
     "pretty-ms": "^10.0.0",

package/src/parser/source-search.js

@@ -162,8 +162,8 @@ function startsUrlToken (source, index) {
 
 /**
  * Finds the first of several delimiter characters that is written at the top
- * level of the text, meaning it is not escaped, quoted, or nested inside a
- * group.
+ * level of the text, meaning it is not escaped, quoted, inside a comment, or
+ * nested inside a group.
  *
  * @param  {string} source      The raw CSS text being scanned.
  * @param  {string} delimiters  The delimiter characters to look for.
@@ -174,6 +174,11 @@ function findTopLevelDelimiter (source, delimiters, startIndex) {
   let index = startIndex;
   while (index < source.length) {
     const character = source[index];
+    if (character === '/' && source[index + 1] === '*') {
+      const closingIndex = source.indexOf('*/', index + 2);
+      index = closingIndex === -1 ? source.length : closingIndex + 2;
+      continue;
+    }
     if (character === '\\') {
       index += 2;
       continue;

package/src/rules/optimize.js

@@ -262,6 +262,9 @@ function createNestedSelectorMatcher (parentSelector) {
 
   return (childSelector) => {
     const child = childSelector.trim();
+    if (child === parent) {
+      return '&';
+    }
     if (child.startsWith(parent + ':') || child.startsWith(parent + '::')) {
       return '&' + child.slice(parent.length);
     }
@@ -497,7 +500,7 @@ function factorCommonParents (rules) {
   while (index < rules.length) {
     const rule = rules[index];
     if (rule.type === 'rule' && rule.selectors?.length > 1) {
-      const candidateParent = extractLeadingCompound(rule.selectors[0]);
+      const candidateParent = extractLeadingCompound(rule.selectors[0]) || rule.selectors[0];
       if (candidateParent) {
         const matchNestedSelector = createNestedSelectorMatcher(candidateParent);
         const childSelectors = rule.selectors.map(matchNestedSelector);
@@ -571,8 +574,8 @@ function factorCommonParents (rules) {
 }
 
 /**
- * Shares a descendant prefix through `:is()` when the parent itself is also
- * in the selector list, preventing a nesting wrapper from saving space.
+ * Shares a descendant prefix through `:is()` when a nesting wrapper did not
+ * save enough space to factor the parent out of the selector list.
  *
  * @param {object} rule  The style rule whose selector list may be shortened.
  */

package/src/rules/stringify.js

@@ -3,8 +3,15 @@
  */
 
 import { processDeclarations } from '../declarations/process.js';
-import { splitTopLevelCommaList } from '../parser/source-search.js';
+import {
+  skipParenthesizedGroup,
+  skipQuotedString,
+  splitTopLevelCommaList,
+  startsUrlToken
+} from '../parser/source-search.js';
+import { tokenizeCssValue } from '../parser/tokenizer.js';
 import { minifyValueForOutput } from '../value/minify.js';
+import { elideRedundantSeparators } from '../value/tokens.js';
 
 import {
   collapseCustomPropertyWhitespace,
@@ -111,6 +118,67 @@ function minifyFunctionPrelude (prelude) {
   return functionName + '(' + minifiedParameters.join(',') + ')';
 }
 
+/**
+ * Removes comments between namespace tokens while leaving strings, URLs, and
+ * escaped characters intact.
+ *
+ * @param  {string} prelude  The namespace prelude as written.
+ * @return {string}          The prelude with comments replaced by separators.
+ */
+function removeNamespaceComments (prelude) {
+  let result = '';
+  let index = 0;
+  while (index < prelude.length) {
+    if (prelude.startsWith('/*', index)) {
+      const closingIndex = prelude.indexOf('*/', index + 2);
+      index = closingIndex === -1 ? prelude.length : closingIndex + 2;
+      result += ' ';
+      continue;
+    }
+    let end = index + 1;
+    if (prelude[index] === '"' || prelude[index] === '\'') {
+      end = skipQuotedString(prelude, index);
+    } else if (prelude[index] === '\\') {
+      end = Math.min(index + 2, prelude.length);
+    } else if (startsUrlToken(prelude, index)) {
+      end = skipParenthesizedGroup(prelude, index + 3);
+    }
+    result += prelude.slice(index, end);
+    index = end;
+  }
+  return result;
+}
+
+/**
+ * Unwraps quoted namespace URLs and removes token separators without changing
+ * whitespace or escapes inside the namespace name's string.
+ *
+ * @param  {string} prelude  The optional namespace prefix and its URL.
+ * @return {string}          The minified namespace statement.
+ */
+function stringifyNamespace (prelude) {
+  const tokens = tokenizeCssValue(removeNamespaceComments(prelude)).filter((token) => {
+    return token.type !== 'whitespace';
+  });
+  const parts = ['@namespace'];
+  for (let index = 0; index < tokens.length; index++) {
+    const token = tokens[index];
+    const isQuotedUrl = (
+      token.type === 'function' &&
+      token.text.toLowerCase() === 'url(' &&
+      tokens[index + 1]?.type === 'string' &&
+      tokens[index + 2]?.text === ')'
+    );
+    if (isQuotedUrl) {
+      parts.push(tokens[index + 1].text);
+      index += 2;
+    } else {
+      parts.push(token.text);
+    }
+  }
+  return elideRedundantSeparators(parts.join(' ')) + ';';
+}
+
 /**
  * Stringifies a generic `at-rule` AST node into minified CSS, with specialized
  * prelude minification for `@function` rules and generic whitespace handling
@@ -466,6 +534,10 @@ function stringifyRule (rule, context) {
     return '@charset ' + rule.charset + ';';
   }
 
+  if (rule.type === 'namespace') {
+    return stringifyNamespace(rule.namespace);
+  }
+
   if (rule.type === 'import') {
     let importStatement = rule.import;
     // Unwrap url() with a quoted string to just the quoted string