@pandacss/parser 0.7.0 → 0.8.0

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import * as ts_morph from 'ts-morph';
 import { ProjectOptions as ProjectOptions$1 } from 'ts-morph';
-import { ResultItem, RecipeConfig, PandaHookable } from '@pandacss/types';
+import { ResultItem, RecipeConfig, ConfigTsOptions, Runtime, PandaHookable } from '@pandacss/types';
 
 declare class ParserResult {
     jsx: Set<ResultItem>;
@@ -48,21 +48,25 @@ type ParserRecipeNode = {
 };
 type ParserNodeOptions = ParserPatternNode | ParserRecipeNode;
 type ParserOptions = {
-    importMap: Record<'css' | 'recipe' | 'pattern' | 'jsx', string>;
+    importMap: Record<'css' | 'recipe' | 'pattern' | 'jsx', string[]>;
     jsx?: {
         factory: string;
         nodes: ParserNodeOptions[];
         isStyleProp: (prop: string) => boolean;
     };
     getRecipesByJsxName: (jsxName: string) => RecipeConfig[];
+    tsOptions?: ConfigTsOptions;
+    join: Runtime['path']['join'];
 };
 
 type ProjectOptions = Partial<ProjectOptions$1> & {
-    readFile: (filePath: string) => string;
+    readFile: Runtime['fs']['readFileSync'];
     getFiles: () => string[];
     hooks: PandaHookable;
     parserOptions: ParserOptions;
+    tsOptions?: ConfigTsOptions;
 };
+
 declare const createProject: ({ getFiles, readFile, parserOptions, hooks, ...projectOptions }: ProjectOptions) => {
     getSourceFile: (filePath: string) => ts_morph.SourceFile | undefined;
     removeSourceFile: (filePath: string) => void;
@@ -74,4 +78,4 @@ declare const createProject: ({ getFiles, readFile, parserOptions, hooks, ...pro
 };
 type Project = ReturnType<typeof createProject>;
 
-export { ParserResult, Project, ProjectOptions, createParserResult, createProject };
+export { ParserResult, Project, createParserResult, createProject };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as ts_morph from 'ts-morph';
 import { ProjectOptions as ProjectOptions$1 } from 'ts-morph';
-import { ResultItem, RecipeConfig, PandaHookable } from '@pandacss/types';
+import { ResultItem, RecipeConfig, ConfigTsOptions, Runtime, PandaHookable } from '@pandacss/types';
 
 declare class ParserResult {
     jsx: Set<ResultItem>;
@@ -48,21 +48,25 @@ type ParserRecipeNode = {
 };
 type ParserNodeOptions = ParserPatternNode | ParserRecipeNode;
 type ParserOptions = {
-    importMap: Record<'css' | 'recipe' | 'pattern' | 'jsx', string>;
+    importMap: Record<'css' | 'recipe' | 'pattern' | 'jsx', string[]>;
     jsx?: {
         factory: string;
         nodes: ParserNodeOptions[];
         isStyleProp: (prop: string) => boolean;
     };
     getRecipesByJsxName: (jsxName: string) => RecipeConfig[];
+    tsOptions?: ConfigTsOptions;
+    join: Runtime['path']['join'];
 };
 
 type ProjectOptions = Partial<ProjectOptions$1> & {
-    readFile: (filePath: string) => string;
+    readFile: Runtime['fs']['readFileSync'];
     getFiles: () => string[];
     hooks: PandaHookable;
     parserOptions: ParserOptions;
+    tsOptions?: ConfigTsOptions;
 };
+
 declare const createProject: ({ getFiles, readFile, parserOptions, hooks, ...projectOptions }: ProjectOptions) => {
     getSourceFile: (filePath: string) => ts_morph.SourceFile | undefined;
     removeSourceFile: (filePath: string) => void;
@@ -74,4 +78,4 @@ declare const createProject: ({ getFiles, readFile, parserOptions, hooks, ...pro
 };
 type Project = ReturnType<typeof createProject>;
 
-export { ParserResult, Project, ProjectOptions, createParserResult, createProject };
+export { ParserResult, Project, createParserResult, createProject };

package/dist/index.js

@@ -67,9 +67,10 @@ function getImportDeclarations(file, options) {
     specifiers.forEach((specifier) => {
       const name = specifier.getNameNode().getText();
       const alias = specifier.getAliasNode()?.getText() || name;
-      if (!match2({ name, alias, mod: source }))
+      const importMapValue = match2({ name, alias, mod: source });
+      if (!importMapValue)
         return;
-      result.push({ name, alias, mod: source });
+      result.push({ name, alias, mod: source, importMapValue });
     });
   });
   return {
@@ -81,7 +82,7 @@ function getImportDeclarations(file, options) {
       return result.find((o) => o.alias === id);
     },
     createMatch(mod) {
-      const mods = result.filter((o) => o.mod.includes(mod));
+      const mods = result.filter((o) => o.mod.includes(mod) || o.importMapValue === mod);
       return (0, import_shared.memo)((id) => !!mods.find((mod2) => mod2.alias === id || mod2.name === id));
     },
     match(id) {
@@ -174,6 +175,7 @@ var ParserResult = class _ParserResult {
 var createParserResult = () => new ParserResult();
 
 // src/parser.ts
+var import_ts_path = require("@pandacss/config/ts-path");
 var isNodeRecipe = (node) => node.type === "recipe";
 var cvaProps = ["compoundVariants", "defaultVariants", "variants", "base"];
 var isCva = (map) => cvaProps.some((prop) => map.has(prop));
@@ -197,7 +199,8 @@ var fallback = (box2) => ({
 });
 var defaultEnv = { preset: "NONE" };
 function createParser(options) {
-  const { jsx, importMap, getRecipesByJsxName } = options;
+  const { jsx, getRecipesByJsxName, tsOptions, join } = options;
+  const importMap = Object.fromEntries(Object.entries(options.importMap).map(([key, value]) => [key, join(...value)]));
   const importRegex = [
     createImportMatcher(importMap.css, ["css", "cva"]),
     createImportMatcher(importMap.recipe),
@@ -212,7 +215,23 @@ function createParser(options) {
     const filePath = sourceFile.getFilePath();
     const imports = getImportDeclarations(sourceFile, {
       match(value) {
-        return importRegex.some(({ regex, mod }) => regex.test(value.name) && value.mod.includes(mod));
+        let found = false;
+        for (const { regex, mod } of importRegex) {
+          if (!regex.test(value.name))
+            continue;
+          if (value.mod.includes(mod)) {
+            found = true;
+            break;
+          }
+          if (tsOptions?.pathMappings) {
+            const filename = (0, import_ts_path.resolveTsPathPattern)(tsOptions.pathMappings, value.mod);
+            if (filename?.includes(mod)) {
+              found = mod;
+              break;
+            }
+          }
+        }
+        return found;
       }
     });
     const collector = createParserResult();
@@ -226,6 +245,10 @@ function createParser(options) {
     const isValidRecipe = imports.createMatch(importMap.recipe);
     const isValidStyleFn = (name) => name === jsx?.factory;
     const isFactory = (name) => Boolean(jsx && name.startsWith(jsxFactoryAlias));
+    const isRawFn = (fullName) => {
+      const name = fullName.split(".raw")[0] ?? "";
+      return name === "css" || isValidPattern(name) || isValidRecipe(name);
+    };
     const jsxPatternNodes = new RegExp(
       `^(${jsx?.nodes.filter((node) => node.type === "pattern").map((node) => node.name).join("|")})$`
     );
@@ -289,7 +312,7 @@ function createParser(options) {
     const matchFn = (0, import_shared2.memo)((fnName) => {
       if (recipes.has(fnName) || patterns.has(fnName))
         return true;
-      if (fnName === cvaAlias || fnName === cssAlias || isFactory(fnName))
+      if (fnName === cvaAlias || fnName === cssAlias || isRawFn(fnName) || isFactory(fnName))
         return true;
       return functions.has(fnName);
     });
@@ -317,7 +340,9 @@ function createParser(options) {
     });
     measure();
     extractResultByName.forEach((result, alias) => {
-      const name = imports.getName(alias);
+      let name = imports.getName(alias);
+      if (isRawFn(name))
+        name = name.replace(".raw", "");
       import_logger.logger.debug(`ast:${name}`, name !== alias ? { kind: result.kind, alias } : { kind: result.kind });
       if (result.kind === "function") {
         (0, import_ts_pattern.match)(name).when(css.match, (name2) => {
@@ -361,11 +386,8 @@ function createParser(options) {
           result.queryList.forEach((query) => {
             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))
-              };
+              const boxNode = import_extractor.box.isMap(map) ? map : fallback(query.box);
+              const result2 = { name, box: boxNode, data: combineResult((0, import_extractor.unbox)(boxNode)) };
               if (import_extractor.box.isMap(map) && isCva(map.value)) {
                 collector.setCva(result2);
               } else {
@@ -384,11 +406,8 @@ function createParser(options) {
           result.queryList.forEach((query) => {
             if (query.kind === "call-expression") {
               const map = query.box.value[0];
-              const result2 = {
-                name: name2,
-                box: map ?? fallback(query.box),
-                data: combineResult((0, import_extractor.unbox)(map))
-              };
+              const boxNode = import_extractor.box.isMap(map) ? map : fallback(query.box);
+              const result2 = { name: name2, box: boxNode, data: combineResult((0, import_extractor.unbox)(boxNode)) };
               if (import_extractor.box.isMap(map) && isCva(map.value)) {
                 collector.setCva(result2);
               } else {

package/dist/index.mjs

@@ -29,9 +29,10 @@ function getImportDeclarations(file, options) {
     specifiers.forEach((specifier) => {
       const name = specifier.getNameNode().getText();
       const alias = specifier.getAliasNode()?.getText() || name;
-      if (!match2({ name, alias, mod: source }))
+      const importMapValue = match2({ name, alias, mod: source });
+      if (!importMapValue)
         return;
-      result.push({ name, alias, mod: source });
+      result.push({ name, alias, mod: source, importMapValue });
     });
   });
   return {
@@ -43,7 +44,7 @@ function getImportDeclarations(file, options) {
       return result.find((o) => o.alias === id);
     },
     createMatch(mod) {
-      const mods = result.filter((o) => o.mod.includes(mod));
+      const mods = result.filter((o) => o.mod.includes(mod) || o.importMapValue === mod);
       return memo((id) => !!mods.find((mod2) => mod2.alias === id || mod2.name === id));
     },
     match(id) {
@@ -136,6 +137,7 @@ var ParserResult = class _ParserResult {
 var createParserResult = () => new ParserResult();
 
 // src/parser.ts
+import { resolveTsPathPattern } from "@pandacss/config/ts-path";
 var isNodeRecipe = (node) => node.type === "recipe";
 var cvaProps = ["compoundVariants", "defaultVariants", "variants", "base"];
 var isCva = (map) => cvaProps.some((prop) => map.has(prop));
@@ -159,7 +161,8 @@ var fallback = (box2) => ({
 });
 var defaultEnv = { preset: "NONE" };
 function createParser(options) {
-  const { jsx, importMap, getRecipesByJsxName } = options;
+  const { jsx, getRecipesByJsxName, tsOptions, join } = options;
+  const importMap = Object.fromEntries(Object.entries(options.importMap).map(([key, value]) => [key, join(...value)]));
   const importRegex = [
     createImportMatcher(importMap.css, ["css", "cva"]),
     createImportMatcher(importMap.recipe),
@@ -174,7 +177,23 @@ function createParser(options) {
     const filePath = sourceFile.getFilePath();
     const imports = getImportDeclarations(sourceFile, {
       match(value) {
-        return importRegex.some(({ regex, mod }) => regex.test(value.name) && value.mod.includes(mod));
+        let found = false;
+        for (const { regex, mod } of importRegex) {
+          if (!regex.test(value.name))
+            continue;
+          if (value.mod.includes(mod)) {
+            found = true;
+            break;
+          }
+          if (tsOptions?.pathMappings) {
+            const filename = resolveTsPathPattern(tsOptions.pathMappings, value.mod);
+            if (filename?.includes(mod)) {
+              found = mod;
+              break;
+            }
+          }
+        }
+        return found;
       }
     });
     const collector = createParserResult();
@@ -188,6 +207,10 @@ function createParser(options) {
     const isValidRecipe = imports.createMatch(importMap.recipe);
     const isValidStyleFn = (name) => name === jsx?.factory;
     const isFactory = (name) => Boolean(jsx && name.startsWith(jsxFactoryAlias));
+    const isRawFn = (fullName) => {
+      const name = fullName.split(".raw")[0] ?? "";
+      return name === "css" || isValidPattern(name) || isValidRecipe(name);
+    };
     const jsxPatternNodes = new RegExp(
       `^(${jsx?.nodes.filter((node) => node.type === "pattern").map((node) => node.name).join("|")})$`
     );
@@ -251,7 +274,7 @@ function createParser(options) {
     const matchFn = memo2((fnName) => {
       if (recipes.has(fnName) || patterns.has(fnName))
         return true;
-      if (fnName === cvaAlias || fnName === cssAlias || isFactory(fnName))
+      if (fnName === cvaAlias || fnName === cssAlias || isRawFn(fnName) || isFactory(fnName))
         return true;
       return functions.has(fnName);
     });
@@ -279,7 +302,9 @@ function createParser(options) {
     });
     measure();
     extractResultByName.forEach((result, alias) => {
-      const name = imports.getName(alias);
+      let name = imports.getName(alias);
+      if (isRawFn(name))
+        name = name.replace(".raw", "");
       logger.debug(`ast:${name}`, name !== alias ? { kind: result.kind, alias } : { kind: result.kind });
       if (result.kind === "function") {
         match(name).when(css.match, (name2) => {
@@ -323,11 +348,8 @@ function createParser(options) {
           result.queryList.forEach((query) => {
             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))
-              };
+              const boxNode = box.isMap(map) ? map : fallback(query.box);
+              const result2 = { name, box: boxNode, data: combineResult(unbox(boxNode)) };
               if (box.isMap(map) && isCva(map.value)) {
                 collector.setCva(result2);
               } else {
@@ -346,11 +368,8 @@ function createParser(options) {
           result.queryList.forEach((query) => {
             if (query.kind === "call-expression") {
               const map = query.box.value[0];
-              const result2 = {
-                name: name2,
-                box: map ?? fallback(query.box),
-                data: combineResult(unbox(map))
-              };
+              const boxNode = box.isMap(map) ? map : fallback(query.box);
+              const result2 = { name: name2, box: boxNode, data: combineResult(unbox(boxNode)) };
               if (box.isMap(map) && isCva(map.value)) {
                 collector.setCva(result2);
               } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pandacss/parser",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "The static parser for panda css",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -14,18 +14,19 @@
     "@vue/compiler-sfc": "^3.3.4",
     "lil-fp": "1.4.5",
     "magic-string": "^0.30.1",
-    "ts-morph": "18.0.0",
-    "ts-pattern": "5.0.1",
-    "@pandacss/extractor": "0.7.0",
-    "@pandacss/is-valid-prop": "0.7.0",
-    "@pandacss/logger": "0.7.0",
-    "@pandacss/shared": "0.7.0",
-    "@pandacss/types": "0.7.0"
+    "ts-morph": "19.0.0",
+    "ts-pattern": "5.0.4",
+    "@pandacss/config": "^0.8.0",
+    "@pandacss/extractor": "0.8.0",
+    "@pandacss/is-valid-prop": "0.8.0",
+    "@pandacss/logger": "0.8.0",
+    "@pandacss/shared": "0.8.0",
+    "@pandacss/types": "0.8.0"
   },
   "devDependencies": {
     "hookable": "5.5.3",
-    "@pandacss/fixture": "0.7.0",
-    "@pandacss/generator": "0.7.0"
+    "@pandacss/fixture": "0.8.0",
+    "@pandacss/generator": "0.8.0"
   },
   "files": [
     "dist"