@pandacss/config 0.0.0-dev-20221220033401 → 0.0.0-dev-20221220144042

package/dist/index.d.ts

@@ -5,8 +5,8 @@ type ConfigFileOptions = {
     file?: string;
 };
 declare function loadConfigFile(options: ConfigFileOptions): Promise<{
+    config: any;
     path: string;
-    config: UserConfig;
     dependencies: string[];
 }>;
 type LoadConfigResult = {
@@ -15,4 +15,18 @@ type LoadConfigResult = {
     dependencies: string[];
 };
 
-export { LoadConfigResult, loadConfigFile };
+type Extendable<T> = T & {
+    extend?: T;
+};
+type Dict = Record<string, any>;
+type ExtendableRecord = Extendable<Dict>;
+/**
+ * Merge all configs into a single config
+ */
+declare function mergeConfigs(configs: ExtendableRecord[]): any;
+/**
+ * Recursively merge all presets into a single config
+ */
+declare function getResolvedConfig(config: ExtendableRecord, cwd: string): Promise<any>;
+
+export { LoadConfigResult, getResolvedConfig, loadConfigFile, mergeConfigs };

package/dist/index.js

@@ -26,14 +26,15 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  loadConfigFile: () => loadConfigFile
+  getResolvedConfig: () => getResolvedConfig,
+  loadConfigFile: () => loadConfigFile,
+  mergeConfigs: () => mergeConfigs
 });
 module.exports = __toCommonJS(src_exports);
 
 // src/load-config.ts
 var import_error = require("@pandacss/error");
 var import_logger2 = require("@pandacss/logger");
-var import_merge_anything = require("merge-anything");
 
 // src/bundle-require.ts
 var import_logger = require("@pandacss/logger");
@@ -124,6 +125,91 @@ function findConfigFile({ cwd, file }) {
   });
 }
 
+// src/merge-config.ts
+var import_merge_anything = require("merge-anything");
+
+// src/utils.ts
+var isObject = (value) => {
+  return Object.prototype.toString.call(value) === "[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 }) => {
+    return mergeWith(merged, extend, (originalValue, newValue) => {
+      if (originalValue === void 0) {
+        return [newValue];
+      }
+      if (Array.isArray(originalValue)) {
+        return [newValue, ...originalValue];
+      }
+      return [newValue, originalValue];
+    });
+  }, {});
+}
+function mergeRecords(records) {
+  return {
+    ...records.reduce((acc, record) => assign(acc, record), {}),
+    extend: getExtends(records)
+  };
+}
+function mergeExtensions(records) {
+  const { extend = [], ...restProps } = mergeRecords(records);
+  return mergeWith(restProps, extend, (obj, extensions) => {
+    return (0, import_merge_anything.mergeAndConcat)({}, obj, ...extensions);
+  });
+}
+function mergeConfigs(configs2) {
+  return 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 ?? {}))
+    },
+    ...configs2
+  );
+}
+async function getResolvedConfig(config, cwd) {
+  const presets = config.presets ?? [];
+  const configs2 = await Promise.all(
+    presets.slice().reverse().map(async (preset) => {
+      const presetModule = await bundleAndRequire(preset, cwd);
+      return getResolvedConfig(presetModule.config, cwd);
+    })
+  );
+  delete config.presets;
+  return mergeConfigs([config, ...configs2]);
+}
+
 // src/load-config.ts
 async function loadConfigFile(options) {
   const { cwd, file } = options;
@@ -136,18 +222,17 @@ async function loadConfigFile(options) {
   if (typeof result.config !== "object") {
     throw new import_error.ConfigError(`\u{1F4A5} Config must export or return an object.`);
   }
-  const presets = result.config.presets ?? [];
-  for (const preset of presets) {
-    const presetResult = await bundleAndRequire(preset, cwd);
-    result.config = (0, import_merge_anything.merge)({}, presetResult.config, result.config);
-  }
-  delete result.config.presets;
+  result.config.presets ||= ["css-panda/presets"];
+  const mergedConfig = await getResolvedConfig(result.config, cwd);
   return {
     ...result,
+    config: mergedConfig,
     path: filePath
   };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  loadConfigFile
+  getResolvedConfig,
+  loadConfigFile,
+  mergeConfigs
 });

package/dist/index.mjs

@@ -7,9 +7,8 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 });
 
 // src/load-config.ts
-import { ConfigNotFoundError, ConfigError } from "@pandacss/error";
+import { ConfigError, ConfigNotFoundError } from "@pandacss/error";
 import { logger as logger2 } from "@pandacss/logger";
-import { merge } from "merge-anything";
 
 // src/bundle-require.ts
 import { logger, quote } from "@pandacss/logger";
@@ -100,6 +99,91 @@ function findConfigFile({ cwd, file }) {
   });
 }
 
+// src/merge-config.ts
+import { mergeAndConcat } from "merge-anything";
+
+// src/utils.ts
+var isObject = (value) => {
+  return Object.prototype.toString.call(value) === "[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 }) => {
+    return mergeWith(merged, extend, (originalValue, newValue) => {
+      if (originalValue === void 0) {
+        return [newValue];
+      }
+      if (Array.isArray(originalValue)) {
+        return [newValue, ...originalValue];
+      }
+      return [newValue, originalValue];
+    });
+  }, {});
+}
+function mergeRecords(records) {
+  return {
+    ...records.reduce((acc, record) => assign(acc, record), {}),
+    extend: getExtends(records)
+  };
+}
+function mergeExtensions(records) {
+  const { extend = [], ...restProps } = mergeRecords(records);
+  return mergeWith(restProps, extend, (obj, extensions) => {
+    return mergeAndConcat({}, obj, ...extensions);
+  });
+}
+function mergeConfigs(configs2) {
+  return 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 ?? {}))
+    },
+    ...configs2
+  );
+}
+async function getResolvedConfig(config, cwd) {
+  const presets = config.presets ?? [];
+  const configs2 = await Promise.all(
+    presets.slice().reverse().map(async (preset) => {
+      const presetModule = await bundleAndRequire(preset, cwd);
+      return getResolvedConfig(presetModule.config, cwd);
+    })
+  );
+  delete config.presets;
+  return mergeConfigs([config, ...configs2]);
+}
+
 // src/load-config.ts
 async function loadConfigFile(options) {
   const { cwd, file } = options;
@@ -112,17 +196,16 @@ async function loadConfigFile(options) {
   if (typeof result.config !== "object") {
     throw new ConfigError(`\u{1F4A5} Config must export or return an object.`);
   }
-  const presets = result.config.presets ?? [];
-  for (const preset of presets) {
-    const presetResult = await bundleAndRequire(preset, cwd);
-    result.config = merge({}, presetResult.config, result.config);
-  }
-  delete result.config.presets;
+  result.config.presets ||= ["css-panda/presets"];
+  const mergedConfig = await getResolvedConfig(result.config, cwd);
   return {
     ...result,
+    config: mergedConfig,
     path: filePath
   };
 }
 export {
-  loadConfigFile
+  getResolvedConfig,
+  loadConfigFile,
+  mergeConfigs
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pandacss/config",
-  "version": "0.0.0-dev-20221220033401",
+  "version": "0.0.0-dev-20221220144042",
   "description": "Find and load panda config",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -18,9 +18,9 @@
     "esbuild": "0.16.10",
     "escalade": "3.1.1",
     "node-eval": "2.0.0",
-    "@pandacss/logger": "0.0.0-dev-20221220033401",
-    "@pandacss/error": "0.0.0-dev-20221220033401",
-    "@pandacss/types": "0.0.0-dev-20221220033401"
+    "@pandacss/logger": "0.0.0-dev-20221220144042",
+    "@pandacss/error": "0.0.0-dev-20221220144042",
+    "@pandacss/types": "0.0.0-dev-20221220144042"
   },
   "scripts": {
     "build": "pnpm tsup src/index.ts --format=esm,cjs --shims --dts",