@zayne-labs/prettier-config 0.13.14 → 0.13.15

package/dist/constants/defaults.d.ts

@@ -1,13 +1,12 @@
 //#region src/constants/defaults.d.ts
-declare const getDefaultTailwindSettings: () => {
+export declare const getDefaultTailwindSettings: () => {
   tailwindAttributes: ["className", "classNames", "classes", "class", "/.*Classes/", "toastOptions"];
   tailwindFunctions: ["cnMerge", "cnJoin", "cn", "tv", "tw", "css", "twMerge", "twJoin", "clsx", "/^get[A-Z][a-zA-Z0-9]*Props$/"];
   tailwindStylesheet: "./tailwind.css";
 };
-declare const getDefaultImportSortingOrder: () => {
+export declare const getDefaultImportSortingOrder: () => {
   css: ".css$";
   main: ["^https?://", "<BUILTIN_MODULES>", "^(bun|jsr|npm):", "<THIRD_PARTY_MODULES>", "^(@@?/|[#$%~])", "^(?!.*[.]css$)[./].*$"];
 };
 //#endregion
-export { getDefaultImportSortingOrder, getDefaultTailwindSettings };
 //# sourceMappingURL=defaults.d.ts.map

package/dist/index.d.ts

@@ -1,16 +1,15 @@
-import { a as OptionsTailwindCss, i as OptionsSortImports, n as OptionsAstro, o as ResolvedPrettierConfig, r as OptionsPrettierConfig, t as ExtractOptions } from "./types-BvFb4aYp.js";
-
+import { a as OptionsTailwindCss, i as OptionsSortImports, n as OptionsAstro, o as ResolvedPrettierConfig, r as OptionsPrettierConfig, t as ExtractOptions } from "./types-DJPsI734.js";
 //#region src/configs/astro.d.ts
-declare const astro: (options: ExtractOptions<OptionsPrettierConfig["astro"]>) => Promise<typeof options>;
+export declare const astro: (options: ExtractOptions<OptionsPrettierConfig["astro"]>) => Promise<typeof options>;
 //#endregion
 //#region src/configs/base.d.ts
-declare const base: (options: ExtractOptions<OptionsPrettierConfig["base"]>) => typeof options;
+export declare const base: (options: ExtractOptions<OptionsPrettierConfig["base"]>) => typeof options;
 //#endregion
 //#region src/configs/tailwindcss.d.ts
-declare const tailwindcss: (options: ExtractOptions<OptionsPrettierConfig["tailwindcss"]>) => Promise<typeof options>;
+export declare const tailwindcss: (options: ExtractOptions<OptionsPrettierConfig["tailwindcss"]>) => Promise<typeof options>;
 //#endregion
 //#region src/configs/sort.d.ts
-declare const sortImports: (options: ExtractOptions<OptionsPrettierConfig["sortImports"]>) => Promise<typeof options>;
+export declare const sortImports: (options: ExtractOptions<OptionsPrettierConfig["sortImports"]>) => Promise<typeof options>;
 //#endregion
 //#region src/factory.d.ts
 /**
@@ -36,7 +35,7 @@ declare const sortImports: (options: ExtractOptions<OptionsPrettierConfig["sortI
  * );
  * ```
  */
-declare const zayne: (options?: OptionsPrettierConfig, ...extraConfigs: ResolvedPrettierConfig[]) => Promise<ResolvedPrettierConfig>;
+export declare const zayne: (options?: OptionsPrettierConfig, ...extraConfigs: ResolvedPrettierConfig[]) => Promise<ResolvedPrettierConfig>;
 //#endregion
-export { ExtractOptions, OptionsAstro, OptionsPrettierConfig, OptionsSortImports, OptionsTailwindCss, ResolvedPrettierConfig, astro, base, sortImports, tailwindcss, zayne };
+export { ExtractOptions, OptionsAstro, OptionsPrettierConfig, OptionsSortImports, OptionsTailwindCss, ResolvedPrettierConfig };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,4 +1,4 @@
-import { n as ensurePackages, o as resolveOptions, t as combineConfigs } from "./utils-D5XWgHFL.js";
+import { n as ensurePackages, o as resolveOptions, t as combineConfigs } from "./utils-CRitUEuM.js";
 import { n as getDefaultTailwindSettings, t as getDefaultImportSortingOrder } from "./defaults-DwaL-Owc.js";
 //#region src/configs/astro.ts
 const astro = async (options) => {
@@ -95,13 +95,14 @@ const sortImports = async (options) => {
 */
 const zayne = async (options = {}, ...extraConfigs) => {
 	const { astro: enabledAstro = false, base: enabledBase = true, sortImports: enabledSortImports = true, tailwindcss: enabledTailwindcss = false } = options;
-	return await combineConfigs([
+	const configArray = [
 		enabledBase ? base(resolveOptions(enabledBase)) : void 0,
 		enabledAstro ? astro(resolveOptions(enabledAstro)) : void 0,
 		enabledSortImports ? sortImports(resolveOptions(enabledSortImports)) : void 0,
 		...extraConfigs,
 		enabledTailwindcss ? tailwindcss(resolveOptions(enabledTailwindcss)) : void 0
-	]);
+	];
+	return await combineConfigs(configArray);
 };
 //#endregion
 export { astro, base, sortImports, tailwindcss, zayne };

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../src/configs/astro.ts","../src/configs/base.ts","../src/configs/tailwindcss.ts","../src/configs/sort.ts","../src/factory.ts"],"sourcesContent":["import type { ExtractOptions, OptionsPrettierConfig } from \"@/types\";\nimport { ensurePackages } from \"@/utils\";\n\nexport const astro = async (\n\toptions: ExtractOptions<OptionsPrettierConfig[\"astro\"]>\n): Promise<typeof options> => {\n\tawait ensurePackages([\"prettier-plugin-astro\"]);\n\n\treturn {\n\t\t...options,\n\n\t\toverrides: [\n\t\t\t{\n\t\t\t\tfiles: \"*.astro\",\n\t\t\t\toptions: { parser: \"astro\" },\n\t\t\t},\n\t\t\t...(options.overrides ?? []),\n\t\t],\n\n\t\tplugins: [\"prettier-plugin-astro\", ...(options.plugins ?? [])],\n\t};\n};\n","import type { ExtractOptions, OptionsPrettierConfig } from \"@/types\";\n\nexport const base = (options: ExtractOptions<OptionsPrettierConfig[\"base\"]>): typeof options => {\n\treturn {\n\t\texperimentalOperatorPosition: \"start\",\n\t\texperimentalTernaries: true,\n\t\tjsxSingleQuote: false,\n\t\tprintWidth: 107,\n\t\tsingleQuote: false,\n\t\ttabWidth: 3,\n\t\ttrailingComma: \"es5\",\n\t\tuseTabs: true,\n\n\t\t...options,\n\t};\n};\n","import { getDefaultTailwindSettings } from \"@/constants/defaults\";\nimport type { ExtractOptions, OptionsPrettierConfig } from \"@/types\";\nimport { ensurePackages } from \"@/utils\";\n\nexport const tailwindcss = async (\n\toptions: ExtractOptions<OptionsPrettierConfig[\"tailwindcss\"]>\n): Promise<typeof options> => {\n\tawait ensurePackages([\n\t\t\"prettier-plugin-tailwindcss\",\n\t\t\"prettier-plugin-classnames\",\n\t\t\"prettier-plugin-merge\",\n\t]);\n\n\tconst zayneDefaultSettings = getDefaultTailwindSettings();\n\n\treturn {\n\t\ttailwindStylesheet: zayneDefaultSettings.tailwindStylesheet,\n\n\t\t...options,\n\n\t\tcustomAttributes: [...zayneDefaultSettings.tailwindAttributes, ...(options.customAttributes ?? [])],\n\t\tcustomFunctions: [...zayneDefaultSettings.tailwindFunctions, ...(options.customFunctions ?? [])],\n\n\t\tplugins: [\n\t\t\t\"prettier-plugin-tailwindcss\",\n\t\t\t\"prettier-plugin-classnames\",\n\n\t\t\t...(options.plugins ?? []),\n\n\t\t\t/**\n\t\t\t * The 'merge' plugin must always come last\n\t\t\t * @see https://github.com/ony3000/prettier-plugin-merge#why-prettier-plugin-merge\n\t\t\t */\n\t\t\t\"prettier-plugin-merge\",\n\t\t],\n\n\t\ttailwindAttributes: [\n\t\t\t...zayneDefaultSettings.tailwindAttributes,\n\t\t\t...(options.tailwindAttributes ?? []),\n\t\t],\n\t\ttailwindFunctions: [...zayneDefaultSettings.tailwindFunctions, ...(options.tailwindFunctions ?? [])],\n\t};\n};\n","import { getDefaultImportSortingOrder } from \"@/constants/defaults\";\nimport type { ExtractOptions, OptionsPrettierConfig } from \"@/types\";\nimport { ensurePackages } from \"@/utils\";\n\nexport const sortImports = async (\n\toptions: ExtractOptions<OptionsPrettierConfig[\"sortImports\"]>\n): Promise<typeof options> => {\n\tawait ensurePackages([\"@ianvs/prettier-plugin-sort-imports\"]);\n\n\tconst sortingOrder = getDefaultImportSortingOrder();\n\n\treturn {\n\t\t...options,\n\n\t\timportOrder: [...sortingOrder.main, ...(options.importOrder ?? []), sortingOrder.css],\n\t\timportOrderSafeSideEffects: [sortingOrder.css, ...(options.importOrderSafeSideEffects ?? [])],\n\t\timportOrderTypeScriptVersion: \"5.9.3\",\n\n\t\tplugins: [\"@zayne-labs/prettier-config/plugins/safe-sort-imports\", ...(options.plugins ?? [])],\n\t};\n};\n","import type { Awaitable } from \"@zayne-labs/toolkit-type-helpers\";\nimport { astro, base, sortImports, tailwindcss } from \"./configs\";\nimport type { OptionsPrettierConfig, ResolvedPrettierConfig } from \"./types\";\nimport { combineConfigs, resolveOptions } from \"./utils\";\n\n/**\n * @description Factory function for creating a customized Prettier configuration.\n * Combines base, Astro, and Tailwind CSS configurations based on the provided options.\n * Any Array values (like `plugins` and `overrides`) are merged, while other values are overwritten.\n *\n * @example\n * ```ts\n * // prettier.config.ts\n * import { zayne } from \"@zayne-labs/prettier-config\";\n *\n * export default zayne(\n *   {\n *     base: true,\n *     tailwindcss: { tailwindStylesheet: \"./src/styles.css\" },\n *     astro: true,\n *   },\n *     // Extra config to merge (optional)\n *   {\n *     useTabs: false,\n *   }\n * );\n * ```\n */\nexport const zayne = async (\n\toptions: OptionsPrettierConfig = {},\n\t...extraConfigs: ResolvedPrettierConfig[]\n) => {\n\tconst {\n\t\tastro: enabledAstro = false,\n\t\tbase: enabledBase = true,\n\t\tsortImports: enabledSortImports = true,\n\t\ttailwindcss: enabledTailwindcss = false,\n\t} = options;\n\n\tconst configArray: Array<Awaitable<ResolvedPrettierConfig | undefined>> = [\n\t\tenabledBase ? base(resolveOptions(enabledBase)) : undefined,\n\t\tenabledAstro ? astro(resolveOptions(enabledAstro)) : undefined,\n\t\tenabledSortImports ? sortImports(resolveOptions(enabledSortImports)) : undefined,\n\n\t\t...extraConfigs,\n\n\t\t/**\n\t\t * Tailwind plugin most always be the last one to avoid conflicts\n\t\t * @see https://github.com/tailwindlabs/prettier-plugin-tailwindcss#compatibility-with-other-prettier-plugins\n\t\t */\n\t\tenabledTailwindcss ? tailwindcss(resolveOptions(enabledTailwindcss)) : undefined,\n\t];\n\n\tconst accumulatedConfig = await combineConfigs(configArray);\n\n\treturn accumulatedConfig;\n};\n"],"mappings":";;;AAGA,MAAa,QAAQ,OACpB,YAC6B;CAC7B,MAAM,eAAe,CAAC,uBAAuB,CAAC;CAE9C,OAAO;EACN,GAAG;EAEH,WAAW,CACV;GACC,OAAO;GACP,SAAS,EAAE,QAAQ,QAAQ;EAC5B,GACA,GAAI,QAAQ,aAAa,CAAC,CAC3B;EAEA,SAAS,CAAC,yBAAyB,GAAI,QAAQ,WAAW,CAAC,CAAE;CAC9D;AACD;;;ACnBA,MAAa,QAAQ,YAA2E;CAC/F,OAAO;EACN,8BAA8B;EAC9B,uBAAuB;EACvB,gBAAgB;EAChB,YAAY;EACZ,aAAa;EACb,UAAU;EACV,eAAe;EACf,SAAS;EAET,GAAG;CACJ;AACD;;;ACXA,MAAa,cAAc,OAC1B,YAC6B;CAC7B,MAAM,eAAe;EACpB;EACA;EACA;CACD,CAAC;CAED,MAAM,uBAAuB,2BAA2B;CAExD,OAAO;EACN,oBAAoB,qBAAqB;EAEzC,GAAG;EAEH,kBAAkB,CAAC,GAAG,qBAAqB,oBAAoB,GAAI,QAAQ,oBAAoB,CAAC,CAAE;EAClG,iBAAiB,CAAC,GAAG,qBAAqB,mBAAmB,GAAI,QAAQ,mBAAmB,CAAC,CAAE;EAE/F,SAAS;GACR;GACA;GAEA,GAAI,QAAQ,WAAW,CAAC;GAMxB;EACD;EAEA,oBAAoB,CACnB,GAAG,qBAAqB,oBACxB,GAAI,QAAQ,sBAAsB,CAAC,CACpC;EACA,mBAAmB,CAAC,GAAG,qBAAqB,mBAAmB,GAAI,QAAQ,qBAAqB,CAAC,CAAE;CACpG;AACD;;;ACtCA,MAAa,cAAc,OAC1B,YAC6B;CAC7B,MAAM,eAAe,CAAC,qCAAqC,CAAC;CAE5D,MAAM,eAAe,6BAA6B;CAElD,OAAO;EACN,GAAG;EAEH,aAAa;GAAC,GAAG,aAAa;GAAM,GAAI,QAAQ,eAAe,CAAC;GAAI,aAAa;EAAG;EACpF,4BAA4B,CAAC,aAAa,KAAK,GAAI,QAAQ,8BAA8B,CAAC,CAAE;EAC5F,8BAA8B;EAE9B,SAAS,CAAC,yDAAyD,GAAI,QAAQ,WAAW,CAAC,CAAE;CAC9F;AACD;;;;;;;;;;;;;;;;;;;;;;;;;;ACQA,MAAa,QAAQ,OACpB,UAAiC,CAAC,GAClC,GAAG,iBACC;CACJ,MAAM,EACL,OAAO,eAAe,OACtB,MAAM,cAAc,MACpB,aAAa,qBAAqB,MAClC,aAAa,qBAAqB,UAC/B;CAkBJ,OAAO,MAFyB,eAAe;EAb9C,cAAc,KAAK,eAAe,WAAW,CAAC,IAAI,KAAA;EAClD,eAAe,MAAM,eAAe,YAAY,CAAC,IAAI,KAAA;EACrD,qBAAqB,YAAY,eAAe,kBAAkB,CAAC,IAAI,KAAA;EAEvE,GAAG;EAMH,qBAAqB,YAAY,eAAe,kBAAkB,CAAC,IAAI,KAAA;CAGf,CAAC;AAG3D"}
+{"version":3,"file":"index.js","names":[],"sources":["../src/configs/astro.ts","../src/configs/base.ts","../src/configs/tailwindcss.ts","../src/configs/sort.ts","../src/factory.ts"],"sourcesContent":["import type { ExtractOptions, OptionsPrettierConfig } from \"@/types\";\nimport { ensurePackages } from \"@/utils\";\n\nexport const astro = async (\n\toptions: ExtractOptions<OptionsPrettierConfig[\"astro\"]>\n): Promise<typeof options> => {\n\tawait ensurePackages([\"prettier-plugin-astro\"]);\n\n\treturn {\n\t\t...options,\n\n\t\toverrides: [\n\t\t\t{\n\t\t\t\tfiles: \"*.astro\",\n\t\t\t\toptions: { parser: \"astro\" },\n\t\t\t},\n\t\t\t...(options.overrides ?? []),\n\t\t],\n\n\t\tplugins: [\"prettier-plugin-astro\", ...(options.plugins ?? [])],\n\t};\n};\n","import type { ExtractOptions, OptionsPrettierConfig } from \"@/types\";\n\nexport const base = (options: ExtractOptions<OptionsPrettierConfig[\"base\"]>): typeof options => {\n\treturn {\n\t\texperimentalOperatorPosition: \"start\",\n\t\texperimentalTernaries: true,\n\t\tjsxSingleQuote: false,\n\t\tprintWidth: 107,\n\t\tsingleQuote: false,\n\t\ttabWidth: 3,\n\t\ttrailingComma: \"es5\",\n\t\tuseTabs: true,\n\n\t\t...options,\n\t};\n};\n","import { getDefaultTailwindSettings } from \"@/constants/defaults\";\nimport type { ExtractOptions, OptionsPrettierConfig } from \"@/types\";\nimport { ensurePackages } from \"@/utils\";\n\nexport const tailwindcss = async (\n\toptions: ExtractOptions<OptionsPrettierConfig[\"tailwindcss\"]>\n): Promise<typeof options> => {\n\tawait ensurePackages([\n\t\t\"prettier-plugin-tailwindcss\",\n\t\t\"prettier-plugin-classnames\",\n\t\t\"prettier-plugin-merge\",\n\t]);\n\n\tconst zayneDefaultSettings = getDefaultTailwindSettings();\n\n\treturn {\n\t\ttailwindStylesheet: zayneDefaultSettings.tailwindStylesheet,\n\n\t\t...options,\n\n\t\tcustomAttributes: [...zayneDefaultSettings.tailwindAttributes, ...(options.customAttributes ?? [])],\n\t\tcustomFunctions: [...zayneDefaultSettings.tailwindFunctions, ...(options.customFunctions ?? [])],\n\n\t\tplugins: [\n\t\t\t\"prettier-plugin-tailwindcss\",\n\t\t\t\"prettier-plugin-classnames\",\n\n\t\t\t...(options.plugins ?? []),\n\n\t\t\t/**\n\t\t\t * The 'merge' plugin must always come last\n\t\t\t * @see https://github.com/ony3000/prettier-plugin-merge#why-prettier-plugin-merge\n\t\t\t */\n\t\t\t\"prettier-plugin-merge\",\n\t\t],\n\n\t\ttailwindAttributes: [\n\t\t\t...zayneDefaultSettings.tailwindAttributes,\n\t\t\t...(options.tailwindAttributes ?? []),\n\t\t],\n\t\ttailwindFunctions: [...zayneDefaultSettings.tailwindFunctions, ...(options.tailwindFunctions ?? [])],\n\t};\n};\n","import { getDefaultImportSortingOrder } from \"@/constants/defaults\";\nimport type { ExtractOptions, OptionsPrettierConfig } from \"@/types\";\nimport { ensurePackages } from \"@/utils\";\n\nexport const sortImports = async (\n\toptions: ExtractOptions<OptionsPrettierConfig[\"sortImports\"]>\n): Promise<typeof options> => {\n\tawait ensurePackages([\"@ianvs/prettier-plugin-sort-imports\"]);\n\n\tconst sortingOrder = getDefaultImportSortingOrder();\n\n\treturn {\n\t\t...options,\n\n\t\timportOrder: [...sortingOrder.main, ...(options.importOrder ?? []), sortingOrder.css],\n\t\timportOrderSafeSideEffects: [sortingOrder.css, ...(options.importOrderSafeSideEffects ?? [])],\n\t\timportOrderTypeScriptVersion: \"5.9.3\",\n\n\t\tplugins: [\"@zayne-labs/prettier-config/plugins/safe-sort-imports\", ...(options.plugins ?? [])],\n\t};\n};\n","import type { Awaitable } from \"@zayne-labs/toolkit-type-helpers\";\nimport { astro, base, sortImports, tailwindcss } from \"./configs\";\nimport type { OptionsPrettierConfig, ResolvedPrettierConfig } from \"./types\";\nimport { combineConfigs, resolveOptions } from \"./utils\";\n\n/**\n * @description Factory function for creating a customized Prettier configuration.\n * Combines base, Astro, and Tailwind CSS configurations based on the provided options.\n * Any Array values (like `plugins` and `overrides`) are merged, while other values are overwritten.\n *\n * @example\n * ```ts\n * // prettier.config.ts\n * import { zayne } from \"@zayne-labs/prettier-config\";\n *\n * export default zayne(\n *   {\n *     base: true,\n *     tailwindcss: { tailwindStylesheet: \"./src/styles.css\" },\n *     astro: true,\n *   },\n *     // Extra config to merge (optional)\n *   {\n *     useTabs: false,\n *   }\n * );\n * ```\n */\nexport const zayne = async (\n\toptions: OptionsPrettierConfig = {},\n\t...extraConfigs: ResolvedPrettierConfig[]\n) => {\n\tconst {\n\t\tastro: enabledAstro = false,\n\t\tbase: enabledBase = true,\n\t\tsortImports: enabledSortImports = true,\n\t\ttailwindcss: enabledTailwindcss = false,\n\t} = options;\n\n\tconst configArray: Array<Awaitable<ResolvedPrettierConfig | undefined>> = [\n\t\tenabledBase ? base(resolveOptions(enabledBase)) : undefined,\n\t\tenabledAstro ? astro(resolveOptions(enabledAstro)) : undefined,\n\t\tenabledSortImports ? sortImports(resolveOptions(enabledSortImports)) : undefined,\n\n\t\t...extraConfigs,\n\n\t\t/**\n\t\t * Tailwind plugin most always be the last one to avoid conflicts\n\t\t * @see https://github.com/tailwindlabs/prettier-plugin-tailwindcss#compatibility-with-other-prettier-plugins\n\t\t */\n\t\tenabledTailwindcss ? tailwindcss(resolveOptions(enabledTailwindcss)) : undefined,\n\t];\n\n\tconst accumulatedConfig = await combineConfigs(configArray);\n\n\treturn accumulatedConfig;\n};\n"],"mappings":";;;AAGA,MAAa,QAAQ,OACpB,YAC6B;CAC7B,MAAM,eAAe,CAAC,uBAAuB,CAAC;CAE9C,OAAO;EACN,GAAG;EAEH,WAAW,CACV;GACC,OAAO;GACP,SAAS,EAAE,QAAQ,QAAQ;EAC5B,GACA,GAAI,QAAQ,aAAa,CAAC,CAC3B;EAEA,SAAS,CAAC,yBAAyB,GAAI,QAAQ,WAAW,CAAC,CAAE;CAC9D;AACD;;;ACnBA,MAAa,QAAQ,YAA2E;CAC/F,OAAO;EACN,8BAA8B;EAC9B,uBAAuB;EACvB,gBAAgB;EAChB,YAAY;EACZ,aAAa;EACb,UAAU;EACV,eAAe;EACf,SAAS;EAET,GAAG;CACJ;AACD;;;ACXA,MAAa,cAAc,OAC1B,YAC6B;CAC7B,MAAM,eAAe;EACpB;EACA;EACA;CACD,CAAC;CAED,MAAM,uBAAuB,2BAA2B;CAExD,OAAO;EACN,oBAAoB,qBAAqB;EAEzC,GAAG;EAEH,kBAAkB,CAAC,GAAG,qBAAqB,oBAAoB,GAAI,QAAQ,oBAAoB,CAAC,CAAE;EAClG,iBAAiB,CAAC,GAAG,qBAAqB,mBAAmB,GAAI,QAAQ,mBAAmB,CAAC,CAAE;EAE/F,SAAS;GACR;GACA;GAEA,GAAI,QAAQ,WAAW,CAAC;GAMxB;EACD;EAEA,oBAAoB,CACnB,GAAG,qBAAqB,oBACxB,GAAI,QAAQ,sBAAsB,CAAC,CACpC;EACA,mBAAmB,CAAC,GAAG,qBAAqB,mBAAmB,GAAI,QAAQ,qBAAqB,CAAC,CAAE;CACpG;AACD;;;ACtCA,MAAa,cAAc,OAC1B,YAC6B;CAC7B,MAAM,eAAe,CAAC,qCAAqC,CAAC;CAE5D,MAAM,eAAe,6BAA6B;CAElD,OAAO;EACN,GAAG;EAEH,aAAa;GAAC,GAAG,aAAa;GAAM,GAAI,QAAQ,eAAe,CAAC;GAAI,aAAa;EAAG;EACpF,4BAA4B,CAAC,aAAa,KAAK,GAAI,QAAQ,8BAA8B,CAAC,CAAE;EAC5F,8BAA8B;EAE9B,SAAS,CAAC,yDAAyD,GAAI,QAAQ,WAAW,CAAC,CAAE;CAC9F;AACD;;;;;;;;;;;;;;;;;;;;;;;;;;ACQA,MAAa,QAAQ,OACpB,UAAiC,CAAC,GAClC,GAAG,iBACC;CACJ,MAAM,EACL,OAAO,eAAe,OACtB,MAAM,cAAc,MACpB,aAAa,qBAAqB,MAClC,aAAa,qBAAqB,UAC/B;CAEJ,MAAM,cAAoE;EACzE,cAAc,KAAK,eAAe,WAAW,CAAC,IAAI,KAAA;EAClD,eAAe,MAAM,eAAe,YAAY,CAAC,IAAI,KAAA;EACrD,qBAAqB,YAAY,eAAe,kBAAkB,CAAC,IAAI,KAAA;EAEvE,GAAG;EAMH,qBAAqB,YAAY,eAAe,kBAAkB,CAAC,IAAI,KAAA;CACxE;CAIA,OAAO,MAFyB,eAAe,WAAW;AAG3D"}

package/dist/plugins/safe-sort-imports.d.ts

@@ -1,5 +1,4 @@
 import { Parser, Printer } from "prettier";
-
 //#region src/plugins/safe-sort-imports.d.ts
 declare const safeSortPlugin: {
   parsers: Record<string, Parser>;

package/dist/plugins/safe-sort-imports.js

@@ -1,4 +1,4 @@
-import { i as isPackageInScope, r as interopDefault } from "../utils-D5XWgHFL.js";
+import { i as isPackageInScope, r as interopDefault } from "../utils-CRitUEuM.js";
 //#region src/plugins/safe-sort-imports.ts
 /**
 * @description This is a temporary fix until the plugin is updated to only load the parsers for the plugins that are in scope.

package/dist/{types-BvFb4aYp.d.ts → types-DJPsI734.d.ts}

@@ -1,6 +1,5 @@
 import { AnyString, ExtractUnion } from "@zayne-labs/toolkit-type-helpers";
 import { Config, Plugin } from "prettier";
-
 //#region src/types.d.ts
 type RestOfAllowedPluginTypes = AnyString | Plugin | URL;
 type OptionsClassNames = {
@@ -77,7 +76,7 @@ type OptionsAstro = {
    * @docs [prettier-plugin-astro#astroskipfrontmatter](https://github.com/withastro/prettier-plugin-astro#astroskipfrontmatter)
    */
   astroSkipFrontmatter?: boolean;
-  overrides?: Array<
+  overrides?: Array<NonNullable<Config["overrides"]>[number] |
   /**
    * @docs [prettier-plugin-astro#recommended-configuration](https://github.com/withastro/prettier-plugin-astro#recommended-configuration)
    */
@@ -86,7 +85,7 @@ type OptionsAstro = {
     options: {
       parser: "astro";
     };
-  } | NonNullable<Config["overrides"]>[number]>;
+  }>;
   plugins?: Array<"prettier-plugin-astro" | RestOfAllowedPluginTypes>;
 };
 type OptionsSortImports = {
@@ -176,4 +175,4 @@ type ResolvedPrettierConfig = Omit<Config & OptionsAstro & OptionsSortImports &
 type ExtractOptions<TUnion> = Extract<TUnion, object>;
 //#endregion
 export { OptionsTailwindCss as a, OptionsSortImports as i, OptionsAstro as n, ResolvedPrettierConfig as o, OptionsPrettierConfig as r, ExtractOptions as t };
-//# sourceMappingURL=types-BvFb4aYp.d.ts.map
+//# sourceMappingURL=types-DJPsI734.d.ts.map

package/dist/{utils-D5XWgHFL.js → utils-CRitUEuM.js}

@@ -47,7 +47,7 @@ const isPackageInScope = (name) => isPackageExists(name, { paths: [scopeUrl] });
 * @param packages - The packages to ensure are installed.
 */
 const ensurePackages = async (packages) => {
-	if (process.env.CI || !process.stdout.isTTY || !isCwdInScope) return;
+	if (!isCwdInScope || process.env.CI || !process.stdout.isTTY) return;
 	const nonExistingPackages = packages.filter((pkg) => pkg && !isPackageInScope(pkg));
 	if (nonExistingPackages.length === 0) return;
 	if (await (await import("@clack/prompts")).confirm({ message: `${nonExistingPackages.length === 1 ? "Package is" : "Packages are"} required for this config: ${nonExistingPackages.join(", ")}. Do you want to install them?` })) await (await import("@antfu/install-pkg")).installPackage(nonExistingPackages, { dev: true });
@@ -55,4 +55,4 @@ const ensurePackages = async (packages) => {
 //#endregion
 export { mergeTwoConfigs as a, isPackageInScope as i, ensurePackages as n, resolveOptions as o, interopDefault as r, combineConfigs as t };
 
-//# sourceMappingURL=utils-D5XWgHFL.js.map
+//# sourceMappingURL=utils-CRitUEuM.js.map

package/dist/{utils-D5XWgHFL.js.map → utils-CRitUEuM.js.map}

@@ -1 +1 @@
-{"version":3,"file":"utils-D5XWgHFL.js","names":[],"sources":["../src/utils.ts"],"sourcesContent":["import { fileURLToPath } from \"node:url\";\nimport { isArray, isObject, type Awaitable } from \"@zayne-labs/toolkit-type-helpers\";\nimport { isPackageExists } from \"local-pkg\";\nimport type { ResolvedPrettierConfig } from \"./types\";\n\n/**\n * @description Resolves a boolean or object option to an object.\n * If the option is an object, it returns it as-is. Otherwise, returns an empty object.\n */\nexport const resolveOptions = <TObject>(option: boolean | TObject | undefined) => {\n\treturn isObject(option) ? option : ({} as TObject);\n};\n\n/**\n * @description Merges two Prettier configurations.\n * Array values (like `plugins` or `overrides`) are concatenated, while other values from the latter config overwrite the former.\n */\nexport const mergeTwoConfigs = (\n\tformerConfig: ResolvedPrettierConfig,\n\tlatterConfig: ResolvedPrettierConfig\n): ResolvedPrettierConfig => {\n\tconst configAccumulator: ResolvedPrettierConfig = {\n\t\t...formerConfig,\n\t};\n\n\tfor (const [latterConfigKey, latterConfigValue] of Object.entries(latterConfig)) {\n\t\tconst accumulatedConfigValue = configAccumulator[latterConfigKey];\n\n\t\tconfigAccumulator[latterConfigKey] =\n\t\t\tisArray(latterConfigValue) && isArray(accumulatedConfigValue) ?\n\t\t\t\t[...accumulatedConfigValue, ...latterConfigValue]\n\t\t\t:\tlatterConfigValue;\n\t}\n\n\treturn configAccumulator;\n};\n\nexport const interopDefault = async <TModule>(\n\tmodule: Awaitable<TModule>\n): Promise<TModule extends { default: infer TDefaultExport } ? TDefaultExport : TModule> => {\n\tconst resolved = await module;\n\n\t// eslint-disable-next-line ts-eslint/no-unnecessary-condition -- casting is necessary to prevent assignability ts issues at call-site\n\treturn (resolved as { default: never }).default ?? resolved;\n};\n\nexport const combineConfigs = async (\n\tconfigArray: Array<Awaitable<ResolvedPrettierConfig | undefined>>\n): Promise<ResolvedPrettierConfig> => {\n\t// eslint-disable-next-line ts-eslint/await-thenable -- Ignore\n\tconst resolvedConfigArray = await Promise.all(configArray);\n\n\tlet accumulatedConfig: ResolvedPrettierConfig = {};\n\n\tfor (const config of resolvedConfigArray) {\n\t\tif (!config) continue;\n\n\t\taccumulatedConfig = mergeTwoConfigs(accumulatedConfig, config);\n\t}\n\n\treturn accumulatedConfig;\n};\n\nconst scopeUrl = fileURLToPath(new URL(\".\", import.meta.url));\nconst isCwdInScope = isPackageExists(\"@zayne-labs/prettier-config\");\n\nexport const isPackageInScope = (name: string): boolean => isPackageExists(name, { paths: [scopeUrl] });\n\n/**\n * @description\n * - Ensures that packages are installed in the current scope.\n * - If they are not installed, and the user is in a TTY, and the user is not in a CI environment,\n * and the user is in the same scope as this package, then prompt the user to\n * install the packages.\n *\n * @param packages - The packages to ensure are installed.\n */\nexport const ensurePackages = async (packages: Array<string | undefined>): Promise<void> => {\n\tif (process.env.CI || !process.stdout.isTTY || !isCwdInScope) return;\n\n\tconst nonExistingPackages = packages.filter((pkg) => pkg && !isPackageInScope(pkg));\n\n\tif (nonExistingPackages.length === 0) return;\n\n\tconst clackPrompt = await import(\"@clack/prompts\");\n\n\tconst result = await clackPrompt.confirm({\n\t\tmessage: `${nonExistingPackages.length === 1 ? \"Package is\" : \"Packages are\"} required for this config: ${nonExistingPackages.join(\", \")}. Do you want to install them?`,\n\t});\n\n\tif (result) {\n\t\tconst antfuPkg = await import(\"@antfu/install-pkg\");\n\n\t\tawait antfuPkg.installPackage(nonExistingPackages as string[], { dev: true });\n\t}\n};\n"],"mappings":";;;;;;;;AASA,MAAa,kBAA2B,WAA0C;CACjF,OAAO,SAAS,MAAM,IAAI,SAAU,CAAC;AACtC;;;;;AAMA,MAAa,mBACZ,cACA,iBAC4B;CAC5B,MAAM,oBAA4C,EACjD,GAAG,aACJ;CAEA,KAAK,MAAM,CAAC,iBAAiB,sBAAsB,OAAO,QAAQ,YAAY,GAAG;EAChF,MAAM,yBAAyB,kBAAkB;EAEjD,kBAAkB,mBACjB,QAAQ,iBAAiB,KAAK,QAAQ,sBAAsB,IAC3D,CAAC,GAAG,wBAAwB,GAAG,iBAAiB,IAC/C;CACJ;CAEA,OAAO;AACR;AAEA,MAAa,iBAAiB,OAC7B,WAC2F;CAC3F,MAAM,WAAW,MAAM;CAGvB,OAAQ,SAAgC,WAAW;AACpD;AAEA,MAAa,iBAAiB,OAC7B,gBACqC;CAErC,MAAM,sBAAsB,MAAM,QAAQ,IAAI,WAAW;CAEzD,IAAI,oBAA4C,CAAC;CAEjD,KAAK,MAAM,UAAU,qBAAqB;EACzC,IAAI,CAAC,QAAQ;EAEb,oBAAoB,gBAAgB,mBAAmB,MAAM;CAC9D;CAEA,OAAO;AACR;AAEA,MAAM,WAAW,cAAc,IAAI,IAAI,KAAK,OAAO,KAAK,GAAG,CAAC;AAC5D,MAAM,eAAe,gBAAgB,6BAA6B;AAElE,MAAa,oBAAoB,SAA0B,gBAAgB,MAAM,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC;;;;;;;;;;AAWtG,MAAa,iBAAiB,OAAO,aAAuD;CAC3F,IAAI,QAAQ,IAAI,MAAM,CAAC,QAAQ,OAAO,SAAS,CAAC,cAAc;CAE9D,MAAM,sBAAsB,SAAS,QAAQ,QAAQ,OAAO,CAAC,iBAAiB,GAAG,CAAC;CAElF,IAAI,oBAAoB,WAAW,GAAG;CAQtC,IAAI,OAJiB,MAFK,OAAO,mBAEA,QAAQ,EACxC,SAAS,GAAG,oBAAoB,WAAW,IAAI,eAAe,eAAe,6BAA6B,oBAAoB,KAAK,IAAI,EAAE,gCAC1I,CAAC,GAKA,OAAM,MAFiB,OAAO,uBAEf,eAAe,qBAAiC,EAAE,KAAK,KAAK,CAAC;AAE9E"}
+{"version":3,"file":"utils-CRitUEuM.js","names":[],"sources":["../src/utils.ts"],"sourcesContent":["import { fileURLToPath } from \"node:url\";\nimport { isArray, isObject, type Awaitable } from \"@zayne-labs/toolkit-type-helpers\";\nimport { isPackageExists } from \"local-pkg\";\nimport type { ResolvedPrettierConfig } from \"./types\";\n\n/**\n * @description Resolves a boolean or object option to an object.\n * If the option is an object, it returns it as-is. Otherwise, returns an empty object.\n */\nexport const resolveOptions = <TObject>(option: boolean | TObject | undefined) => {\n\treturn isObject(option) ? option : ({} as TObject);\n};\n\n/**\n * @description Merges two Prettier configurations.\n * Array values (like `plugins` or `overrides`) are concatenated, while other values from the latter config overwrite the former.\n */\nexport const mergeTwoConfigs = (\n\tformerConfig: ResolvedPrettierConfig,\n\tlatterConfig: ResolvedPrettierConfig\n): ResolvedPrettierConfig => {\n\tconst configAccumulator: ResolvedPrettierConfig = {\n\t\t...formerConfig,\n\t};\n\n\tfor (const [latterConfigKey, latterConfigValue] of Object.entries(latterConfig)) {\n\t\tconst accumulatedConfigValue = configAccumulator[latterConfigKey];\n\n\t\tconfigAccumulator[latterConfigKey] =\n\t\t\tisArray(latterConfigValue) && isArray(accumulatedConfigValue) ?\n\t\t\t\t[...accumulatedConfigValue, ...latterConfigValue]\n\t\t\t:\tlatterConfigValue;\n\t}\n\n\treturn configAccumulator;\n};\n\nexport const interopDefault = async <TModule>(\n\tmodule: Awaitable<TModule>\n): Promise<TModule extends { default: infer TDefaultExport } ? TDefaultExport : TModule> => {\n\tconst resolved = await module;\n\n\t// eslint-disable-next-line ts-eslint/no-unnecessary-condition -- casting is necessary to prevent assignability ts issues at call-site\n\treturn (resolved as { default: never }).default ?? resolved;\n};\n\nexport const combineConfigs = async (\n\tconfigArray: Array<Awaitable<ResolvedPrettierConfig | undefined>>\n): Promise<ResolvedPrettierConfig> => {\n\t// eslint-disable-next-line ts-eslint/await-thenable -- Ignore\n\tconst resolvedConfigArray = await Promise.all(configArray);\n\n\tlet accumulatedConfig: ResolvedPrettierConfig = {};\n\n\tfor (const config of resolvedConfigArray) {\n\t\tif (!config) continue;\n\n\t\taccumulatedConfig = mergeTwoConfigs(accumulatedConfig, config);\n\t}\n\n\treturn accumulatedConfig;\n};\n\nconst scopeUrl = fileURLToPath(new URL(\".\", import.meta.url));\nconst isCwdInScope = isPackageExists(\"@zayne-labs/prettier-config\");\n\nexport const isPackageInScope = (name: string): boolean => isPackageExists(name, { paths: [scopeUrl] });\n\n/**\n * @description\n * - Ensures that packages are installed in the current scope.\n * - If they are not installed, and the user is in a TTY, and the user is not in a CI environment,\n * and the user is in the same scope as this package, then prompt the user to\n * install the packages.\n *\n * @param packages - The packages to ensure are installed.\n */\nexport const ensurePackages = async (packages: Array<string | undefined>): Promise<void> => {\n\tif (!isCwdInScope || process.env.CI || !process.stdout.isTTY) return;\n\n\tconst nonExistingPackages = packages.filter((pkg) => pkg && !isPackageInScope(pkg));\n\n\tif (nonExistingPackages.length === 0) return;\n\n\tconst clackPrompt = await import(\"@clack/prompts\");\n\n\tconst result = await clackPrompt.confirm({\n\t\tmessage: `${nonExistingPackages.length === 1 ? \"Package is\" : \"Packages are\"} required for this config: ${nonExistingPackages.join(\", \")}. Do you want to install them?`,\n\t});\n\n\tif (result) {\n\t\tconst antfuPkg = await import(\"@antfu/install-pkg\");\n\n\t\tawait antfuPkg.installPackage(nonExistingPackages as string[], { dev: true });\n\t}\n};\n"],"mappings":";;;;;;;;AASA,MAAa,kBAA2B,WAA0C;CACjF,OAAO,SAAS,MAAM,IAAI,SAAU,CAAC;AACtC;;;;;AAMA,MAAa,mBACZ,cACA,iBAC4B;CAC5B,MAAM,oBAA4C,EACjD,GAAG,aACJ;CAEA,KAAK,MAAM,CAAC,iBAAiB,sBAAsB,OAAO,QAAQ,YAAY,GAAG;EAChF,MAAM,yBAAyB,kBAAkB;EAEjD,kBAAkB,mBACjB,QAAQ,iBAAiB,KAAK,QAAQ,sBAAsB,IAC3D,CAAC,GAAG,wBAAwB,GAAG,iBAAiB,IAC/C;CACJ;CAEA,OAAO;AACR;AAEA,MAAa,iBAAiB,OAC7B,WAC2F;CAC3F,MAAM,WAAW,MAAM;CAGvB,OAAQ,SAAgC,WAAW;AACpD;AAEA,MAAa,iBAAiB,OAC7B,gBACqC;CAErC,MAAM,sBAAsB,MAAM,QAAQ,IAAI,WAAW;CAEzD,IAAI,oBAA4C,CAAC;CAEjD,KAAK,MAAM,UAAU,qBAAqB;EACzC,IAAI,CAAC,QAAQ;EAEb,oBAAoB,gBAAgB,mBAAmB,MAAM;CAC9D;CAEA,OAAO;AACR;AAEA,MAAM,WAAW,cAAc,IAAI,IAAI,KAAK,YAAY,GAAG,CAAC;AAC5D,MAAM,eAAe,gBAAgB,6BAA6B;AAElE,MAAa,oBAAoB,SAA0B,gBAAgB,MAAM,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC;;;;;;;;;;AAWtG,MAAa,iBAAiB,OAAO,aAAuD;CAC3F,IAAI,CAAC,gBAAgB,QAAQ,IAAI,MAAM,CAAC,QAAQ,OAAO,OAAO;CAE9D,MAAM,sBAAsB,SAAS,QAAQ,QAAQ,OAAO,CAAC,iBAAiB,GAAG,CAAC;CAElF,IAAI,oBAAoB,WAAW,GAAG;CAQtC,IAAI,OAJiB,MAFK,OAAO,kBAAA,CAEA,QAAQ,EACxC,SAAS,GAAG,oBAAoB,WAAW,IAAI,eAAe,eAAe,6BAA6B,oBAAoB,KAAK,IAAI,EAAE,gCAC1I,CAAC,GAKA,OAAM,MAFiB,OAAO,sBAAA,CAEf,eAAe,qBAAiC,EAAE,KAAK,KAAK,CAAC;AAE9E"}

package/dist/utils.d.ts

@@ -1,22 +1,21 @@
-import { o as ResolvedPrettierConfig } from "./types-BvFb4aYp.js";
+import { o as ResolvedPrettierConfig } from "./types-DJPsI734.js";
 import { Awaitable } from "@zayne-labs/toolkit-type-helpers";
-
 //#region src/utils.d.ts
 /**
  * @description Resolves a boolean or object option to an object.
  * If the option is an object, it returns it as-is. Otherwise, returns an empty object.
  */
-declare const resolveOptions: <TObject>(option: boolean | TObject | undefined) => TObject;
+export declare const resolveOptions: <TObject>(option: boolean | TObject | undefined) => TObject;
 /**
  * @description Merges two Prettier configurations.
  * Array values (like `plugins` or `overrides`) are concatenated, while other values from the latter config overwrite the former.
  */
-declare const mergeTwoConfigs: (formerConfig: ResolvedPrettierConfig, latterConfig: ResolvedPrettierConfig) => ResolvedPrettierConfig;
-declare const interopDefault: <TModule>(module: Awaitable<TModule>) => Promise<TModule extends {
+export declare const mergeTwoConfigs: (formerConfig: ResolvedPrettierConfig, latterConfig: ResolvedPrettierConfig) => ResolvedPrettierConfig;
+export declare const interopDefault: <TModule>(module: Awaitable<TModule>) => Promise<TModule extends {
   default: infer TDefaultExport;
 } ? TDefaultExport : TModule>;
-declare const combineConfigs: (configArray: Array<Awaitable<ResolvedPrettierConfig | undefined>>) => Promise<ResolvedPrettierConfig>;
-declare const isPackageInScope: (name: string) => boolean;
+export declare const combineConfigs: (configArray: Array<Awaitable<ResolvedPrettierConfig | undefined>>) => Promise<ResolvedPrettierConfig>;
+export declare const isPackageInScope: (name: string) => boolean;
 /**
  * @description
  * - Ensures that packages are installed in the current scope.
@@ -26,7 +25,6 @@ declare const isPackageInScope: (name: string) => boolean;
  *
  * @param packages - The packages to ensure are installed.
  */
-declare const ensurePackages: (packages: Array<string | undefined>) => Promise<void>;
+export declare const ensurePackages: (packages: Array<string | undefined>) => Promise<void>;
 //#endregion
-export { combineConfigs, ensurePackages, interopDefault, isPackageInScope, mergeTwoConfigs, resolveOptions };
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.js

@@ -1,2 +1,2 @@
-import { a as mergeTwoConfigs, i as isPackageInScope, n as ensurePackages, o as resolveOptions, r as interopDefault, t as combineConfigs } from "./utils-D5XWgHFL.js";
+import { a as mergeTwoConfigs, i as isPackageInScope, n as ensurePackages, o as resolveOptions, r as interopDefault, t as combineConfigs } from "./utils-CRitUEuM.js";
 export { combineConfigs, ensurePackages, interopDefault, isPackageInScope, mergeTwoConfigs, resolveOptions };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zayne-labs/prettier-config",
   "type": "module",
-  "version": "0.13.14",
+  "version": "0.13.15",
   "description": "Zayne Labs' Prettier config",
   "author": "Ryan Zayne",
   "license": "MIT",
@@ -33,11 +33,11 @@
   },
   "peerDependencies": {
     "@ianvs/prettier-plugin-sort-imports": "^4.7.1",
-    "prettier": "^3.8.3",
+    "prettier": "^3.9.6",
     "prettier-plugin-astro": "^0.14.1",
-    "prettier-plugin-classnames": "^0.10.1",
+    "prettier-plugin-classnames": "^0.10.4",
     "prettier-plugin-merge": "^0.10.1",
-    "prettier-plugin-tailwindcss": "^0.8.0"
+    "prettier-plugin-tailwindcss": "^0.8.1"
   },
   "peerDependenciesMeta": {
     "prettier-plugin-astro": {
@@ -54,25 +54,25 @@
     }
   },
   "dependencies": {
-    "@antfu/install-pkg": "1.1.0",
-    "@clack/prompts": "1.5.0",
-    "@zayne-labs/toolkit-type-helpers": "0.12.55",
+    "@antfu/install-pkg": "2.0.1",
+    "@clack/prompts": "1.8.0",
+    "@zayne-labs/toolkit-type-helpers": "0.12.59",
     "local-pkg": "1.2.1"
   },
   "devDependencies": {
     "@ianvs/prettier-plugin-sort-imports": "^4.7.1",
     "@total-typescript/ts-reset": "0.6.1",
-    "concurrently": "10.0.1",
+    "@zayne-labs/tsconfig": "0.13.15",
+    "concurrently": "10.0.5",
     "cross-env": "10.1.0",
-    "prettier": "^3.8.3",
+    "prettier": "^3.9.6",
     "prettier-plugin-astro": "^0.14.1",
-    "prettier-plugin-classnames": "^0.10.1",
+    "prettier-plugin-classnames": "^0.10.4",
     "prettier-plugin-merge": "^0.10.1",
-    "prettier-plugin-tailwindcss": "^0.8.0",
-    "publint": "0.3.21",
-    "tsdown": "0.22.1",
-    "typescript": "6.0.3",
-    "@zayne-labs/tsconfig": "0.13.14"
+    "prettier-plugin-tailwindcss": "^0.8.1",
+    "publint": "0.3.24",
+    "tsdown": "0.23.0",
+    "typescript": "6.0.3"
   },
   "publishConfig": {
     "access": "public",