@pandacss/config 0.35.0 → 0.36.0

package/dist/{chunk-XG53JPBE.mjs → chunk-D3CL3VYD.mjs}

@@ -86,7 +86,8 @@ var artifactConfigDeps = {
   "types-jsx": jsx,
   "types-entry": [],
   "types-gen": [],
-  "types-gen-system": []
+  "types-gen-system": [],
+  themes: ["themes"].concat(tokens)
 };
 var artifactMatchers = Object.entries(artifactConfigDeps).map(([key, paths]) => {
   if (!paths.length)

package/dist/{chunk-TMHVUUQX.mjs → chunk-IMFODN4N.mjs}

@@ -1,4 +1,5 @@
 // src/merge-config.ts
+import { assign, isObject, mergeWith, traverse } from "@pandacss/shared";
 import { mergeAndConcat } from "merge-anything";
 
 // src/merge-hooks.ts
@@ -96,51 +97,6 @@ var tryCatch = (name, fn) => {
   };
 };
 
-// src/utils.ts
-import { traverse } from "@pandacss/shared";
-var isObject = (v) => Object.prototype.toString.call(v) === "[object Object]";
-function mergeWith(target, ...sources) {
-  const customizer = sources.pop();
-  for (const source of sources) {
-    for (const key in source) {
-      const merged = customizer(target[key], source[key]);
-      if (merged === void 0) {
-        if (isObject(target[key]) && isObject(source[key])) {
-          target[key] = mergeWith({}, target[key], source[key], customizer);
-        } else {
-          target[key] = source[key];
-        }
-      } else {
-        target[key] = merged;
-      }
-    }
-  }
-  return target;
-}
-function assign(target, ...sources) {
-  for (const source of sources) {
-    for (const key in source) {
-      if (!target?.hasOwnProperty?.(key)) {
-        target[key] = source[key];
-      }
-    }
-  }
-  return target;
-}
-var omit = (obj, paths) => {
-  const result = { ...obj };
-  traverse(obj, ({ path, parent, key }) => {
-    if (paths.includes(path)) {
-      delete parent[key];
-    }
-  });
-  return result;
-};
-var utils = {
-  omit,
-  traverse
-};
-
 // src/merge-config.ts
 function getExtends(items) {
   return items.reduce((merged, { extend }) => {
@@ -181,6 +137,7 @@ var compact = (obj) => {
     return acc;
   }, {});
 };
+var tokenKeys = ["description", "extensions", "type", "value"];
 function mergeConfigs(configs) {
   const [userConfig] = configs;
   const pluginHooks = userConfig.plugins ?? [];
@@ -194,15 +151,33 @@ function mergeConfigs(configs) {
       patterns: mergeExtensions(configs.map((config) => config.patterns ?? {})),
       utilities: mergeExtensions(configs.map((config) => config.utilities ?? {})),
       globalCss: mergeExtensions(configs.map((config) => config.globalCss ?? {})),
+      globalVars: mergeExtensions(configs.map((config) => config.globalVars ?? {})),
       staticCss: mergeExtensions(configs.map((config) => config.staticCss ?? {})),
+      themes: mergeExtensions(configs.map((config) => config.themes ?? {})),
       hooks: mergeHooks(pluginHooks)
     },
     ...configs
   );
-  return compact(mergedResult);
+  const withoutEmpty = compact(mergedResult);
+  if (withoutEmpty.theme?.tokens) {
+    traverse(withoutEmpty.theme.tokens, (args) => args, {
+      stop(args) {
+        if (isObject(args.value) && "value" in args.value) {
+          const keys = Object.keys(args.value);
+          if (keys.filter((k) => !tokenKeys.includes(k)).length) {
+            const { type: _type, description: _description, extensions: _extensions, value, DEFAULT } = args.value;
+            args.value.DEFAULT = { value: DEFAULT?.value ?? value };
+            delete args.value.value;
+          }
+          return true;
+        }
+        return false;
+      }
+    });
+  }
+  return withoutEmpty;
 }
 
 export {
-  utils,
   mergeConfigs
 };

package/dist/diff-config.js

@@ -120,7 +120,8 @@ var artifactConfigDeps = {
   "types-jsx": jsx,
   "types-entry": [],
   "types-gen": [],
-  "types-gen-system": []
+  "types-gen-system": [],
+  themes: ["themes"].concat(tokens)
 };
 var artifactMatchers = Object.entries(artifactConfigDeps).map(([key, paths]) => {
   if (!paths.length)

package/dist/diff-config.mjs

@@ -1,6 +1,6 @@
 import {
   diffConfigs
-} from "./chunk-XG53JPBE.mjs";
+} from "./chunk-D3CL3VYD.mjs";
 export {
   diffConfigs
 };

package/dist/index.d.mts

@@ -42,7 +42,7 @@ type ExtendableConfig = Extendable<Config>;
 /**
  * Recursively merge all presets into a single config
  */
-declare function getResolvedConfig(config: ExtendableConfig, cwd: string): Promise<Config>;
+declare function getResolvedConfig(config: ExtendableConfig, cwd: string): Promise<_pandacss_types.UserConfig>;
 
 /**
  * Find, load and resolve the final config (including presets)

package/dist/index.d.ts

@@ -42,7 +42,7 @@ type ExtendableConfig = Extendable<Config>;
 /**
  * Recursively merge all presets into a single config
  */
-declare function getResolvedConfig(config: ExtendableConfig, cwd: string): Promise<Config>;
+declare function getResolvedConfig(config: ExtendableConfig, cwd: string): Promise<_pandacss_types.UserConfig>;
 
 /**
  * Find, load and resolve the final config (including presets)

package/dist/index.js

@@ -190,7 +190,8 @@ var artifactConfigDeps = {
   "types-jsx": jsx,
   "types-entry": [],
   "types-gen": [],
-  "types-gen-system": []
+  "types-gen-system": [],
+  themes: ["themes"].concat(tokens)
 };
 var artifactMatchers = Object.entries(artifactConfigDeps).map(([key, paths]) => {
   if (!paths.length)
@@ -381,6 +382,7 @@ function getConfigDependencies(filePath, tsOptions = { pathMappings: [] }, compi
 }
 
 // src/merge-config.ts
+var import_shared4 = require("@pandacss/shared");
 var import_merge_anything = require("merge-anything");
 
 // src/merge-hooks.ts
@@ -478,57 +480,12 @@ var tryCatch = (name, fn) => {
   };
 };
 
-// src/utils.ts
-var import_shared4 = require("@pandacss/shared");
-var isObject = (v) => Object.prototype.toString.call(v) === "[object Object]";
-function mergeWith(target, ...sources) {
-  const customizer = sources.pop();
-  for (const source of sources) {
-    for (const key in source) {
-      const merged = customizer(target[key], source[key]);
-      if (merged === void 0) {
-        if (isObject(target[key]) && isObject(source[key])) {
-          target[key] = mergeWith({}, target[key], source[key], customizer);
-        } else {
-          target[key] = source[key];
-        }
-      } else {
-        target[key] = merged;
-      }
-    }
-  }
-  return target;
-}
-function assign(target, ...sources) {
-  for (const source of sources) {
-    for (const key in source) {
-      if (!target?.hasOwnProperty?.(key)) {
-        target[key] = source[key];
-      }
-    }
-  }
-  return target;
-}
-var omit = (obj, paths) => {
-  const result = { ...obj };
-  (0, import_shared4.traverse)(obj, ({ path: path2, parent, key }) => {
-    if (paths.includes(path2)) {
-      delete parent[key];
-    }
-  });
-  return result;
-};
-var utils = {
-  omit,
-  traverse: import_shared4.traverse
-};
-
 // src/merge-config.ts
 function getExtends(items) {
   return items.reduce((merged, { extend }) => {
     if (!extend)
       return merged;
-    return mergeWith(merged, extend, (originalValue, newValue) => {
+    return (0, import_shared4.mergeWith)(merged, extend, (originalValue, newValue) => {
       if (newValue === void 0) {
         return originalValue ?? [];
       }
@@ -544,13 +501,13 @@ function getExtends(items) {
 }
 function mergeRecords(records) {
   return {
-    ...records.reduce((acc, record) => assign(acc, record), {}),
+    ...records.reduce((acc, record) => (0, import_shared4.assign)(acc, record), {}),
     extend: getExtends(records)
   };
 }
 function mergeExtensions(records) {
   const { extend = [], ...restProps } = mergeRecords(records);
-  return mergeWith(restProps, extend, (obj, extensions) => {
+  return (0, import_shared4.mergeWith)(restProps, extend, (obj, extensions) => {
     return (0, import_merge_anything.mergeAndConcat)({}, obj, ...extensions);
   });
 }
@@ -563,25 +520,45 @@ var compact = (obj) => {
     return acc;
   }, {});
 };
+var tokenKeys = ["description", "extensions", "type", "value"];
 function mergeConfigs(configs2) {
   const [userConfig] = configs2;
   const pluginHooks = userConfig.plugins ?? [];
   if (userConfig.hooks) {
     pluginHooks.push({ name: "__panda.config__", hooks: userConfig.hooks });
   }
-  const mergedResult = assign(
+  const mergedResult = (0, import_shared4.assign)(
     {
       conditions: mergeExtensions(configs2.map((config) => config.conditions ?? {})),
       theme: mergeExtensions(configs2.map((config) => config.theme ?? {})),
       patterns: mergeExtensions(configs2.map((config) => config.patterns ?? {})),
       utilities: mergeExtensions(configs2.map((config) => config.utilities ?? {})),
       globalCss: mergeExtensions(configs2.map((config) => config.globalCss ?? {})),
+      globalVars: mergeExtensions(configs2.map((config) => config.globalVars ?? {})),
       staticCss: mergeExtensions(configs2.map((config) => config.staticCss ?? {})),
+      themes: mergeExtensions(configs2.map((config) => config.themes ?? {})),
       hooks: mergeHooks(pluginHooks)
     },
     ...configs2
   );
-  return compact(mergedResult);
+  const withoutEmpty = compact(mergedResult);
+  if (withoutEmpty.theme?.tokens) {
+    (0, import_shared4.traverse)(withoutEmpty.theme.tokens, (args) => args, {
+      stop(args) {
+        if ((0, import_shared4.isObject)(args.value) && "value" in args.value) {
+          const keys = Object.keys(args.value);
+          if (keys.filter((k) => !tokenKeys.includes(k)).length) {
+            const { type: _type, description: _description, extensions: _extensions, value, DEFAULT } = args.value;
+            args.value.DEFAULT = { value: DEFAULT?.value ?? value };
+            delete args.value.value;
+          }
+          return true;
+        }
+        return false;
+      }
+    });
+  }
+  return withoutEmpty;
 }
 
 // src/get-resolved-config.ts
@@ -889,6 +866,10 @@ ${Array.from(warnings).map((err) => "- " + err).join("\n")}
 };
 
 // src/resolve-config.ts
+var hookUtils = {
+  omit: import_shared9.omit,
+  traverse: import_shared9.traverse
+};
 async function resolveConfig(result, cwd) {
   const presets = /* @__PURE__ */ new Set();
   if (!result.config.eject) {
@@ -917,7 +898,7 @@ async function resolveConfig(result, cwd) {
       config: loadConfigResult.config,
       path: loadConfigResult.path,
       dependencies: loadConfigResult.dependencies,
-      utils
+      utils: hookUtils
     });
     if (result2) {
       loadConfigResult.config = result2;

package/dist/index.mjs

@@ -1,10 +1,9 @@
 import {
-  mergeConfigs,
-  utils
-} from "./chunk-TMHVUUQX.mjs";
+  mergeConfigs
+} from "./chunk-IMFODN4N.mjs";
 import {
   diffConfigs
-} from "./chunk-XG53JPBE.mjs";
+} from "./chunk-D3CL3VYD.mjs";
 import {
   resolveTsPathPattern
 } from "./chunk-RPIVZP2I.mjs";
@@ -215,7 +214,7 @@ async function getResolvedConfig(config, cwd) {
 
 // src/resolve-config.ts
 import { logger as logger3 } from "@pandacss/logger";
-import { parseJson, stringifyJson } from "@pandacss/shared";
+import { omit, parseJson, stringifyJson, traverse } from "@pandacss/shared";
 
 // src/bundled-preset.ts
 import { preset as presetBase } from "@pandacss/preset-base";
@@ -499,6 +498,10 @@ ${Array.from(warnings).map((err) => "- " + err).join("\n")}
 };
 
 // src/resolve-config.ts
+var hookUtils = {
+  omit,
+  traverse
+};
 async function resolveConfig(result, cwd) {
   const presets = /* @__PURE__ */ new Set();
   if (!result.config.eject) {
@@ -527,7 +530,7 @@ async function resolveConfig(result, cwd) {
       config: loadConfigResult.config,
       path: loadConfigResult.path,
       dependencies: loadConfigResult.dependencies,
-      utils
+      utils: hookUtils
     });
     if (result2) {
       loadConfigResult.config = result2;

package/dist/merge-config.d.mts

@@ -1,4 +1,4 @@
-import { Config } from '@pandacss/types';
+import { UserConfig, Config } from '@pandacss/types';
 
 type Extendable<T> = T & {
     extend?: T;
@@ -7,6 +7,6 @@ type ExtendableConfig = Extendable<Config>;
 /**
  * Merge all configs into a single config
  */
-declare function mergeConfigs(configs: ExtendableConfig[]): any;
+declare function mergeConfigs(configs: ExtendableConfig[]): UserConfig;
 
 export { mergeConfigs };

package/dist/merge-config.d.ts

@@ -1,4 +1,4 @@
-import { Config } from '@pandacss/types';
+import { UserConfig, Config } from '@pandacss/types';
 
 type Extendable<T> = T & {
     extend?: T;
@@ -7,6 +7,6 @@ type ExtendableConfig = Extendable<Config>;
 /**
  * Merge all configs into a single config
  */
-declare function mergeConfigs(configs: ExtendableConfig[]): any;
+declare function mergeConfigs(configs: ExtendableConfig[]): UserConfig;
 
 export { mergeConfigs };

package/dist/merge-config.js

@@ -23,6 +23,7 @@ __export(merge_config_exports, {
   mergeConfigs: () => mergeConfigs
 });
 module.exports = __toCommonJS(merge_config_exports);
+var import_shared = require("@pandacss/shared");
 var import_merge_anything = require("merge-anything");
 
 // src/merge-hooks.ts
@@ -120,44 +121,12 @@ var tryCatch = (name, fn) => {
   };
 };
 
-// src/utils.ts
-var import_shared = require("@pandacss/shared");
-var isObject = (v) => Object.prototype.toString.call(v) === "[object Object]";
-function mergeWith(target, ...sources) {
-  const customizer = sources.pop();
-  for (const source of sources) {
-    for (const key in source) {
-      const merged = customizer(target[key], source[key]);
-      if (merged === void 0) {
-        if (isObject(target[key]) && isObject(source[key])) {
-          target[key] = mergeWith({}, target[key], source[key], customizer);
-        } else {
-          target[key] = source[key];
-        }
-      } else {
-        target[key] = merged;
-      }
-    }
-  }
-  return target;
-}
-function assign(target, ...sources) {
-  for (const source of sources) {
-    for (const key in source) {
-      if (!target?.hasOwnProperty?.(key)) {
-        target[key] = source[key];
-      }
-    }
-  }
-  return target;
-}
-
 // src/merge-config.ts
 function getExtends(items) {
   return items.reduce((merged, { extend }) => {
     if (!extend)
       return merged;
-    return mergeWith(merged, extend, (originalValue, newValue) => {
+    return (0, import_shared.mergeWith)(merged, extend, (originalValue, newValue) => {
       if (newValue === void 0) {
         return originalValue ?? [];
       }
@@ -173,13 +142,13 @@ function getExtends(items) {
 }
 function mergeRecords(records) {
   return {
-    ...records.reduce((acc, record) => assign(acc, record), {}),
+    ...records.reduce((acc, record) => (0, import_shared.assign)(acc, record), {}),
     extend: getExtends(records)
   };
 }
 function mergeExtensions(records) {
   const { extend = [], ...restProps } = mergeRecords(records);
-  return mergeWith(restProps, extend, (obj, extensions) => {
+  return (0, import_shared.mergeWith)(restProps, extend, (obj, extensions) => {
     return (0, import_merge_anything.mergeAndConcat)({}, obj, ...extensions);
   });
 }
@@ -192,25 +161,45 @@ var compact = (obj) => {
     return acc;
   }, {});
 };
+var tokenKeys = ["description", "extensions", "type", "value"];
 function mergeConfigs(configs) {
   const [userConfig] = configs;
   const pluginHooks = userConfig.plugins ?? [];
   if (userConfig.hooks) {
     pluginHooks.push({ name: "__panda.config__", hooks: userConfig.hooks });
   }
-  const mergedResult = assign(
+  const mergedResult = (0, import_shared.assign)(
     {
       conditions: mergeExtensions(configs.map((config) => config.conditions ?? {})),
       theme: mergeExtensions(configs.map((config) => config.theme ?? {})),
       patterns: mergeExtensions(configs.map((config) => config.patterns ?? {})),
       utilities: mergeExtensions(configs.map((config) => config.utilities ?? {})),
       globalCss: mergeExtensions(configs.map((config) => config.globalCss ?? {})),
+      globalVars: mergeExtensions(configs.map((config) => config.globalVars ?? {})),
       staticCss: mergeExtensions(configs.map((config) => config.staticCss ?? {})),
+      themes: mergeExtensions(configs.map((config) => config.themes ?? {})),
       hooks: mergeHooks(pluginHooks)
     },
     ...configs
   );
-  return compact(mergedResult);
+  const withoutEmpty = compact(mergedResult);
+  if (withoutEmpty.theme?.tokens) {
+    (0, import_shared.traverse)(withoutEmpty.theme.tokens, (args) => args, {
+      stop(args) {
+        if ((0, import_shared.isObject)(args.value) && "value" in args.value) {
+          const keys = Object.keys(args.value);
+          if (keys.filter((k) => !tokenKeys.includes(k)).length) {
+            const { type: _type, description: _description, extensions: _extensions, value, DEFAULT } = args.value;
+            args.value.DEFAULT = { value: DEFAULT?.value ?? value };
+            delete args.value.value;
+          }
+          return true;
+        }
+        return false;
+      }
+    });
+  }
+  return withoutEmpty;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/merge-config.mjs

@@ -1,6 +1,6 @@
 import {
   mergeConfigs
-} from "./chunk-TMHVUUQX.mjs";
+} from "./chunk-IMFODN4N.mjs";
 export {
   mergeConfigs
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pandacss/config",
-  "version": "0.35.0",
+  "version": "0.36.0",
   "description": "Find and load panda config",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -53,6 +53,15 @@
         "default": "./dist/resolve-ts-path-pattern.mjs"
       }
     },
+    "./utils": {
+      "source": "./src/utils.ts",
+      "types": "./dist/utils.d.ts",
+      "require": "./dist/utils.js",
+      "import": {
+        "types": "./dist/utils.d.mts",
+        "default": "./dist/utils.mjs"
+      }
+    },
     "./package.json": "./package.json"
   },
   "files": [
@@ -64,11 +73,11 @@
     "merge-anything": "5.1.7",
     "microdiff": "1.3.2",
     "typescript": "5.3.3",
-    "@pandacss/logger": "0.35.0",
-    "@pandacss/preset-base": "0.35.0",
-    "@pandacss/preset-panda": "0.35.0",
-    "@pandacss/shared": "0.35.0",
-    "@pandacss/types": "0.35.0"
+    "@pandacss/logger": "0.36.0",
+    "@pandacss/preset-base": "0.36.0",
+    "@pandacss/preset-panda": "0.36.0",
+    "@pandacss/shared": "0.36.0",
+    "@pandacss/types": "0.36.0"
   },
   "devDependencies": {
     "pkg-types": "1.0.3"