@kitschpatrol/shared-config 5.0.0 → 5.0.2

package/bin/cli.js

@@ -627,7 +627,7 @@ var source_default = chalk;
 import { cosmiconfig } from "cosmiconfig";
 import { execa } from "execa";
 import fse2 from "fs-extra";
-import fs2 from "node:fs";
+import fs3 from "node:fs";
 import path3 from "node:path";
 import { PassThrough } from "node:stream";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
@@ -5541,7 +5541,7 @@ var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 
 // ../../package.json
-var version = "5.0.0";
+var version = "5.0.2";
 
 // ../../src/execa-utils.ts
 function isErrorExecaError(error) {
@@ -5753,6 +5753,29 @@ function getCwdOverride(option) {
   return process.cwd();
 }
 
+// ../../src/prettier-utils.ts
+import fs2 from "node:fs/promises";
+async function formatTextAndSaveFile(filePath, content) {
+  try {
+    const { default: prettier } = await import("prettier");
+    const prettierConfig = await prettier.resolveConfig(filePath);
+    const formattedContent = await prettier.format(content, {
+      filepath: filePath,
+      ...prettierConfig
+    });
+    await fs2.writeFile(filePath, formattedContent, "utf8");
+  } catch {
+    console.warn(`Skipped formatting ${filePath} since Prettier is not installed.`);
+  }
+}
+async function formatFileInPlace(filePath) {
+  try {
+    const content = await fs2.readFile(filePath, "utf8");
+    await formatTextAndSaveFile(filePath, content);
+  } catch {
+  }
+}
+
 // ../../src/stream-utils.ts
 import { Transform } from "node:stream";
 function createStreamFilter(matcher) {
@@ -5810,7 +5833,11 @@ async function executeFunctionCommand(logStream, positionalArguments, optionFlag
     targetStream = subStream;
   }
   if (verbose) {
-    targetStream.write(source_default.bold(`Running: "${command2.name}()"`));
+    targetStream.write(
+      source_default.bold(
+        `Running: "${command2.name}() with Positional arguments: ${String(positionalArguments)} and Option flags: ${String(optionFlags)}"`
+      )
+    );
   }
   try {
     exitCode = await command2.execute(targetStream, positionalArguments, optionFlags);
@@ -5928,9 +5955,6 @@ async function copyAndMergeInitFiles(logStream, location, configFile, configPack
   const source = path3.join(path3.dirname(sourcePackage), "init");
   const destination = path3.dirname(destinationPackage);
   const hasConfigLocationOption = (location === "file" || location === "package") && configFile !== void 0 && configPackageJson !== void 0;
-  logStream.write(`Adding initial configuration files from:
-"${source}" \u2192 "${destination}"
-`);
   try {
     if (hasConfigLocationOption) {
       const configKey = Object.keys(configPackageJson)[0];
@@ -5942,7 +5966,8 @@ Package config key "${configKey}" \u2192 "${destination}" (Because --location is
 `
         );
         const mergedPackageJson = merge(destinationPackageJson, configPackageJson);
-        fse2.writeJSONSync(destinationPackage, mergedPackageJson, { spaces: 2 });
+        fse2.writeJSONSync(destinationPackage, mergedPackageJson, { spaces: "	" });
+        await formatFileInPlace(destinationPackage);
       } else {
         const destinationPackageJson = fse2.readJsonSync(destinationPackage);
         if (Object.keys(destinationPackageJson).includes(configKey)) {
@@ -5952,14 +5977,28 @@ Package config key "${configKey}" in "${destination}" (Because --location is set
 `
           );
           delete destinationPackageJson[configKey];
-          fse2.writeJSONSync(destinationPackage, destinationPackageJson, { spaces: 2 });
+          fse2.writeJSONSync(destinationPackage, destinationPackageJson, { spaces: "	" });
+          await formatFileInPlace(destinationPackage);
         }
       }
     }
+    const sourceExists = await fse2.pathExists(source);
+    if (!sourceExists) {
+      return 0;
+    }
+    const sourceFiles = await fse2.readdir(source);
+    if (sourceFiles.length === 0) {
+      logStream.write(`Source directory "${source}" is empty.
+`);
+      return 0;
+    }
+    logStream.write(`Adding initial configuration files from:
+"${source}" \u2192 "${destination}"
+`);
     await fse2.copy(source, destination, {
-      filter(source2, destination2) {
-        const isFile = fs2.statSync(source2).isFile();
-        const destinationExists = fs2.existsSync(destination2);
+      async filter(source2, destination2) {
+        const isFile = fs3.statSync(source2).isFile();
+        const destinationExists = fs3.existsSync(destination2);
         if (isFile) {
           if (hasConfigLocationOption && location === "package" && source2.includes(configFile)) {
             if (destinationExists) {
@@ -5978,25 +6017,28 @@ Package config key "${configKey}" in "${destination}" (Because --location is set
             }
             return false;
           }
-          if (destinationExists && destination2.includes(".vscode/") && path3.extname(destination2) === ".json") {
+          if (destinationExists && (destination2.includes(".vscode/") || destination2.includes("package.json")) && path3.extname(destination2) === ".json") {
             logStream.write(`Merging: 
 "${source2}" \u2192 "${destination2}"
 `);
             const sourceJson = fse2.readJSONSync(source2);
             const destinationJson = fse2.readJSONSync(destination2);
             const mergedJson = merge(destinationJson, sourceJson);
-            fse2.writeJSONSync(destination2, mergedJson, { spaces: 2 });
+            fse2.writeJSONSync(destination2, mergedJson, { spaces: "	" });
+            await formatFileInPlace(destination2);
             return false;
           }
           if (destinationExists) {
             logStream.write(`Overwriting: 
 "${source2}" \u2192 "${destination2}"
 `);
+            await formatFileInPlace(destination2);
             return true;
           }
           logStream.write(`Copying: 
 "${source2}" \u2192 "${destination2}"
 `);
+          await formatFileInPlace(destination2);
           return true;
         }
         return true;
@@ -6036,11 +6078,12 @@ async function buildCommands(commandDefinition11) {
       // Command: init.locationOptionFlag ? 'init [--location]' : 'init',
       describe: init.description ?? `Initialize by copying starter config files to your project root${init.locationOptionFlag ? " or to your package.json file." : "."}`,
       async handler(argv) {
+        const location = init.locationOptionFlag ? argv.location : void 0;
         const copyAndMergeInitFilesCommand = {
-          async execute(logStream2) {
+          async execute(logStream2, _, optionFlags) {
             return copyAndMergeInitFiles(
               logStream2,
-              init.locationOptionFlag ? argv.location : void 0,
+              optionFlags.at(1),
               init.configFile,
               init.configPackageJson
             );
@@ -6050,7 +6093,7 @@ async function buildCommands(commandDefinition11) {
         const exitCode = await executeCommands(
           logStream,
           [],
-          [],
+          location === void 0 ? [] : ["--location", location],
           [copyAndMergeInitFilesCommand, ...init.commands ?? []]
         );
         process.exit(exitCode);
@@ -6231,6 +6274,21 @@ async function checkForUnusedWords(fileGlobs = ["."]) {
 }
 
 // ../cspell-config/src/command.ts
+async function getCspellIgnorePaths() {
+  const config = await getDefaultConfigLoader2().searchForConfigFile(void 0);
+  if (config === void 0) {
+    throw new Error("No CSpell configuration found.");
+  }
+  const resolvedConfig = await resolveConfigFileImports(config);
+  if (resolvedConfig.ignorePaths === void 0) {
+    return "";
+  }
+  const globStrings = [];
+  for (const globDefOrString of resolvedConfig.ignorePaths) {
+    globStrings.push(typeof globDefOrString === "string" ? globDefOrString : globDefOrString.glob);
+  }
+  return globStrings.join(",");
+}
 async function checkForUnusedWordsCommand(logStream, positionalArguments) {
   const unusedWords = await checkForUnusedWords(positionalArguments);
   if (unusedWords.length > 0) {
@@ -6275,7 +6333,12 @@ async function casePoliceCommand(logStream, positionalArguments) {
         logColor: "cyanBright",
         logPrefix,
         name: "case-police",
-        optionFlags: ["--dict", await getCasePoliceDictionaryPath()],
+        optionFlags: [
+          "--dict",
+          await getCasePoliceDictionaryPath(),
+          "--ignore",
+          await getCspellIgnorePaths()
+        ],
         receivePositionalArguments: true
       }
     ]
@@ -6300,7 +6363,7 @@ async function printCspellConfigCommand(logStream) {
 var commandDefinition = {
   commands: {
     init: {
-      configFile: "cspell.config.json",
+      configFile: "cspell.config.js",
       configPackageJson: {
         cspell: {
           import: "@kitschpatrol/cspell-config"
@@ -6426,6 +6489,11 @@ import path6 from "node:path";
 // ../knip-config/src/index.ts
 var sharedKnipConfig = {
   entry: [
+    // Default entry... not merging in from default Knip config?
+    "{index,cli,main}.{js,mjs,cjs,jsx,ts,tsx,mts,cts}!",
+    "src/{index,cli,main}.{js,mjs,cjs,jsx,ts,tsx,mts,cts}!",
+    // Customized entries
+    "src/{bin,lib,cli}/{index,cli,main}.{js,mjs,cjs,jsx,ts,tsx,mts,cts}!",
     "scripts/**/*.ts",
     ".remarkrc.js",
     "cspell.config.js",
@@ -6433,6 +6501,15 @@ var sharedKnipConfig = {
     "mdat.config.ts",
     "prettier.config.js",
     "stylelint.config.js"
+  ],
+  ignoreDependencies: [
+    "@kitschpatrol/cspell-config",
+    "@kitschpatrol/eslint-config",
+    "@kitschpatrol/knip-config",
+    "@kitschpatrol/mdat-config",
+    "@kitschpatrol/prettier-config",
+    "@kitschpatrol/remark-config",
+    "@kitschpatrol/stylelint-config"
   ]
 };
 var src_default = sharedKnipConfig;
@@ -6463,7 +6540,12 @@ var commandDefinition3 = {
         {
           cwdOverride: "workspace-root",
           name: "knip",
-          optionFlags: ["--fix", "--allow-remove-files", ...getWorkspaceOptionFlags()]
+          optionFlags: [
+            "--fix",
+            "--allow-remove-files",
+            "--no-config-hints",
+            ...getWorkspaceOptionFlags()
+          ]
         }
       ],
       description: `Automatically remove unused code and dependencies. ${DESCRIPTION.packageRun} ${DESCRIPTION.monorepoRun}`,
@@ -6481,7 +6563,7 @@ var commandDefinition3 = {
           // Run from root, then pass --workspace IF in a monorepo and called from a subpackage
           cwdOverride: "workspace-root",
           name: "knip",
-          optionFlags: ["--no-progress", ...getWorkspaceOptionFlags()]
+          optionFlags: ["--no-progress", "--no-config-hints", ...getWorkspaceOptionFlags()]
         }
         // "Production" pass is not worth it?
         // {
@@ -6658,7 +6740,7 @@ var commandDefinition6 = {
           plugins: ["@kitschpatrol/remark-config"]
         }
       },
-      locationOptionFlag: false
+      locationOptionFlag: true
     },
     printConfig: {
       commands: [getCosmiconfigCommand("remark")],
@@ -6674,7 +6756,7 @@ var commandDefinition6 = {
 };
 
 // ../repo-config/src/copyright-year-updater.ts
-import fs3 from "node:fs/promises";
+import fs4 from "node:fs/promises";
 
 // ../../src/node-utils.ts
 import process5 from "node:process";
@@ -6735,7 +6817,7 @@ async function copyrightYear(logStream, fix = false) {
     "!node_modules/**"
   ];
   suppressNodeWarnings();
-  for await (const filePath of fs3.glob(patterns, {
+  for await (const filePath of fs4.glob(patterns, {
     cwd: getPackageDirectory(),
     // Will find monorepo packages
     withFileTypes: false
@@ -6746,12 +6828,12 @@ async function copyrightYear(logStream, fix = false) {
   const outdatedLicenseFiles = [];
   for (const filePath of licenseFiles) {
     try {
-      const originalContent = await fs3.readFile(filePath, "utf8");
+      const originalContent = await fs4.readFile(filePath, "utf8");
       const updatedContent = updateLicenseContent(originalContent, currentYear);
       if (updatedContent !== originalContent) {
         outdatedLicenseFiles.push(filePath);
         if (fix) {
-          await fs3.writeFile(filePath, updatedContent, "utf8");
+          await fs4.writeFile(filePath, updatedContent, "utf8");
         }
       }
     } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitschpatrol/shared-config",
-  "version": "5.0.0",
+  "version": "5.0.2",
   "description": "A collection of shared configurations for various linters and formatting tools. All managed as a single dependency, and invoked via a single command.",
   "keywords": [
     "shared-config",
@@ -38,16 +38,18 @@
     "@pinojs/json-colorizer": "^4.0.0",
     "cosmiconfig": "^9.0.0",
     "execa": "^9.5.2",
+    "find-workspaces": "^0.3.1",
     "fs-extra": "^11.3.0",
-    "@kitschpatrol/eslint-config": "5.0.0",
-    "@kitschpatrol/prettier-config": "5.0.0",
-    "@kitschpatrol/knip-config": "5.0.0",
-    "@kitschpatrol/repo-config": "5.0.0",
-    "@kitschpatrol/cspell-config": "5.0.0",
-    "@kitschpatrol/remark-config": "5.0.0",
-    "@kitschpatrol/mdat-config": "5.0.0",
-    "@kitschpatrol/stylelint-config": "5.0.0",
-    "@kitschpatrol/typescript-config": "5.0.0"
+    "prettier": "^3.4.2",
+    "@kitschpatrol/cspell-config": "5.0.2",
+    "@kitschpatrol/knip-config": "5.0.2",
+    "@kitschpatrol/mdat-config": "5.0.2",
+    "@kitschpatrol/eslint-config": "5.0.2",
+    "@kitschpatrol/repo-config": "5.0.2",
+    "@kitschpatrol/remark-config": "5.0.2",
+    "@kitschpatrol/stylelint-config": "5.0.2",
+    "@kitschpatrol/prettier-config": "5.0.2",
+    "@kitschpatrol/typescript-config": "5.0.2"
   },
   "devDependencies": {
     "chalk": "^5.4.1",