@unocss/preset-attributify 0.18.0 → 0.20.1

package/dist/index.cjs

@@ -11,11 +11,11 @@ const strippedPrefixes = [
 const splitterRE = /[\s'"`;]+/g;
 const elementRE = /<\w[\w:\.$-]*\s((?:'[\s\S]*?'|"[\s\S]*?"|`[\s\S]*?`|\{[\s\S]*?\}|[\s\S]*?)*?)>/g;
 const valuedAttributeRE = /([?]|(?!\d|-{2}|-\d)[a-zA-Z0-9\u00A0-\uFFFF-_:%-]+)(?:=(["'])([^\2]*?)\2)?/g;
-const extractorAttributify = (options) => ({
+const extractorAttributify = {
   name: "attributify",
-  extract({ code }) {
+  extract({ code, options: { ignoreAttributes, nonValuedAttribute } }) {
     const result = Array.from(code.matchAll(elementRE)).flatMap((match) => Array.from((match[1] || "").matchAll(valuedAttributeRE))).flatMap(([, name, _, content]) => {
-      if (options?.ignoreAttributes?.includes(name))
+      if (ignoreAttributes?.includes(name))
         return [];
       for (const prefix of strippedPrefixes) {
         if (name.startsWith(prefix)) {
@@ -24,7 +24,7 @@ const extractorAttributify = (options) => ({
         }
       }
       if (!content) {
-        if (core.isValidSelector(name) && options?.nonValuedAttribute !== false)
+        if (core.isValidSelector(name) && nonValuedAttribute !== false)
           return [`[${name}=""]`];
         return [];
       }
@@ -36,37 +36,39 @@ const extractorAttributify = (options) => ({
     });
     return new Set(result);
   }
-});
+};
 
 const variantsRE = /^(.+\:\!?)?(.*?)$/;
-const variantAttributify = (options = {}) => {
-  const prefix = options.prefix ?? "un-";
-  return (input) => {
-    const match = core.isAttributifySelector(input);
-    if (!match)
-      return;
-    let name = match[1];
-    if (name.startsWith(prefix))
-      name = name.slice(prefix.length);
-    else if (options.prefixedOnly)
-      return;
-    const content = match[2];
-    const [, variants = "", body = content] = content.match(variantsRE) || [];
-    if (body === "~" || !body)
-      return `${variants}${name}`;
-    else
-      return `${variants}${name}-${body}`;
-  };
+const variantAttributify = (input, { options: { prefix, prefixedOnly } }) => {
+  const match = core.isAttributifySelector(input);
+  if (!match)
+    return;
+  let name = match[1];
+  if (name.startsWith(prefix))
+    name = name.slice(prefix.length);
+  else if (prefixedOnly)
+    return;
+  const content = match[2];
+  const [, variants = "", body = content] = content.match(variantsRE) || [];
+  if (body === "~" || !body)
+    return `${variants}${name}`;
+  else
+    return `${variants}${name}-${body}`;
 };
 
-const preset = (options) => {
+const preset = (options = {}) => {
+  options.strict = options.strict ?? false;
+  options.prefix = options.prefix ?? "un-";
+  options.prefixedOnly = options.prefixedOnly ?? false;
+  options.nonValuedAttribute = options.nonValuedAttribute ?? true;
+  options.ignoreAttributes = options.ignoreAttributes ?? [];
   const variants = [
-    variantAttributify(options)
+    variantAttributify
   ];
   const extractors = [
-    extractorAttributify(options)
+    extractorAttributify
   ];
-  if (!options?.strict)
+  if (!options.strict)
     extractors.unshift(core.extractorSplit);
   return {
     name: "@unocss/preset-attributify",

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import { Extractor, VariantFunction, Preset } from '@unocss/core';
+import { PresetOptions, Extractor, VariantFunction, Preset } from '@unocss/core';
 
-interface AttributifyOptions {
+interface AttributifyOptions extends PresetOptions {
     /**
      * Only generate CSS for attributify or class
      *
@@ -34,10 +34,10 @@ interface AttributifyOptions {
     ignoreAttributes?: string[];
 }
 
-declare const extractorAttributify: (options?: AttributifyOptions | undefined) => Extractor;
+declare const extractorAttributify: Extractor;
 
-declare const variantAttributify: (options?: AttributifyOptions) => VariantFunction;
+declare const variantAttributify: VariantFunction;
 
-declare const preset: (options?: AttributifyOptions | undefined) => Preset;
+declare const preset: (options?: AttributifyOptions) => Preset;
 
 export { AttributifyOptions, preset as default, extractorAttributify, variantAttributify };

package/dist/index.mjs

@@ -7,11 +7,11 @@ const strippedPrefixes = [
 const splitterRE = /[\s'"`;]+/g;
 const elementRE = /<\w[\w:\.$-]*\s((?:'[\s\S]*?'|"[\s\S]*?"|`[\s\S]*?`|\{[\s\S]*?\}|[\s\S]*?)*?)>/g;
 const valuedAttributeRE = /([?]|(?!\d|-{2}|-\d)[a-zA-Z0-9\u00A0-\uFFFF-_:%-]+)(?:=(["'])([^\2]*?)\2)?/g;
-const extractorAttributify = (options) => ({
+const extractorAttributify = {
   name: "attributify",
-  extract({ code }) {
+  extract({ code, options: { ignoreAttributes, nonValuedAttribute } }) {
     const result = Array.from(code.matchAll(elementRE)).flatMap((match) => Array.from((match[1] || "").matchAll(valuedAttributeRE))).flatMap(([, name, _, content]) => {
-      if (options?.ignoreAttributes?.includes(name))
+      if (ignoreAttributes?.includes(name))
         return [];
       for (const prefix of strippedPrefixes) {
         if (name.startsWith(prefix)) {
@@ -20,7 +20,7 @@ const extractorAttributify = (options) => ({
         }
       }
       if (!content) {
-        if (isValidSelector(name) && options?.nonValuedAttribute !== false)
+        if (isValidSelector(name) && nonValuedAttribute !== false)
           return [`[${name}=""]`];
         return [];
       }
@@ -32,37 +32,39 @@ const extractorAttributify = (options) => ({
     });
     return new Set(result);
   }
-});
+};
 
 const variantsRE = /^(.+\:\!?)?(.*?)$/;
-const variantAttributify = (options = {}) => {
-  const prefix = options.prefix ?? "un-";
-  return (input) => {
-    const match = isAttributifySelector(input);
-    if (!match)
-      return;
-    let name = match[1];
-    if (name.startsWith(prefix))
-      name = name.slice(prefix.length);
-    else if (options.prefixedOnly)
-      return;
-    const content = match[2];
-    const [, variants = "", body = content] = content.match(variantsRE) || [];
-    if (body === "~" || !body)
-      return `${variants}${name}`;
-    else
-      return `${variants}${name}-${body}`;
-  };
+const variantAttributify = (input, { options: { prefix, prefixedOnly } }) => {
+  const match = isAttributifySelector(input);
+  if (!match)
+    return;
+  let name = match[1];
+  if (name.startsWith(prefix))
+    name = name.slice(prefix.length);
+  else if (prefixedOnly)
+    return;
+  const content = match[2];
+  const [, variants = "", body = content] = content.match(variantsRE) || [];
+  if (body === "~" || !body)
+    return `${variants}${name}`;
+  else
+    return `${variants}${name}-${body}`;
 };
 
-const preset = (options) => {
+const preset = (options = {}) => {
+  options.strict = options.strict ?? false;
+  options.prefix = options.prefix ?? "un-";
+  options.prefixedOnly = options.prefixedOnly ?? false;
+  options.nonValuedAttribute = options.nonValuedAttribute ?? true;
+  options.ignoreAttributes = options.ignoreAttributes ?? [];
   const variants = [
-    variantAttributify(options)
+    variantAttributify
   ];
   const extractors = [
-    extractorAttributify(options)
+    extractorAttributify
   ];
-  if (!options?.strict)
+  if (!options.strict)
     extractors.unshift(extractorSplit);
   return {
     name: "@unocss/preset-attributify",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/preset-attributify",
-  "version": "0.18.0",
+  "version": "0.20.1",
   "description": "Attributify preset for UnoCSS",
   "keywords": [
     "unocss",
@@ -33,7 +33,7 @@
     "dist"
   ],
   "dependencies": {
-    "@unocss/core": "0.18.0"
+    "@unocss/core": "0.20.1"
   },
   "scripts": {
     "build": "unbuild",