@unocss/preset-attributify 0.46.5 → 0.47.0

package/dist/index.cjs

@@ -118,7 +118,7 @@ const strippedPrefixes = [
 ];
 const splitterRE = /[\s'"`;]+/g;
 const elementRE = /<\w(?=.*>)[\w:\.$-]*\s((?:['"`\{].*?['"`\}]|.*?)*?)>/gs;
-const valuedAttributeRE = /([?]|(?!\d|-{2}|-\d)[a-zA-Z0-9\u00A0-\uFFFF-_:!%-]+)(?:={?(["'])([^\2]*?)\2}?)?/g;
+const valuedAttributeRE = /([?]|(?!\d|-{2}|-\d)[a-zA-Z0-9\u00A0-\uFFFF-_:!%-]+)=?(?:["]([^"]*)["]|[']([^']*)[']|[{]([^}]*)[}])?/gms;
 const defaultIgnoreAttributes = ["placeholder"];
 const extractorAttributify = (options) => {
   const ignoreAttributes = options?.ignoreAttributes ?? defaultIgnoreAttributes;
@@ -127,7 +127,8 @@ const extractorAttributify = (options) => {
   return {
     name: "attributify",
     extract({ code }) {
-      const result = Array.from(code.matchAll(elementRE)).flatMap((match) => Array.from((match[1] || "").matchAll(valuedAttributeRE))).flatMap(([, name, _, content]) => {
+      const result = Array.from(code.matchAll(elementRE)).flatMap((match) => Array.from((match[1] || "").matchAll(valuedAttributeRE))).flatMap(([, name, ...contents]) => {
+        const content = contents.filter(Boolean).join("");
         if (ignoreAttributes.includes(name))
           return [];
         for (const prefix of strippedPrefixes) {
@@ -148,7 +149,8 @@ const extractorAttributify = (options) => {
         if (["class", "className"].includes(name)) {
           return content.split(splitterRE).filter(core.isValidSelector);
         } else {
-          return content.split(splitterRE).filter(Boolean).map((v) => `[${name}~="${v}"]`);
+          const extractTernary = Array.from(content.matchAll(/(?:[\?:].*?)(["'])([^\1]*?)\1/gms)).map(([, , v]) => v.split(splitterRE)).flat();
+          return (extractTernary.length ? extractTernary : content.split(splitterRE)).filter(Boolean).map((v) => `[${name}~="${v}"]`);
         }
       });
       return new Set(result);

package/dist/index.d.ts

@@ -50,20 +50,20 @@ declare const extractorAttributify: (options?: AttributifyOptions) => Extractor;
 declare const variantsRE: RegExp;
 declare const variantAttributify: (options?: AttributifyOptions) => VariantObject;
 
-declare type TwoStringsCompositionPrefix = 'm' | 'p';
-declare type TwoStringsCompositionSuffix = 'r' | 'b' | 'l' | 't' | 'a';
+type TwoStringsCompositionPrefix = 'm' | 'p';
+type TwoStringsCompositionSuffix = 'r' | 'b' | 'l' | 't' | 'a';
 /** Some words can compose with two strings to become a complete unocss rule such as ha, mr, mb */
-declare type TwoStringsComposition = `${TwoStringsCompositionPrefix}${TwoStringsCompositionSuffix}` | 'ha' | 'wa';
+type TwoStringsComposition = `${TwoStringsCompositionPrefix}${TwoStringsCompositionSuffix}` | 'ha' | 'wa';
 /** Some words can be a complete unocss rule by itself */
-declare type SpecialSingleWord = 'container' | 'flex' | 'block' | 'inline' | 'block' | 'table' | 'isolate' | 'absolute' | 'relative' | 'fixed' | 'sticky' | 'static' | 'visible' | 'invisible' | 'grow' | 'shrink' | 'antialiased' | 'italic' | 'ordinal' | 'overline' | 'underline' | 'uppercase' | 'lowercase' | 'capitalize' | 'truncate' | 'border' | 'rounded' | 'outline' | 'ring' | 'shadow' | 'blur' | 'grayscale' | 'invert' | 'sepia' | 'transition' | 'resize' | 'transform' | 'filter';
-declare type StringNumberCompositionPrefix = 'op' | 'opacity' | 'fw' | 'p' | 'm' | 'w' | 'h' | 'z';
+type SpecialSingleWord = 'container' | 'flex' | 'block' | 'inline' | 'block' | 'table' | 'isolate' | 'absolute' | 'relative' | 'fixed' | 'sticky' | 'static' | 'visible' | 'invisible' | 'grow' | 'shrink' | 'antialiased' | 'italic' | 'ordinal' | 'overline' | 'underline' | 'uppercase' | 'lowercase' | 'capitalize' | 'truncate' | 'border' | 'rounded' | 'outline' | 'ring' | 'shadow' | 'blur' | 'grayscale' | 'invert' | 'sepia' | 'transition' | 'resize' | 'transform' | 'filter';
+type StringNumberCompositionPrefix = 'op' | 'opacity' | 'fw' | 'p' | 'm' | 'w' | 'h' | 'z';
 /** Some words can be a complete unocss rule by compose a string and a number, such as op80, fw300, p2, p10px */
-declare type StringNumberComposition = `${StringNumberCompositionPrefix}${number}${'px' | ''}`;
-declare type PseudoPrefix = 'active' | 'before' | 'after' | 'dark' | 'light' | 'first' | 'last' | 'focus' | 'hover' | 'link' | 'root' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | 'enabled' | 'disabled' | 'all' | 'children';
+type StringNumberComposition = `${StringNumberCompositionPrefix}${number}${'px' | ''}`;
+type PseudoPrefix = 'active' | 'before' | 'after' | 'dark' | 'light' | 'first' | 'last' | 'focus' | 'hover' | 'link' | 'root' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | 'enabled' | 'disabled' | 'all' | 'children';
 /** Some words can be used to separate utilities, such as font="mono light", text="sm white" */
-declare type SeparateEnabled = 'align' | 'animate' | 'backdrop' | 'bg' | 'blend' | 'border' | 'box' | 'container' | 'content' | 'cursor' | 'display' | 'divide' | 'filter' | 'flex' | 'font' | 'gap' | 'gradient' | 'grid' | 'h' | 'icon' | 'items' | 'justify' | 'list' | 'm' | 'opacity' | 'order' | 'outline' | 'overflow' | 'p' | 'place' | 'pos' | 'ring' | 'select' | 'shadow' | 'space' | 'table' | 'text' | 'transform' | 'transition' | 'underline' | 'w' | 'z' | PseudoPrefix;
-declare type BasicAttributes = StringNumberComposition | SpecialSingleWord | TwoStringsComposition | SeparateEnabled;
-declare type AttributifyNames<Prefix extends string = ''> = `${Prefix}${BasicAttributes}` | `${Prefix}${PseudoPrefix}:${BasicAttributes}`;
+type SeparateEnabled = 'align' | 'animate' | 'backdrop' | 'bg' | 'blend' | 'border' | 'box' | 'container' | 'content' | 'cursor' | 'display' | 'divide' | 'filter' | 'flex' | 'font' | 'gap' | 'gradient' | 'grid' | 'h' | 'icon' | 'items' | 'justify' | 'list' | 'm' | 'opacity' | 'order' | 'outline' | 'overflow' | 'p' | 'place' | 'pos' | 'ring' | 'select' | 'shadow' | 'space' | 'table' | 'text' | 'transform' | 'transition' | 'underline' | 'w' | 'z' | PseudoPrefix;
+type BasicAttributes = StringNumberComposition | SpecialSingleWord | TwoStringsComposition | SeparateEnabled;
+type AttributifyNames<Prefix extends string = ''> = `${Prefix}${BasicAttributes}` | `${Prefix}${PseudoPrefix}:${BasicAttributes}`;
 interface AttributifyAttributes extends Partial<Record<AttributifyNames, string | boolean>> {
 }
 

package/dist/index.mjs

@@ -114,7 +114,7 @@ const strippedPrefixes = [
 ];
 const splitterRE = /[\s'"`;]+/g;
 const elementRE = /<\w(?=.*>)[\w:\.$-]*\s((?:['"`\{].*?['"`\}]|.*?)*?)>/gs;
-const valuedAttributeRE = /([?]|(?!\d|-{2}|-\d)[a-zA-Z0-9\u00A0-\uFFFF-_:!%-]+)(?:={?(["'])([^\2]*?)\2}?)?/g;
+const valuedAttributeRE = /([?]|(?!\d|-{2}|-\d)[a-zA-Z0-9\u00A0-\uFFFF-_:!%-]+)=?(?:["]([^"]*)["]|[']([^']*)[']|[{]([^}]*)[}])?/gms;
 const defaultIgnoreAttributes = ["placeholder"];
 const extractorAttributify = (options) => {
   const ignoreAttributes = options?.ignoreAttributes ?? defaultIgnoreAttributes;
@@ -123,7 +123,8 @@ const extractorAttributify = (options) => {
   return {
     name: "attributify",
     extract({ code }) {
-      const result = Array.from(code.matchAll(elementRE)).flatMap((match) => Array.from((match[1] || "").matchAll(valuedAttributeRE))).flatMap(([, name, _, content]) => {
+      const result = Array.from(code.matchAll(elementRE)).flatMap((match) => Array.from((match[1] || "").matchAll(valuedAttributeRE))).flatMap(([, name, ...contents]) => {
+        const content = contents.filter(Boolean).join("");
         if (ignoreAttributes.includes(name))
           return [];
         for (const prefix of strippedPrefixes) {
@@ -144,7 +145,8 @@ const extractorAttributify = (options) => {
         if (["class", "className"].includes(name)) {
           return content.split(splitterRE).filter(isValidSelector);
         } else {
-          return content.split(splitterRE).filter(Boolean).map((v) => `[${name}~="${v}"]`);
+          const extractTernary = Array.from(content.matchAll(/(?:[\?:].*?)(["'])([^\1]*?)\1/gms)).map(([, , v]) => v.split(splitterRE)).flat();
+          return (extractTernary.length ? extractTernary : content.split(splitterRE)).filter(Boolean).map((v) => `[${name}~="${v}"]`);
         }
       });
       return new Set(result);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/preset-attributify",
-  "version": "0.46.5",
+  "version": "0.47.0",
   "description": "Attributify preset for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -33,7 +33,7 @@
     "dist"
   ],
   "dependencies": {
-    "@unocss/core": "0.46.5"
+    "@unocss/core": "0.47.0"
   },
   "scripts": {
     "build": "unbuild",