@pandacss/parser 0.0.0-dev-20230623141647 → 0.0.0-dev-20230625185332

package/dist/index.js

@@ -175,6 +175,8 @@ var createParserResult = () => new ParserResult();
 
 // src/parser.ts
 var isNodeRecipe = (node) => node.type === "recipe";
+var cvaProps = ["compoundVariants", "defaultVariants", "variants", "base"];
+var isCva = (map) => cvaProps.some((prop) => map.has(prop));
 function createImportMatcher(mod, values) {
   const regex = values ? new RegExp(`^(${values.join("|")})$`) : /.*/;
   return {
@@ -188,10 +190,10 @@ function createImportMatcher(mod, values) {
 var combineResult = (unboxed) => {
   return [...unboxed.conditions, unboxed.raw, ...unboxed.spreadConditions];
 };
-var fallback = (box) => ({
+var fallback = (box2) => ({
   value: void 0,
-  getNode: () => box.getNode(),
-  getStack: () => box.getStack()
+  getNode: () => box2.getNode(),
+  getStack: () => box2.getStack()
 });
 var defaultEnv = { preset: "NONE" };
 function createParser(options) {
@@ -222,6 +224,7 @@ function createParser(options) {
     const isValidPattern = imports.createMatch(importMap.pattern);
     const isValidRecipe = imports.createMatch(importMap.recipe);
     const isValidStyleFn = (name) => name === jsx?.factory;
+    const isFactory = (name) => jsx && name.startsWith(jsx.factory);
     const jsxFactoryAlias = jsx ? imports.getAlias(jsx.factory) : "panda";
     const jsxPatternNodes = new RegExp(
       `^(${jsx?.nodes.map((node) => node.type === "pattern" && node.name).join("|")})$`
@@ -309,6 +312,9 @@ function createParser(options) {
           return true;
         }
       },
+      taggedTemplates: {
+        matchTaggedTemplate: (tag) => matchFn(tag.fnName)
+      },
       getEvaluateOptions: (node) => ({ node, environment: defaultEnv }),
       flags: { skipTraverseFiles: true }
     });
@@ -319,48 +325,88 @@ function createParser(options) {
       if (result.kind === "function") {
         (0, import_ts_pattern.match)(name).when(css.match, (name2) => {
           result.queryList.forEach((query) => {
-            collector.set(name2, {
-              name: name2,
-              box: query.box.value[0] ?? fallback(query.box),
-              data: combineResult((0, import_extractor.unbox)(query.box.value[0]))
-            });
+            if (query.kind === "call-expression") {
+              collector.set(name2, {
+                name: name2,
+                box: query.box.value[0] ?? fallback(query.box),
+                data: combineResult((0, import_extractor.unbox)(query.box.value[0]))
+              });
+            } else if (query.kind === "tagged-template") {
+              const obj = (0, import_shared2.astish)(query.box.value);
+              collector.set(name2, {
+                name: name2,
+                box: query.box ?? fallback(query.box),
+                data: [obj]
+              });
+            }
           });
         }).when(isValidPattern, (name2) => {
           result.queryList.forEach((query) => {
-            collector.setPattern(name2, {
-              name: name2,
-              box: query.box.value[0] ?? fallback(query.box),
-              data: combineResult((0, import_extractor.unbox)(query.box.value[0]))
-            });
+            if (query.kind === "call-expression") {
+              collector.setPattern(name2, {
+                name: name2,
+                box: query.box.value[0] ?? fallback(query.box),
+                data: combineResult((0, import_extractor.unbox)(query.box.value[0]))
+              });
+            }
           });
         }).when(isValidRecipe, (name2) => {
           result.queryList.forEach((query) => {
-            collector.setRecipe(name2, {
-              name: name2,
-              box: query.box.value[0] ?? fallback(query.box),
-              data: combineResult((0, import_extractor.unbox)(query.box.value[0]))
-            });
+            if (query.kind === "call-expression") {
+              collector.setRecipe(name2, {
+                name: name2,
+                box: query.box.value[0] ?? fallback(query.box),
+                data: combineResult((0, import_extractor.unbox)(query.box.value[0]))
+              });
+            }
           });
         }).when(isValidStyleFn, () => {
           result.queryList.forEach((query) => {
-            collector.setCva({
-              name,
-              box: query.box.value[1] ?? fallback(query.box),
-              data: combineResult((0, import_extractor.unbox)(query.box.value[1]))
-            });
+            if (query.kind === "call-expression" && query.box.value[1]) {
+              const map = query.box.value[1];
+              const result2 = {
+                name,
+                box: map ?? fallback(query.box),
+                data: combineResult((0, import_extractor.unbox)(map))
+              };
+              if (import_extractor.box.isMap(map) && isCva(map.value)) {
+                collector.setCva(result2);
+              } else {
+                collector.set("css", result2);
+              }
+            } else if (query.kind === "tagged-template") {
+              const obj = (0, import_shared2.astish)(query.box.value);
+              collector.set("css", {
+                name,
+                box: query.box ?? fallback(query.box),
+                data: [obj]
+              });
+            }
           });
-        }).when(
-          (name2) => jsx && name2.startsWith(jsxFactoryAlias),
-          (name2) => {
-            result.queryList.forEach((query) => {
-              collector.setCva({
+        }).when(isFactory, (name2) => {
+          result.queryList.forEach((query) => {
+            if (query.kind === "call-expression") {
+              const map = query.box.value[0];
+              const result2 = {
                 name: name2,
-                box: query.box.value[0] ?? fallback(query.box),
-                data: combineResult((0, import_extractor.unbox)(query.box.value[0]))
+                box: map ?? fallback(query.box),
+                data: combineResult((0, import_extractor.unbox)(map))
+              };
+              if (import_extractor.box.isMap(map) && isCva(map.value)) {
+                collector.setCva(result2);
+              } else {
+                collector.set("css", result2);
+              }
+            } else if (query.kind === "tagged-template") {
+              const obj = (0, import_shared2.astish)(query.box.value);
+              collector.set("css", {
+                name: name2,
+                box: query.box ?? fallback(query.box),
+                data: [obj]
               });
-            });
-          }
-        ).otherwise(() => {
+            }
+          });
+        }).otherwise(() => {
         });
       } else if (result.kind === "component") {
         result.queryList.forEach((query) => {

package/dist/index.mjs

@@ -3,9 +3,9 @@ import { Obj, pipe, tap } from "lil-fp";
 import { Project as TsProject, ScriptKind } from "ts-morph";
 
 // src/parser.ts
-import { extract, unbox } from "@pandacss/extractor";
+import { extract, unbox, box } from "@pandacss/extractor";
 import { logger } from "@pandacss/logger";
-import { memo as memo2 } from "@pandacss/shared";
+import { astish, memo as memo2 } from "@pandacss/shared";
 import { Node } from "ts-morph";
 import { match } from "ts-pattern";
 
@@ -137,6 +137,8 @@ var createParserResult = () => new ParserResult();
 
 // src/parser.ts
 var isNodeRecipe = (node) => node.type === "recipe";
+var cvaProps = ["compoundVariants", "defaultVariants", "variants", "base"];
+var isCva = (map) => cvaProps.some((prop) => map.has(prop));
 function createImportMatcher(mod, values) {
   const regex = values ? new RegExp(`^(${values.join("|")})$`) : /.*/;
   return {
@@ -150,10 +152,10 @@ function createImportMatcher(mod, values) {
 var combineResult = (unboxed) => {
   return [...unboxed.conditions, unboxed.raw, ...unboxed.spreadConditions];
 };
-var fallback = (box) => ({
+var fallback = (box2) => ({
   value: void 0,
-  getNode: () => box.getNode(),
-  getStack: () => box.getStack()
+  getNode: () => box2.getNode(),
+  getStack: () => box2.getStack()
 });
 var defaultEnv = { preset: "NONE" };
 function createParser(options) {
@@ -184,6 +186,7 @@ function createParser(options) {
     const isValidPattern = imports.createMatch(importMap.pattern);
     const isValidRecipe = imports.createMatch(importMap.recipe);
     const isValidStyleFn = (name) => name === jsx?.factory;
+    const isFactory = (name) => jsx && name.startsWith(jsx.factory);
     const jsxFactoryAlias = jsx ? imports.getAlias(jsx.factory) : "panda";
     const jsxPatternNodes = new RegExp(
       `^(${jsx?.nodes.map((node) => node.type === "pattern" && node.name).join("|")})$`
@@ -271,6 +274,9 @@ function createParser(options) {
           return true;
         }
       },
+      taggedTemplates: {
+        matchTaggedTemplate: (tag) => matchFn(tag.fnName)
+      },
       getEvaluateOptions: (node) => ({ node, environment: defaultEnv }),
       flags: { skipTraverseFiles: true }
     });
@@ -281,48 +287,88 @@ function createParser(options) {
       if (result.kind === "function") {
         match(name).when(css.match, (name2) => {
           result.queryList.forEach((query) => {
-            collector.set(name2, {
-              name: name2,
-              box: query.box.value[0] ?? fallback(query.box),
-              data: combineResult(unbox(query.box.value[0]))
-            });
+            if (query.kind === "call-expression") {
+              collector.set(name2, {
+                name: name2,
+                box: query.box.value[0] ?? fallback(query.box),
+                data: combineResult(unbox(query.box.value[0]))
+              });
+            } else if (query.kind === "tagged-template") {
+              const obj = astish(query.box.value);
+              collector.set(name2, {
+                name: name2,
+                box: query.box ?? fallback(query.box),
+                data: [obj]
+              });
+            }
           });
         }).when(isValidPattern, (name2) => {
           result.queryList.forEach((query) => {
-            collector.setPattern(name2, {
-              name: name2,
-              box: query.box.value[0] ?? fallback(query.box),
-              data: combineResult(unbox(query.box.value[0]))
-            });
+            if (query.kind === "call-expression") {
+              collector.setPattern(name2, {
+                name: name2,
+                box: query.box.value[0] ?? fallback(query.box),
+                data: combineResult(unbox(query.box.value[0]))
+              });
+            }
           });
         }).when(isValidRecipe, (name2) => {
           result.queryList.forEach((query) => {
-            collector.setRecipe(name2, {
-              name: name2,
-              box: query.box.value[0] ?? fallback(query.box),
-              data: combineResult(unbox(query.box.value[0]))
-            });
+            if (query.kind === "call-expression") {
+              collector.setRecipe(name2, {
+                name: name2,
+                box: query.box.value[0] ?? fallback(query.box),
+                data: combineResult(unbox(query.box.value[0]))
+              });
+            }
           });
         }).when(isValidStyleFn, () => {
           result.queryList.forEach((query) => {
-            collector.setCva({
-              name,
-              box: query.box.value[1] ?? fallback(query.box),
-              data: combineResult(unbox(query.box.value[1]))
-            });
+            if (query.kind === "call-expression" && query.box.value[1]) {
+              const map = query.box.value[1];
+              const result2 = {
+                name,
+                box: map ?? fallback(query.box),
+                data: combineResult(unbox(map))
+              };
+              if (box.isMap(map) && isCva(map.value)) {
+                collector.setCva(result2);
+              } else {
+                collector.set("css", result2);
+              }
+            } else if (query.kind === "tagged-template") {
+              const obj = astish(query.box.value);
+              collector.set("css", {
+                name,
+                box: query.box ?? fallback(query.box),
+                data: [obj]
+              });
+            }
           });
-        }).when(
-          (name2) => jsx && name2.startsWith(jsxFactoryAlias),
-          (name2) => {
-            result.queryList.forEach((query) => {
-              collector.setCva({
+        }).when(isFactory, (name2) => {
+          result.queryList.forEach((query) => {
+            if (query.kind === "call-expression") {
+              const map = query.box.value[0];
+              const result2 = {
                 name: name2,
-                box: query.box.value[0] ?? fallback(query.box),
-                data: combineResult(unbox(query.box.value[0]))
+                box: map ?? fallback(query.box),
+                data: combineResult(unbox(map))
+              };
+              if (box.isMap(map) && isCva(map.value)) {
+                collector.setCva(result2);
+              } else {
+                collector.set("css", result2);
+              }
+            } else if (query.kind === "tagged-template") {
+              const obj = astish(query.box.value);
+              collector.set("css", {
+                name: name2,
+                box: query.box ?? fallback(query.box),
+                data: [obj]
               });
-            });
-          }
-        ).otherwise(() => {
+            }
+          });
+        }).otherwise(() => {
         });
       } else if (result.kind === "component") {
         result.queryList.forEach((query) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pandacss/parser",
-  "version": "0.0.0-dev-20230623141647",
+  "version": "0.0.0-dev-20230625185332",
   "description": "The static parser for panda css",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -17,16 +17,16 @@
     "svelte": "^3.59.1",
     "ts-morph": "18.0.0",
     "ts-pattern": "4.3.0",
-    "@pandacss/extractor": "0.0.0-dev-20230623141647",
-    "@pandacss/is-valid-prop": "0.0.0-dev-20230623141647",
-    "@pandacss/logger": "0.0.0-dev-20230623141647",
-    "@pandacss/shared": "0.0.0-dev-20230623141647",
-    "@pandacss/types": "0.0.0-dev-20230623141647"
+    "@pandacss/extractor": "0.0.0-dev-20230625185332",
+    "@pandacss/is-valid-prop": "0.0.0-dev-20230625185332",
+    "@pandacss/logger": "0.0.0-dev-20230625185332",
+    "@pandacss/shared": "0.0.0-dev-20230625185332",
+    "@pandacss/types": "0.0.0-dev-20230625185332"
   },
   "devDependencies": {
     "hookable": "5.5.3",
-    "@pandacss/fixture": "0.0.0-dev-20230623141647",
-    "@pandacss/generator": "0.0.0-dev-20230623141647"
+    "@pandacss/fixture": "0.0.0-dev-20230625185332",
+    "@pandacss/generator": "0.0.0-dev-20230625185332"
   },
   "files": [
     "dist"