@bamboocss/config 1.11.3 → 1.12.0

package/dist/merge-config.cjs

@@ -1,4 +1,254 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_merge_config = require("./merge-config-CcNpHJit.cjs");
-exports.mergeConfigs = require_merge_config.mergeConfigs;
-exports.mergeHooks = require_merge_config.mergeHooks;
+let _bamboocss_shared = require("@bamboocss/shared");
+let _bamboocss_logger = require("@bamboocss/logger");
+//#region src/merge-hooks.ts
+const mergeHooks = (plugins) => {
+	const hooksFns = {};
+	plugins.forEach(({ name, hooks }) => {
+		Object.entries(hooks ?? {}).forEach(([key, value]) => {
+			if (!hooksFns[key]) hooksFns[key] = [];
+			hooksFns[key].push([name, value]);
+		});
+	});
+	return Object.fromEntries(Object.entries(hooksFns).map(([key, entries]) => {
+		const fns = entries.map(([name, fn]) => tryCatch(name, fn));
+		const reducer = key in reducers ? reducers[key] : void 0;
+		if (reducer) return [key, reducer(fns)];
+		return [key, syncHooks.includes(key) ? callAll(...fns) : callAllAsync(...fns)];
+	}));
+};
+const createReducer = (reducer) => reducer;
+const reducers = {
+	"config:resolved": createReducer((fns) => async (_args) => {
+		const args = Object.assign({}, _args);
+		const original = _args.config;
+		let config = args.config;
+		for (const hookFn of fns) {
+			const result = await hookFn(Object.assign(args, {
+				config,
+				original
+			}));
+			if (result !== void 0) config = result;
+		}
+		return config;
+	}),
+	"parser:before": createReducer((fns) => (_args) => {
+		const args = Object.assign({}, _args);
+		const original = _args.content;
+		let content = args.content;
+		for (const hookFn of fns) {
+			const result = hookFn(Object.assign(args, {
+				content,
+				original
+			}));
+			if (result !== void 0) content = result;
+		}
+		return content;
+	}),
+	"parser:preprocess": createReducer((fns) => (_args) => {
+		const args = Object.assign({}, _args);
+		const original = _args.data;
+		let data = args.data;
+		for (const hookFn of fns) {
+			const result = hookFn(Object.assign(args, {
+				data,
+				original
+			}));
+			if (result !== void 0) data = result;
+		}
+		return data;
+	}),
+	"cssgen:done": createReducer((fns) => (_args) => {
+		const args = Object.assign({}, _args);
+		const original = _args.content;
+		let content = args.content;
+		for (const hookFn of fns) {
+			const result = hookFn(Object.assign(args, {
+				content,
+				original
+			}));
+			if (result !== void 0) content = result;
+		}
+		return content;
+	}),
+	"codegen:prepare": createReducer((fns) => async (_args) => {
+		const args = Object.assign({}, _args);
+		const original = _args.artifacts;
+		let artifacts = args.artifacts;
+		for (const hookFn of fns) {
+			const result = await hookFn(Object.assign(args, {
+				artifacts,
+				original
+			}));
+			if (result) artifacts = result;
+		}
+		return artifacts;
+	}),
+	"preset:resolved": createReducer((fns) => async (_args) => {
+		const args = Object.assign({}, _args);
+		const original = _args.preset;
+		let preset = args.preset;
+		for (const hookFn of fns) {
+			const result = await hookFn(Object.assign(args, {
+				preset,
+				original
+			}));
+			if (result !== void 0) preset = result;
+		}
+		return preset;
+	}),
+	"css:optimize": createReducer((fns) => (_args) => {
+		const args = Object.assign({}, _args);
+		const original = _args.css;
+		let css = args.css;
+		for (const hookFn of fns) {
+			const result = hookFn(Object.assign(args, {
+				css,
+				original
+			}));
+			if (result !== void 0) css = result;
+		}
+		return css;
+	})
+};
+const syncHooks = [
+	"context:created",
+	"parser:before",
+	"parser:preprocess",
+	"parser:after",
+	"cssgen:done",
+	"css:optimize"
+];
+const callAllAsync = (...fns) => async (...a) => {
+	for (const fn of fns) await fn?.(...a);
+};
+const callAll = (...fns) => (...a) => {
+	fns.forEach((fn) => fn?.(...a));
+};
+const tryCatch = (name, fn) => {
+	return (...args) => {
+		try {
+			return fn(...args);
+		} catch (e) {
+			_bamboocss_logger.logger.caughtError("hooks", `Error in plugin "${name}"`, e);
+		}
+	};
+};
+//#endregion
+//#region src/validation/utils.ts
+const isValidToken = (token) => (0, _bamboocss_shared.isObject)(token) && Object.hasOwnProperty.call(token, "value");
+//#endregion
+//#region src/merge-config.ts
+/**
+* Collect all `extend` properties into an array (to avoid mutation)
+*/
+function getExtends(items) {
+	return items.reduce((merged, { extend }) => {
+		if (!extend) return merged;
+		return (0, _bamboocss_shared.mergeWith)(merged, extend, (originalValue, newValue) => {
+			if (newValue === void 0) return originalValue ?? [];
+			if (originalValue === void 0) return [newValue];
+			if (Array.isArray(originalValue)) return [newValue, ...originalValue];
+			return [newValue, originalValue];
+		});
+	}, {});
+}
+/**
+* Separate the `extend` properties from the rest of the object
+*/
+function mergeRecords(records) {
+	return {
+		...records.reduce((acc, record) => (0, _bamboocss_shared.assign)(acc, record), {}),
+		extend: getExtends(records)
+	};
+}
+/**
+* Merge all `extend` properties into the rest of the object
+*/
+function mergeExtensions(records) {
+	const { extend = [], ...restProps } = mergeRecords(records);
+	return (0, _bamboocss_shared.mergeWith)(restProps, extend, (obj, extensions) => {
+		return (0, _bamboocss_shared.mergeAndConcat)({}, obj, ...extensions);
+	});
+}
+const isEmptyObject = (obj) => typeof obj === "object" && Object.keys(obj).length === 0;
+const compact = (obj) => {
+	return Object.keys(obj).reduce((acc, key) => {
+		if (obj[key] !== void 0 && !isEmptyObject(obj[key])) acc[key] = obj[key];
+		return acc;
+	}, {});
+};
+const tokenKeys = [
+	"description",
+	"extensions",
+	"type",
+	"value",
+	"deprecated"
+];
+/**
+* Merge all configs into a single config
+*/
+function mergeConfigs(configs) {
+	const userConfig = configs.at(-1);
+	const pluginHooks = userConfig.plugins ?? [];
+	if (userConfig.hooks) pluginHooks.push({
+		name: _bamboocss_shared.BAMBOO_CONFIG_NAME,
+		hooks: userConfig.hooks
+	});
+	const reversed = Array.from(configs).reverse();
+	const withoutEmpty = compact((0, _bamboocss_shared.assign)({
+		conditions: mergeExtensions(reversed.map((config) => config.conditions ?? {})),
+		theme: mergeExtensions(reversed.map((config) => config.theme ?? {})),
+		patterns: mergeExtensions(reversed.map((config) => config.patterns ?? {})),
+		utilities: mergeExtensions(reversed.map((config) => config.utilities ?? {})),
+		globalCss: mergeExtensions(reversed.map((config) => config.globalCss ?? {})),
+		globalVars: mergeExtensions(reversed.map((config) => config.globalVars ?? {})),
+		globalFontface: mergeExtensions(reversed.map((config) => config.globalFontface ?? {})),
+		globalPositionTry: mergeExtensions(reversed.map((config) => config.globalPositionTry ?? {})),
+		staticCss: mergeExtensions(reversed.map((config) => config.staticCss ?? {})),
+		themes: mergeExtensions(reversed.map((config) => config.themes ?? {})),
+		hooks: mergeHooks(pluginHooks)
+	}, ...reversed));
+	/**
+	* Properly merge tokens between flat/nested forms by setting the flat form as the default
+	* preset:
+	* ```
+	* tokens: {
+	*   black: {
+	*     value: "black"
+	*   }
+	* }
+	* // color: "black"
+	* ```
+	*
+	* config:
+	* ```
+	* tokens: {
+	*   black: {
+	*     0: { value: "black" },
+	*     10: { value: "black/10" },
+	*     20: { value: "black/20" },
+	*     // ...
+	*   }
+	* }
+	*
+	* // color: "black.20"
+	* ```
+	*/
+	if (withoutEmpty.theme?.tokens) (0, _bamboocss_shared.walkObject)(withoutEmpty.theme.tokens, (args) => args, { stop(token) {
+		if (!isValidToken(token)) return false;
+		if (Object.keys(token).filter((k) => !tokenKeys.includes(k)).length > 0) {
+			token.DEFAULT ||= {};
+			tokenKeys.forEach((key) => {
+				if (token[key] == null) return;
+				token.DEFAULT[key] ||= token[key];
+				delete token[key];
+			});
+		}
+		return true;
+	} });
+	return withoutEmpty;
+}
+//#endregion
+exports.mergeConfigs = mergeConfigs;
+exports.mergeHooks = mergeHooks;

package/dist/merge-config.d.cts

@@ -1,2 +1,16 @@
-import { n as mergeHooks, t as mergeConfigs } from "./merge-config-DVOlBQJY.cjs";
+import { BambooPlugin, Config } from "@bamboocss/types";
+
+//#region src/merge-hooks.d.ts
+declare const mergeHooks: (plugins: BambooPlugin[]) => BambooHooks;
+//#endregion
+//#region src/merge-config.d.ts
+type Extendable<T> = T & {
+  extend?: T;
+};
+type ExtendableConfig = Extendable<Config>;
+/**
+ * Merge all configs into a single config
+ */
+declare function mergeConfigs(configs: ExtendableConfig[]): any;
+//#endregion
 export { mergeConfigs, mergeHooks };

package/dist/merge-config.d.mts

@@ -1,2 +1,16 @@
-import { n as mergeHooks, t as mergeConfigs } from "./merge-config-oEiBYbfB.mjs";
+import { BambooPlugin, Config } from "@bamboocss/types";
+
+//#region src/merge-hooks.d.ts
+declare const mergeHooks: (plugins: BambooPlugin[]) => BambooHooks;
+//#endregion
+//#region src/merge-config.d.ts
+type Extendable<T> = T & {
+  extend?: T;
+};
+type ExtendableConfig = Extendable<Config>;
+/**
+ * Merge all configs into a single config
+ */
+declare function mergeConfigs(configs: ExtendableConfig[]): any;
+//#endregion
 export { mergeConfigs, mergeHooks };

package/dist/merge-config.mjs

@@ -1,2 +1,252 @@
-import { s as mergeHooks, t as mergeConfigs } from "./merge-config-DI__LOWx.mjs";
+import { BAMBOO_CONFIG_NAME, assign, isObject, mergeAndConcat, mergeWith, walkObject } from "@bamboocss/shared";
+import { logger } from "@bamboocss/logger";
+//#region src/merge-hooks.ts
+const mergeHooks = (plugins) => {
+	const hooksFns = {};
+	plugins.forEach(({ name, hooks }) => {
+		Object.entries(hooks ?? {}).forEach(([key, value]) => {
+			if (!hooksFns[key]) hooksFns[key] = [];
+			hooksFns[key].push([name, value]);
+		});
+	});
+	return Object.fromEntries(Object.entries(hooksFns).map(([key, entries]) => {
+		const fns = entries.map(([name, fn]) => tryCatch(name, fn));
+		const reducer = key in reducers ? reducers[key] : void 0;
+		if (reducer) return [key, reducer(fns)];
+		return [key, syncHooks.includes(key) ? callAll(...fns) : callAllAsync(...fns)];
+	}));
+};
+const createReducer = (reducer) => reducer;
+const reducers = {
+	"config:resolved": createReducer((fns) => async (_args) => {
+		const args = Object.assign({}, _args);
+		const original = _args.config;
+		let config = args.config;
+		for (const hookFn of fns) {
+			const result = await hookFn(Object.assign(args, {
+				config,
+				original
+			}));
+			if (result !== void 0) config = result;
+		}
+		return config;
+	}),
+	"parser:before": createReducer((fns) => (_args) => {
+		const args = Object.assign({}, _args);
+		const original = _args.content;
+		let content = args.content;
+		for (const hookFn of fns) {
+			const result = hookFn(Object.assign(args, {
+				content,
+				original
+			}));
+			if (result !== void 0) content = result;
+		}
+		return content;
+	}),
+	"parser:preprocess": createReducer((fns) => (_args) => {
+		const args = Object.assign({}, _args);
+		const original = _args.data;
+		let data = args.data;
+		for (const hookFn of fns) {
+			const result = hookFn(Object.assign(args, {
+				data,
+				original
+			}));
+			if (result !== void 0) data = result;
+		}
+		return data;
+	}),
+	"cssgen:done": createReducer((fns) => (_args) => {
+		const args = Object.assign({}, _args);
+		const original = _args.content;
+		let content = args.content;
+		for (const hookFn of fns) {
+			const result = hookFn(Object.assign(args, {
+				content,
+				original
+			}));
+			if (result !== void 0) content = result;
+		}
+		return content;
+	}),
+	"codegen:prepare": createReducer((fns) => async (_args) => {
+		const args = Object.assign({}, _args);
+		const original = _args.artifacts;
+		let artifacts = args.artifacts;
+		for (const hookFn of fns) {
+			const result = await hookFn(Object.assign(args, {
+				artifacts,
+				original
+			}));
+			if (result) artifacts = result;
+		}
+		return artifacts;
+	}),
+	"preset:resolved": createReducer((fns) => async (_args) => {
+		const args = Object.assign({}, _args);
+		const original = _args.preset;
+		let preset = args.preset;
+		for (const hookFn of fns) {
+			const result = await hookFn(Object.assign(args, {
+				preset,
+				original
+			}));
+			if (result !== void 0) preset = result;
+		}
+		return preset;
+	}),
+	"css:optimize": createReducer((fns) => (_args) => {
+		const args = Object.assign({}, _args);
+		const original = _args.css;
+		let css = args.css;
+		for (const hookFn of fns) {
+			const result = hookFn(Object.assign(args, {
+				css,
+				original
+			}));
+			if (result !== void 0) css = result;
+		}
+		return css;
+	})
+};
+const syncHooks = [
+	"context:created",
+	"parser:before",
+	"parser:preprocess",
+	"parser:after",
+	"cssgen:done",
+	"css:optimize"
+];
+const callAllAsync = (...fns) => async (...a) => {
+	for (const fn of fns) await fn?.(...a);
+};
+const callAll = (...fns) => (...a) => {
+	fns.forEach((fn) => fn?.(...a));
+};
+const tryCatch = (name, fn) => {
+	return (...args) => {
+		try {
+			return fn(...args);
+		} catch (e) {
+			logger.caughtError("hooks", `Error in plugin "${name}"`, e);
+		}
+	};
+};
+//#endregion
+//#region src/validation/utils.ts
+const isValidToken = (token) => isObject(token) && Object.hasOwnProperty.call(token, "value");
+//#endregion
+//#region src/merge-config.ts
+/**
+* Collect all `extend` properties into an array (to avoid mutation)
+*/
+function getExtends(items) {
+	return items.reduce((merged, { extend }) => {
+		if (!extend) return merged;
+		return mergeWith(merged, extend, (originalValue, newValue) => {
+			if (newValue === void 0) return originalValue ?? [];
+			if (originalValue === void 0) return [newValue];
+			if (Array.isArray(originalValue)) return [newValue, ...originalValue];
+			return [newValue, originalValue];
+		});
+	}, {});
+}
+/**
+* Separate the `extend` properties from the rest of the object
+*/
+function mergeRecords(records) {
+	return {
+		...records.reduce((acc, record) => assign(acc, record), {}),
+		extend: getExtends(records)
+	};
+}
+/**
+* Merge all `extend` properties into the rest of the object
+*/
+function mergeExtensions(records) {
+	const { extend = [], ...restProps } = mergeRecords(records);
+	return mergeWith(restProps, extend, (obj, extensions) => {
+		return mergeAndConcat({}, obj, ...extensions);
+	});
+}
+const isEmptyObject = (obj) => typeof obj === "object" && Object.keys(obj).length === 0;
+const compact = (obj) => {
+	return Object.keys(obj).reduce((acc, key) => {
+		if (obj[key] !== void 0 && !isEmptyObject(obj[key])) acc[key] = obj[key];
+		return acc;
+	}, {});
+};
+const tokenKeys = [
+	"description",
+	"extensions",
+	"type",
+	"value",
+	"deprecated"
+];
+/**
+* Merge all configs into a single config
+*/
+function mergeConfigs(configs) {
+	const userConfig = configs.at(-1);
+	const pluginHooks = userConfig.plugins ?? [];
+	if (userConfig.hooks) pluginHooks.push({
+		name: BAMBOO_CONFIG_NAME,
+		hooks: userConfig.hooks
+	});
+	const reversed = Array.from(configs).reverse();
+	const withoutEmpty = compact(assign({
+		conditions: mergeExtensions(reversed.map((config) => config.conditions ?? {})),
+		theme: mergeExtensions(reversed.map((config) => config.theme ?? {})),
+		patterns: mergeExtensions(reversed.map((config) => config.patterns ?? {})),
+		utilities: mergeExtensions(reversed.map((config) => config.utilities ?? {})),
+		globalCss: mergeExtensions(reversed.map((config) => config.globalCss ?? {})),
+		globalVars: mergeExtensions(reversed.map((config) => config.globalVars ?? {})),
+		globalFontface: mergeExtensions(reversed.map((config) => config.globalFontface ?? {})),
+		globalPositionTry: mergeExtensions(reversed.map((config) => config.globalPositionTry ?? {})),
+		staticCss: mergeExtensions(reversed.map((config) => config.staticCss ?? {})),
+		themes: mergeExtensions(reversed.map((config) => config.themes ?? {})),
+		hooks: mergeHooks(pluginHooks)
+	}, ...reversed));
+	/**
+	* Properly merge tokens between flat/nested forms by setting the flat form as the default
+	* preset:
+	* ```
+	* tokens: {
+	*   black: {
+	*     value: "black"
+	*   }
+	* }
+	* // color: "black"
+	* ```
+	*
+	* config:
+	* ```
+	* tokens: {
+	*   black: {
+	*     0: { value: "black" },
+	*     10: { value: "black/10" },
+	*     20: { value: "black/20" },
+	*     // ...
+	*   }
+	* }
+	*
+	* // color: "black.20"
+	* ```
+	*/
+	if (withoutEmpty.theme?.tokens) walkObject(withoutEmpty.theme.tokens, (args) => args, { stop(token) {
+		if (!isValidToken(token)) return false;
+		if (Object.keys(token).filter((k) => !tokenKeys.includes(k)).length > 0) {
+			token.DEFAULT ||= {};
+			tokenKeys.forEach((key) => {
+				if (token[key] == null) return;
+				token.DEFAULT[key] ||= token[key];
+				delete token[key];
+			});
+		}
+		return true;
+	} });
+	return withoutEmpty;
+}
+//#endregion
 export { mergeConfigs, mergeHooks };

package/dist/resolve-ts-path-pattern.cjs

@@ -1,5 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("./diff-config-Co_3mDXE.cjs");
 let path = require("path");
 //#region src/resolve-ts-path-pattern.ts
 /**

package/dist/resolve-ts-path-pattern.d.cts

@@ -1,5 +1,9 @@
-import { t as PathMapping } from "./ts-config-paths-wVx39QZ0.cjs";
-
+//#region src/ts-config-paths.d.ts
+interface PathMapping {
+  pattern: RegExp;
+  paths: string[];
+}
+//#endregion
 //#region src/resolve-ts-path-pattern.d.ts
 /**
  * @see https://github.com/aleclarson/vite-tsconfig-paths/blob/e8f0acf7adfcfbf77edbe937f64b4e5d39557ad0/src/index.ts#LL231C57-L231C57

package/dist/resolve-ts-path-pattern.d.mts

@@ -1,5 +1,9 @@
-import { t as PathMapping } from "./ts-config-paths-CvGId8kq.mjs";
-
+//#region src/ts-config-paths.d.ts
+interface PathMapping {
+  pattern: RegExp;
+  paths: string[];
+}
+//#endregion
 //#region src/resolve-ts-path-pattern.d.ts
 /**
  * @see https://github.com/aleclarson/vite-tsconfig-paths/blob/e8f0acf7adfcfbf77edbe937f64b4e5d39557ad0/src/index.ts#LL231C57-L231C57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bamboocss/config",
-  "version": "1.11.3",
+  "version": "1.12.0",
   "description": "Find and load bamboo config",
   "homepage": "https://bamboo-css.com",
   "license": "MIT",
@@ -64,11 +64,11 @@
     "escalade": "3.2.0",
     "microdiff": "1.5.0",
     "typescript": "6.0.2",
-    "@bamboocss/logger": "1.11.3",
-    "@bamboocss/preset-base": "1.11.3",
-    "@bamboocss/shared": "1.11.3",
-    "@bamboocss/types": "1.11.3",
-    "@bamboocss/preset-bamboo": "1.11.3"
+    "@bamboocss/logger": "1.12.0",
+    "@bamboocss/preset-bamboo": "1.12.0",
+    "@bamboocss/preset-base": "1.12.0",
+    "@bamboocss/shared": "1.12.0",
+    "@bamboocss/types": "1.12.0"
   },
   "devDependencies": {
     "pkg-types": "2.3.0"