@teacss/directives 0.3.8 → 0.4.1

package/README.md

@@ -19,7 +19,7 @@ lifecycle; applications should normally select a build integration instead.
 .button {
   @apply p-x:4 p-y:2 rd:2 content:["hello world"];
   color: theme("colors.red.500");
-  background-image: icon("carbon-sun");
+  background-image: icon("lucide-sun");
 }
 
 @screen md {
@@ -35,6 +35,12 @@ lifecycle; applications should normally select a build integration instead.
 `@apply` splits only whitespace outside attached `[]` literal regions, so
 spaces in arbitrary values remain part of one TeaCSS utility.
 
+`@apply` also reads `{a;b}@cond` group syntax, in both the at-rule and
+`--at-apply` forms, like every other class-list surface; a group body may hold
+another group, and the outer condition chain lands after the inner one.
+`theme("key", fallback)` inside an arbitrary value resolves the fallback when
+the key is missing.
+
 Used automatically by the Vite, PostCSS, Rsbuild, Bun, and CLI pipelines.
 When an integration splices a CSS entry, a BOM and native `@charset` remain
 before hoisted `@import` rules.

package/dist/index.js

@@ -1,2 +1,2 @@
-import{a as e,i as t,n,o as r,r as i,s as a,t as o}from"./screen-core-WpBOgdSr.js";import{createGenerator as s,expandVariantGroup as c,isCssId as l,splitClassTokens as u,toArray as d}from"@teacss/core";import{generate as f,parse as p,walk as m}from"css-tree";import{hasIconFn as h,hasThemeFn as g,transformThemeFn as _}from"@teacss/rule-helpers";import{customToTheme as v,diagnoseCustom as y,parseEntry as b,resolveEntryConfig as x,resolvePresets as S,scanTopLevelAtRules as C}from"@teacss/config";import{generateSources as w}from"@teacss/runtime/source-generation";async function T(e,t,n){let r=[],i=[],a=!1;for(let o of t.block.children)if(o.type===`Raw`)await n(o.value,o.loc.start.offset);else{let n=await E(e,t,o);if(!n)continue;r.push(n.consumedRange),i.push(...n.standaloneCss),a||=n.hasInlineUtility}let o=e.code.original,s=t.block.loc.start.offset+1,c=!1;for(let[e,t]of r){if(o.slice(s,e).trim()){c=!0;break}s=t}c||=!!o.slice(s,t.block.loc.end.offset-1).trim(),!a&&!c&&r.length>0&&e.code.remove(t.loc.start.offset,t.loc.end.offset);for(let n of i)e.code.appendLeft(t.loc.end.offset,n)}async function E({code:n,generator:o,applyVariable:s,options:l,filename:d},p,m){let h=n.original,g;if(m.type===`Atrule`&&m.name===`apply`&&m.prelude&&m.prelude.type===`Raw`)g=D(m.prelude.value.trim());else if(m.type===`Declaration`&&s.includes(m.property)&&(m.value.type===`Value`||m.value.type===`Raw`)){let e=h.slice(m.value.loc.start.offset,m.value.loc.end.offset).trim();e=D(e),g=u(e).map(e=>D(e)).join(` `)}if(!g)return;g=O(g),g=_(g,o.config.theme,l.throwOnMissing??!0);let v=await a(u(c(g)),o),y=t(v);if(y.length&&(l.throwOnMissing??!0))throw Error(`${i(y)}${d?` in ${d}`:``}`);let b=e(v,o.parentOrders),x=+(h[m.loc.end.offset]===`;`),S=[m.loc.start.offset,m.loc.end.offset+x];if(!b.length)return n.remove(...S),{consumedRange:S,hasInlineUtility:!1,standaloneCss:[]};let C,w=!1,T=[];for(let e of b)if(e.kind===`top-level`)T.push(e.body);else if(e.kind===`standalone`){if(!C){let e=p.prelude;C={prelude:e,selector:f(e),replacementSelector:n.slice(p.prelude.loc.start.offset,p.prelude.loc.end.offset)}}let t=r(C,e);T.push(t)}else w=!0,n.appendLeft(m.loc.start.offset,e.body);return S[1]=m.loc.end.offset+x,n.remove(...S),{consumedRange:S,hasInlineUtility:w,standaloneCss:T}}function D(e){return e.replace(/^(['"])(.*)\1$/,`$2`)}function O(e){return e.replace(/\/\*[\s\S]*?\*\//g,``)}async function k({code:e,generator:t,options:r},i){let a=await n(t,i,(t,n)=>e.slice(t,n),r.throwOnMissing??!0);a!==void 0&&e.overwrite(i.loc.start.offset,i.loc.end.offset,a)}const A=/(@screen [^{]+).+/g;function j({code:e,generator:t},n){if(n.prelude?.type!==`Raw`)return;let r=o(n.prelude.value,t.config.theme);if(!r)return;let i=n.loc.start.offset,a=e.original.slice(i,n.loc.end.offset);for(let t of a.matchAll(A))e.overwrite(i+t.index,i+t.index+t[1].length,`@media ${r}`)}const M=new Set([`preset`,`source`,`shortcut`,`safelist`]);function N(e){let t=e.original;if(!t.includes(`@`))return;let n=C(t);if(!n.some(e=>e.name===`teacss`&&e.prelude===``&&e.terminator!==`block`))for(let t of n)(M.has(t.name)?t.terminator===`;`:t.name===`custom`&&t.terminator===`block`)&&e.remove(t.start,t.end)}function P(e){return e.includes(`@preset`)||e.includes(`@source`)||e.includes(`@shortcut`)||e.includes(`@safelist`)||e.includes(`@custom`)}async function F(e,t,n,r,i,a){let{applyVariable:o}=n,s=n.varStyle;o===void 0&&(o=s===void 0?[`--at-apply`]:s?[`${s}apply`]:[]),o=d(o||[]);let c=e=>e.includes(`@apply`)||o.some(t=>e.includes(t)),l=i||e.original,u=c(l),f=l.includes(`@screen`),_=g(l)||h(l);if(i===void 0&&P(l)&&N(e),!u&&!_&&!f)return;let v=p(l,{parseCustomProperty:!0,parseAtrulePrelude:!1,positions:!0,filename:r,offset:a});if(v.type!==`StyleSheet`)return;let y=[],b=new WeakSet,x=new WeakSet,S={options:n,applyVariable:o,generator:t,code:e,filename:r,offset:a},C=(i,a)=>F(e,t,n,r,i,a),w=async e=>{for(let t of e.block.children)t.type===`Raw`&&await C(t.value,t.loc.start.offset)};m(v,function(t){if(f&&t.type===`Atrule`&&t.name===`screen`)j(S,t);else if(_&&t.type===`Function`&&(t.name===`theme`||t.name===`icon`))return y.push(k(S,t)),this.skip;else u&&t.type===`Rule`&&c(e.original.slice(t.loc.start.offset,t.loc.end.offset))?(b.add(t),y.push(T(S,t,C))):t.type===`Raw`&&this.rule&&!b.has(this.rule)&&!x.has(this.rule)&&(x.add(this.rule),y.push(w(this.rule)))}),await Promise.all(y)}async function I(e,t){let{base:n,readSources:r,contents:i}=t,a=await x(e,n),o=await s(a.config),c=[],l=[];for(let e of a.config.content?.filesystem??[])e.startsWith(`!`)?l.push(e.slice(1)):c.push(e);let{files:u,sources:d}=i?{files:[],sources:i}:r?await r(c,l):{files:[],sources:[]},f=await w(o,u,d);return{layers:f.getLayers()||``,files:u,unknown:a.unknown,matched:f.matched.size,hasTeacss:a.hasTeacss,hasPreset:!!a.config.presets?.length}}function L(e,t){let n=[],r=[],i=[];for(let a of C(e))a.name===`charset`&&a.terminator===`;`?(n.push(e.slice(a.start,a.end)),i.push({start:a.start,end:a.end,replacement:``})):a.name===`import`&&a.terminator===`;`?(r.push(e.slice(a.start,a.end)),i.push({start:a.start,end:a.end,replacement:``})):(a.name===`preset`||a.name===`source`||a.name===`shortcut`||a.name===`safelist`)&&a.terminator===`;`||a.name===`custom`&&a.terminator===`block`?i.push({start:a.start,end:a.end,replacement:``}):a.name===`teacss`&&a.prelude===``&&a.terminator!==`block`&&i.push({start:a.start,end:a.end,replacement:t});i.sort((e,t)=>e.start-t.start);let a=``,o=0;for(let t of i)a+=e.slice(o,t.start)+t.replacement,o=t.end;a+=e.slice(o);let s=a.startsWith(``)?``:``;s&&(a=a.slice(1));let c=[...n,...r];return s+(c.length?`${c.join(`
-`)}\n`:``)+a}function R(e={}){return{name:`@teacss/directives`,enforce:e.enforce,idFilter:l,transform:(t,n,r)=>F(t,r.generator,e,n)}}export{v as customToTheme,R as default,y as diagnoseCustom,I as generateEntry,b as parseEntry,S as resolvePresets,L as spliceEntry,F as transformDirectives};
+import{a as e,i as t,n,o as r,r as i,s as a,t as o}from"./screen-core-WpBOgdSr.js";import{createGenerator as s,expandClassGroups as c,expandVariantGroup as l,isCssId as u,splitClassTokens as d,toArray as f}from"@teacss/core";import{generate as p,parse as m,walk as h}from"css-tree";import{hasIconFn as g,hasThemeFn as _,transformThemeFn as v}from"@teacss/rule-helpers";import{customToTheme as y,diagnoseCustom as b,parseEntry as x,resolveEntryConfig as S,resolvePresets as C,scanTopLevelAtRules as w}from"@teacss/config";import{generateSources as T}from"@teacss/runtime/source-generation";async function E(e,t,n){let r=[],i=[],a=!1;for(let o of t.block.children)if(o.type===`Raw`)await n(o.value,o.loc.start.offset);else{let n=await D(e,t,o);if(!n)continue;r.push(n.consumedRange),i.push(...n.standaloneCss),a||=n.hasInlineUtility}let o=e.code.original,s=t.block.loc.start.offset+1,c=!1;for(let[e,t]of r){if(o.slice(s,e).trim()){c=!0;break}s=t}c||=!!o.slice(s,t.block.loc.end.offset-1).trim(),!a&&!c&&r.length>0&&e.code.remove(t.loc.start.offset,t.loc.end.offset);for(let n of i)e.code.appendLeft(t.loc.end.offset,n)}async function D({code:n,generator:o,applyVariable:s,options:u,filename:f},m,h){let g=n.original,_,y=h.loc.end.offset;if(h.type===`Atrule`&&h.name===`apply`&&h.prelude&&h.prelude.type===`Raw`)_=k(h.prelude.value.trim());else if(h.type===`Atrule`&&h.name===`apply`&&!h.prelude&&h.block)y=O(g,y),_=g.slice(h.loc.start.offset+6,y).trim();else if(h.type===`Declaration`&&s.includes(h.property)&&(h.value.type===`Value`||h.value.type===`Raw`)){let e=g.slice(h.value.loc.start.offset,h.value.loc.end.offset).trim();e=k(e),_=d(e).map(e=>k(e)).join(` `)}if(!_)return;_=A(_),_=v(_,o.config.theme,u.throwOnMissing??!0);let b=await a(d(l(c(_))),o),x=t(b);if(x.length&&(u.throwOnMissing??!0))throw Error(`${i(x)}${f?` in ${f}`:``}`);let S=e(b,o.parentOrders),C=+(g[y]===`;`),w=[h.loc.start.offset,y+C];if(!S.length)return n.remove(...w),{consumedRange:w,hasInlineUtility:!1,standaloneCss:[]};let T,E=!1,D=[];for(let e of S)if(e.kind===`top-level`)D.push(e.body);else if(e.kind===`standalone`){if(!T){let e=m.prelude;T={prelude:e,selector:p(e),replacementSelector:n.slice(m.prelude.loc.start.offset,m.prelude.loc.end.offset)}}let t=r(T,e);D.push(t)}else E=!0,n.appendLeft(h.loc.start.offset,e.body);return n.remove(...w),{consumedRange:w,hasInlineUtility:E,standaloneCss:D}}function O(e,t){let n=t;for(;e[n]===`@`;){let t=0;for(n++;n<e.length;){let r=e[n];if(r===`[`||r===`(`)t++;else if(r===`]`||r===`)`)t--;else if(t===0&&(/\s/.test(r)||r===`;`||r===`{`||r===`}`))break;n++}}return n}function k(e){return e.replace(/^(['"])(.*)\1$/,`$2`)}function A(e){return e.replace(/\/\*[\s\S]*?\*\//g,``)}async function j({code:e,generator:t,options:r},i){let a=await n(t,i,(t,n)=>e.slice(t,n),r.throwOnMissing??!0);a!==void 0&&e.overwrite(i.loc.start.offset,i.loc.end.offset,a)}const M=/(@screen [^{]+).+/g;function N({code:e,generator:t},n){if(n.prelude?.type!==`Raw`)return;let r=o(n.prelude.value,t.config.theme);if(!r)return;let i=n.loc.start.offset,a=e.original.slice(i,n.loc.end.offset);for(let t of a.matchAll(M))e.overwrite(i+t.index,i+t.index+t[1].length,`@media ${r}`)}const P=new Set([`preset`,`source`,`shortcut`,`safelist`]);function F(e){let t=e.original;if(!t.includes(`@`))return;let n=w(t);if(!n.some(e=>e.name===`teacss`&&e.prelude===``&&e.terminator!==`block`))for(let t of n)(P.has(t.name)?t.terminator===`;`:t.name===`custom`&&t.terminator===`block`)&&e.remove(t.start,t.end)}function I(e){return e.includes(`@preset`)||e.includes(`@source`)||e.includes(`@shortcut`)||e.includes(`@safelist`)||e.includes(`@custom`)}async function L(e,t,n,r,i,a){let{applyVariable:o}=n,s=n.varStyle;o===void 0&&(o=s===void 0?[`--at-apply`]:s?[`${s}apply`]:[]),o=f(o||[]);let c=e=>e.includes(`@apply`)||o.some(t=>e.includes(t)),l=i||e.original,u=c(l),d=l.includes(`@screen`),p=_(l)||g(l);if(i===void 0&&I(l)&&F(e),!u&&!p&&!d)return;let v=m(l,{parseCustomProperty:!0,parseAtrulePrelude:!1,positions:!0,filename:r,offset:a});if(v.type!==`StyleSheet`)return;let y=[],b=new WeakSet,x=new WeakSet,S={options:n,applyVariable:o,generator:t,code:e,filename:r,offset:a},C=(i,a)=>L(e,t,n,r,i,a),w=async e=>{for(let t of e.block.children)t.type===`Raw`&&await C(t.value,t.loc.start.offset)};h(v,function(t){if(d&&t.type===`Atrule`&&t.name===`screen`)N(S,t);else if(p&&t.type===`Function`&&(t.name===`theme`||t.name===`icon`))return y.push(j(S,t)),this.skip;else u&&t.type===`Rule`&&c(e.original.slice(t.loc.start.offset,t.loc.end.offset))?(b.add(t),y.push(E(S,t,C))):t.type===`Raw`&&this.rule&&!b.has(this.rule)&&!x.has(this.rule)&&(x.add(this.rule),y.push(w(this.rule)))}),await Promise.all(y)}async function R(e,t){let{base:n,readSources:r,contents:i}=t,a=await S(e,n),o=await s(a.config),c=[],l=[];for(let e of a.config.content?.filesystem??[])e.startsWith(`!`)?l.push(e.slice(1)):c.push(e);let{files:u,sources:d}=i?{files:[],sources:i}:r?await r(c,l):{files:[],sources:[]},f=await T(o,u,d);return{layers:f.getLayers()||``,files:u,unknown:a.unknown,matched:f.matched.size,hasTeacss:a.hasTeacss,hasPreset:!!a.config.presets?.length}}function z(e,t){let n=[],r=[],i=[];for(let a of w(e))a.name===`charset`&&a.terminator===`;`?(n.push(e.slice(a.start,a.end)),i.push({start:a.start,end:a.end,replacement:``})):a.name===`import`&&a.terminator===`;`?(r.push(e.slice(a.start,a.end)),i.push({start:a.start,end:a.end,replacement:``})):(a.name===`preset`||a.name===`source`||a.name===`shortcut`||a.name===`safelist`)&&a.terminator===`;`||a.name===`custom`&&a.terminator===`block`?i.push({start:a.start,end:a.end,replacement:``}):a.name===`teacss`&&a.prelude===``&&a.terminator!==`block`&&i.push({start:a.start,end:a.end,replacement:t});i.sort((e,t)=>e.start-t.start);let a=``,o=0;for(let t of i)a+=e.slice(o,t.start)+t.replacement,o=t.end;a+=e.slice(o);let s=a.startsWith(``)?``:``;s&&(a=a.slice(1));let c=[...n,...r];return s+(c.length?`${c.join(`
+`)}\n`:``)+a}function B(e={}){return{name:`@teacss/directives`,enforce:e.enforce,idFilter:u,transform:(t,n,r)=>L(t,r.generator,e,n)}}export{y as customToTheme,B as default,b as diagnoseCustom,R as generateEntry,x as parseEntry,C as resolvePresets,z as spliceEntry,L as transformDirectives};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teacss/directives",
-  "version": "0.3.8",
+  "version": "0.4.1",
   "description": "Build-time CSS directive transformer for TeaCSS — @apply, theme(), icon(), and @screen.",
   "homepage": "https://css.teasim.com",
   "funding": "https://github.com/sponsors/billgo",
@@ -23,16 +23,16 @@
     "dev": "tsdown --watch"
   },
   "dependencies": {
-    "@teacss/config": "0.3.8",
-    "@teacss/core": "0.3.8",
-    "@teacss/rule-helpers": "0.3.8",
-    "@teacss/runtime": "0.3.8",
+    "@teacss/config": "0.4.1",
+    "@teacss/core": "0.4.1",
+    "@teacss/rule-helpers": "0.4.1",
+    "@teacss/runtime": "0.4.1",
     "@types/css-tree": "^2.3.11",
     "css-tree": "^3.2.1"
   },
   "devDependencies": {
-    "@teacss/preset-icons": "0.3.8",
-    "@teacss/preset-standard": "0.3.8",
+    "@teacss/preset-icons": "0.4.1",
+    "@teacss/preset-standard": "0.4.1",
     "magic-string": "^1.1.0"
   },
   "engines": {