@pandacss/language-server 0.0.0-dev-20230927132629 → 0.0.0-dev-20230927144111

package/dist/index.js

@@ -31684,7 +31684,15 @@ transform`)}
    ${r.file.import("compact, createCss, withoutSpace","../helpers")}
 
    export const createRecipe = (name, defaultVariants, compoundVariants) => {
-     return (variants) => {
+    const getRecipeStyles = (variants) => {
+      return {
+        [name]: '__ignore__',
+        ...defaultVariants,
+        ...compact(variants),
+      };
+    };
+
+     const recipeFn = (variants, withCompoundVariants = true) => {
       const transform = (prop, value) => {
         assertCompoundVariant(name, compoundVariants, variants, prop)
 
@@ -31704,16 +31712,21 @@ transform`)}
         }
       })
 
-      const recipeStyles = {
-        [name]: '__ignore__',
-        ...defaultVariants,
-        ...compact(variants),
-      }
+      const recipeStyles = getRecipeStyles(variants)
 
-      const compoundVariantStyles = getCompoundVariantCss(compoundVariants, recipeStyles)
+      if (withCompoundVariants) {
+        const compoundVariantStyles = getCompoundVariantCss(compoundVariants, recipeStyles)
+        return cx(recipeCss(recipeStyles), css(compoundVariantStyles))
+      }
 
-      return cx(recipeCss(recipeStyles), css(compoundVariantStyles))
+      return recipeCss(recipeStyles)
      }
+
+      return Object.assign(recipeFn, {
+        __getCompoundVariantCss__: (variants) => {
+          return getCompoundVariantCss(compoundVariants, getRecipeStyles(variants));
+        },
+      })
    }
   `},...r.recipes.details.map(h=>{let{baseName:b,config:x,upperName:w,variantKeyMap:L,dashName:q}=h,{description:te,defaultVariants:me,compoundVariants:Ee}=x,ke=Sg(x).when(aRe,Ue=>pf`
         ${r.file.import("splitProps, getSlotCompoundVariant","../helpers")}
@@ -31851,7 +31864,7 @@ transform`)}
     import { h } from 'preact'
     import { forwardRef } from 'preact/compat'
     import { useMemo } from 'preact/hooks'
-    ${r.file.import("css, cx, cva, assignCss","../css/index")}
+    ${r.file.import("css, cx, cva","../css/index")}
     ${r.file.import("splitProps, normalizeHTMLProps","../helpers")}
     ${r.file.import("isCssProperty","./is-valid-prop")}
 
@@ -31867,15 +31880,14 @@ transform`)}
 
         function recipeClass() {
           const { css: cssStyles, ...propStyles } = styleProps
-          const styles = assignCss(propStyles, cssStyles)
-          return cx(cvaFn(variantProps), css(styles), elementProps.className, elementProps.class)
+          const compoundVariantStyles = cvaFn.__getCompoundVariantCss__?.(variantProps);
+          return cx(cvaFn(variantProps, false), css(compoundVariantStyles, propStyles, cssStyles), elementProps.className, elementProps.class)
         }
 
         function cvaClass() {
           const { css: cssStyles, ...propStyles } = styleProps
           const cvaStyles = cvaFn.raw(variantProps)
-          const styles = assignCss(cvaStyles, propStyles, cssStyles)
-          return cx(css(styles), elementProps.className, elementProps.class)
+          return cx(css(cvaStyles, propStyles, cssStyles), elementProps.className, elementProps.class)
         }
 
         const classes = configOrCva.__recipe__ ? recipeClass : cvaClass
@@ -32037,7 +32049,7 @@ export type ${u} = JsxFactory ${i==="none"?"":"& JsxElements"}
 export type ${d}<T extends ElementType> = ComponentProps<T>
   `}}function B0r(r){let{factoryName:e,componentName:i}=r.jsx;return{js:pf`
     import { h } from '@builder.io/qwik'
-    ${r.file.import("css, cx, cva, assignCss","../css/index")}
+    ${r.file.import("css, cx, cva","../css/index")}
     ${r.file.import("splitProps, normalizeHTMLProps","../helpers")}
     ${r.file.import("isCssProperty","./is-valid-prop")}
 
@@ -32053,14 +32065,13 @@ export type ${d}<T extends ElementType> = ComponentProps<T>
         const { css: cssStyles, ...propStyles } = styleProps
 
         function recipeClass() {
-          const styles = assignCss(propStyles, cssStyles)
-          return cx(cvaFn(variantProps), css(styles), elementProps.class)
+          const compoundVariantStyles = cvaFn.__getCompoundVariantCss__?.(variantProps);
+          return cx(cvaFn(variantProps, false), css(compoundVariantStyles, propStyles, cssStyles), elementProps.class)
         }
 
         function cvaClass() {
           const cvaStyles = cvaFn.raw(variantProps)
-          const styles = assignCss(cvaStyles, propStyles, cssStyles)
-          return cx(css(styles), elementProps.class)
+          return cx(css(cvaStyles, propStyles, cssStyles), elementProps.class)
         }
 
         const classes = configOrCva.__recipe__ ? recipeClass : cvaClass
@@ -32228,7 +32239,7 @@ export type ${u} = JsxFactory ${i==="none"?"":"& JsxElements"}
 export type ${d}<T extends ElementType> = ComponentProps<T>
   `}}function b0r(r){let{factoryName:e,componentName:i}=r.jsx;return{js:pf`
     import { createElement, forwardRef, useMemo } from 'react'
-    ${r.file.import("css, cx, cva, assignCss","../css/index")}
+    ${r.file.import("css, cx, cva","../css/index")}
     ${r.file.import("splitProps, normalizeHTMLProps","../helpers")}
     ${r.jsx.styleProps==="all"?r.file.import("isCssProperty","./is-valid-prop"):""}
 
@@ -32245,41 +32256,40 @@ export type ${d}<T extends ElementType> = ComponentProps<T>
 
           function recipeClass() {
             const { css: cssStyles, ...propStyles } = styleProps
-            const styles = assignCss(propStyles, cssStyles)
-            return cx(cvaFn(variantProps), css(styles), elementProps.className)
+            const compoundVariantStyles = cvaFn.__getCompoundVariantCss__?.(variantProps);
+            return cx(cvaFn(variantProps, false), css(compoundVariantStyles, propStyles, cssStyles), elementProps.className)
           }
 
           function cvaClass() {
             const { css: cssStyles, ...propStyles } = styleProps
             const cvaStyles = cvaFn.raw(variantProps)
-            const styles = assignCss(cvaStyles, propStyles, cssStyles)
-            return cx(css(styles), elementProps.className)
+            return cx(css(cvaStyles, propStyles, cssStyles), elementProps.className)
           }`).with("minimal",()=>pf`
           const [variantProps, htmlProps, elementProps] = useMemo(() => {
             return splitProps(restProps, cvaFn.variantKeys, normalizeHTMLProps.keys)
           }, [restProps])
 
           function recipeClass() {
-            return cx(cvaFn(variantProps), css(assignCss(elementProps.css)), elementProps.className)
+            const compoundVariantStyles = cvaFn.__getCompoundVariantCss__?.(variantProps);
+            return cx(cvaFn(variantProps, false), css(compoundVariantStyles, elementProps.css), elementProps.className)
           }
 
           function cvaClass() {
             const cvaStyles = cvaFn.raw(variantProps)
-            const styles = assignCss(cvaStyles, elementProps.css)
-            return cx(css(styles), elementProps.className)
+            return cx(css(cvaStyles, elementProps.css), elementProps.className)
           }`).with("none",()=>pf`
           const [variantProps, htmlProps, elementProps] = useMemo(() => {
             return splitProps(restProps, cvaFn.variantKeys, normalizeHTMLProps.keys)
           }, [restProps])
 
           function recipeClass() {
-            return cx(cvaFn(variantProps), elementProps.className)
+            const compoundVariantStyles = cvaFn.__getCompoundVariantCss__?.(variantProps);
+            return cx(cvaFn(variantProps, false), elementProps.className)
           }
 
           function cvaClass() {
             const cvaStyles = cvaFn.raw(variantProps)
-            const styles = assignCss(cvaStyles)
-            return cx(css(styles), elementProps.className)
+            return cx(css(cvaStyles), elementProps.className)
           }`).run()}
 
 
@@ -32469,15 +32479,13 @@ export type ${d}<T extends ElementType> = ComponentProps<T>
 
         function recipeClass() {
           const { css: cssStyles, ...propStyles } = styleProps
-          const styles = assignCss(propStyles, cssStyles)
-          return cx(cvaFn(variantProps), css(styles), localProps.class)
+          return cx(cvaFn(variantProps, false), css(compoundVariantStyles, propStyles, cssStyles), localProps.class)
         }
 
         function cvaClass() {
           const { css: cssStyles, ...propStyles } = styleProps
           const cvaStyles = cvaFn.raw(variantProps)
-          const styles = assignCss(cvaStyles, propStyles, cssStyles)
-          return cx(css(styles), localProps.class)
+          return cx(css(cvaStyles, propStyles, cssStyles), localProps.class)
         }
 
         const classes = configOrCva.__recipe__ ? recipeClass : cvaClass
@@ -32669,15 +32677,14 @@ export type ${d}<T extends ElementType> = ComponentProps<T>
           const recipeClass = computed(() => {
             const [variantProps, styleProps, _htmlProps, elementProps] = splittedProps.value
             const { css: cssStyles, ...propStyles } = styleProps
-            const styles = assignCss(propStyles, cssStyles)
-            return cx(cvaFn(variantProps), css(styles), elementProps.className)
+            const compoundVariantStyles = cvaFn.__getCompoundVariantCss__?.(variantProps);
+            return cx(cvaFn(variantProps, false), css(compoundVariantStyles, propStyles, cssStyles), elementProps.className)
           })
 
           const cvaClass = computed(() => {
             const [variantProps, styleProps, _htmlProps, elementProps] = splittedProps.value
             const { css: cssStyles, ...propStyles } = styleProps
-            const styles = assignCss(propStyles, cssStyles)
-            return cx(cvaFn(variantProps), css(styles), elementProps.className)
+            return cx(cvaFn(variantProps), css(propStyles, cssStyles), elementProps.className)
           })
 
           const classes = configOrCva.__recipe__ ? recipeClass : cvaClass
@@ -53839,11 +53846,13 @@ export interface RecipeRuntimeFn<T extends RecipeVariantRecord> extends RecipeVa
   ): [RecipeSelection<T>, Pretty<DistributiveOmit<Props, keyof T>>]
 }
 
-export type RecipeCompoundSelection<T extends RecipeVariantRecord> = {
-  [K in keyof T]?: StringToBoolean<keyof T[K]> | Array<StringToBoolean<keyof T[K]>>
+type OneOrMore<T> = T | Array<T>
+
+export type RecipeCompoundSelection<T> = {
+  [K in keyof T]?: OneOrMore<StringToBoolean<keyof T[K]>>
 }
 
-export type RecipeCompoundVariant<T extends RecipeVariantRecord> = RecipeCompoundSelection<T> & {
+export type RecipeCompoundVariant<T> = T & {
   css: SystemStyleObject
 }
 
@@ -53855,7 +53864,7 @@ export interface RecipeDefinition<T extends RecipeVariantRecord> {
   /**
    * The multi-variant styles of the recipe.
    */
-  variants?: T | RecipeVariantRecord
+  variants?: T
   /**
    * The default variants of the recipe.
    */
@@ -53863,7 +53872,7 @@ export interface RecipeDefinition<T extends RecipeVariantRecord> {
   /**
    * The styles to apply when a combination of variants is selected.
    */
-  compoundVariants?: Array<RecipeCompoundVariant<T>>
+  compoundVariants?: Pretty<RecipeCompoundVariant<RecipeCompoundSelection<T>>>[]
 }
 
 export type RecipeCreatorFn = <T extends RecipeVariantRecord>(config: RecipeDefinition<T>) => RecipeRuntimeFn<T>
@@ -53910,7 +53919,7 @@ export interface SlotRecipeRuntimeFn<S extends string, T extends SlotRecipeVaria
   splitVariantProps<Props extends RecipeSelection<T>>(props: Props): [RecipeSelection<T>, Pretty<Omit<Props, keyof T>>]
 }
 
-export type SlotRecipeCompoundVariant<S extends string, T extends RecipeVariantRecord> = RecipeCompoundSelection<T> & {
+export type SlotRecipeCompoundVariant<S extends string, T> = T & {
   css: SlotRecord<S, SystemStyleObject>
 }
 
@@ -53926,7 +53935,7 @@ export interface SlotRecipeDefinition<S extends string, T extends SlotRecipeVari
   /**
    * The multi-variant styles of the recipe.
    */
-  variants?: T | SlotRecipeVariantRecord<S>
+  variants?: T
   /**
    * The default variants of the recipe.
    */
@@ -53934,7 +53943,7 @@ export interface SlotRecipeDefinition<S extends string, T extends SlotRecipeVari
   /**
    * The styles to apply when a combination of variants is selected.
    */
-  compoundVariants?: Array<SlotRecipeCompoundVariant<S, T>>
+  compoundVariants?: Pretty<SlotRecipeCompoundVariant<S, RecipeCompoundSelection<T>>>[]
 }
 
 export type SlotRecipeCreatorFn = <S extends string, T extends SlotRecipeVariantRecord<S>>(

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pandacss/language-server",
   "displayName": "Panda CSS",
   "description": "🐼 The official Panda language server",
-  "version": "0.0.0-dev-20230927132629",
+  "version": "0.0.0-dev-20230927144111",
   "main": "dist/index.js",
   "repository": {
     "url": "https://github.com/chakra-ui/panda",
@@ -32,14 +32,14 @@
     "vscode-languageserver": "^8.1.0",
     "vscode-languageserver-textdocument": "^1.0.8",
     "vscode-uri": "^3.0.7",
-    "@pandacss/core": "0.0.0-dev-20230927132629",
-    "@pandacss/extension-shared": "0.0.0-dev-20230927132629",
-    "@pandacss/extractor": "0.0.0-dev-20230927132629",
-    "@pandacss/node": "0.0.0-dev-20230927132629",
-    "@pandacss/parser": "0.0.0-dev-20230927132629",
-    "@pandacss/shared": "0.0.0-dev-20230927132629",
-    "@pandacss/token-dictionary": "0.0.0-dev-20230927132629",
-    "@pandacss/types": "0.0.0-dev-20230927132629"
+    "@pandacss/core": "0.0.0-dev-20230927144111",
+    "@pandacss/extension-shared": "0.0.0-dev-20230927144111",
+    "@pandacss/extractor": "0.0.0-dev-20230927144111",
+    "@pandacss/node": "0.0.0-dev-20230927144111",
+    "@pandacss/parser": "0.0.0-dev-20230927144111",
+    "@pandacss/shared": "0.0.0-dev-20230927144111",
+    "@pandacss/token-dictionary": "0.0.0-dev-20230927144111",
+    "@pandacss/types": "0.0.0-dev-20230927144111"
   },
   "dependencies": {
     "fast-glob": "^3.3.1"