@pandacss/generator 0.10.0 → 0.11.1

package/dist/index.d.mts

@@ -94,6 +94,10 @@ declare const getEngine: (conf: ConfigResultWithHooks) => {
     conditions: _pandacss_core.Conditions;
     createSheetContext: () => _pandacss_core.StylesheetContext;
     createSheet: (options?: Pick<_pandacss_core.StylesheetOptions, "content"> | undefined) => _pandacss_core.Stylesheet;
+    layers: _pandacss_types.CascadeLayers;
+    isValidLayerRule: (layerRule: string) => boolean;
+    layerString: string;
+    layerNames: string[];
     hooks: _pandacss_types.PandaHookable;
     path: string;
     config: _pandacss_types_dist_shared.UnwrapExtend<_pandacss_types.RequiredBy<_pandacss_types.Config, "outdir" | "cwd" | "include">>;
@@ -320,6 +324,10 @@ declare const createGenerator: (conf: ConfigResultWithHooks) => {
     conditions: _pandacss_core.Conditions;
     createSheetContext: () => _pandacss_core.StylesheetContext;
     createSheet: (options?: Pick<_pandacss_core.StylesheetOptions, "content"> | undefined) => _pandacss_core.Stylesheet;
+    layers: _pandacss_types.CascadeLayers;
+    isValidLayerRule: (layerRule: string) => boolean;
+    layerString: string;
+    layerNames: string[];
     hooks: _pandacss_types.PandaHookable;
     path: string;
     config: _pandacss_types_dist_shared.UnwrapExtend<_pandacss_types.RequiredBy<_pandacss_types.Config, "outdir" | "cwd" | "include">>;

package/dist/index.d.ts

@@ -94,6 +94,10 @@ declare const getEngine: (conf: ConfigResultWithHooks) => {
     conditions: _pandacss_core.Conditions;
     createSheetContext: () => _pandacss_core.StylesheetContext;
     createSheet: (options?: Pick<_pandacss_core.StylesheetOptions, "content"> | undefined) => _pandacss_core.Stylesheet;
+    layers: _pandacss_types.CascadeLayers;
+    isValidLayerRule: (layerRule: string) => boolean;
+    layerString: string;
+    layerNames: string[];
     hooks: _pandacss_types.PandaHookable;
     path: string;
     config: _pandacss_types_dist_shared.UnwrapExtend<_pandacss_types.RequiredBy<_pandacss_types.Config, "outdir" | "cwd" | "include">>;
@@ -320,6 +324,10 @@ declare const createGenerator: (conf: ConfigResultWithHooks) => {
     conditions: _pandacss_core.Conditions;
     createSheetContext: () => _pandacss_core.StylesheetContext;
     createSheet: (options?: Pick<_pandacss_core.StylesheetOptions, "content"> | undefined) => _pandacss_core.Stylesheet;
+    layers: _pandacss_types.CascadeLayers;
+    isValidLayerRule: (layerRule: string) => boolean;
+    layerString: string;
+    layerNames: string[];
     hooks: _pandacss_types.PandaHookable;
     path: string;
     config: _pandacss_types_dist_shared.UnwrapExtend<_pandacss_types.RequiredBy<_pandacss_types.Config, "outdir" | "cwd" | "include">>;

package/dist/index.js

@@ -206,7 +206,7 @@ function generateKeyframeCss(ctx) {
 var css = String.raw;
 function generateResetCss(ctx, scope = "") {
   const selector = scope ? `${scope} ` : "";
-  const output = css`@layer reset {
+  const output = css`@layer ${ctx.layers.reset} {
   ${selector}* {
     margin: 0;
     padding: 0;
@@ -473,7 +473,7 @@ function generateTokenCss(ctx) {
     }
   }
   const css2 = results.join("\n\n");
-  const output = `@layer tokens {
+  const output = `@layer ${ctx.layers.tokens} {
     ${(0, import_core3.prettifyCss)(cleanupSelectors(css2, root))}
   }
   `;
@@ -623,11 +623,7 @@ function generateCssFn(ctx) {
     config: { hash, prefix },
     conditions
   } = ctx;
-  const { separator } = utility;
-  const shorthandsByProp = Array.from(utility.shorthands.entries()).reduce((acc, [shorthand, prop]) => {
-    acc[prop] = shorthand;
-    return acc;
-  }, {});
+  const { separator, getPropShorthands } = utility;
   return {
     dts: import_outdent4.outdent`
     import type { SystemStyleObject } from '../types'
@@ -644,25 +640,39 @@ function generateCssFn(ctx) {
     ${ctx.file.import("sortConditions, finalizeConditions", "./conditions")}
 
     const utilities = "${utility.entries().map(([prop, className]) => {
-      const shorthand = shorthandsByProp[prop];
-      return [prop, shorthand ? [className, shorthand === className ? 1 : shorthand].join("/") : className].join(":");
+      const shorthandList = getPropShorthands(prop);
+      const result = [
+        prop,
+        [
+          className,
+          shorthandList.length ? (
+            // mark shorthand equal to className as 1 to save a few bytes
+            shorthandList.map((shorthand) => shorthand === className ? 1 : shorthand).join("/")
+          ) : null
+        ].filter(Boolean).join("/")
+      ].join(":");
+      return result;
     }).join(",")}"
 
-    const classMap = {}
+    const classNameByProp = new Map()
     ${utility.hasShorthand ? import_outdent4.outdent`
-    const shorthands = {}
+    const shorthands = new Map()
     utilities.split(',').forEach((utility) => {
       const [prop, meta] = utility.split(':')
-      const [className, shorthand] = meta.split('/')
-      classMap[prop] = className
-      if (shorthand) shorthands[shorthand === '1' ? className : shorthand] = prop
+      const [className, ...shorthandList] = meta.split('/')
+      classNameByProp.set(prop, className)
+      if (shorthandList.length) {
+        shorthandList.forEach((shorthand) => {
+          shorthands.set(shorthand === '1' ? className : shorthand, prop)
+        })
+      }
     })
 
-    const resolveShorthand = (prop) => shorthands[prop] || prop
+    const resolveShorthand = (prop) => shorthands.get(prop) || prop
     ` : import_outdent4.outdent`
     utilities.split(',').forEach((utility) => {
       const [prop, className] = utility.split(':')
-      classMap[prop] = className
+      classNameByProp.set(prop, className)
     })
     `}
 
@@ -677,15 +687,21 @@ function generateCssFn(ctx) {
         ${prefix ? "prefix: " + JSON.stringify(prefix) + "," : ""}
         transform: ${utility.hasShorthand ? `(prop, value) => {
               const key = resolveShorthand(prop)
-              const propKey = classMap[key] || hypenateProperty(key)
+              const propKey = classNameByProp.get(key) || hypenateProperty(key)
               return { className: \`\${propKey}${separator}\${withoutSpace(value)}\` }
-            }` : `(key, value) => ({ className: \`\${classMap[key] || hypenateProperty(key)}${separator}\${withoutSpace(value)}\` })`},
+            }` : `(key, value) => ({ className: \`\${classNameByProp.get(key) || hypenateProperty(key)}${separator}\${withoutSpace(value)}\` })`},
         ${utility.hasShorthand ? "hasShorthand: true," : ""}
         resolveShorthand: ${utility.hasShorthand ? "resolveShorthand" : "prop => prop"},
       }
     }
 
-    export const css = createCss(context)
+    const cssFn = createCss(context)
+    export const cssCache = new Map()
+    export const css = (styles) => {
+      const classNames = cssFn(styles)
+      cssCache.set(classNames, styles)
+      return classNames
+    }
     css.raw = (styles) => styles
 
     export const { mergeCss, assignCss } = createMergeCss(context)
@@ -823,23 +839,34 @@ function generateCvaFn(ctx) {
 
 // src/artifacts/js/cx.ts
 var import_outdent7 = __toESM(require("outdent"));
-function generateCx() {
+function generateCx(ctx) {
   return {
     js: import_outdent7.default`
+    ${ctx.file.import("cssCache, css, mergeCss", "./css")}
+
     function cx() {
+      const objs = []
       let str = '',
         i = 0,
         arg
-    
+
       for (; i < arguments.length; ) {
-        if ((arg = arguments[i++]) && typeof arg === 'string') {
-          str && (str += ' ')
-          str += arg
+        arg = arguments[i++]
+        if (!arg || typeof arg !== 'string') continue
+
+        if (cssCache.has(arg)) {
+          objs.push(cssCache.get(arg))
+          continue
         }
+
+        str && (str += ' ')
+        str += arg.toString()
       }
-      return str
+
+      const merged = mergeCss(...objs)
+      return [css(merged), str].join(' ')
     }
-   
+
     export { cx }
   `,
     dts: import_outdent7.default`
@@ -891,14 +918,14 @@ function generateHelpers(ctx) {
 
 // src/artifacts/generated/is-valid-prop.mjs.json
 var is_valid_prop_mjs_default = {
-  content: '// src/index.ts\nvar userGeneratedStr = "";\nvar userGenerated = userGeneratedStr.split(",");\nvar cssPropertiesStr = "WebkitAppearance,WebkitBorderBefore,WebkitBorderBeforeColor,WebkitBorderBeforeStyle,WebkitBorderBeforeWidth,WebkitBoxReflect,WebkitLineClamp,WebkitMask,WebkitMaskAttachment,WebkitMaskClip,WebkitMaskComposite,WebkitMaskImage,WebkitMaskOrigin,WebkitMaskPosition,WebkitMaskPositionX,WebkitMaskPositionY,WebkitMaskRepeat,WebkitMaskRepeatX,WebkitMaskRepeatY,WebkitMaskSize,WebkitOverflowScrolling,WebkitTapHighlightColor,WebkitTextFillColor,WebkitTextStroke,WebkitTextStrokeColor,WebkitTextStrokeWidth,WebkitTouchCallout,WebkitUserModify,accentColor,alignContent,alignItems,alignSelf,alignTracks,all,animation,animationComposition,animationDelay,animationDirection,animationDuration,animationFillMode,animationIterationCount,animationName,animationPlayState,animationTimingFunction,animationTimeline,appearance,aspectRatio,azimuth,backdropFilter,backfaceVisibility,background,backgroundAttachment,backgroundBlendMode,backgroundClip,backgroundColor,backgroundImage,backgroundOrigin,backgroundPosition,backgroundPositionX,backgroundPositionY,backgroundRepeat,backgroundSize,blockOverflow,blockSize,border,borderBlock,borderBlockColor,borderBlockStyle,borderBlockWidth,borderBlockEnd,borderBlockEndColor,borderBlockEndStyle,borderBlockEndWidth,borderBlockStart,borderBlockStartColor,borderBlockStartStyle,borderBlockStartWidth,borderBottom,borderBottomColor,borderBottomLeftRadius,borderBottomRightRadius,borderBottomStyle,borderBottomWidth,borderCollapse,borderColor,borderEndEndRadius,borderEndStartRadius,borderImage,borderImageOutset,borderImageRepeat,borderImageSlice,borderImageSource,borderImageWidth,borderInline,borderInlineEnd,borderInlineColor,borderInlineStyle,borderInlineWidth,borderInlineEndColor,borderInlineEndStyle,borderInlineEndWidth,borderInlineStart,borderInlineStartColor,borderInlineStartStyle,borderInlineStartWidth,borderLeft,borderLeftColor,borderLeftStyle,borderLeftWidth,borderRadius,borderRight,borderRightColor,borderRightStyle,borderRightWidth,borderSpacing,borderStartEndRadius,borderStartStartRadius,borderStyle,borderTop,borderTopColor,borderTopLeftRadius,borderTopRightRadius,borderTopStyle,borderTopWidth,borderWidth,bottom,boxAlign,boxDecorationBreak,boxDirection,boxFlex,boxFlexGroup,boxLines,boxOrdinalGroup,boxOrient,boxPack,boxShadow,boxSizing,breakAfter,breakBefore,breakInside,captionSide,caret,caretColor,caretShape,clear,clip,clipPath,color,colorScheme,columnCount,columnFill,columnGap,columnRule,columnRuleColor,columnRuleStyle,columnRuleWidth,columnSpan,columnWidth,columns,contain,containIntrinsicSize,containIntrinsicBlockSize,containIntrinsicHeight,containIntrinsicInlineSize,containIntrinsicWidth,container,containerName,containerType,content,contentVisibility,counterIncrement,counterReset,counterSet,cursor,direction,display,emptyCells,filter,flex,flexBasis,flexDirection,flexFlow,flexGrow,flexShrink,flexWrap,float,font,fontFamily,fontFeatureSettings,fontKerning,fontLanguageOverride,fontOpticalSizing,fontPalette,fontVariationSettings,fontSize,fontSizeAdjust,fontSmooth,fontStretch,fontStyle,fontSynthesis,fontVariant,fontVariantAlternates,fontVariantCaps,fontVariantEastAsian,fontVariantEmoji,fontVariantLigatures,fontVariantNumeric,fontVariantPosition,fontWeight,forcedColorAdjust,gap,grid,gridArea,gridAutoColumns,gridAutoFlow,gridAutoRows,gridColumn,gridColumnEnd,gridColumnGap,gridColumnStart,gridGap,gridRow,gridRowEnd,gridRowGap,gridRowStart,gridTemplate,gridTemplateAreas,gridTemplateColumns,gridTemplateRows,hangingPunctuation,height,hyphenateCharacter,hyphenateLimitChars,hyphens,imageOrientation,imageRendering,imageResolution,imeMode,initialLetter,initialLetterAlign,inlineSize,inputSecurity,inset,insetBlock,insetBlockEnd,insetBlockStart,insetInline,insetInlineEnd,insetInlineStart,isolation,justifyContent,justifyItems,justifySelf,justifyTracks,left,letterSpacing,lineBreak,lineClamp,lineHeight,lineHeightStep,listStyle,listStyleImage,listStylePosition,listStyleType,margin,marginBlock,marginBlockEnd,marginBlockStart,marginBottom,marginInline,marginInlineEnd,marginInlineStart,marginLeft,marginRight,marginTop,marginTrim,mask,maskBorder,maskBorderMode,maskBorderOutset,maskBorderRepeat,maskBorderSlice,maskBorderSource,maskBorderWidth,maskClip,maskComposite,maskImage,maskMode,maskOrigin,maskPosition,maskRepeat,maskSize,maskType,masonryAutoFlow,mathDepth,mathShift,mathStyle,maxBlockSize,maxHeight,maxInlineSize,maxLines,maxWidth,minBlockSize,minHeight,minInlineSize,minWidth,mixBlendMode,objectFit,objectPosition,offset,offsetAnchor,offsetDistance,offsetPath,offsetPosition,offsetRotate,opacity,order,orphans,outline,outlineColor,outlineOffset,outlineStyle,outlineWidth,overflow,overflowAnchor,overflowBlock,overflowClipBox,overflowClipMargin,overflowInline,overflowWrap,overflowX,overflowY,overscrollBehavior,overscrollBehaviorBlock,overscrollBehaviorInline,overscrollBehaviorX,overscrollBehaviorY,padding,paddingBlock,paddingBlockEnd,paddingBlockStart,paddingBottom,paddingInline,paddingInlineEnd,paddingInlineStart,paddingLeft,paddingRight,paddingTop,page,pageBreakAfter,pageBreakBefore,pageBreakInside,paintOrder,perspective,perspectiveOrigin,placeContent,placeItems,placeSelf,pointerEvents,position,printColorAdjust,quotes,resize,right,rotate,rowGap,rubyAlign,rubyMerge,rubyPosition,scale,scrollbarColor,scrollbarGutter,scrollbarWidth,scrollBehavior,scrollMargin,scrollMarginBlock,scrollMarginBlockStart,scrollMarginBlockEnd,scrollMarginBottom,scrollMarginInline,scrollMarginInlineStart,scrollMarginInlineEnd,scrollMarginLeft,scrollMarginRight,scrollMarginTop,scrollPadding,scrollPaddingBlock,scrollPaddingBlockStart,scrollPaddingBlockEnd,scrollPaddingBottom,scrollPaddingInline,scrollPaddingInlineStart,scrollPaddingInlineEnd,scrollPaddingLeft,scrollPaddingRight,scrollPaddingTop,scrollSnapAlign,scrollSnapCoordinate,scrollSnapDestination,scrollSnapPointsX,scrollSnapPointsY,scrollSnapStop,scrollSnapType,scrollSnapTypeX,scrollSnapTypeY,scrollTimeline,scrollTimelineAxis,scrollTimelineName,shapeImageThreshold,shapeMargin,shapeOutside,tabSize,tableLayout,textAlign,textAlignLast,textCombineUpright,textDecoration,textDecorationColor,textDecorationLine,textDecorationSkip,textDecorationSkipInk,textDecorationStyle,textDecorationThickness,textEmphasis,textEmphasisColor,textEmphasisPosition,textEmphasisStyle,textIndent,textJustify,textOrientation,textOverflow,textRendering,textShadow,textSizeAdjust,textTransform,textUnderlineOffset,textUnderlinePosition,top,touchAction,transform,transformBox,transformOrigin,transformStyle,transition,transitionDelay,transitionDuration,transitionProperty,transitionTimingFunction,translate,unicodeBidi,userSelect,verticalAlign,viewTransitionName,visibility,whiteSpace,widows,width,willChange,wordBreak,wordSpacing,wordWrap,writingMode,zIndex,zoom";\nvar allCssProperties = cssPropertiesStr.split(",").concat(userGenerated);\nvar properties = new Map(allCssProperties.map((prop) => [prop, true]));\nfunction memo(fn) {\n  const cache = /* @__PURE__ */ Object.create(null);\n  return (arg) => {\n    if (cache[arg] === void 0)\n      cache[arg] = fn(arg);\n    return cache[arg];\n  };\n}\nvar selectorRegex = /&|@/;\nvar isCssProperty = /* @__PURE__ */ memo((prop) => {\n  return properties.has(prop) || prop.startsWith("--") || selectorRegex.test(prop);\n});\nexport {\n  allCssProperties,\n  isCssProperty\n};\n'
+  content: '// src/index.ts\nvar userGeneratedStr = "";\nvar userGenerated = userGeneratedStr.split(",");\nvar cssPropertiesStr = "WebkitAppearance,WebkitBorderBefore,WebkitBorderBeforeColor,WebkitBorderBeforeStyle,WebkitBorderBeforeWidth,WebkitBoxReflect,WebkitLineClamp,WebkitMask,WebkitMaskAttachment,WebkitMaskClip,WebkitMaskComposite,WebkitMaskImage,WebkitMaskOrigin,WebkitMaskPosition,WebkitMaskPositionX,WebkitMaskPositionY,WebkitMaskRepeat,WebkitMaskRepeatX,WebkitMaskRepeatY,WebkitMaskSize,WebkitOverflowScrolling,WebkitTapHighlightColor,WebkitTextFillColor,WebkitTextStroke,WebkitTextStrokeColor,WebkitTextStrokeWidth,WebkitTouchCallout,WebkitUserModify,accentColor,alignContent,alignItems,alignSelf,alignTracks,all,animation,animationComposition,animationDelay,animationDirection,animationDuration,animationFillMode,animationIterationCount,animationName,animationPlayState,animationTimingFunction,animationTimeline,appearance,aspectRatio,azimuth,backdropFilter,backfaceVisibility,background,backgroundAttachment,backgroundBlendMode,backgroundClip,backgroundColor,backgroundImage,backgroundOrigin,backgroundPosition,backgroundPositionX,backgroundPositionY,backgroundRepeat,backgroundSize,blockOverflow,blockSize,border,borderBlock,borderBlockColor,borderBlockStyle,borderBlockWidth,borderBlockEnd,borderBlockEndColor,borderBlockEndStyle,borderBlockEndWidth,borderBlockStart,borderBlockStartColor,borderBlockStartStyle,borderBlockStartWidth,borderBottom,borderBottomColor,borderBottomLeftRadius,borderBottomRightRadius,borderBottomStyle,borderBottomWidth,borderCollapse,borderColor,borderEndEndRadius,borderEndStartRadius,borderImage,borderImageOutset,borderImageRepeat,borderImageSlice,borderImageSource,borderImageWidth,borderInline,borderInlineEnd,borderInlineColor,borderInlineStyle,borderInlineWidth,borderInlineEndColor,borderInlineEndStyle,borderInlineEndWidth,borderInlineStart,borderInlineStartColor,borderInlineStartStyle,borderInlineStartWidth,borderLeft,borderLeftColor,borderLeftStyle,borderLeftWidth,borderRadius,borderRight,borderRightColor,borderRightStyle,borderRightWidth,borderSpacing,borderStartEndRadius,borderStartStartRadius,borderStyle,borderTop,borderTopColor,borderTopLeftRadius,borderTopRightRadius,borderTopStyle,borderTopWidth,borderWidth,bottom,boxAlign,boxDecorationBreak,boxDirection,boxFlex,boxFlexGroup,boxLines,boxOrdinalGroup,boxOrient,boxPack,boxShadow,boxSizing,breakAfter,breakBefore,breakInside,captionSide,caret,caretColor,caretShape,clear,clip,clipPath,color,colorScheme,columnCount,columnFill,columnGap,columnRule,columnRuleColor,columnRuleStyle,columnRuleWidth,columnSpan,columnWidth,columns,contain,containIntrinsicSize,containIntrinsicBlockSize,containIntrinsicHeight,containIntrinsicInlineSize,containIntrinsicWidth,container,containerName,containerType,content,contentVisibility,counterIncrement,counterReset,counterSet,cursor,direction,display,emptyCells,filter,flex,flexBasis,flexDirection,flexFlow,flexGrow,flexShrink,flexWrap,float,font,fontFamily,fontFeatureSettings,fontKerning,fontLanguageOverride,fontOpticalSizing,fontPalette,fontVariationSettings,fontSize,fontSizeAdjust,fontSmooth,fontStretch,fontStyle,fontSynthesis,fontVariant,fontVariantAlternates,fontVariantCaps,fontVariantEastAsian,fontVariantEmoji,fontVariantLigatures,fontVariantNumeric,fontVariantPosition,fontWeight,forcedColorAdjust,gap,grid,gridArea,gridAutoColumns,gridAutoFlow,gridAutoRows,gridColumn,gridColumnEnd,gridColumnGap,gridColumnStart,gridGap,gridRow,gridRowEnd,gridRowGap,gridRowStart,gridTemplate,gridTemplateAreas,gridTemplateColumns,gridTemplateRows,hangingPunctuation,height,hyphenateCharacter,hyphenateLimitChars,hyphens,imageOrientation,imageRendering,imageResolution,imeMode,initialLetter,initialLetterAlign,inlineSize,inputSecurity,inset,insetBlock,insetBlockEnd,insetBlockStart,insetInline,insetInlineEnd,insetInlineStart,isolation,justifyContent,justifyItems,justifySelf,justifyTracks,left,letterSpacing,lineBreak,lineClamp,lineHeight,lineHeightStep,listStyle,listStyleImage,listStylePosition,listStyleType,margin,marginBlock,marginBlockEnd,marginBlockStart,marginBottom,marginInline,marginInlineEnd,marginInlineStart,marginLeft,marginRight,marginTop,marginTrim,mask,maskBorder,maskBorderMode,maskBorderOutset,maskBorderRepeat,maskBorderSlice,maskBorderSource,maskBorderWidth,maskClip,maskComposite,maskImage,maskMode,maskOrigin,maskPosition,maskRepeat,maskSize,maskType,masonryAutoFlow,mathDepth,mathShift,mathStyle,maxBlockSize,maxHeight,maxInlineSize,maxLines,maxWidth,minBlockSize,minHeight,minInlineSize,minWidth,mixBlendMode,objectFit,objectPosition,offset,offsetAnchor,offsetDistance,offsetPath,offsetPosition,offsetRotate,opacity,order,orphans,outline,outlineColor,outlineOffset,outlineStyle,outlineWidth,overflow,overflowAnchor,overflowBlock,overflowClipBox,overflowClipMargin,overflowInline,overflowWrap,overflowX,overflowY,overscrollBehavior,overscrollBehaviorBlock,overscrollBehaviorInline,overscrollBehaviorX,overscrollBehaviorY,padding,paddingBlock,paddingBlockEnd,paddingBlockStart,paddingBottom,paddingInline,paddingInlineEnd,paddingInlineStart,paddingLeft,paddingRight,paddingTop,page,pageBreakAfter,pageBreakBefore,pageBreakInside,paintOrder,perspective,perspectiveOrigin,placeContent,placeItems,placeSelf,pointerEvents,position,printColorAdjust,quotes,resize,right,rotate,rowGap,rubyAlign,rubyMerge,rubyPosition,scale,scrollbarColor,scrollbarGutter,scrollbarWidth,scrollBehavior,scrollMargin,scrollMarginBlock,scrollMarginBlockStart,scrollMarginBlockEnd,scrollMarginBottom,scrollMarginInline,scrollMarginInlineStart,scrollMarginInlineEnd,scrollMarginLeft,scrollMarginRight,scrollMarginTop,scrollPadding,scrollPaddingBlock,scrollPaddingBlockStart,scrollPaddingBlockEnd,scrollPaddingBottom,scrollPaddingInline,scrollPaddingInlineStart,scrollPaddingInlineEnd,scrollPaddingLeft,scrollPaddingRight,scrollPaddingTop,scrollSnapAlign,scrollSnapCoordinate,scrollSnapDestination,scrollSnapPointsX,scrollSnapPointsY,scrollSnapStop,scrollSnapType,scrollSnapTypeX,scrollSnapTypeY,scrollTimeline,scrollTimelineAxis,scrollTimelineName,shapeImageThreshold,shapeMargin,shapeOutside,tabSize,tableLayout,textAlign,textAlignLast,textCombineUpright,textDecoration,textDecorationColor,textDecorationLine,textDecorationSkip,textDecorationSkipInk,textDecorationStyle,textDecorationThickness,textEmphasis,textEmphasisColor,textEmphasisPosition,textEmphasisStyle,textIndent,textJustify,textOrientation,textOverflow,textRendering,textShadow,textSizeAdjust,textTransform,textUnderlineOffset,textUnderlinePosition,top,touchAction,transform,transformBox,transformOrigin,transformStyle,transition,transitionDelay,transitionDuration,transitionProperty,transitionTimingFunction,translate,unicodeBidi,userSelect,verticalAlign,viewTransitionName,visibility,whiteSpace,widows,width,willChange,wordBreak,wordSpacing,wordWrap,writingMode,zIndex,zoom,alignmentBaseline,baselineShift,clipRule,colorInterpolation,colorRendering,dominantBaseline,fill,fillOpacity,fillRule,floodColor,floodOpacity,glyphOrientationVertical,lightingColor,marker,markerEnd,markerMid,markerStart,shapeRendering,stopColor,stopOpacity,stroke,strokeDasharray,strokeDashoffset,strokeLinecap,strokeLinejoin,strokeMiterlimit,strokeOpacity,strokeWidth,textAnchor,vectorEffect";\nvar allCssProperties = cssPropertiesStr.split(",").concat(userGenerated);\nvar properties = new Map(allCssProperties.map((prop) => [prop, true]));\nfunction memo(fn) {\n  const cache = /* @__PURE__ */ Object.create(null);\n  return (arg) => {\n    if (cache[arg] === void 0)\n      cache[arg] = fn(arg);\n    return cache[arg];\n  };\n}\nvar cssPropertySelectorRegex = /&|@/;\nvar isCssProperty = /* @__PURE__ */ memo((prop) => {\n  return properties.has(prop) || prop.startsWith("--") || cssPropertySelectorRegex.test(prop);\n});\nexport {\n  allCssProperties,\n  isCssProperty\n};\n'
 };
 
 // src/artifacts/js/is-valid-prop.ts
 var import_outdent9 = require("outdent");
 var import_ts_pattern = require("ts-pattern");
 var cssPropRegex = /var cssPropertiesStr = ".*?";/;
-var memoFnDeclarationRegex = /function memo(.+?)\nvar selectorRegex/s;
+var memoFnDeclarationRegex = /function memo(.+?)\nvar cssPropertySelectorRegex/s;
 function generateIsValidProp(ctx) {
   if (ctx.isTemplateLiteralSyntax)
     return;
@@ -907,7 +934,7 @@ function generateIsValidProp(ctx) {
     'var userGeneratedStr = "";',
     `var userGeneratedStr = "${(0, import_ts_pattern.match)(ctx.jsx.styleProps).with("all", () => Array.from(new Set(ctx.properties)).join(",")).with("minimal", () => "css").with("none", () => "").exhaustive()}"`
   );
-  content = content.replace(memoFnDeclarationRegex, "var selectorRegex");
+  content = content.replace(memoFnDeclarationRegex, "var cssPropertySelectorRegex");
   if (ctx.jsx.styleProps === "minimal" || ctx.jsx.styleProps === "none") {
     content = content.replace("/* @__PURE__ */ memo(", "/* @__PURE__ */ (");
     content = content.replace(cssPropRegex, 'var cssPropertiesStr = "";');
@@ -2990,9 +3017,9 @@ function generatePropTypes(ctx) {
   ${result.join("\n")}
 
   export type PropertyValue<T extends string> = T extends keyof PropertyTypes
-    ? ConditionalValue<PropertyTypes[T]${strictText}>
+    ? ConditionalValue<PropertyTypes[T]${strictText} | (string & {})>
     : T extends keyof CssProperties
-    ? ConditionalValue<CssProperties[T]>
+    ? ConditionalValue<CssProperties[T] | (string & {})>
     : ConditionalValue<string | number>
   `;
 }
@@ -3158,7 +3185,7 @@ function setupSva(ctx) {
   };
 }
 function setupCx(ctx) {
-  const code = generateCx();
+  const code = generateCx(ctx);
   return {
     dir: ctx.paths.css,
     files: [
@@ -3324,7 +3351,7 @@ var generateFlattenedCss = (ctx) => (options) => {
   const { files, resolve } = options;
   const { theme: { keyframes } = {}, preflight, minify, staticCss } = ctx.config;
   const unresolved = [
-    "@layer reset, base, tokens, recipes, utilities;",
+    ctx.layerString,
     preflight && "@import './reset.css';",
     "@import './global.css';",
     staticCss && "@import './static.css';",
@@ -3341,7 +3368,9 @@ var generateFlattenedCss = (ctx) => (options) => {
     ].filter(Boolean).join("\n\n") : unresolved
   });
   sheet.append(...files);
-  return sheet.toCss({ optimize: true, minify });
+  const output = sheet.toCss({ optimize: true, minify });
+  ctx.hooks.callHook("generator:css", "styles.css", output);
+  return output;
 };
 
 // src/artifacts/css/parser-css.ts
@@ -3473,12 +3502,20 @@ var getBaseEngine = (conf) => {
   });
   const compositionContext = { conditions, utility };
   (0, import_core5.assignCompositions)(compositions, compositionContext);
+  const layers = config.layers;
+  const layerNames = Object.values(layers);
+  const isValidLayerRule = (0, import_shared5.memo)((layerRule) => {
+    const names = new Set(layerRule.split(",").map((name) => name.trim()));
+    return names.size >= 5 && layerNames.every((name) => names.has(name));
+  });
+  const layerString = `@layer ${layerNames.join(", ")};`;
   const createSheetContext = () => ({
     root: import_postcss3.default.root(),
     conditions,
     utility,
     hash: hash.className,
-    helpers
+    helpers,
+    layers
   });
   const createSheet = (options) => {
     const sheetContext = createSheetContext();
@@ -3514,7 +3551,12 @@ var getBaseEngine = (conf) => {
     recipes,
     conditions,
     createSheetContext,
-    createSheet
+    createSheet,
+    // cascade layer
+    layers,
+    isValidLayerRule,
+    layerString,
+    layerNames
   };
 };
 
@@ -3623,7 +3665,15 @@ var defaults = (conf) => ({
     outExtension: "mjs",
     shorthands: true,
     syntax: "object-literal",
-    ...conf.config
+    ...conf.config,
+    layers: {
+      reset: "reset",
+      base: "base",
+      tokens: "tokens",
+      recipes: "recipes",
+      utilities: "utilities",
+      ...conf.config.layers
+    }
   }
 });
 var getImportMap = (outdir) => ({

package/dist/index.mjs

@@ -175,7 +175,7 @@ function generateKeyframeCss(ctx) {
 var css = String.raw;
 function generateResetCss(ctx, scope = "") {
   const selector = scope ? `${scope} ` : "";
-  const output = css`@layer reset {
+  const output = css`@layer ${ctx.layers.reset} {
   ${selector}* {
     margin: 0;
     padding: 0;
@@ -442,7 +442,7 @@ function generateTokenCss(ctx) {
     }
   }
   const css2 = results.join("\n\n");
-  const output = `@layer tokens {
+  const output = `@layer ${ctx.layers.tokens} {
     ${prettifyCss(cleanupSelectors(css2, root))}
   }
   `;
@@ -592,11 +592,7 @@ function generateCssFn(ctx) {
     config: { hash, prefix },
     conditions
   } = ctx;
-  const { separator } = utility;
-  const shorthandsByProp = Array.from(utility.shorthands.entries()).reduce((acc, [shorthand, prop]) => {
-    acc[prop] = shorthand;
-    return acc;
-  }, {});
+  const { separator, getPropShorthands } = utility;
   return {
     dts: outdent4`
     import type { SystemStyleObject } from '../types'
@@ -613,25 +609,39 @@ function generateCssFn(ctx) {
     ${ctx.file.import("sortConditions, finalizeConditions", "./conditions")}
 
     const utilities = "${utility.entries().map(([prop, className]) => {
-      const shorthand = shorthandsByProp[prop];
-      return [prop, shorthand ? [className, shorthand === className ? 1 : shorthand].join("/") : className].join(":");
+      const shorthandList = getPropShorthands(prop);
+      const result = [
+        prop,
+        [
+          className,
+          shorthandList.length ? (
+            // mark shorthand equal to className as 1 to save a few bytes
+            shorthandList.map((shorthand) => shorthand === className ? 1 : shorthand).join("/")
+          ) : null
+        ].filter(Boolean).join("/")
+      ].join(":");
+      return result;
     }).join(",")}"
 
-    const classMap = {}
+    const classNameByProp = new Map()
     ${utility.hasShorthand ? outdent4`
-    const shorthands = {}
+    const shorthands = new Map()
     utilities.split(',').forEach((utility) => {
       const [prop, meta] = utility.split(':')
-      const [className, shorthand] = meta.split('/')
-      classMap[prop] = className
-      if (shorthand) shorthands[shorthand === '1' ? className : shorthand] = prop
+      const [className, ...shorthandList] = meta.split('/')
+      classNameByProp.set(prop, className)
+      if (shorthandList.length) {
+        shorthandList.forEach((shorthand) => {
+          shorthands.set(shorthand === '1' ? className : shorthand, prop)
+        })
+      }
     })
 
-    const resolveShorthand = (prop) => shorthands[prop] || prop
+    const resolveShorthand = (prop) => shorthands.get(prop) || prop
     ` : outdent4`
     utilities.split(',').forEach((utility) => {
       const [prop, className] = utility.split(':')
-      classMap[prop] = className
+      classNameByProp.set(prop, className)
     })
     `}
 
@@ -646,15 +656,21 @@ function generateCssFn(ctx) {
         ${prefix ? "prefix: " + JSON.stringify(prefix) + "," : ""}
         transform: ${utility.hasShorthand ? `(prop, value) => {
               const key = resolveShorthand(prop)
-              const propKey = classMap[key] || hypenateProperty(key)
+              const propKey = classNameByProp.get(key) || hypenateProperty(key)
               return { className: \`\${propKey}${separator}\${withoutSpace(value)}\` }
-            }` : `(key, value) => ({ className: \`\${classMap[key] || hypenateProperty(key)}${separator}\${withoutSpace(value)}\` })`},
+            }` : `(key, value) => ({ className: \`\${classNameByProp.get(key) || hypenateProperty(key)}${separator}\${withoutSpace(value)}\` })`},
         ${utility.hasShorthand ? "hasShorthand: true," : ""}
         resolveShorthand: ${utility.hasShorthand ? "resolveShorthand" : "prop => prop"},
       }
     }
 
-    export const css = createCss(context)
+    const cssFn = createCss(context)
+    export const cssCache = new Map()
+    export const css = (styles) => {
+      const classNames = cssFn(styles)
+      cssCache.set(classNames, styles)
+      return classNames
+    }
     css.raw = (styles) => styles
 
     export const { mergeCss, assignCss } = createMergeCss(context)
@@ -792,23 +808,34 @@ function generateCvaFn(ctx) {
 
 // src/artifacts/js/cx.ts
 import outdent7 from "outdent";
-function generateCx() {
+function generateCx(ctx) {
   return {
     js: outdent7`
+    ${ctx.file.import("cssCache, css, mergeCss", "./css")}
+
     function cx() {
+      const objs = []
       let str = '',
         i = 0,
         arg
-    
+
       for (; i < arguments.length; ) {
-        if ((arg = arguments[i++]) && typeof arg === 'string') {
-          str && (str += ' ')
-          str += arg
+        arg = arguments[i++]
+        if (!arg || typeof arg !== 'string') continue
+
+        if (cssCache.has(arg)) {
+          objs.push(cssCache.get(arg))
+          continue
         }
+
+        str && (str += ' ')
+        str += arg.toString()
       }
-      return str
+
+      const merged = mergeCss(...objs)
+      return [css(merged), str].join(' ')
     }
-   
+
     export { cx }
   `,
     dts: outdent7`
@@ -860,14 +887,14 @@ function generateHelpers(ctx) {
 
 // src/artifacts/generated/is-valid-prop.mjs.json
 var is_valid_prop_mjs_default = {
-  content: '// src/index.ts\nvar userGeneratedStr = "";\nvar userGenerated = userGeneratedStr.split(",");\nvar cssPropertiesStr = "WebkitAppearance,WebkitBorderBefore,WebkitBorderBeforeColor,WebkitBorderBeforeStyle,WebkitBorderBeforeWidth,WebkitBoxReflect,WebkitLineClamp,WebkitMask,WebkitMaskAttachment,WebkitMaskClip,WebkitMaskComposite,WebkitMaskImage,WebkitMaskOrigin,WebkitMaskPosition,WebkitMaskPositionX,WebkitMaskPositionY,WebkitMaskRepeat,WebkitMaskRepeatX,WebkitMaskRepeatY,WebkitMaskSize,WebkitOverflowScrolling,WebkitTapHighlightColor,WebkitTextFillColor,WebkitTextStroke,WebkitTextStrokeColor,WebkitTextStrokeWidth,WebkitTouchCallout,WebkitUserModify,accentColor,alignContent,alignItems,alignSelf,alignTracks,all,animation,animationComposition,animationDelay,animationDirection,animationDuration,animationFillMode,animationIterationCount,animationName,animationPlayState,animationTimingFunction,animationTimeline,appearance,aspectRatio,azimuth,backdropFilter,backfaceVisibility,background,backgroundAttachment,backgroundBlendMode,backgroundClip,backgroundColor,backgroundImage,backgroundOrigin,backgroundPosition,backgroundPositionX,backgroundPositionY,backgroundRepeat,backgroundSize,blockOverflow,blockSize,border,borderBlock,borderBlockColor,borderBlockStyle,borderBlockWidth,borderBlockEnd,borderBlockEndColor,borderBlockEndStyle,borderBlockEndWidth,borderBlockStart,borderBlockStartColor,borderBlockStartStyle,borderBlockStartWidth,borderBottom,borderBottomColor,borderBottomLeftRadius,borderBottomRightRadius,borderBottomStyle,borderBottomWidth,borderCollapse,borderColor,borderEndEndRadius,borderEndStartRadius,borderImage,borderImageOutset,borderImageRepeat,borderImageSlice,borderImageSource,borderImageWidth,borderInline,borderInlineEnd,borderInlineColor,borderInlineStyle,borderInlineWidth,borderInlineEndColor,borderInlineEndStyle,borderInlineEndWidth,borderInlineStart,borderInlineStartColor,borderInlineStartStyle,borderInlineStartWidth,borderLeft,borderLeftColor,borderLeftStyle,borderLeftWidth,borderRadius,borderRight,borderRightColor,borderRightStyle,borderRightWidth,borderSpacing,borderStartEndRadius,borderStartStartRadius,borderStyle,borderTop,borderTopColor,borderTopLeftRadius,borderTopRightRadius,borderTopStyle,borderTopWidth,borderWidth,bottom,boxAlign,boxDecorationBreak,boxDirection,boxFlex,boxFlexGroup,boxLines,boxOrdinalGroup,boxOrient,boxPack,boxShadow,boxSizing,breakAfter,breakBefore,breakInside,captionSide,caret,caretColor,caretShape,clear,clip,clipPath,color,colorScheme,columnCount,columnFill,columnGap,columnRule,columnRuleColor,columnRuleStyle,columnRuleWidth,columnSpan,columnWidth,columns,contain,containIntrinsicSize,containIntrinsicBlockSize,containIntrinsicHeight,containIntrinsicInlineSize,containIntrinsicWidth,container,containerName,containerType,content,contentVisibility,counterIncrement,counterReset,counterSet,cursor,direction,display,emptyCells,filter,flex,flexBasis,flexDirection,flexFlow,flexGrow,flexShrink,flexWrap,float,font,fontFamily,fontFeatureSettings,fontKerning,fontLanguageOverride,fontOpticalSizing,fontPalette,fontVariationSettings,fontSize,fontSizeAdjust,fontSmooth,fontStretch,fontStyle,fontSynthesis,fontVariant,fontVariantAlternates,fontVariantCaps,fontVariantEastAsian,fontVariantEmoji,fontVariantLigatures,fontVariantNumeric,fontVariantPosition,fontWeight,forcedColorAdjust,gap,grid,gridArea,gridAutoColumns,gridAutoFlow,gridAutoRows,gridColumn,gridColumnEnd,gridColumnGap,gridColumnStart,gridGap,gridRow,gridRowEnd,gridRowGap,gridRowStart,gridTemplate,gridTemplateAreas,gridTemplateColumns,gridTemplateRows,hangingPunctuation,height,hyphenateCharacter,hyphenateLimitChars,hyphens,imageOrientation,imageRendering,imageResolution,imeMode,initialLetter,initialLetterAlign,inlineSize,inputSecurity,inset,insetBlock,insetBlockEnd,insetBlockStart,insetInline,insetInlineEnd,insetInlineStart,isolation,justifyContent,justifyItems,justifySelf,justifyTracks,left,letterSpacing,lineBreak,lineClamp,lineHeight,lineHeightStep,listStyle,listStyleImage,listStylePosition,listStyleType,margin,marginBlock,marginBlockEnd,marginBlockStart,marginBottom,marginInline,marginInlineEnd,marginInlineStart,marginLeft,marginRight,marginTop,marginTrim,mask,maskBorder,maskBorderMode,maskBorderOutset,maskBorderRepeat,maskBorderSlice,maskBorderSource,maskBorderWidth,maskClip,maskComposite,maskImage,maskMode,maskOrigin,maskPosition,maskRepeat,maskSize,maskType,masonryAutoFlow,mathDepth,mathShift,mathStyle,maxBlockSize,maxHeight,maxInlineSize,maxLines,maxWidth,minBlockSize,minHeight,minInlineSize,minWidth,mixBlendMode,objectFit,objectPosition,offset,offsetAnchor,offsetDistance,offsetPath,offsetPosition,offsetRotate,opacity,order,orphans,outline,outlineColor,outlineOffset,outlineStyle,outlineWidth,overflow,overflowAnchor,overflowBlock,overflowClipBox,overflowClipMargin,overflowInline,overflowWrap,overflowX,overflowY,overscrollBehavior,overscrollBehaviorBlock,overscrollBehaviorInline,overscrollBehaviorX,overscrollBehaviorY,padding,paddingBlock,paddingBlockEnd,paddingBlockStart,paddingBottom,paddingInline,paddingInlineEnd,paddingInlineStart,paddingLeft,paddingRight,paddingTop,page,pageBreakAfter,pageBreakBefore,pageBreakInside,paintOrder,perspective,perspectiveOrigin,placeContent,placeItems,placeSelf,pointerEvents,position,printColorAdjust,quotes,resize,right,rotate,rowGap,rubyAlign,rubyMerge,rubyPosition,scale,scrollbarColor,scrollbarGutter,scrollbarWidth,scrollBehavior,scrollMargin,scrollMarginBlock,scrollMarginBlockStart,scrollMarginBlockEnd,scrollMarginBottom,scrollMarginInline,scrollMarginInlineStart,scrollMarginInlineEnd,scrollMarginLeft,scrollMarginRight,scrollMarginTop,scrollPadding,scrollPaddingBlock,scrollPaddingBlockStart,scrollPaddingBlockEnd,scrollPaddingBottom,scrollPaddingInline,scrollPaddingInlineStart,scrollPaddingInlineEnd,scrollPaddingLeft,scrollPaddingRight,scrollPaddingTop,scrollSnapAlign,scrollSnapCoordinate,scrollSnapDestination,scrollSnapPointsX,scrollSnapPointsY,scrollSnapStop,scrollSnapType,scrollSnapTypeX,scrollSnapTypeY,scrollTimeline,scrollTimelineAxis,scrollTimelineName,shapeImageThreshold,shapeMargin,shapeOutside,tabSize,tableLayout,textAlign,textAlignLast,textCombineUpright,textDecoration,textDecorationColor,textDecorationLine,textDecorationSkip,textDecorationSkipInk,textDecorationStyle,textDecorationThickness,textEmphasis,textEmphasisColor,textEmphasisPosition,textEmphasisStyle,textIndent,textJustify,textOrientation,textOverflow,textRendering,textShadow,textSizeAdjust,textTransform,textUnderlineOffset,textUnderlinePosition,top,touchAction,transform,transformBox,transformOrigin,transformStyle,transition,transitionDelay,transitionDuration,transitionProperty,transitionTimingFunction,translate,unicodeBidi,userSelect,verticalAlign,viewTransitionName,visibility,whiteSpace,widows,width,willChange,wordBreak,wordSpacing,wordWrap,writingMode,zIndex,zoom";\nvar allCssProperties = cssPropertiesStr.split(",").concat(userGenerated);\nvar properties = new Map(allCssProperties.map((prop) => [prop, true]));\nfunction memo(fn) {\n  const cache = /* @__PURE__ */ Object.create(null);\n  return (arg) => {\n    if (cache[arg] === void 0)\n      cache[arg] = fn(arg);\n    return cache[arg];\n  };\n}\nvar selectorRegex = /&|@/;\nvar isCssProperty = /* @__PURE__ */ memo((prop) => {\n  return properties.has(prop) || prop.startsWith("--") || selectorRegex.test(prop);\n});\nexport {\n  allCssProperties,\n  isCssProperty\n};\n'
+  content: '// src/index.ts\nvar userGeneratedStr = "";\nvar userGenerated = userGeneratedStr.split(",");\nvar cssPropertiesStr = "WebkitAppearance,WebkitBorderBefore,WebkitBorderBeforeColor,WebkitBorderBeforeStyle,WebkitBorderBeforeWidth,WebkitBoxReflect,WebkitLineClamp,WebkitMask,WebkitMaskAttachment,WebkitMaskClip,WebkitMaskComposite,WebkitMaskImage,WebkitMaskOrigin,WebkitMaskPosition,WebkitMaskPositionX,WebkitMaskPositionY,WebkitMaskRepeat,WebkitMaskRepeatX,WebkitMaskRepeatY,WebkitMaskSize,WebkitOverflowScrolling,WebkitTapHighlightColor,WebkitTextFillColor,WebkitTextStroke,WebkitTextStrokeColor,WebkitTextStrokeWidth,WebkitTouchCallout,WebkitUserModify,accentColor,alignContent,alignItems,alignSelf,alignTracks,all,animation,animationComposition,animationDelay,animationDirection,animationDuration,animationFillMode,animationIterationCount,animationName,animationPlayState,animationTimingFunction,animationTimeline,appearance,aspectRatio,azimuth,backdropFilter,backfaceVisibility,background,backgroundAttachment,backgroundBlendMode,backgroundClip,backgroundColor,backgroundImage,backgroundOrigin,backgroundPosition,backgroundPositionX,backgroundPositionY,backgroundRepeat,backgroundSize,blockOverflow,blockSize,border,borderBlock,borderBlockColor,borderBlockStyle,borderBlockWidth,borderBlockEnd,borderBlockEndColor,borderBlockEndStyle,borderBlockEndWidth,borderBlockStart,borderBlockStartColor,borderBlockStartStyle,borderBlockStartWidth,borderBottom,borderBottomColor,borderBottomLeftRadius,borderBottomRightRadius,borderBottomStyle,borderBottomWidth,borderCollapse,borderColor,borderEndEndRadius,borderEndStartRadius,borderImage,borderImageOutset,borderImageRepeat,borderImageSlice,borderImageSource,borderImageWidth,borderInline,borderInlineEnd,borderInlineColor,borderInlineStyle,borderInlineWidth,borderInlineEndColor,borderInlineEndStyle,borderInlineEndWidth,borderInlineStart,borderInlineStartColor,borderInlineStartStyle,borderInlineStartWidth,borderLeft,borderLeftColor,borderLeftStyle,borderLeftWidth,borderRadius,borderRight,borderRightColor,borderRightStyle,borderRightWidth,borderSpacing,borderStartEndRadius,borderStartStartRadius,borderStyle,borderTop,borderTopColor,borderTopLeftRadius,borderTopRightRadius,borderTopStyle,borderTopWidth,borderWidth,bottom,boxAlign,boxDecorationBreak,boxDirection,boxFlex,boxFlexGroup,boxLines,boxOrdinalGroup,boxOrient,boxPack,boxShadow,boxSizing,breakAfter,breakBefore,breakInside,captionSide,caret,caretColor,caretShape,clear,clip,clipPath,color,colorScheme,columnCount,columnFill,columnGap,columnRule,columnRuleColor,columnRuleStyle,columnRuleWidth,columnSpan,columnWidth,columns,contain,containIntrinsicSize,containIntrinsicBlockSize,containIntrinsicHeight,containIntrinsicInlineSize,containIntrinsicWidth,container,containerName,containerType,content,contentVisibility,counterIncrement,counterReset,counterSet,cursor,direction,display,emptyCells,filter,flex,flexBasis,flexDirection,flexFlow,flexGrow,flexShrink,flexWrap,float,font,fontFamily,fontFeatureSettings,fontKerning,fontLanguageOverride,fontOpticalSizing,fontPalette,fontVariationSettings,fontSize,fontSizeAdjust,fontSmooth,fontStretch,fontStyle,fontSynthesis,fontVariant,fontVariantAlternates,fontVariantCaps,fontVariantEastAsian,fontVariantEmoji,fontVariantLigatures,fontVariantNumeric,fontVariantPosition,fontWeight,forcedColorAdjust,gap,grid,gridArea,gridAutoColumns,gridAutoFlow,gridAutoRows,gridColumn,gridColumnEnd,gridColumnGap,gridColumnStart,gridGap,gridRow,gridRowEnd,gridRowGap,gridRowStart,gridTemplate,gridTemplateAreas,gridTemplateColumns,gridTemplateRows,hangingPunctuation,height,hyphenateCharacter,hyphenateLimitChars,hyphens,imageOrientation,imageRendering,imageResolution,imeMode,initialLetter,initialLetterAlign,inlineSize,inputSecurity,inset,insetBlock,insetBlockEnd,insetBlockStart,insetInline,insetInlineEnd,insetInlineStart,isolation,justifyContent,justifyItems,justifySelf,justifyTracks,left,letterSpacing,lineBreak,lineClamp,lineHeight,lineHeightStep,listStyle,listStyleImage,listStylePosition,listStyleType,margin,marginBlock,marginBlockEnd,marginBlockStart,marginBottom,marginInline,marginInlineEnd,marginInlineStart,marginLeft,marginRight,marginTop,marginTrim,mask,maskBorder,maskBorderMode,maskBorderOutset,maskBorderRepeat,maskBorderSlice,maskBorderSource,maskBorderWidth,maskClip,maskComposite,maskImage,maskMode,maskOrigin,maskPosition,maskRepeat,maskSize,maskType,masonryAutoFlow,mathDepth,mathShift,mathStyle,maxBlockSize,maxHeight,maxInlineSize,maxLines,maxWidth,minBlockSize,minHeight,minInlineSize,minWidth,mixBlendMode,objectFit,objectPosition,offset,offsetAnchor,offsetDistance,offsetPath,offsetPosition,offsetRotate,opacity,order,orphans,outline,outlineColor,outlineOffset,outlineStyle,outlineWidth,overflow,overflowAnchor,overflowBlock,overflowClipBox,overflowClipMargin,overflowInline,overflowWrap,overflowX,overflowY,overscrollBehavior,overscrollBehaviorBlock,overscrollBehaviorInline,overscrollBehaviorX,overscrollBehaviorY,padding,paddingBlock,paddingBlockEnd,paddingBlockStart,paddingBottom,paddingInline,paddingInlineEnd,paddingInlineStart,paddingLeft,paddingRight,paddingTop,page,pageBreakAfter,pageBreakBefore,pageBreakInside,paintOrder,perspective,perspectiveOrigin,placeContent,placeItems,placeSelf,pointerEvents,position,printColorAdjust,quotes,resize,right,rotate,rowGap,rubyAlign,rubyMerge,rubyPosition,scale,scrollbarColor,scrollbarGutter,scrollbarWidth,scrollBehavior,scrollMargin,scrollMarginBlock,scrollMarginBlockStart,scrollMarginBlockEnd,scrollMarginBottom,scrollMarginInline,scrollMarginInlineStart,scrollMarginInlineEnd,scrollMarginLeft,scrollMarginRight,scrollMarginTop,scrollPadding,scrollPaddingBlock,scrollPaddingBlockStart,scrollPaddingBlockEnd,scrollPaddingBottom,scrollPaddingInline,scrollPaddingInlineStart,scrollPaddingInlineEnd,scrollPaddingLeft,scrollPaddingRight,scrollPaddingTop,scrollSnapAlign,scrollSnapCoordinate,scrollSnapDestination,scrollSnapPointsX,scrollSnapPointsY,scrollSnapStop,scrollSnapType,scrollSnapTypeX,scrollSnapTypeY,scrollTimeline,scrollTimelineAxis,scrollTimelineName,shapeImageThreshold,shapeMargin,shapeOutside,tabSize,tableLayout,textAlign,textAlignLast,textCombineUpright,textDecoration,textDecorationColor,textDecorationLine,textDecorationSkip,textDecorationSkipInk,textDecorationStyle,textDecorationThickness,textEmphasis,textEmphasisColor,textEmphasisPosition,textEmphasisStyle,textIndent,textJustify,textOrientation,textOverflow,textRendering,textShadow,textSizeAdjust,textTransform,textUnderlineOffset,textUnderlinePosition,top,touchAction,transform,transformBox,transformOrigin,transformStyle,transition,transitionDelay,transitionDuration,transitionProperty,transitionTimingFunction,translate,unicodeBidi,userSelect,verticalAlign,viewTransitionName,visibility,whiteSpace,widows,width,willChange,wordBreak,wordSpacing,wordWrap,writingMode,zIndex,zoom,alignmentBaseline,baselineShift,clipRule,colorInterpolation,colorRendering,dominantBaseline,fill,fillOpacity,fillRule,floodColor,floodOpacity,glyphOrientationVertical,lightingColor,marker,markerEnd,markerMid,markerStart,shapeRendering,stopColor,stopOpacity,stroke,strokeDasharray,strokeDashoffset,strokeLinecap,strokeLinejoin,strokeMiterlimit,strokeOpacity,strokeWidth,textAnchor,vectorEffect";\nvar allCssProperties = cssPropertiesStr.split(",").concat(userGenerated);\nvar properties = new Map(allCssProperties.map((prop) => [prop, true]));\nfunction memo(fn) {\n  const cache = /* @__PURE__ */ Object.create(null);\n  return (arg) => {\n    if (cache[arg] === void 0)\n      cache[arg] = fn(arg);\n    return cache[arg];\n  };\n}\nvar cssPropertySelectorRegex = /&|@/;\nvar isCssProperty = /* @__PURE__ */ memo((prop) => {\n  return properties.has(prop) || prop.startsWith("--") || cssPropertySelectorRegex.test(prop);\n});\nexport {\n  allCssProperties,\n  isCssProperty\n};\n'
 };
 
 // src/artifacts/js/is-valid-prop.ts
 import { outdent as outdent9 } from "outdent";
 import { match } from "ts-pattern";
 var cssPropRegex = /var cssPropertiesStr = ".*?";/;
-var memoFnDeclarationRegex = /function memo(.+?)\nvar selectorRegex/s;
+var memoFnDeclarationRegex = /function memo(.+?)\nvar cssPropertySelectorRegex/s;
 function generateIsValidProp(ctx) {
   if (ctx.isTemplateLiteralSyntax)
     return;
@@ -876,7 +903,7 @@ function generateIsValidProp(ctx) {
     'var userGeneratedStr = "";',
     `var userGeneratedStr = "${match(ctx.jsx.styleProps).with("all", () => Array.from(new Set(ctx.properties)).join(",")).with("minimal", () => "css").with("none", () => "").exhaustive()}"`
   );
-  content = content.replace(memoFnDeclarationRegex, "var selectorRegex");
+  content = content.replace(memoFnDeclarationRegex, "var cssPropertySelectorRegex");
   if (ctx.jsx.styleProps === "minimal" || ctx.jsx.styleProps === "none") {
     content = content.replace("/* @__PURE__ */ memo(", "/* @__PURE__ */ (");
     content = content.replace(cssPropRegex, 'var cssPropertiesStr = "";');
@@ -2959,9 +2986,9 @@ function generatePropTypes(ctx) {
   ${result.join("\n")}
 
   export type PropertyValue<T extends string> = T extends keyof PropertyTypes
-    ? ConditionalValue<PropertyTypes[T]${strictText}>
+    ? ConditionalValue<PropertyTypes[T]${strictText} | (string & {})>
     : T extends keyof CssProperties
-    ? ConditionalValue<CssProperties[T]>
+    ? ConditionalValue<CssProperties[T] | (string & {})>
     : ConditionalValue<string | number>
   `;
 }
@@ -3127,7 +3154,7 @@ function setupSva(ctx) {
   };
 }
 function setupCx(ctx) {
-  const code = generateCx();
+  const code = generateCx(ctx);
   return {
     dir: ctx.paths.css,
     files: [
@@ -3293,7 +3320,7 @@ var generateFlattenedCss = (ctx) => (options) => {
   const { files, resolve } = options;
   const { theme: { keyframes } = {}, preflight, minify, staticCss } = ctx.config;
   const unresolved = [
-    "@layer reset, base, tokens, recipes, utilities;",
+    ctx.layerString,
     preflight && "@import './reset.css';",
     "@import './global.css';",
     staticCss && "@import './static.css';",
@@ -3310,7 +3337,9 @@ var generateFlattenedCss = (ctx) => (options) => {
     ].filter(Boolean).join("\n\n") : unresolved
   });
   sheet.append(...files);
-  return sheet.toCss({ optimize: true, minify });
+  const output = sheet.toCss({ optimize: true, minify });
+  ctx.hooks.callHook("generator:css", "styles.css", output);
+  return output;
 };
 
 // src/artifacts/css/parser-css.ts
@@ -3448,12 +3477,20 @@ var getBaseEngine = (conf) => {
   });
   const compositionContext = { conditions, utility };
   assignCompositions(compositions, compositionContext);
+  const layers = config.layers;
+  const layerNames = Object.values(layers);
+  const isValidLayerRule = memo((layerRule) => {
+    const names = new Set(layerRule.split(",").map((name) => name.trim()));
+    return names.size >= 5 && layerNames.every((name) => names.has(name));
+  });
+  const layerString = `@layer ${layerNames.join(", ")};`;
   const createSheetContext = () => ({
     root: postcss3.root(),
     conditions,
     utility,
     hash: hash.className,
-    helpers
+    helpers,
+    layers
   });
   const createSheet = (options) => {
     const sheetContext = createSheetContext();
@@ -3489,7 +3526,12 @@ var getBaseEngine = (conf) => {
     recipes,
     conditions,
     createSheetContext,
-    createSheet
+    createSheet,
+    // cascade layer
+    layers,
+    isValidLayerRule,
+    layerString,
+    layerNames
   };
 };
 
@@ -3598,7 +3640,15 @@ var defaults = (conf) => ({
     outExtension: "mjs",
     shorthands: true,
     syntax: "object-literal",
-    ...conf.config
+    ...conf.config,
+    layers: {
+      reset: "reset",
+      base: "base",
+      tokens: "tokens",
+      recipes: "recipes",
+      utilities: "utilities",
+      ...conf.config.layers
+    }
   }
 });
 var getImportMap = (outdir) => ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pandacss/generator",
-  "version": "0.10.0",
+  "version": "0.11.1",
   "description": "The css generator for css panda",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -20,17 +20,17 @@
     "pluralize": "8.0.0",
     "postcss": "8.4.27",
     "ts-pattern": "5.0.4",
-    "@pandacss/core": "0.10.0",
-    "@pandacss/is-valid-prop": "0.10.0",
-    "@pandacss/logger": "0.10.0",
-    "@pandacss/shared": "0.10.0",
-    "@pandacss/token-dictionary": "0.10.0",
-    "@pandacss/types": "0.10.0"
+    "@pandacss/core": "0.11.1",
+    "@pandacss/is-valid-prop": "0.11.1",
+    "@pandacss/logger": "0.11.1",
+    "@pandacss/shared": "0.11.1",
+    "@pandacss/token-dictionary": "0.11.1",
+    "@pandacss/types": "0.11.1"
   },
   "devDependencies": {
     "@types/pluralize": "0.0.30",
     "hookable": "5.5.3",
-    "@pandacss/fixture": "0.10.0"
+    "@pandacss/fixture": "0.11.1"
   },
   "scripts": {
     "prebuild": "tsx scripts/prebuild.ts",