banhaten 0.4.0 → 0.6.0

package/src/cli/index.js

@@ -14,6 +14,7 @@ import {
   assertFileUnchanged,
   deferUntilApplied,
   formatUnifiedDiff,
+  readFileForUpdate,
   runFileTransaction,
   writeFile,
 } from "./file-transaction.js"
@@ -393,7 +394,7 @@ async function writeComponents(requestedNames, flags, options) {
 }
 
 async function readInstallReceipt(cwd) {
-  const receipt = await readJsonIfExists(path.join(cwd, INSTALL_RECEIPT_FILE))
+  const receipt = await readJsonForUpdate(path.join(cwd, INSTALL_RECEIPT_FILE))
   if (!receipt) return null
   if (receipt.schemaVersion !== 1 || !receipt.components) {
     throw new Error(
@@ -446,7 +447,7 @@ async function findInstalledComponents(installPlan) {
 async function writeInstallReceipt(installPlan, names, options) {
   const { cwd } = installPlan
   const receiptPath = path.join(cwd, INSTALL_RECEIPT_FILE)
-  const current = (await readJsonIfExists(receiptPath)) || {
+  const current = (await readJsonForUpdate(receiptPath)) || {
     schemaVersion: 1,
     components: {},
   }
@@ -577,7 +578,7 @@ async function loadConfig(cwd) {
   const componentsPath = path.join(cwd, "components.json")
   const config = structuredClone(DEFAULT_CONFIG)
 
-  const componentsConfig = await readJsonIfExists(componentsPath)
+  const componentsConfig = await readJsonForUpdate(componentsPath)
   let hasExplicitCssPath = false
   if (componentsConfig) {
     if (componentsConfig.tailwind?.css) {
@@ -592,7 +593,7 @@ async function loadConfig(cwd) {
       config.aliases.ui
   }
 
-  const localConfig = await readJsonIfExists(configPath)
+  const localConfig = await readJsonForUpdate(configPath)
   if (localConfig) {
     // Validate what the user actually wrote, before it is merged onto the
     // defaults. Validating the merged object instead would apply
@@ -727,16 +728,17 @@ async function writeRegistryFiles(installPlan, files, options) {
       : source
     const target = relative(cwd, targetPath)
 
-    await assertManagedFileSafe(targetPath, content, target, options)
+    const current = await readFileForUpdate(targetPath)
+    assertManagedFileSafe(current, content, target, options)
 
     const status = await writeFile(targetPath, content, options)
     writes.push(`${status} ${target}`)
     if (options.showDiff && status === "would update") {
-      const current = await fs.readFile(
-        targetPath,
-        isTextRegistryFile(file.source) ? "utf8" : undefined
-      )
-      writes.push(formatUnifiedDiff(target, current, content))
+      writes.push(formatUnifiedDiff(
+        target,
+        isTextRegistryFile(file.source) ? current.toString("utf8") : current,
+        content
+      ))
     }
   }
 
@@ -748,7 +750,7 @@ async function writeGlobalCss(installPlan, options) {
   const cssPath = path.join(cwd, installPlan.destinations.css)
   const sourcePath = path.join(registryRoot, "styles", "globals.css")
   const tokenCss = await fs.readFile(sourcePath, "utf8")
-  const current = await readTextIfExists(cssPath)
+  const current = await readTextForUpdate(cssPath)
   const tokenBlock = current
     ? removeExistingTokenBlock(current, relative(cwd, cssPath))
     : { content: "", found: false }
@@ -819,7 +821,7 @@ function getPackageChanges(installPlan, dependencies) {
 
 async function updatePackageJson(cwd, changes, options) {
   const packagePath = path.join(cwd, "package.json")
-  const currentSource = await readTextIfExists(packagePath)
+  const currentSource = await readTextForUpdate(packagePath)
   const packageExists = currentSource !== null
   const packageJson = currentSource !== null ? JSON.parse(currentSource) : {
     name: path.basename(cwd).toLowerCase(),
@@ -914,28 +916,19 @@ async function readJson(filePath) {
   return JSON.parse(await fs.readFile(filePath, "utf8"))
 }
 
-async function readJsonIfExists(filePath) {
-  try {
-    return await readJson(filePath)
-  } catch (error) {
-    if (error.code === "ENOENT") return null
-    throw error
-  }
+async function readJsonForUpdate(filePath) {
+  const source = await readTextForUpdate(filePath)
+  return source === null ? null : JSON.parse(source)
 }
 
-async function readTextIfExists(filePath) {
-  try {
-    return await fs.readFile(filePath, "utf8")
-  } catch (error) {
-    if (error.code === "ENOENT") return null
-    throw error
-  }
+async function readTextForUpdate(filePath) {
+  const source = await readFileForUpdate(filePath)
+  return source === null ? null : source.toString("utf8")
 }
 
-async function assertManagedFileSafe(targetPath, nextContent, target, options) {
-  if (options.dryRun || options.force || !(await exists(targetPath))) return
+function assertManagedFileSafe(current, nextContent, target, options) {
+  if (options.dryRun || options.force || current === null) return
 
-  const current = await fs.readFile(targetPath)
   const next = Buffer.isBuffer(nextContent)
     ? nextContent
     : Buffer.from(nextContent, "utf8")