@pandacss/config 0.0.0-dev-20240212091357 → 0.0.0-dev-20240212185235

package/dist/index.js

@@ -496,6 +496,7 @@ async function getResolvedConfig(config, cwd) {
 }
 
 // src/resolve-config.ts
+var import_logger3 = require("@pandacss/logger");
 var import_shared8 = require("@pandacss/shared");
 
 // src/bundled-preset.ts
@@ -593,17 +594,11 @@ var validateRecipes = (options) => {
 // src/validation/validate-tokens.ts
 var import_shared6 = require("@pandacss/shared");
 
-// src/validation/get-final-paths.ts
-var getFinalPaths = (paths) => {
-  paths.forEach((path2) => {
-    paths.forEach((potentialExtension) => {
-      if (potentialExtension.startsWith(path2 + ".")) {
-        paths.delete(path2);
-      }
-    });
-  });
-  return paths;
-};
+// src/validation/utils.ts
+var isValidToken = (token) => Object.hasOwnProperty.call(token, "value");
+var isTokenReference = (value) => typeof value === "string" && value.startsWith("{");
+var formatPath = (path2) => path2;
+var SEP = ".";
 
 // src/validation/validate-token-references.ts
 var validateTokenReferences = (valueAtPath, refsByPath, addError) => {
@@ -613,17 +608,23 @@ var validateTokenReferences = (valueAtPath, refsByPath, addError) => {
     }
     const stack = [path2];
     while (stack.length > 0) {
-      const current = stack.pop();
-      const value = valueAtPath.get(current);
+      const currentPath = stack.pop();
+      const value = valueAtPath.get(currentPath);
       if (!value) {
-        addError("tokens", `Missing token: \`${current}\` used in \`config.semanticTokens.${path2}\``);
+        addError("tokens", `Missing token: \`${currentPath}\` used in \`config.semanticTokens.${path2}\``);
       }
-      const deps = refsByPath.get(current);
+      if (isTokenReference(value) && !refsByPath.has(value)) {
+        addError("tokens", `Unknown token reference: \`${currentPath}\` used in \`${value}\``);
+      }
+      const deps = refsByPath.get(currentPath);
       if (!deps)
         continue;
       for (const transitiveDep of deps) {
         if (path2 === transitiveDep) {
-          addError("tokens", `Circular token reference: \`${transitiveDep}\` -> \`${current}\` -> ... -> \`${path2}\``);
+          addError(
+            "tokens",
+            `Circular token reference: \`${transitiveDep}\` -> \`${currentPath}\` -> ... -> \`${path2}\``
+          );
           break;
         }
         stack.push(transitiveDep);
@@ -643,43 +644,65 @@ var validateTokens = (options) => {
     return;
   const { tokenNames, semanticTokenNames, valueAtPath, refsByPath } = tokens2;
   if (theme.tokens) {
-    (0, import_shared6.traverse)(theme.tokens, (node) => {
-      if (node.depth >= 1) {
-        tokenNames.add(node.path);
-        valueAtPath.set(node.path, node.value);
+    const tokenPaths = /* @__PURE__ */ new Set();
+    (0, import_shared6.walkObject)(
+      theme.tokens,
+      (value, paths) => {
+        const path2 = paths.join(SEP);
+        tokenNames.add(path2);
+        tokenPaths.add(path2);
+        valueAtPath.set(path2, value);
+      },
+      {
+        stop: isValidToken
       }
-    });
-    const finalPaths = getFinalPaths(tokenNames);
-    finalPaths.forEach((path2) => {
-      if (!path2.includes("value")) {
-        addError("tokens", `Token paths must end with 'value': \`theme.tokens.${path2}\``);
+    );
+    tokenPaths.forEach((path2) => {
+      const value = valueAtPath.get(path2);
+      const formattedPath = formatPath(path2);
+      if (!isValidToken(value)) {
+        addError("tokens", `Token must contain 'value': \`theme.tokens.${formattedPath}\``);
+        return;
       }
-      const atPath = valueAtPath.get(path2);
-      if (typeof atPath === "string" && atPath.startsWith("{")) {
-        refsByPath.set(path2, /* @__PURE__ */ new Set([]));
+      if (isTokenReference(value)) {
+        refsByPath.set(formattedPath, /* @__PURE__ */ new Set([]));
       }
     });
   }
   if (theme.semanticTokens) {
-    (0, import_shared6.traverse)(theme.semanticTokens, (node) => {
-      if (node.depth >= 1) {
-        semanticTokenNames.add(node.path);
-        valueAtPath.set(node.path, node.value);
-        if (typeof node.value === "string" && node.value.startsWith("{") && node.path.includes("value")) {
-          const tokenPath = node.path.split(".value")[0];
-          if (!refsByPath.has(tokenPath)) {
-            refsByPath.set(tokenPath, /* @__PURE__ */ new Set());
+    const tokenPaths = /* @__PURE__ */ new Set();
+    (0, import_shared6.walkObject)(
+      theme.semanticTokens,
+      (value, paths) => {
+        const path2 = paths.join(SEP);
+        semanticTokenNames.add(path2);
+        valueAtPath.set(path2, value);
+        tokenPaths.add(path2);
+        if (!isValidToken(value))
+          return;
+        (0, import_shared6.walkObject)(value, (itemValue) => {
+          if (isTokenReference(itemValue)) {
+            const formattedPath = formatPath(path2);
+            if (!refsByPath.has(formattedPath)) {
+              refsByPath.set(formattedPath, /* @__PURE__ */ new Set());
+            }
+            const references = refsByPath.get(formattedPath);
+            if (!references)
+              return;
+            const reference = itemValue.slice(1, -1);
+            references.add(reference);
           }
-          const values = refsByPath.get(tokenPath);
-          const tokenRef = node.value.slice(1, -1);
-          values.add(tokenRef);
-        }
+        });
+      },
+      {
+        stop: isValidToken
       }
-    });
-    const finalPaths = getFinalPaths(semanticTokenNames);
-    finalPaths.forEach((path2) => {
-      if (!path2.includes("value")) {
-        addError("tokens", `Semantic token paths must contain 'value': \`theme.semanticTokens.${path2}\``);
+    );
+    tokenPaths.forEach((path2) => {
+      const formattedPath = formatPath(path2);
+      const value = valueAtPath.get(path2);
+      if (!(0, import_shared6.isObject)(value) && !path2.includes("value")) {
+        addError("tokens", `Token must contain 'value': \`theme.semanticTokens.${formattedPath}\``);
       }
     });
     validateTokenReferences(valueAtPath, refsByPath, addError);
@@ -692,11 +715,7 @@ var validateConfig = (config) => {
     return;
   const warnings = /* @__PURE__ */ new Set();
   const addError = (scope, message) => {
-    if (config.validation === "warn") {
-      warnings.add(`[${scope}]: ` + message);
-    } else {
-      throw new import_shared7.PandaError("CONFIG_ERROR", `[${scope}]: ` + message);
-    }
+    warnings.add(`[${scope}] ` + message);
   };
   validateBreakpoints(config.theme?.breakpoints, addError);
   validateConditions(config.conditions, addError);
@@ -718,12 +737,13 @@ var validateConfig = (config) => {
   validatePatterns(config.patterns, artifacts);
   validateArtifactNames(artifacts, addError);
   if (warnings.size) {
-    import_logger2.logger.warn(
-      "config",
-      `\u26A0\uFE0F Invalid config:
+    const errors = `\u26A0\uFE0F Invalid config:
 ${Array.from(warnings).map((err) => "- " + err).join("\n")}
-`
-    );
+`;
+    if (config.validation === "error") {
+      throw new import_shared7.PandaError("CONFIG_ERROR", errors);
+    }
+    import_logger2.logger.warn("config", errors);
     return warnings;
   }
 };
@@ -743,6 +763,9 @@ async function resolveConfig(result, cwd) {
   }
   result.config.presets = Array.from(presets);
   const config = await getResolvedConfig(result.config, cwd);
+  if (config.logLevel) {
+    import_logger3.logger.level = config.logLevel;
+  }
   validateConfig(config);
   const { hooks = {} } = result.config;
   const loadConfigResult = {

package/dist/index.mjs

@@ -214,6 +214,7 @@ async function getResolvedConfig(config, cwd) {
 }
 
 // src/resolve-config.ts
+import { logger as logger3 } from "@pandacss/logger";
 import { parseJson, stringifyJson } from "@pandacss/shared";
 
 // src/bundled-preset.ts
@@ -309,19 +310,13 @@ var validateRecipes = (options) => {
 };
 
 // src/validation/validate-tokens.ts
-import { traverse } from "@pandacss/shared";
+import { isObject, walkObject } from "@pandacss/shared";
 
-// src/validation/get-final-paths.ts
-var getFinalPaths = (paths) => {
-  paths.forEach((path2) => {
-    paths.forEach((potentialExtension) => {
-      if (potentialExtension.startsWith(path2 + ".")) {
-        paths.delete(path2);
-      }
-    });
-  });
-  return paths;
-};
+// src/validation/utils.ts
+var isValidToken = (token) => Object.hasOwnProperty.call(token, "value");
+var isTokenReference = (value) => typeof value === "string" && value.startsWith("{");
+var formatPath = (path2) => path2;
+var SEP = ".";
 
 // src/validation/validate-token-references.ts
 var validateTokenReferences = (valueAtPath, refsByPath, addError) => {
@@ -331,17 +326,23 @@ var validateTokenReferences = (valueAtPath, refsByPath, addError) => {
     }
     const stack = [path2];
     while (stack.length > 0) {
-      const current = stack.pop();
-      const value = valueAtPath.get(current);
+      const currentPath = stack.pop();
+      const value = valueAtPath.get(currentPath);
       if (!value) {
-        addError("tokens", `Missing token: \`${current}\` used in \`config.semanticTokens.${path2}\``);
+        addError("tokens", `Missing token: \`${currentPath}\` used in \`config.semanticTokens.${path2}\``);
       }
-      const deps = refsByPath.get(current);
+      if (isTokenReference(value) && !refsByPath.has(value)) {
+        addError("tokens", `Unknown token reference: \`${currentPath}\` used in \`${value}\``);
+      }
+      const deps = refsByPath.get(currentPath);
       if (!deps)
         continue;
       for (const transitiveDep of deps) {
         if (path2 === transitiveDep) {
-          addError("tokens", `Circular token reference: \`${transitiveDep}\` -> \`${current}\` -> ... -> \`${path2}\``);
+          addError(
+            "tokens",
+            `Circular token reference: \`${transitiveDep}\` -> \`${currentPath}\` -> ... -> \`${path2}\``
+          );
           break;
         }
         stack.push(transitiveDep);
@@ -361,43 +362,65 @@ var validateTokens = (options) => {
     return;
   const { tokenNames, semanticTokenNames, valueAtPath, refsByPath } = tokens;
   if (theme.tokens) {
-    traverse(theme.tokens, (node) => {
-      if (node.depth >= 1) {
-        tokenNames.add(node.path);
-        valueAtPath.set(node.path, node.value);
+    const tokenPaths = /* @__PURE__ */ new Set();
+    walkObject(
+      theme.tokens,
+      (value, paths) => {
+        const path2 = paths.join(SEP);
+        tokenNames.add(path2);
+        tokenPaths.add(path2);
+        valueAtPath.set(path2, value);
+      },
+      {
+        stop: isValidToken
       }
-    });
-    const finalPaths = getFinalPaths(tokenNames);
-    finalPaths.forEach((path2) => {
-      if (!path2.includes("value")) {
-        addError("tokens", `Token paths must end with 'value': \`theme.tokens.${path2}\``);
+    );
+    tokenPaths.forEach((path2) => {
+      const value = valueAtPath.get(path2);
+      const formattedPath = formatPath(path2);
+      if (!isValidToken(value)) {
+        addError("tokens", `Token must contain 'value': \`theme.tokens.${formattedPath}\``);
+        return;
       }
-      const atPath = valueAtPath.get(path2);
-      if (typeof atPath === "string" && atPath.startsWith("{")) {
-        refsByPath.set(path2, /* @__PURE__ */ new Set([]));
+      if (isTokenReference(value)) {
+        refsByPath.set(formattedPath, /* @__PURE__ */ new Set([]));
       }
     });
   }
   if (theme.semanticTokens) {
-    traverse(theme.semanticTokens, (node) => {
-      if (node.depth >= 1) {
-        semanticTokenNames.add(node.path);
-        valueAtPath.set(node.path, node.value);
-        if (typeof node.value === "string" && node.value.startsWith("{") && node.path.includes("value")) {
-          const tokenPath = node.path.split(".value")[0];
-          if (!refsByPath.has(tokenPath)) {
-            refsByPath.set(tokenPath, /* @__PURE__ */ new Set());
+    const tokenPaths = /* @__PURE__ */ new Set();
+    walkObject(
+      theme.semanticTokens,
+      (value, paths) => {
+        const path2 = paths.join(SEP);
+        semanticTokenNames.add(path2);
+        valueAtPath.set(path2, value);
+        tokenPaths.add(path2);
+        if (!isValidToken(value))
+          return;
+        walkObject(value, (itemValue) => {
+          if (isTokenReference(itemValue)) {
+            const formattedPath = formatPath(path2);
+            if (!refsByPath.has(formattedPath)) {
+              refsByPath.set(formattedPath, /* @__PURE__ */ new Set());
+            }
+            const references = refsByPath.get(formattedPath);
+            if (!references)
+              return;
+            const reference = itemValue.slice(1, -1);
+            references.add(reference);
           }
-          const values = refsByPath.get(tokenPath);
-          const tokenRef = node.value.slice(1, -1);
-          values.add(tokenRef);
-        }
+        });
+      },
+      {
+        stop: isValidToken
       }
-    });
-    const finalPaths = getFinalPaths(semanticTokenNames);
-    finalPaths.forEach((path2) => {
-      if (!path2.includes("value")) {
-        addError("tokens", `Semantic token paths must contain 'value': \`theme.semanticTokens.${path2}\``);
+    );
+    tokenPaths.forEach((path2) => {
+      const formattedPath = formatPath(path2);
+      const value = valueAtPath.get(path2);
+      if (!isObject(value) && !path2.includes("value")) {
+        addError("tokens", `Token must contain 'value': \`theme.semanticTokens.${formattedPath}\``);
       }
     });
     validateTokenReferences(valueAtPath, refsByPath, addError);
@@ -410,11 +433,7 @@ var validateConfig = (config) => {
     return;
   const warnings = /* @__PURE__ */ new Set();
   const addError = (scope, message) => {
-    if (config.validation === "warn") {
-      warnings.add(`[${scope}]: ` + message);
-    } else {
-      throw new PandaError3("CONFIG_ERROR", `[${scope}]: ` + message);
-    }
+    warnings.add(`[${scope}] ` + message);
   };
   validateBreakpoints(config.theme?.breakpoints, addError);
   validateConditions(config.conditions, addError);
@@ -436,12 +455,13 @@ var validateConfig = (config) => {
   validatePatterns(config.patterns, artifacts);
   validateArtifactNames(artifacts, addError);
   if (warnings.size) {
-    logger2.warn(
-      "config",
-      `\u26A0\uFE0F Invalid config:
+    const errors = `\u26A0\uFE0F Invalid config:
 ${Array.from(warnings).map((err) => "- " + err).join("\n")}
-`
-    );
+`;
+    if (config.validation === "error") {
+      throw new PandaError3("CONFIG_ERROR", errors);
+    }
+    logger2.warn("config", errors);
     return warnings;
   }
 };
@@ -461,6 +481,9 @@ async function resolveConfig(result, cwd) {
   }
   result.config.presets = Array.from(presets);
   const config = await getResolvedConfig(result.config, cwd);
+  if (config.logLevel) {
+    logger3.level = config.logLevel;
+  }
   validateConfig(config);
   const { hooks = {} } = result.config;
   const loadConfigResult = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pandacss/config",
-  "version": "0.0.0-dev-20240212091357",
+  "version": "0.0.0-dev-20240212185235",
   "description": "Find and load panda config",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -64,11 +64,11 @@
     "merge-anything": "5.1.7",
     "microdiff": "1.3.2",
     "typescript": "5.3.3",
-    "@pandacss/logger": "0.0.0-dev-20240212091357",
-    "@pandacss/preset-base": "0.0.0-dev-20240212091357",
-    "@pandacss/preset-panda": "0.0.0-dev-20240212091357",
-    "@pandacss/shared": "0.0.0-dev-20240212091357",
-    "@pandacss/types": "0.0.0-dev-20240212091357"
+    "@pandacss/logger": "0.0.0-dev-20240212185235",
+    "@pandacss/preset-base": "0.0.0-dev-20240212185235",
+    "@pandacss/preset-panda": "0.0.0-dev-20240212185235",
+    "@pandacss/shared": "0.0.0-dev-20240212185235",
+    "@pandacss/types": "0.0.0-dev-20240212185235"
   },
   "devDependencies": {
     "pkg-types": "1.0.3"