create-krispya 0.16.0 → 0.17.0

package/dist/cli.cjs

@@ -9,7 +9,7 @@ const node_module = require('node:module');
 const node_path = require('node:path');
 const node_process = require('node:process');
 const undici = require('undici');
-const workspace = require('./shared/create-krispya.D7X3ZrTg.cjs');
+const workspace = require('./shared/create-krispya.C0eXGXA9.cjs');
 const promises$1 = require('fs/promises');
 const fs = require('fs');
 const path = require('path');
@@ -1109,7 +1109,7 @@ async function handleFixCommand(options) {
       };
       files["biome.json"] = {
         type: "text",
-        content: JSON.stringify(biomeConfig, null, 2)
+        content: workspace.renderJson(biomeConfig)
       };
     }
     for (const [filePath, file] of Object.entries(files)) {
@@ -1342,7 +1342,7 @@ async function planExpectedFiles(config) {
     };
     rootConfig["biome.json"] = {
       type: "text",
-      content: JSON.stringify(biomeConfig, null, 2)
+      content: workspace.renderJson(biomeConfig)
     };
   }
   return {
@@ -1479,6 +1479,60 @@ function fileContentsEqual(filePath, currentContent, newContent) {
   }
   return currentContent === newContent;
 }
+function compareTextFileWithDisk(filePath, currentContent, expectedContent) {
+  if (filePath === ".gitignore") {
+    const merged = workspace.mergeGitignoreContent(currentContent, workspace.detectGitignoreVariant(expectedContent));
+    if (fileContentsEqual(filePath, currentContent, merged.content)) {
+      return {
+        path: filePath,
+        status: "unchanged",
+        currentContent,
+        newContent: currentContent,
+        mergeSafe: merged.mergeSafe
+      };
+    }
+    return {
+      path: filePath,
+      status: "modified",
+      currentContent,
+      newContent: merged.content,
+      mergeSafe: merged.mergeSafe
+    };
+  }
+  if (workspace.isManagedAiFilePath(filePath)) {
+    const merged = workspace.mergeAiFileContent(currentContent, expectedContent);
+    if (fileContentsEqual(filePath, currentContent, merged.content)) {
+      return {
+        path: filePath,
+        status: "unchanged",
+        currentContent,
+        newContent: currentContent,
+        mergeSafe: merged.mergeSafe
+      };
+    }
+    return {
+      path: filePath,
+      status: "modified",
+      currentContent,
+      newContent: merged.content,
+      mergeSafe: merged.mergeSafe
+    };
+  }
+  if (fileContentsEqual(filePath, currentContent, expectedContent)) {
+    return {
+      path: filePath,
+      status: "unchanged",
+      currentContent,
+      newContent: currentContent
+    };
+  }
+  return {
+    path: filePath,
+    status: "modified",
+    currentContent,
+    newContent: expectedContent
+  };
+}
 async function compareWithDisk(expected, root) {
   const categoryLabels = {
     "ai-files": "AI Files",
@@ -1500,21 +1554,7 @@ async function compareWithDisk(expected, root) {
       const newContent = file.content;
       if (await fileExists(fullPath)) {
         const currentContent = await promises$1.readFile(fullPath, "utf-8");
-        if (fileContentsEqual(filePath, currentContent, newContent)) {
-          changes.push({
-            path: filePath,
-            status: "unchanged",
-            currentContent,
-            newContent
-          });
-        } else {
-          changes.push({
-            path: filePath,
-            status: "modified",
-            currentContent,
-            newContent
-          });
-        }
+        changes.push(compareTextFileWithDisk(filePath, currentContent, newContent));
       } else {
         changes.push({
           path: filePath,
@@ -1539,13 +1579,13 @@ async function compareWithDisk(expected, root) {
           category: "ai-files-update",
           label: categoryLabels["ai-files-update"],
           changes: modifiedAiFiles,
-          hasUserModifications: true
+          hasUserModifications: modifiedAiFiles.some((change) => !change.mergeSafe)
         });
       }
       continue;
     }
     if (changes.length === 0) continue;
-    const hasUserModifications = changes.some((c) => c.status === "modified");
+    const hasUserModifications = changes.some((c) => c.status === "modified" && !c.mergeSafe);
     categories.push({
       category,
       label: categoryLabels[category],
@@ -1710,8 +1750,7 @@ async function getPackageJsonScriptUpdates(root, config) {
   if (Object.keys(nextDevDependencies).length > 0 || pkg.devDependencies != null) {
     nextPackageJson.devDependencies = nextDevDependencies;
   }
-  const newContent = `${JSON.stringify(nextPackageJson, null, 2)}
-`;
+  const newContent = workspace.renderJson(nextPackageJson, { inlineArrays: false });
   return [
     {
       path: "package.json",
@@ -1751,8 +1790,7 @@ async function getPackageManagerConfigUpdates(root, config) {
       path: "package.json",
       status: "modified",
       currentContent,
-      newContent: `${JSON.stringify(nextPackageJson, null, 2)}
-`
+      newContent: workspace.renderJson(nextPackageJson, { inlineArrays: false })
     }
   ];
 }
@@ -1769,8 +1807,7 @@ function planSinglePackageOxlintConfig(config) {
   return {
     path,
     status: "added",
-    newContent: `${JSON.stringify(oxlintConfig, null, 2)}
-`
+    newContent: workspace.renderJson(oxlintConfig)
   };
 }
 async function getOxlintConfigReplacementUpdates(root, config) {
@@ -1972,10 +2009,12 @@ const UPDATE_CATEGORY_ORDER = [
 function isMergeUpdateCategory(category) {
   return category === "workspace-config" || category === "package-json";
 }
-function getUpdateHint(category, status) {
-  if (status === "added") return "new file";
-  if (category === "package-json") return "merge update";
-  if (category === "workspace-config") return "merge update";
+function isMergeSafeChange(category, change) {
+  return isMergeUpdateCategory(category) || change.mergeSafe === true;
+}
+function getUpdateHint(category, change) {
+  if (change.status === "added") return "new file";
+  if (isMergeSafeChange(category, change)) return "merge update";
   return "changed; overwrites if selected";
 }
 function isSelectableFileChange(change) {
@@ -1983,7 +2022,7 @@ function isSelectableFileChange(change) {
 }
 function getInitialUpdateSelections(category) {
   return category.changes.filter(
-    (change) => change.status === "added" || change.status === "modified" && isMergeUpdateCategory(category.category)
+    (change) => change.status === "added" || change.status === "modified" && isMergeSafeChange(category.category, change)
   ).map((change) => change.path);
 }
 async function promptForUpdateSelections(category) {
@@ -1993,7 +2032,7 @@ async function promptForUpdateSelections(category) {
     options: selectableChanges.map((change) => ({
       value: change.path,
       label: change.path,
-      hint: getUpdateHint(category.category, change.status)
+      hint: getUpdateHint(category.category, change)
     })),
     initialValues: getInitialUpdateSelections(category),
     required: false
@@ -2272,8 +2311,11 @@ async function processUpdateCategory(category, projectRoot, options) {
       console.log(formatFileChange(change));
     }
     console.log();
-    if (isMergeUpdateCategory(category.category)) {
-      changesToApply = [...newChanges, ...modifiedChanges];
+    const mergeSafeModifiedChanges = modifiedChanges.filter(
+      (change) => isMergeSafeChange(category.category, change)
+    );
+    if (mergeSafeModifiedChanges.length > 0) {
+      changesToApply = [...newChanges, ...mergeSafeModifiedChanges];
       if (changesToApply.length > 0) {
         console.log(color__default.dim("  (--yes mode: applying merge updates)"));
       }

package/dist/cli.mjs

@@ -7,7 +7,7 @@ import { createRequire } from 'node:module';
 import { resolve, join, dirname } from 'node:path';
 import { cwd } from 'node:process';
 import { fetch } from 'undici';
-import { g as getEngineName, a as getPackageManagerName, b as getBaseTemplate, s as shouldEnableReactCompiler, c as getLanguageFromTemplate, d as generateRandomName, e as getConfigStrategy, f as getAiPlatforms, A as ALL_AI_PLATFORMS, h as AI_PLATFORM_LABELS, i as AI_PLATFORM_HINTS, j as detectTooling, p as parsePackageManagerSpec, k as parseEngine, l as parseWorkspaceYamlContent, v as validateWorkspace, r as renderTypescriptConfigPackage, m as renderOxlintConfigPackage, n as renderEslintConfigPackage, o as renderOxfmtConfigPackage, q as renderPrettierConfigPackage, t as resolveMonorepoRootPackageVersions, u as getResolvedPackageVersion, w as renderVscodeFiles, x as renderAiFiles, y as renderVscodeFiles$1, z as renderEditorConfig, B as renderGitignore, C as toPrettierIgnoreContent, D as mergePackageJsonScripts, E as getPackageManagerProfile, F as renderPnpmWorkspaceConfig, G as renderViteConfig, H as packageJsonScripts, I as resolveDefaultPackageJsonScripts, J as formatResolvedPackageVersion, K as getSemverMajorString, L as formatPackageManager, M as renderOxlintConfig, N as resolvePackageManager, O as getSemverMajor, P as compareNumericSemver, Q as getPackageDirectoryName, R as planProject, S as resolveProjectPlanInput, T as validatePackageName, U as clearConfig, V as getConfigPath, W as resolveWorkspacePlanInput, X as planWorkspace } from './shared/create-krispya.DV9KI0bg.mjs';
+import { g as getEngineName, a as getPackageManagerName, b as getBaseTemplate, s as shouldEnableReactCompiler, c as getLanguageFromTemplate, d as generateRandomName, e as getConfigStrategy, f as getAiPlatforms, A as ALL_AI_PLATFORMS, h as AI_PLATFORM_LABELS, i as AI_PLATFORM_HINTS, j as detectTooling, p as parsePackageManagerSpec, k as parseEngine, l as parseWorkspaceYamlContent, v as validateWorkspace, r as renderTypescriptConfigPackage, m as renderOxlintConfigPackage, n as renderEslintConfigPackage, o as renderOxfmtConfigPackage, q as renderPrettierConfigPackage, t as resolveMonorepoRootPackageVersions, u as getResolvedPackageVersion, w as renderJson, x as renderVscodeFiles, y as renderAiFiles, z as renderVscodeFiles$1, B as renderEditorConfig, C as renderGitignore, D as toPrettierIgnoreContent, E as mergePackageJsonScripts, F as getPackageManagerProfile, G as renderPnpmWorkspaceConfig, H as renderViteConfig, I as mergeGitignoreContent, J as detectGitignoreVariant, K as isManagedAiFilePath, L as mergeAiFileContent, M as packageJsonScripts, N as resolveDefaultPackageJsonScripts, O as formatResolvedPackageVersion, P as getSemverMajorString, Q as formatPackageManager, R as renderOxlintConfig, S as resolvePackageManager, T as getSemverMajor, U as compareNumericSemver, V as getPackageDirectoryName, W as planProject, X as resolveProjectPlanInput, Y as validatePackageName, Z as clearConfig, _ as getConfigPath, $ as resolveWorkspacePlanInput, a0 as planWorkspace } from './shared/create-krispya.DevK9Jek.mjs';
 import { readFile as readFile$1, mkdir as mkdir$1, writeFile as writeFile$1, access as access$1 } from 'fs/promises';
 import { constants as constants$1 } from 'fs';
 import { join as join$1, dirname as dirname$1 } from 'path';
@@ -1089,7 +1089,7 @@ async function handleFixCommand(options) {
       };
       files["biome.json"] = {
         type: "text",
-        content: JSON.stringify(biomeConfig, null, 2)
+        content: renderJson(biomeConfig)
       };
     }
     for (const [filePath, file] of Object.entries(files)) {
@@ -1322,7 +1322,7 @@ async function planExpectedFiles(config) {
     };
     rootConfig["biome.json"] = {
       type: "text",
-      content: JSON.stringify(biomeConfig, null, 2)
+      content: renderJson(biomeConfig)
     };
   }
   return {
@@ -1459,6 +1459,60 @@ function fileContentsEqual(filePath, currentContent, newContent) {
   }
   return currentContent === newContent;
 }
+function compareTextFileWithDisk(filePath, currentContent, expectedContent) {
+  if (filePath === ".gitignore") {
+    const merged = mergeGitignoreContent(currentContent, detectGitignoreVariant(expectedContent));
+    if (fileContentsEqual(filePath, currentContent, merged.content)) {
+      return {
+        path: filePath,
+        status: "unchanged",
+        currentContent,
+        newContent: currentContent,
+        mergeSafe: merged.mergeSafe
+      };
+    }
+    return {
+      path: filePath,
+      status: "modified",
+      currentContent,
+      newContent: merged.content,
+      mergeSafe: merged.mergeSafe
+    };
+  }
+  if (isManagedAiFilePath(filePath)) {
+    const merged = mergeAiFileContent(currentContent, expectedContent);
+    if (fileContentsEqual(filePath, currentContent, merged.content)) {
+      return {
+        path: filePath,
+        status: "unchanged",
+        currentContent,
+        newContent: currentContent,
+        mergeSafe: merged.mergeSafe
+      };
+    }
+    return {
+      path: filePath,
+      status: "modified",
+      currentContent,
+      newContent: merged.content,
+      mergeSafe: merged.mergeSafe
+    };
+  }
+  if (fileContentsEqual(filePath, currentContent, expectedContent)) {
+    return {
+      path: filePath,
+      status: "unchanged",
+      currentContent,
+      newContent: currentContent
+    };
+  }
+  return {
+    path: filePath,
+    status: "modified",
+    currentContent,
+    newContent: expectedContent
+  };
+}
 async function compareWithDisk(expected, root) {
   const categoryLabels = {
     "ai-files": "AI Files",
@@ -1480,21 +1534,7 @@ async function compareWithDisk(expected, root) {
       const newContent = file.content;
       if (await fileExists(fullPath)) {
         const currentContent = await readFile$1(fullPath, "utf-8");
-        if (fileContentsEqual(filePath, currentContent, newContent)) {
-          changes.push({
-            path: filePath,
-            status: "unchanged",
-            currentContent,
-            newContent
-          });
-        } else {
-          changes.push({
-            path: filePath,
-            status: "modified",
-            currentContent,
-            newContent
-          });
-        }
+        changes.push(compareTextFileWithDisk(filePath, currentContent, newContent));
       } else {
         changes.push({
           path: filePath,
@@ -1519,13 +1559,13 @@ async function compareWithDisk(expected, root) {
           category: "ai-files-update",
           label: categoryLabels["ai-files-update"],
           changes: modifiedAiFiles,
-          hasUserModifications: true
+          hasUserModifications: modifiedAiFiles.some((change) => !change.mergeSafe)
         });
       }
       continue;
     }
     if (changes.length === 0) continue;
-    const hasUserModifications = changes.some((c) => c.status === "modified");
+    const hasUserModifications = changes.some((c) => c.status === "modified" && !c.mergeSafe);
     categories.push({
       category,
       label: categoryLabels[category],
@@ -1690,8 +1730,7 @@ async function getPackageJsonScriptUpdates(root, config) {
   if (Object.keys(nextDevDependencies).length > 0 || pkg.devDependencies != null) {
     nextPackageJson.devDependencies = nextDevDependencies;
   }
-  const newContent = `${JSON.stringify(nextPackageJson, null, 2)}
-`;
+  const newContent = renderJson(nextPackageJson, { inlineArrays: false });
   return [
     {
       path: "package.json",
@@ -1731,8 +1770,7 @@ async function getPackageManagerConfigUpdates(root, config) {
       path: "package.json",
       status: "modified",
       currentContent,
-      newContent: `${JSON.stringify(nextPackageJson, null, 2)}
-`
+      newContent: renderJson(nextPackageJson, { inlineArrays: false })
     }
   ];
 }
@@ -1749,8 +1787,7 @@ function planSinglePackageOxlintConfig(config) {
   return {
     path,
     status: "added",
-    newContent: `${JSON.stringify(oxlintConfig, null, 2)}
-`
+    newContent: renderJson(oxlintConfig)
   };
 }
 async function getOxlintConfigReplacementUpdates(root, config) {
@@ -1952,10 +1989,12 @@ const UPDATE_CATEGORY_ORDER = [
 function isMergeUpdateCategory(category) {
   return category === "workspace-config" || category === "package-json";
 }
-function getUpdateHint(category, status) {
-  if (status === "added") return "new file";
-  if (category === "package-json") return "merge update";
-  if (category === "workspace-config") return "merge update";
+function isMergeSafeChange(category, change) {
+  return isMergeUpdateCategory(category) || change.mergeSafe === true;
+}
+function getUpdateHint(category, change) {
+  if (change.status === "added") return "new file";
+  if (isMergeSafeChange(category, change)) return "merge update";
   return "changed; overwrites if selected";
 }
 function isSelectableFileChange(change) {
@@ -1963,7 +2002,7 @@ function isSelectableFileChange(change) {
 }
 function getInitialUpdateSelections(category) {
   return category.changes.filter(
-    (change) => change.status === "added" || change.status === "modified" && isMergeUpdateCategory(category.category)
+    (change) => change.status === "added" || change.status === "modified" && isMergeSafeChange(category.category, change)
   ).map((change) => change.path);
 }
 async function promptForUpdateSelections(category) {
@@ -1973,7 +2012,7 @@ async function promptForUpdateSelections(category) {
     options: selectableChanges.map((change) => ({
       value: change.path,
       label: change.path,
-      hint: getUpdateHint(category.category, change.status)
+      hint: getUpdateHint(category.category, change)
     })),
     initialValues: getInitialUpdateSelections(category),
     required: false
@@ -2252,8 +2291,11 @@ async function processUpdateCategory(category, projectRoot, options) {
       console.log(formatFileChange(change));
     }
     console.log();
-    if (isMergeUpdateCategory(category.category)) {
-      changesToApply = [...newChanges, ...modifiedChanges];
+    const mergeSafeModifiedChanges = modifiedChanges.filter(
+      (change) => isMergeSafeChange(category.category, change)
+    );
+    if (mergeSafeModifiedChanges.length > 0) {
+      changesToApply = [...newChanges, ...mergeSafeModifiedChanges];
       if (changesToApply.length > 0) {
         console.log(color.dim("  (--yes mode: applying merge updates)"));
       }

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const workspace = require('./shared/create-krispya.D7X3ZrTg.cjs');
+const workspace = require('./shared/create-krispya.C0eXGXA9.cjs');
 require('fs/promises');
 require('fs');
 require('path');

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { Y as DEFAULT_MINIMUM_RELEASE_AGE_MINUTES, Z as assignResolvedPackageVersion, U as clearConfig, P as compareNumericSemver, j as detectTooling, _ as formatEngine, $ as formatNodeTypesVersion, L as formatPackageManager, J as formatResolvedPackageVersion, d as generateRandomName, f as getAiPlatforms, b as getBaseTemplate, V as getConfigPath, e as getConfigStrategy, g as getEngineName, a0 as getEngineSpec, c as getLanguageFromTemplate, a1 as getLatestNodeVersion, a2 as getLatestNpmCliVersion, a3 as getLatestNpmMajorVersion, a4 as getLatestNpmMajorVersionAtOrBelow, a5 as getLatestNpmVersion, a6 as getLatestPnpmVersion, a7 as getLatestYarnVersion, Q as getPackageDirectoryName, a8 as getPackageFallbackVersion, a as getPackageManagerName, E as getPackageManagerProfile, a9 as getPackageManagerSpec, u as getResolvedPackageVersion, O as getSemverMajor, K as getSemverMajorString, aa as isPackageManagerName, ab as materializeJobs, ac as merge, k as parseEngine, p as parsePackageManagerSpec, l as parseWorkspaceYamlContent, R as planProject, X as planWorkspace, ad as projectPlanInputToOptions, F as renderPnpmWorkspaceConfig, ae as resolveEngine, t as resolveMonorepoRootPackageVersions, N as resolvePackageManager, af as resolvePackageManagerProfile, ag as resolvePackageVersions, ah as resolveProjectFacts, ai as resolveProjectPackageVersions, S as resolveProjectPlanInput, aj as resolveWorkspaceFacts, W as resolveWorkspacePlanInput, ak as setAiPlatforms, al as setConfigStrategy, s as shouldEnableReactCompiler, am as unique, T as validatePackageName, v as validateWorkspace, an as workspacePlanInputToMonorepoParams } from './shared/create-krispya.DV9KI0bg.mjs';
+export { a1 as DEFAULT_MINIMUM_RELEASE_AGE_MINUTES, a2 as assignResolvedPackageVersion, Z as clearConfig, U as compareNumericSemver, j as detectTooling, a3 as formatEngine, a4 as formatNodeTypesVersion, Q as formatPackageManager, O as formatResolvedPackageVersion, d as generateRandomName, f as getAiPlatforms, b as getBaseTemplate, _ as getConfigPath, e as getConfigStrategy, g as getEngineName, a5 as getEngineSpec, c as getLanguageFromTemplate, a6 as getLatestNodeVersion, a7 as getLatestNpmCliVersion, a8 as getLatestNpmMajorVersion, a9 as getLatestNpmMajorVersionAtOrBelow, aa as getLatestNpmVersion, ab as getLatestPnpmVersion, ac as getLatestYarnVersion, V as getPackageDirectoryName, ad as getPackageFallbackVersion, a as getPackageManagerName, F as getPackageManagerProfile, ae as getPackageManagerSpec, u as getResolvedPackageVersion, T as getSemverMajor, P as getSemverMajorString, af as isPackageManagerName, ag as materializeJobs, ah as merge, k as parseEngine, p as parsePackageManagerSpec, l as parseWorkspaceYamlContent, W as planProject, a0 as planWorkspace, ai as projectPlanInputToOptions, G as renderPnpmWorkspaceConfig, aj as resolveEngine, t as resolveMonorepoRootPackageVersions, S as resolvePackageManager, ak as resolvePackageManagerProfile, al as resolvePackageVersions, am as resolveProjectFacts, an as resolveProjectPackageVersions, X as resolveProjectPlanInput, ao as resolveWorkspaceFacts, $ as resolveWorkspacePlanInput, ap as setAiPlatforms, aq as setConfigStrategy, s as shouldEnableReactCompiler, ar as unique, Y as validatePackageName, v as validateWorkspace, as as workspacePlanInputToMonorepoParams } from './shared/create-krispya.DevK9Jek.mjs';
 import 'fs/promises';
 import 'fs';
 import 'path';