@pandacss/generator 0.17.4 → 0.18.0

package/dist/index.js

@@ -815,9 +815,9 @@ function generateCvaFn(ctx) {
         return mergeCss(variantCss, compoundVariantCss)
       }
 
-      function merge(cvaConfig) {
-        const override = defaults(cvaConfig)
-        const variantKeys = uniq(override.variantKeys, Object.keys(variants))
+      function merge(__cva) {
+        const override = defaults(__cva.config)
+        const variantKeys = uniq(__cva.variantKeys, Object.keys(variants))
         return cva({
           base: mergeCss(base, override.base),
           variants: Object.fromEntries(
@@ -926,7 +926,7 @@ var helpers_mjs_default = {
 
 // src/artifacts/generated/astish.mjs.json
 var astish_mjs_default = {
-  content: '// src/astish.ts\nvar newRule = /(?:([\\u0080-\\uFFFF\\w-%@]+) *:? *([^{;]+?);|([^;}{]*?) *{)|(}\\s*)/g;\nvar ruleClean = /\\/\\*[^]*?\\*\\/|\\s\\s+|\\n/g;\nvar astish = (val, tree = [{}]) => {\n  const block = newRule.exec((val ?? "").replace(ruleClean, ""));\n  if (!block)\n    return tree[0];\n  if (block[4])\n    tree.shift();\n  else if (block[3])\n    tree.unshift(tree[0][block[3]] = tree[0][block[3]] || {});\n  else\n    tree[0][block[1]] = block[2];\n  return astish(val, tree);\n};\nexport {\n  astish\n};\n'
+  content: '// src/astish.ts\nvar newRule = /(?:([\\u0080-\\uFFFF\\w-%@]+) *:? *([^{;]+?);|([^;}{]*?) *{)|(}\\s*)/g;\nvar ruleClean = /\\/\\*[^]*?\\*\\/|  +/g;\nvar ruleNewline = /\\n+/g;\nvar empty = " ";\nvar astish = (val, tree = [{}]) => {\n  if (!val)\n    return tree[0];\n  let block, left;\n  while (block = newRule.exec(val.replace(ruleClean, ""))) {\n    if (block[4])\n      tree.shift();\n    else if (block[3]) {\n      left = block[3].replace(ruleNewline, empty).trim();\n      tree.unshift(tree[0][left] = tree[0][left] || {});\n    } else\n      tree[0][block[1]] = block[2].replace(ruleNewline, empty).trim();\n  }\n  return tree[0];\n};\nexport {\n  astish\n};\n'
 };
 
 // src/artifacts/generated/normalize-html.mjs.json
@@ -979,12 +979,15 @@ function generateIsValidProp(ctx) {
   } else {
     content = ctx.file.import("memo", "../helpers") + "\n" + content;
   }
+  content = ctx.file.import("splitProps", "../helpers") + "\n" + content;
+  content += `export const splitCssProps = /* @__PURE__ */ (props) =>  splitProps(props, isCssProperty)`;
   return {
     js: content,
     dts: import_outdent9.outdent`
     declare const isCssProperty: (value: string) => boolean;
+    declare const splitCssProps: <TProps extends Record<string, unknown>>(props: TProps) => [Pick<TProps, CssProperty>, Omit<TProps, CssProperty>]
 
-    export { isCssProperty };
+    export { isCssProperty, splitCssProps };
     `
   };
 }
@@ -1015,7 +1018,7 @@ function generatedJsxHelpers(ctx) {
     export const composeCvaFn = (cvaA, cvaB) => {
       if (cvaA && !cvaB) return cvaA
       if (!cvaA && cvaB) return cvaB
-      if ((cvaA.__cva__ && cvaB.__cva__) || (cvaA.__recipe__ && cvaB.__recipe__)) return cvaA.merge(cvaB.config)
+      if ((cvaA.__cva__ && cvaB.__cva__) || (cvaA.__recipe__ && cvaB.__recipe__)) return cvaA.merge(cvaB)
       const error = new TypeError('Cannot merge cva with recipe. Please use either cva or recipe.')
       TypeError.captureStackTrace?.(error)
       throw error
@@ -2330,7 +2333,7 @@ function generateSolidJsxFactory(ctx) {
       "defaultShouldForwardProp, composeShouldForwardProps, composeCvaFn, getDisplayName",
       "./factory-helper"
     )}
-    ${ctx.file.import("isCssProperty, allCssProperties", "./is-valid-prop")}
+    ${ctx.file.import("isCssProperty", "./is-valid-prop")}
     ${ctx.file.import("css, cx, cva", "../css/index")}
     ${ctx.file.import("normalizeHTMLProps", "../helpers")}
 
@@ -2355,13 +2358,19 @@ function generateSolidJsxFactory(ctx) {
           Object.keys(props).filter((prop) => !normalizeHTMLProps.keys.includes(prop) && shouldForwardProp(prop)),
         )
 
-        const [localProps, htmlProps, forwardedProps, variantProps, styleProps, elementProps] = splitProps(
+        const [localProps, htmlProps, forwardedProps, restProps] = splitProps(
           mergedProps,
           ['as', 'class', 'className'],
           normalizeHTMLProps.keys,
-          forwardedKeys(),
+          forwardedKeys()
+        )
+
+        const cssPropertyKeys = createMemo(() => Object.keys(restProps).filter((prop) => isCssProperty(prop)))
+
+        const [variantProps, styleProps, elementProps] = splitProps(
+          restProps,
           __cvaFn__.variantKeys,
-          allCssProperties,
+          cssPropertyKeys(),
         )
 
         function recipeClass() {

package/dist/index.mjs

@@ -784,9 +784,9 @@ function generateCvaFn(ctx) {
         return mergeCss(variantCss, compoundVariantCss)
       }
 
-      function merge(cvaConfig) {
-        const override = defaults(cvaConfig)
-        const variantKeys = uniq(override.variantKeys, Object.keys(variants))
+      function merge(__cva) {
+        const override = defaults(__cva.config)
+        const variantKeys = uniq(__cva.variantKeys, Object.keys(variants))
         return cva({
           base: mergeCss(base, override.base),
           variants: Object.fromEntries(
@@ -895,7 +895,7 @@ var helpers_mjs_default = {
 
 // src/artifacts/generated/astish.mjs.json
 var astish_mjs_default = {
-  content: '// src/astish.ts\nvar newRule = /(?:([\\u0080-\\uFFFF\\w-%@]+) *:? *([^{;]+?);|([^;}{]*?) *{)|(}\\s*)/g;\nvar ruleClean = /\\/\\*[^]*?\\*\\/|\\s\\s+|\\n/g;\nvar astish = (val, tree = [{}]) => {\n  const block = newRule.exec((val ?? "").replace(ruleClean, ""));\n  if (!block)\n    return tree[0];\n  if (block[4])\n    tree.shift();\n  else if (block[3])\n    tree.unshift(tree[0][block[3]] = tree[0][block[3]] || {});\n  else\n    tree[0][block[1]] = block[2];\n  return astish(val, tree);\n};\nexport {\n  astish\n};\n'
+  content: '// src/astish.ts\nvar newRule = /(?:([\\u0080-\\uFFFF\\w-%@]+) *:? *([^{;]+?);|([^;}{]*?) *{)|(}\\s*)/g;\nvar ruleClean = /\\/\\*[^]*?\\*\\/|  +/g;\nvar ruleNewline = /\\n+/g;\nvar empty = " ";\nvar astish = (val, tree = [{}]) => {\n  if (!val)\n    return tree[0];\n  let block, left;\n  while (block = newRule.exec(val.replace(ruleClean, ""))) {\n    if (block[4])\n      tree.shift();\n    else if (block[3]) {\n      left = block[3].replace(ruleNewline, empty).trim();\n      tree.unshift(tree[0][left] = tree[0][left] || {});\n    } else\n      tree[0][block[1]] = block[2].replace(ruleNewline, empty).trim();\n  }\n  return tree[0];\n};\nexport {\n  astish\n};\n'
 };
 
 // src/artifacts/generated/normalize-html.mjs.json
@@ -948,12 +948,15 @@ function generateIsValidProp(ctx) {
   } else {
     content = ctx.file.import("memo", "../helpers") + "\n" + content;
   }
+  content = ctx.file.import("splitProps", "../helpers") + "\n" + content;
+  content += `export const splitCssProps = /* @__PURE__ */ (props) =>  splitProps(props, isCssProperty)`;
   return {
     js: content,
     dts: outdent9`
     declare const isCssProperty: (value: string) => boolean;
+    declare const splitCssProps: <TProps extends Record<string, unknown>>(props: TProps) => [Pick<TProps, CssProperty>, Omit<TProps, CssProperty>]
 
-    export { isCssProperty };
+    export { isCssProperty, splitCssProps };
     `
   };
 }
@@ -984,7 +987,7 @@ function generatedJsxHelpers(ctx) {
     export const composeCvaFn = (cvaA, cvaB) => {
       if (cvaA && !cvaB) return cvaA
       if (!cvaA && cvaB) return cvaB
-      if ((cvaA.__cva__ && cvaB.__cva__) || (cvaA.__recipe__ && cvaB.__recipe__)) return cvaA.merge(cvaB.config)
+      if ((cvaA.__cva__ && cvaB.__cva__) || (cvaA.__recipe__ && cvaB.__recipe__)) return cvaA.merge(cvaB)
       const error = new TypeError('Cannot merge cva with recipe. Please use either cva or recipe.')
       TypeError.captureStackTrace?.(error)
       throw error
@@ -2299,7 +2302,7 @@ function generateSolidJsxFactory(ctx) {
       "defaultShouldForwardProp, composeShouldForwardProps, composeCvaFn, getDisplayName",
       "./factory-helper"
     )}
-    ${ctx.file.import("isCssProperty, allCssProperties", "./is-valid-prop")}
+    ${ctx.file.import("isCssProperty", "./is-valid-prop")}
     ${ctx.file.import("css, cx, cva", "../css/index")}
     ${ctx.file.import("normalizeHTMLProps", "../helpers")}
 
@@ -2324,13 +2327,19 @@ function generateSolidJsxFactory(ctx) {
           Object.keys(props).filter((prop) => !normalizeHTMLProps.keys.includes(prop) && shouldForwardProp(prop)),
         )
 
-        const [localProps, htmlProps, forwardedProps, variantProps, styleProps, elementProps] = splitProps(
+        const [localProps, htmlProps, forwardedProps, restProps] = splitProps(
           mergedProps,
           ['as', 'class', 'className'],
           normalizeHTMLProps.keys,
-          forwardedKeys(),
+          forwardedKeys()
+        )
+
+        const cssPropertyKeys = createMemo(() => Object.keys(restProps).filter((prop) => isCssProperty(prop)))
+
+        const [variantProps, styleProps, elementProps] = splitProps(
+          restProps,
           __cvaFn__.variantKeys,
-          allCssProperties,
+          cssPropertyKeys(),
         )
 
         function recipeClass() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pandacss/generator",
-  "version": "0.17.4",
+  "version": "0.18.0",
   "description": "The css generator for css panda",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -32,20 +32,21 @@
     "pluralize": "8.0.0",
     "postcss": "^8.4.31",
     "ts-pattern": "5.0.5",
-    "@pandacss/core": "0.17.4",
-    "@pandacss/is-valid-prop": "0.17.4",
-    "@pandacss/logger": "0.17.4",
-    "@pandacss/shared": "0.17.4",
-    "@pandacss/token-dictionary": "0.17.4",
-    "@pandacss/types": "0.17.4"
+    "@pandacss/core": "0.18.0",
+    "@pandacss/is-valid-prop": "0.18.0",
+    "@pandacss/logger": "0.18.0",
+    "@pandacss/shared": "0.18.0",
+    "@pandacss/token-dictionary": "0.18.0",
+    "@pandacss/types": "0.18.0"
   },
   "devDependencies": {
     "@types/pluralize": "0.0.30",
     "hookable": "5.5.3",
-    "@pandacss/fixture": "0.17.4"
+    "@pandacss/fixture": "0.18.0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format=esm,cjs --dts",
-    "build-fast": "tsup src/index.ts --format=esm,cjs --no-dts"
+    "build-fast": "tsup src/index.ts --format=esm,cjs --no-dts",
+    "dev": "pnpm build-fast --watch"
   }
 }