@kitschpatrol/prettier-config 2.1.0 → 2.2.0

package/bin/cli.js

@@ -1,14 +1,17 @@
 #!/usr/bin/env node
-import O from"chalk";import{execa as x}from"execa";import A from"meow";import f from"node:path";import{Transform as $}from"node:stream";import{fileURLToPath as S}from"node:url";import{packageUp as k}from"package-up";function N(r,e){return new $({transform(n,t,i){let s=n.toString().split(/\r?\n/).filter(l=>l.trim().length>0).map(l=>`${r?O[e]("["+r+"] "):""}${l}`).join(`
+import O from"chalk";import{execa as x}from"execa";import A from"meow";import f from"node:path";import{Transform as $}from"node:stream";import{fileURLToPath as N}from"node:url";import{packageUp as k}from"package-up";function S(r,n){return new $({transform(e,t,o){let l=e.toString().split(/\r?\n/).filter(m=>m.trim().length>0).map(m=>`${r?O[n]("["+r+"] "):""}${m}`).join(`
 `)+`
-`;this.push(s),i()}})}function j(r,e){let n=`
+`;this.push(l),o()}})}function j(r,n){let e=`
   Usage
     $ ${r} [<file|glob> ...]
-  `;if(Object.keys(e).length>0){n+=`
-  Options`;for(let t of Object.keys(e))switch(t){case"init":{n+=`
-    --init, -i            Initialize by copying starter config files to your project root.`;break}case"check":{n+=`
-    --check, -c           Check for and report issues. Same as ${r}.`;break}case"fix":{n+=`
-    --fix, -f             Fix all auto-fixable issues, and report the un-fixable.`;break}case"printConfig":{n+=`
-    --print-config <file> Print the effective configuration for a file`;break}default:console.error(`Unknown command name: ${t}`)}}return n}function T(r){return Object.keys(r).reduce((e,n)=>{let t={};switch(n){case"init":{t={shortFlag:"i",type:"boolean"};break}case"check":{t={aliases:["lint",""],shortFlag:"l",type:"boolean"};break}case"fix":{t={shortFlag:"f",type:"boolean"};break}case"printConfig":{t={type:"boolean"};break}default:console.error(`Unknown command name: ${n}`)}return e[n]=t,e},{})}async function h(r,e,n=[]){if(e.command!==void 0&&typeof e.command=="string"){let t;try{let i=x(e.command,[...e.options??[],...n],{env:{FORCE_COLOR:"true"},stdin:"inherit"});i.stdout?.pipe(r,{end:!1}),await i,t=i.exitCode??1}catch(i){t=typeof i.exitCode=="number"?i.exitCode:1}return t}return console.error(`Invalid optionCommand: ${JSON.stringify(e,void 0,2)}`),1}function y(r,e){r.length===0&&!e.defaultArguments&&(console.error("This command must be used with a file argument"),process.exit(1))}async function C(r,e,n,t){let i=A(j(r,t),{allowUnknownFlags:!1,booleanDefault:void 0,flags:T(t),importMeta:import.meta}),{flags:u,input:s}=i,l=Object.keys(t).reduce((c,o)=>(u[o]&&(c[o]=t[o]),c),{});Object.keys(l).length===0&&(l.check=t.check);let m=N(e,n);m.pipe(process.stdout);let a=0;for(let[c,o]of Object.entries(l))if(typeof o.command=="function"){y(s,o);let g=s.length===0?o.defaultArguments??[]:s,p=o.options??[];a+=await o.command(m,g,p)}else if(typeof o.command=="string")y(s,o),a+=await h(m,o,s.length===0?o.defaultArguments:s);else switch(c){case"init":{let g=await k();if(g===void 0){console.error("The `--init` flag must be used in a directory with a package.json file"),a+=1;break}let p=await k({cwd:S(import.meta.url)});if(p===void 0){console.error("The script being called was not in a package, weird."),a+=1;break}let d=f.join(f.dirname(p),"init/"),b=f.dirname(g);console.log(`Copying initial configuration files from:
-"${d}" \u2192 "${b}"`);let F={command:"cp",options:["-Ri",`${d}`,`${b}`]};a+=await h(m,F);break}case"check":{console.error("No default implementation for check"),a+=1;break}case"fix":{console.error("No default implementation for fix"),a+=1;break}case"printConfig":{console.error("No default implementation for print-config"),a+=1;break}default:{console.error(`Unknown command name: ${c}`),a+=1;break}}process.exit(a>0?1:0)}import{resolveConfig as v}from"prettier";var w=["--log-level=warn","--plugin=@prettier/plugin-php","--plugin=@prettier/plugin-ruby","--plugin=@prettier/plugin-xml","--plugin=prettier-plugin-astro","--plugin=prettier-plugin-pkg","--plugin=prettier-plugin-sh","--plugin=prettier-plugin-sql","--plugin=prettier-plugin-svelte","--plugin=prettier-plugin-tailwindcss","--plugin=prettier-plugin-toml"];await C("prettier-config","Prettier","blue",{check:{command:"prettier",defaultArguments:["."],options:[...w,"--check"]},fix:{command:"prettier",defaultArguments:["."],options:[...w,"--write"]},init:{},printConfig:{async command(r,e){let n=e?.at(0);return n?(r.write(JSON.stringify(await v(n,{}),void 0,2)),r.write(`
+  `;if(Object.keys(n).length>0){e+=`
+  Options`;for(let t of Object.keys(n))switch(t){case"init":{e+=`
+    --init, -i            Initialize by copying starter config files to your project root.`;break}case"check":{e+=`
+    --check, -c           Check for and report issues. Same as ${r}.`;break}case"fix":{e+=`
+    --fix, -f             Fix all auto-fixable issues, and report the un-fixable.`;break}case"printConfig":{e+=`
+    --print-config <file> Print the effective configuration for a file`;break}default:console.error(`Unknown command name: ${t}`)}}return e}function T(r){return Object.keys(r).reduce((n,e)=>{let t={};switch(e){case"init":{t={shortFlag:"i",type:"boolean"};break}case"check":{t={aliases:["lint",""],shortFlag:"l",type:"boolean"};break}case"fix":{t={shortFlag:"f",type:"boolean"};break}case"printConfig":{t={type:"boolean"};break}default:console.error(`Unknown command name: ${e}`)}return n[e]=t,n},{})}async function h(r,n,e=[]){if(n.command!==void 0&&typeof n.command=="string"){let t;try{let o=x(n.command,[...n.options??[],...e],{env:{FORCE_COLOR:"true"},stdin:"inherit"});o.stdout?.pipe(r,{end:!1}),o.stderr?.pipe(r,{end:!1}),await o,t=o.exitCode??1}catch(o){t=typeof o.exitCode=="number"?o.exitCode:1}return t}return r.write(`Error: Invalid optionCommand: ${JSON.stringify(n,void 0,2)}`),1}function y(r,n,e){r.length===0&&!n.defaultArguments&&(e.write(`Error: This command must be used with a file argument
+`),process.exit(1))}async function C(r,n,e,t){let o=A(j(r,t),{allowUnknownFlags:!1,booleanDefault:void 0,flags:T(t),importMeta:import.meta}),{flags:u,input:l}=o,m=Object.keys(t).reduce((c,i)=>(u[i]&&(c[i]=t[i]),c),{});Object.keys(m).length===0&&(m.check=t.check);let s=S(n,e);s.pipe(process.stdout);let a=0;for(let[c,i]of Object.entries(m))if(typeof i.command=="function"){y(l,i,s);let p=l.length===0?i.defaultArguments??[]:l,g=i.options??[];a+=await i.command(s,p,g)}else if(typeof i.command=="string")y(l,i,s),a+=await h(s,i,l.length===0?i.defaultArguments:l);else switch(c){case"init":{let p=await k();if(p===void 0){s.write("Error: The `--init` flag must be used in a directory with a package.json file\n"),a+=1;break}let g=await k({cwd:N(import.meta.url)});if(g===void 0){s.write(`Error: The script being called was not in a package, weird.
+`),a+=1;break}let d=f.join(f.dirname(g),"init/"),b=f.dirname(p);s.write(`Copying initial configuration files from:
+"${d}" \u2192 "${b}"
+`);let F={command:"cp",options:["-Ri",`${d}`,`${b}`]};a+=await h(s,F);break}case"check":{console.error("No default implementation for check"),a+=1;break}case"fix":{console.error("No default implementation for fix"),a+=1;break}case"printConfig":{console.error("No default implementation for print-config"),a+=1;break}default:{console.error(`Unknown command name: ${c}`),a+=1;break}}process.exit(a>0?1:0)}import{resolveConfig as v}from"prettier";var w=["--log-level=warn","--plugin=@prettier/plugin-php","--plugin=@prettier/plugin-ruby","--plugin=@prettier/plugin-xml","--plugin=prettier-plugin-astro","--plugin=prettier-plugin-pkg","--plugin=prettier-plugin-sh","--plugin=prettier-plugin-sql","--plugin=prettier-plugin-svelte","--plugin=prettier-plugin-tailwindcss","--plugin=prettier-plugin-toml"];await C("prettier-config","Prettier","blue",{check:{command:"prettier",defaultArguments:["."],options:[...w,"--check"]},fix:{command:"prettier",defaultArguments:["."],options:[...w,"--write"]},init:{},printConfig:{async command(r,n){let e=n?.at(0);return e?(r.write(JSON.stringify(await v(e,{}),void 0,2)),r.write(`
 `),0):1}}});

package/init/.prettierrc.js

@@ -1,8 +1,11 @@
 import sharedConfig from '@kitschpatrol/prettier-config';
 
 /** @type {import("prettier").Config} */
-const config = {
-	...sharedConfig,
+const localConfig = {
+	// Overrides
 };
 
-export default config;
+export default {
+	...sharedConfig,
+	...localConfig,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitschpatrol/prettier-config",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "type": "module",
   "description": "Prettier config for @kitschpatrol/shared-config",
   "repository": {
@@ -47,7 +47,8 @@
     "prettier-plugin-sql": "^0.17.1",
     "prettier-plugin-svelte": "^3.1.2",
     "prettier-plugin-tailwindcss": "^0.5.9",
-    "prettier-plugin-toml": "^2.0.1"
+    "prettier-plugin-toml": "^2.0.1",
+    "up": "^1.0.2"
   },
   "publishConfig": {
     "access": "public"