Revert "Replace atomicFS with fs in theme"

This reverts commit 1a1086d.

Author: scriptype

src/theme/index.js

@@ -1,10 +1,9 @@
 const { tmpdir } = require('os')
-const { stat, rm, mkdir, mkdtemp, cp, readdir } = require('fs/promises')
 const { join } = require('path')
 const Debug = require('../debug')
 const Settings = require('../settings')
 const createDecorator = require('./decorator')
-const { atomicReplace } = require('../lib/fileSystemHelpers')
+const { atomicReplace, atomicFS } = require('../lib/fileSystemHelpers')
 const {
   ASSETS,
   PARTIALS,
@@ -42,7 +41,7 @@ const Methods = (() => {
 
   const customThemeExists = async (customThemePath) => {
     try {
-      return await stat(customThemePath)
+      return await atomicFS.stat(customThemePath)
     } catch {
       return false
     }
@@ -51,10 +50,12 @@ const Methods = (() => {
   const refreshCustomTheme = async (customThemePath) => {
     const backupKeepDir = async (keepPath) => {
       try {
-        if (await stat(keepPath)) {
-          const tempPath = await mkdtemp(join(tmpdir(), 'writ-theme-keep'))
+        if (await atomicFS.stat(keepPath)) {
+          const tempPath = await atomicFS.mkdtemp(
+            join(tmpdir(), 'writ-theme-keep')
+          )
           Debug.debugLog('refresh theme temp dir', tempPath)
-          await cp(keepPath, tempPath, { recursive: true })
+          await atomicFS.cp(keepPath, tempPath)
           return tempPath
         }
       } catch {
@@ -64,10 +65,7 @@ const Methods = (() => {
     }
 
     const applyKeepOverrides = async (keepBackupPath, themePath) => {
-      const entries = await readdir(keepBackupPath, {
-        recursive: true,
-        withFileTypes: true
-      })
+      const entries = await atomicFS.readdirRecursive(keepBackupPath)
 
       await Promise.all(
         entries
@@ -77,7 +75,7 @@ const Methods = (() => {
               entry.parentPath.replace(keepBackupPath, ''),
               entry.name
             )
-            return cp(
+            return atomicFS.cp(
               join(keepBackupPath, relativePath),
               join(themePath, relativePath)
             )
@@ -98,10 +96,8 @@ const Methods = (() => {
         })
 
         if (keepBackupPath) {
-          await mkdir(join(tempPath, KEEP_PATH), { recursive: true })
-          await cp(keepBackupPath, join(tempPath, KEEP_PATH), {
-            recursive: true
-          })
+          await atomicFS.mkdir(join(tempPath, KEEP_PATH))
+          await atomicFS.cp(keepBackupPath, join(tempPath, KEEP_PATH))
           await applyKeepOverrides(keepBackupPath, tempPath)
         }
       })
@@ -110,13 +106,13 @@ const Methods = (() => {
       throw e
     } finally {
       if (keepBackupPath) {
-        await rm(keepBackupPath, { recursive: true, force: true })
+        await atomicFS.rm(keepBackupPath)
       }
     }
   }
 
   const collectCustomizerPaths = async (customThemePath) => {
-    const paths = await readdir(customThemePath)
+    const paths = await atomicFS.readdir(customThemePath)
     const customizerPaths = paths.filter(p => {
       return p.endsWith('.css') || p.endsWith('.js')
     })
@@ -125,12 +121,11 @@ const Methods = (() => {
 
   const copyCommonResources = (targetPath) => {
     return Promise.all([
-      cp(
+      atomicFS.cp(
         join(__dirname, 'common', PARTIALS.from),
-        join(targetPath, PARTIALS.to),
-        { recursive: true }
+        join(targetPath, PARTIALS.to)
       ),
-      cp(
+      atomicFS.cp(
         join(__dirname, 'common', TEMPLATE_HELPERS.from),
         join(targetPath, PARTIALS.to, TEMPLATE_HELPERS.to)
       )
@@ -141,17 +136,15 @@ const Methods = (() => {
     const { theme } = Settings.getSettings()
     const themeSrcPath = join(__dirname, '..', '..', 'packages', `theme-${theme}`)
     return Promise.all([
-      cp(
+      atomicFS.cp(
         join(themeSrcPath, ASSETS),
-        join(customThemePath, ASSETS, theme),
-        { recursive: true }
+        join(customThemePath, ASSETS, theme)
       ),
-      cp(
+      atomicFS.cp(
         join(themeSrcPath, PARTIALS.from),
-        join(customThemePath, PARTIALS.to),
-        { recursive: true }
+        join(customThemePath, PARTIALS.to)
       ),
-      cp(
+      atomicFS.cp(
         join(themeSrcPath, THEME_SETTINGS),
         join(customThemePath, THEME_SETTINGS)
       )
@@ -163,14 +156,14 @@ const Methods = (() => {
   }
 
   const copyCustomizers = async (customThemePath) => {
-    const paths = await readdir(join(__dirname, 'customizers'))
+    const paths = await atomicFS.readdir(join(__dirname, 'customizers'))
     const customizers = paths.filter(p => {
       return p.endsWith('.css') || p.endsWith('.js')
     })
     State.customizers.push(...customizers)
     return Promise.all(
       paths.map(path => {
-        return cp(
+        return atomicFS.cp(
           join(__dirname, 'customizers', path),
           join(customThemePath, path)
         )
@@ -180,12 +173,12 @@ const Methods = (() => {
 
   const makeCustomThemeDirectory = async (customThemePath, options = {}) => {
     if (!options.skipContainer) {
-      await mkdir(customThemePath)
+      await atomicFS.mkdir(customThemePath)
     }
 
     await Promise.all([
-      mkdir(join(customThemePath, ASSETS)),
-      mkdir(join(customThemePath, PARTIALS.to))
+      atomicFS.mkdir(join(customThemePath, ASSETS)),
+      atomicFS.mkdir(join(customThemePath, PARTIALS.to))
     ])
 
     await copyCommonResources(customThemePath)