@jsenv/filesystem 4.8.1 → 4.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/filesystem",
-  "version": "4.8.1",
+  "version": "4.9.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -31,7 +31,7 @@
     "test": "node --conditions=development ./scripts/test.mjs"
   },
   "dependencies": {
-    "@jsenv/urls": "2.3.0",
+    "@jsenv/urls": "2.3.1",
     "@jsenv/url-meta": "8.4.2",
     "@jsenv/abort": "4.3.0",
     "@jsenv/utils": "2.1.1"

package/src/copy/copy_directory_content.js

@@ -1,12 +1,12 @@
 import { Abort } from "@jsenv/abort";
-import { urlToFileSystemPath, resolveUrl } from "@jsenv/urls";
+import { resolveUrl, urlToFileSystemPath } from "@jsenv/urls";
 
 import { assertAndNormalizeDirectoryUrl } from "../path_and_url/directory_url_validation.js";
 import { urlTargetsSameFileSystemPath } from "../path_and_url/url_targets_same_file_system_path.js";
-import { statsToType } from "../read_write/stat/stats_to_type.js";
-import { readEntryStat } from "../read_write/stat/read_entry_stat.js";
-import { readSymbolicLink } from "../read_write/read_symbolic_link.js";
 import { readDirectory } from "../read_write/read_directory.js";
+import { readSymbolicLink } from "../read_write/read_symbolic_link.js";
+import { readEntryStat } from "../read_write/stat/read_entry_stat.js";
+import { statsToType } from "../read_write/stat/stats_to_type.js";
 import { copyEntry } from "./copy_entry.js";
 
 export const copyDirectoryContent = async ({

package/src/copy/copy_directory_content_sync.js

@@ -1,12 +1,12 @@
 import { Abort } from "@jsenv/abort";
-import { urlToFileSystemPath, resolveUrl } from "@jsenv/urls";
+import { resolveUrl, urlToFileSystemPath } from "@jsenv/urls";
 
 import { assertAndNormalizeDirectoryUrl } from "../path_and_url/directory_url_validation.js";
 import { urlTargetsSameFileSystemPath } from "../path_and_url/url_targets_same_file_system_path.js";
-import { statsToType } from "../read_write/stat/stats_to_type.js";
-import { readEntryStatSync } from "../read_write/stat/read_entry_stat_sync.js";
-import { readSymbolicLinkSync } from "../read_write/read_symbolic_link_sync.js";
 import { readDirectorySync } from "../read_write/read_directory_sync.js";
+import { readSymbolicLinkSync } from "../read_write/read_symbolic_link_sync.js";
+import { readEntryStatSync } from "../read_write/stat/read_entry_stat_sync.js";
+import { statsToType } from "../read_write/stat/stats_to_type.js";
 import { copyEntrySync } from "./copy_entry_sync.js";
 
 export const copyDirectoryContentSync = ({

package/src/copy/copy_entry.js

@@ -1,24 +1,24 @@
-import { copyFile as copyFileNode } from "node:fs";
 import { Abort } from "@jsenv/abort";
 import {
-  resolveUrl,
-  urlToRelativeUrl,
   ensurePathnameTrailingSlash,
+  resolveUrl,
   urlIsInsideOf,
   urlToFileSystemPath,
+  urlToRelativeUrl,
 } from "@jsenv/urls";
+import { copyFile as copyFileNode } from "node:fs";
 
 import { assertAndNormalizeFileUrl } from "../path_and_url/file_url_validation.js";
 import { urlTargetsSameFileSystemPath } from "../path_and_url/url_targets_same_file_system_path.js";
+import { ensureParentDirectories } from "../read_write/ensure_parent_directories.js";
+import { readDirectory } from "../read_write/read_directory.js";
+import { readSymbolicLink } from "../read_write/read_symbolic_link.js";
+import { binaryFlagsToPermissions } from "../read_write/stat/permissions.js";
 import { readEntryStat } from "../read_write/stat/read_entry_stat.js";
 import { statsToType } from "../read_write/stat/stats_to_type.js";
-import { binaryFlagsToPermissions } from "../read_write/stat/permissions.js";
-import { writeEntryPermissions } from "../read_write/stat/write_entry_permissions.js";
 import { writeEntryModificationTime } from "../read_write/stat/write_entry_modification_time.js";
+import { writeEntryPermissions } from "../read_write/stat/write_entry_permissions.js";
 import { writeDirectory } from "../read_write/write_directory.js";
-import { ensureParentDirectories } from "../read_write/ensure_parent_directories.js";
-import { readDirectory } from "../read_write/read_directory.js";
-import { readSymbolicLink } from "../read_write/read_symbolic_link.js";
 import { writeSymbolicLink } from "../read_write/write_symbolic_link.js";
 import { removeEntry } from "../remove/remove_entry.js";
 

package/src/copy/copy_entry_sync.js

@@ -1,24 +1,24 @@
-import { copyFileSync as copyFileSyncNode } from "node:fs";
 import { Abort } from "@jsenv/abort";
 import {
-  resolveUrl,
-  urlToRelativeUrl,
   ensurePathnameTrailingSlash,
+  resolveUrl,
   urlIsInsideOf,
   urlToFileSystemPath,
+  urlToRelativeUrl,
 } from "@jsenv/urls";
+import { copyFileSync as copyFileSyncNode } from "node:fs";
 
 import { assertAndNormalizeFileUrl } from "../path_and_url/file_url_validation.js";
 import { urlTargetsSameFileSystemPath } from "../path_and_url/url_targets_same_file_system_path.js";
+import { ensureParentDirectoriesSync } from "../read_write/ensure_parent_directories_sync.js";
+import { readDirectorySync } from "../read_write/read_directory_sync.js";
+import { readSymbolicLinkSync } from "../read_write/read_symbolic_link_sync.js";
+import { binaryFlagsToPermissions } from "../read_write/stat/permissions.js";
 import { readEntryStatSync } from "../read_write/stat/read_entry_stat_sync.js";
 import { statsToType } from "../read_write/stat/stats_to_type.js";
-import { binaryFlagsToPermissions } from "../read_write/stat/permissions.js";
-import { writeEntryPermissionsSync } from "../read_write/stat/write_entry_permissions_sync.js";
 import { writeEntryModificationTimeSync } from "../read_write/stat/write_entry_modification_time_sync.js";
+import { writeEntryPermissionsSync } from "../read_write/stat/write_entry_permissions_sync.js";
 import { writeDirectorySync } from "../read_write/write_directory_sync.js";
-import { ensureParentDirectoriesSync } from "../read_write/ensure_parent_directories_sync.js";
-import { readDirectorySync } from "../read_write/read_directory_sync.js";
-import { readSymbolicLinkSync } from "../read_write/read_symbolic_link_sync.js";
 import { writeSymbolicLinkSync } from "../read_write/write_symbolic_link_sync.js";
 import { removeEntrySync } from "../remove/remove_entry_sync.js";
 

package/src/lifecycle/create_watcher.js

@@ -1,4 +1,4 @@
-import { watch, openSync, closeSync } from "node:fs";
+import { closeSync, openSync, watch } from "node:fs";
 
 const isWindows = process.platform === "win32";
 

package/src/lifecycle/register_directory_lifecycle.js

@@ -1,11 +1,11 @@
-import { readdirSync, statSync } from "node:fs";
 import { URL_META } from "@jsenv/url-meta";
 import { urlToFileSystemPath, urlToRelativeUrl } from "@jsenv/urls";
+import { readdirSync, statSync } from "node:fs";
 
 import { assertAndNormalizeDirectoryUrl } from "../path_and_url/directory_url_validation.js";
 import { statsToType } from "../read_write/stat/stats_to_type.js";
-import { guardTooFastSecondCallPerFile } from "./guard_second_call.js";
 import { createWatcher } from "./create_watcher.js";
+import { guardTooFastSecondCallPerFile } from "./guard_second_call.js";
 import { trackResources } from "./track_resources.js";
 
 const isLinux = process.platform === "linux";

package/src/lifecycle/register_file_lifecycle.js

@@ -1,12 +1,12 @@
-import { statSync } from "node:fs";
-import { dirname, basename } from "node:path";
 import { urlToFileSystemPath } from "@jsenv/urls";
+import { statSync } from "node:fs";
+import { basename, dirname } from "node:path";
 
 import { assertAndNormalizeFileUrl } from "../path_and_url/file_url_validation.js";
 import { statsToType } from "../read_write/stat/stats_to_type.js";
-import { trackResources } from "./track_resources.js";
 import { createWatcher } from "./create_watcher.js";
 import { guardTooFastSecondCall } from "./guard_second_call.js";
+import { trackResources } from "./track_resources.js";
 
 export const registerFileLifecycle = (
   source,

package/src/list/collect_directory_match_report.js

@@ -2,8 +2,8 @@ import { Abort } from "@jsenv/abort";
 import { URL_META } from "@jsenv/url-meta";
 import { urlToRelativeUrl } from "@jsenv/urls";
 
-import { assertAndNormalizeDirectoryUrl } from "../path_and_url/directory_url_validation.js";
 import { comparePathnames } from "../path_and_url/compare_pathnames.js";
+import { assertAndNormalizeDirectoryUrl } from "../path_and_url/directory_url_validation.js";
 import { readDirectory } from "../read_write/read_directory.js";
 import { readEntryStat } from "../read_write/stat/read_entry_stat.js";
 

package/src/list/collect_files.js

@@ -2,10 +2,10 @@ import { Abort } from "@jsenv/abort";
 import { URL_META } from "@jsenv/url-meta";
 import { urlToRelativeUrl } from "@jsenv/urls";
 
-import { assertAndNormalizeDirectoryUrl } from "../path_and_url/directory_url_validation.js";
 import { comparePathnames } from "../path_and_url/compare_pathnames.js";
-import { readEntryStat } from "../read_write/stat/read_entry_stat.js";
+import { assertAndNormalizeDirectoryUrl } from "../path_and_url/directory_url_validation.js";
 import { readDirectory } from "../read_write/read_directory.js";
+import { readEntryStat } from "../read_write/stat/read_entry_stat.js";
 
 export const collectFiles = async ({
   signal = new AbortController().signal,

package/src/list/visit_structure_sync.js

@@ -1,10 +1,10 @@
 import { URL_META } from "@jsenv/url-meta";
 import { urlToRelativeUrl } from "@jsenv/urls";
 
-import { assertAndNormalizeDirectoryUrl } from "../path_and_url/directory_url_validation.js";
 import { comparePathnames } from "../path_and_url/compare_pathnames.js";
-import { readEntryStatSync } from "../read_write/stat/read_entry_stat_sync.js";
+import { assertAndNormalizeDirectoryUrl } from "../path_and_url/directory_url_validation.js";
 import { readDirectorySync } from "../read_write/read_directory_sync.js";
+import { readEntryStatSync } from "../read_write/stat/read_entry_stat_sync.js";
 
 export const visitStructureSync = ({
   directoryUrl,

package/src/main.js

@@ -1,3 +1,5 @@
+// tslint:disable:ordered-imports
+
 // we might wanna expose the sync versions as follows:
 // readDirectory.sync()
 // +1: very easy to switch between sync/async versions of a given function
@@ -57,7 +59,10 @@ export { writeEntryModificationTimeSync } from "./read_write/stat/write_entry_mo
 
 // move
 export { moveDirectoryContent } from "./move/move_directory_content.js";
+export { moveFile } from "./move/move_file.js";
 export { moveEntry } from "./move/move_entry.js";
+export { moveFileSync } from "./move/move_file_sync.js";
+export { moveEntrySync } from "./move/move_entry_sync.js";
 
 // copy
 export { copyEntry } from "./copy/copy_entry.js";

package/src/move/move_directory_content.js

@@ -1,12 +1,12 @@
 import { Abort } from "@jsenv/abort";
-import { urlToFileSystemPath, resolveUrl } from "@jsenv/urls";
+import { resolveUrl, urlToFileSystemPath } from "@jsenv/urls";
 
 import { assertAndNormalizeDirectoryUrl } from "../path_and_url/directory_url_validation.js";
 import { urlTargetsSameFileSystemPath } from "../path_and_url/url_targets_same_file_system_path.js";
+import { readDirectory } from "../read_write/read_directory.js";
+import { readSymbolicLink } from "../read_write/read_symbolic_link.js";
 import { readEntryStat } from "../read_write/stat/read_entry_stat.js";
 import { statsToType } from "../read_write/stat/stats_to_type.js";
-import { readSymbolicLink } from "../read_write/read_symbolic_link.js";
-import { readDirectory } from "../read_write/read_directory.js";
 import { moveEntry } from "./move_entry.js";
 
 export const moveDirectoryContent = async ({

package/src/move/move_entry.js

@@ -1,14 +1,14 @@
-import { rename } from "node:fs";
 import { Abort } from "@jsenv/abort";
-import { urlToFileSystemPath, resolveUrl } from "@jsenv/urls";
+import { resolveUrl, urlToFileSystemPath } from "@jsenv/urls";
+import { rename } from "node:fs";
 
+import { copyEntry } from "../copy/copy_entry.js";
 import { assertAndNormalizeFileUrl } from "../path_and_url/file_url_validation.js";
 import { urlTargetsSameFileSystemPath } from "../path_and_url/url_targets_same_file_system_path.js";
-import { statsToType } from "../read_write/stat/stats_to_type.js";
-import { readEntryStat } from "../read_write/stat/read_entry_stat.js";
 import { ensureParentDirectories } from "../read_write/ensure_parent_directories.js";
 import { readSymbolicLink } from "../read_write/read_symbolic_link.js";
-import { copyEntry } from "../copy/copy_entry.js";
+import { readEntryStat } from "../read_write/stat/read_entry_stat.js";
+import { statsToType } from "../read_write/stat/stats_to_type.js";
 import { removeEntry } from "../remove/remove_entry.js";
 
 export const moveEntry = async ({

package/src/move/move_entry_sync.js

@@ -0,0 +1,111 @@
+import { resolveUrl, urlToFileSystemPath } from "@jsenv/urls";
+import { renameSync } from "node:fs";
+
+import { copyEntry } from "../copy/copy_entry.js";
+import { assertAndNormalizeFileUrl } from "../path_and_url/file_url_validation.js";
+import { urlTargetsSameFileSystemPath } from "../path_and_url/url_targets_same_file_system_path.js";
+import { ensureParentDirectoriesSync } from "../read_write/ensure_parent_directories_sync.js";
+import { readSymbolicLinkSync } from "../read_write/read_symbolic_link_sync.js";
+import { readEntryStatSync } from "../read_write/stat/read_entry_stat_sync.js";
+import { statsToType } from "../read_write/stat/stats_to_type.js";
+import { removeEntrySync } from "../remove/remove_entry_sync.js";
+
+export const moveEntrySync = ({
+  from,
+  to,
+  overwrite = false,
+  allowUseless = false,
+  followLink = true,
+}) => {
+  const fromUrl = assertAndNormalizeFileUrl(from);
+  const fromPath = urlToFileSystemPath(fromUrl);
+  let toUrl = assertAndNormalizeFileUrl(to);
+  let toPath = urlToFileSystemPath(toUrl);
+
+  const sourceStats = readEntryStatSync(fromUrl, {
+    nullIfNotFound: true,
+    followLink: false,
+  });
+  if (!sourceStats) {
+    throw new Error(`nothing to move from ${fromPath}`);
+  }
+
+  let destinationStats = readEntryStatSync(toUrl, {
+    nullIfNotFound: true,
+    // we force false here but in fact we will follow the destination link
+    // to know where we will actually move and detect useless move overrite etc..
+    followLink: false,
+  });
+
+  if (followLink && destinationStats && destinationStats.isSymbolicLink()) {
+    const linkTarget = readSymbolicLinkSync(toUrl);
+    toUrl = resolveUrl(linkTarget, toUrl);
+    toPath = urlToFileSystemPath(toUrl);
+    destinationStats = readEntryStatSync(toUrl, {
+      nullIfNotFound: true,
+    });
+  }
+
+  if (urlTargetsSameFileSystemPath(fromUrl, toUrl)) {
+    if (allowUseless) {
+      return;
+    }
+    throw new Error(
+      `no move needed for ${fromPath} because destination and source are the same`,
+    );
+  }
+
+  if (destinationStats) {
+    const sourceType = statsToType(sourceStats);
+    const destinationType = statsToType(destinationStats);
+
+    if (sourceType !== destinationType) {
+      throw new Error(
+        `cannot move ${sourceType} from ${fromPath} to ${toPath} because destination exists and is not a ${sourceType} (it's a ${destinationType})`,
+      );
+    }
+    if (!overwrite) {
+      throw new Error(
+        `cannot move ${sourceType} from ${fromPath} to ${toPath} because destination exists and overwrite option is disabled`,
+      );
+    }
+
+    // remove file, link, directory...
+    removeEntrySync(toUrl, {
+      recursive: true,
+    });
+  } else {
+    ensureParentDirectoriesSync(toUrl);
+  }
+
+  moveNaiveSync(fromPath, toPath, {
+    handleCrossDeviceError: () => {
+      copyEntry({
+        from: fromUrl,
+        to: toUrl,
+        preserveStat: true,
+      });
+      removeEntrySync(fromUrl, {
+        recursive: true,
+      });
+    },
+  });
+};
+
+const moveNaiveSync = (
+  fromPath,
+  destinationPath,
+  { handleCrossDeviceError = null } = {},
+) => {
+  try {
+    renameSync(fromPath, destinationPath);
+  } catch (error) {
+    if (error) {
+      if (handleCrossDeviceError && error.code === "EXDEV") {
+        handleCrossDeviceError(error);
+      } else {
+        throw error;
+      }
+    }
+  }
+};

package/src/move/move_file.js

@@ -0,0 +1,5 @@
+import { moveEntry } from "./move_entry.js";
+
+export const moveFile = async (options) => {
+  await moveEntry(options);
+};

package/src/move/move_file_sync.js

@@ -0,0 +1,5 @@
+import { moveEntrySync } from "./move_entry_sync.js";
+
+export const moveFileSync = (options) => {
+  moveEntrySync(options);
+};

package/src/path_and_url/directory_url_validation.js

@@ -1,7 +1,7 @@
 import {
+  ensurePathnameTrailingSlash,
   fileSystemPathToUrl,
   isFileSystemPath,
-  ensurePathnameTrailingSlash,
 } from "@jsenv/urls";
 
 export const validateDirectoryUrl = (value) => {

package/src/read_write/ensure_parent_directories.js

@@ -1,5 +1,5 @@
-import { dirname } from "node:path";
 import { urlToFileSystemPath } from "@jsenv/urls";
+import { dirname } from "node:path";
 
 import { assertAndNormalizeFileUrl } from "../path_and_url/file_url_validation.js";
 import { writeDirectory } from "./write_directory.js";

package/src/read_write/ensure_parent_directories_sync.js

@@ -1,5 +1,5 @@
-import { dirname } from "node:path";
 import { urlToFileSystemPath } from "@jsenv/urls";
+import { dirname } from "node:path";
 
 import { assertAndNormalizeFileUrl } from "../path_and_url/file_url_validation.js";
 import { writeDirectorySync } from "./write_directory_sync.js";

package/src/read_write/get_real_file_system_url_sync.js

@@ -1,5 +1,5 @@
-import { readdirSync, realpathSync } from "node:fs";
 import { fileSystemPathToUrl, urlToFileSystemPath } from "@jsenv/urls";
+import { readdirSync, realpathSync } from "node:fs";
 
 export const getRealFileSystemUrlSync = (
   fileUrl,

package/src/read_write/read_file_structure_sync.js

@@ -1,9 +1,9 @@
-import { readdirSync, statSync, readFileSync } from "node:fs";
 import { urlToRelativeUrl } from "@jsenv/urls";
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js";
+import { readdirSync, readFileSync, statSync } from "node:fs";
 
-import { assertAndNormalizeDirectoryUrl } from "../path_and_url/directory_url_validation.js";
 import { comparePathnames } from "../path_and_url/compare_pathnames.js";
+import { assertAndNormalizeDirectoryUrl } from "../path_and_url/directory_url_validation.js";
 
 export const readFileStructureSync = (directoryUrl) => {
   directoryUrl = assertAndNormalizeDirectoryUrl(directoryUrl);

package/src/read_write/read_symbolic_link.js

@@ -3,8 +3,8 @@
  *   https://nodejs.org/docs/latest-v13.x/api/fs.html#fs_fs_symlink_target_path_type_callback
  */
 
+import { fileSystemPathToUrl, isFileSystemPath } from "@jsenv/urls";
 import { readlink } from "node:fs";
-import { isFileSystemPath, fileSystemPathToUrl } from "@jsenv/urls";
 
 import { assertAndNormalizeFileUrl } from "../path_and_url/file_url_validation.js";
 

package/src/read_write/read_symbolic_link_sync.js

@@ -3,8 +3,8 @@
  *   https://nodejs.org/docs/latest-v13.x/api/fs.html#fs_fs_symlink_target_path_type_callback
  */
 
+import { fileSystemPathToUrl, isFileSystemPath } from "@jsenv/urls";
 import { readlinkSync } from "node:fs";
-import { isFileSystemPath, fileSystemPathToUrl } from "@jsenv/urls";
 
 import { assertAndNormalizeFileUrl } from "../path_and_url/file_url_validation.js";
 

package/src/read_write/stat/read_entry_permissions.js

@@ -3,8 +3,8 @@
  *   https://nodejs.org/docs/latest-v13.x/api/fs.html#fs_file_modes
  */
 
-import { promises } from "node:fs";
 import { urlToFileSystemPath } from "@jsenv/urls";
+import { promises } from "node:fs";
 
 import { assertAndNormalizeFileUrl } from "../../path_and_url/file_url_validation.js";
 import { binaryFlagsToPermissions } from "./permissions.js";

package/src/read_write/stat/read_entry_stat.js

@@ -3,8 +3,8 @@
  *   https://nodejs.org/docs/latest-v13.x/api/fs.html#fs_class_fs_stats
  */
 
-import { lstat, stat } from "node:fs";
 import { urlToFileSystemPath } from "@jsenv/urls";
+import { lstat, stat } from "node:fs";
 
 import { assertAndNormalizeFileUrl } from "../../path_and_url/file_url_validation.js";
 import { writeEntryPermissions } from "./write_entry_permissions.js";

package/src/read_write/stat/read_entry_stat_sync.js

@@ -3,8 +3,8 @@
  *   https://nodejs.org/docs/latest-v13.x/api/fs.html#fs_class_fs_stats
  */
 
-import { lstatSync, statSync } from "node:fs";
 import { urlToFileSystemPath } from "@jsenv/urls";
+import { lstatSync, statSync } from "node:fs";
 
 import { assertAndNormalizeFileUrl } from "../../path_and_url/file_url_validation.js";
 import { writeEntryPermissionsSync } from "./write_entry_permissions_sync.js";

package/src/read_write/stat/test_entry_permissions.js

@@ -1,4 +1,4 @@
-import { promises, constants } from "node:fs";
+import { constants, promises } from "node:fs";
 
 import { assertAndNormalizeFileUrl } from "../../path_and_url/file_url_validation.js";
 

package/src/read_write/write_directory.js

@@ -1,9 +1,9 @@
-import { promises } from "node:fs";
 import { urlToFileSystemPath } from "@jsenv/urls";
+import { promises } from "node:fs";
 
 import { assertAndNormalizeDirectoryUrl } from "../path_and_url/directory_url_validation.js";
-import { statsToType } from "./stat/stats_to_type.js";
 import { readEntryStat } from "./stat/read_entry_stat.js";
+import { statsToType } from "./stat/stats_to_type.js";
 
 // https://nodejs.org/dist/latest-v13.x/docs/api/fs.html#fs_fspromises_mkdir_path_options
 const { mkdir } = promises;

package/src/read_write/write_directory_sync.js

@@ -1,5 +1,5 @@
-import { mkdirSync } from "node:fs";
 import { urlToFileSystemPath } from "@jsenv/urls";
+import { mkdirSync } from "node:fs";
 
 import { assertAndNormalizeDirectoryUrl } from "../path_and_url/directory_url_validation.js";
 import { readEntryStatSync } from "./stat/read_entry_stat_sync.js";

package/src/read_write/write_file_sync.js

@@ -1,7 +1,7 @@
 import {
-  writeFileSync as writeFileSyncNode,
   mkdirSync,
   readFileSync,
+  writeFileSync as writeFileSyncNode,
 } from "node:fs";
 
 import { assertAndNormalizeFileUrl } from "../path_and_url/file_url_validation.js";

package/src/read_write/write_symbolic_link.js

@@ -1,16 +1,16 @@
-import { promises } from "node:fs";
 import {
   fileSystemPathToUrl,
-  urlToFileSystemPath,
-  resolveUrl,
   isFileSystemPath,
+  resolveUrl,
+  urlToFileSystemPath,
 } from "@jsenv/urls";
+import { promises } from "node:fs";
 
 import { assertAndNormalizeFileUrl } from "../path_and_url/file_url_validation.js";
 import { removeEntry } from "../remove/remove_entry.js";
-import { readEntryStat } from "./stat/read_entry_stat.js";
-import { readSymbolicLink } from "./read_symbolic_link.js";
 import { ensureParentDirectories } from "./ensure_parent_directories.js";
+import { readSymbolicLink } from "./read_symbolic_link.js";
+import { readEntryStat } from "./stat/read_entry_stat.js";
 
 // https://nodejs.org/dist/latest-v13.x/docs/api/fs.html#fs_fspromises_symlink_target_path_type
 const { symlink } = promises;

package/src/read_write/write_symbolic_link_sync.js

@@ -1,16 +1,16 @@
-import { symlinkSync } from "node:fs";
 import {
   fileSystemPathToUrl,
-  urlToFileSystemPath,
-  resolveUrl,
   isFileSystemPath,
+  resolveUrl,
+  urlToFileSystemPath,
 } from "@jsenv/urls";
+import { symlinkSync } from "node:fs";
 
 import { assertAndNormalizeFileUrl } from "../path_and_url/file_url_validation.js";
 import { removeEntrySync } from "../remove/remove_entry_sync.js";
-import { readEntryStatSync } from "./stat/read_entry_stat_sync.js";
-import { readSymbolicLinkSync } from "./read_symbolic_link_sync.js";
 import { ensureParentDirectoriesSync } from "./ensure_parent_directories_sync.js";
+import { readSymbolicLinkSync } from "./read_symbolic_link_sync.js";
+import { readEntryStatSync } from "./stat/read_entry_stat_sync.js";
 
 const isWindows = process.platform === "win32";
 

package/src/remove/clear_directory_sync.js

@@ -1,5 +1,5 @@
-import { readdirSync, statSync } from "node:fs";
 import { URL_META } from "@jsenv/url-meta";
+import { readdirSync, statSync } from "node:fs";
 
 import { removeEntrySync } from "./remove_entry_sync.js";
 

package/src/remove/ensure_empty_directory.js

@@ -1,8 +1,8 @@
 import { urlToFileSystemPath } from "@jsenv/urls";
 
 import { assertAndNormalizeFileUrl } from "../path_and_url/file_url_validation.js";
-import { statsToType } from "../read_write/stat/stats_to_type.js";
 import { readEntryStat } from "../read_write/stat/read_entry_stat.js";
+import { statsToType } from "../read_write/stat/stats_to_type.js";
 import { writeDirectory } from "../read_write/write_directory.js";
 import { removeEntry } from "./remove_entry.js";
 

package/src/remove/remove_entry.js

@@ -1,14 +1,14 @@
-import { unlink, rmdir, openSync, closeSync } from "node:fs";
 import { Abort } from "@jsenv/abort";
 import {
   ensurePathnameTrailingSlash,
-  urlToFileSystemPath,
   resolveUrl,
+  urlToFileSystemPath,
 } from "@jsenv/urls";
+import { closeSync, openSync, rmdir, unlink } from "node:fs";
 
 import { assertAndNormalizeFileUrl } from "../path_and_url/file_url_validation.js";
-import { readEntryStat } from "../read_write/stat/read_entry_stat.js";
 import { readDirectory } from "../read_write/read_directory.js";
+import { readEntryStat } from "../read_write/stat/read_entry_stat.js";
 
 export const removeEntry = async (
   source,

package/src/remove/remove_entry_sync.js

@@ -1,16 +1,16 @@
-import {
-  unlinkSync,
-  rmdirSync,
-  readdirSync,
-  openSync,
-  closeSync,
-} from "node:fs";
 import { Abort } from "@jsenv/abort";
 import {
   ensurePathnameTrailingSlash,
-  urlToFileSystemPath,
   resolveUrl,
+  urlToFileSystemPath,
 } from "@jsenv/urls";
+import {
+  closeSync,
+  openSync,
+  readdirSync,
+  rmdirSync,
+  unlinkSync,
+} from "node:fs";
 
 import { assertAndNormalizeFileUrl } from "../path_and_url/file_url_validation.js";
 import { readEntryStatSync } from "../read_write/stat/read_entry_stat_sync.js";

package/src/remove/remove_file.js

@@ -1,5 +1,5 @@
 import { removeEntry } from "./remove_entry.js";
 
-export const removeFile = (url, options) => {
-  return removeEntry(url, options);
+export const removeFile = async (url, options) => {
+  await removeEntry(url, options);
 };

package/src/remove/remove_file_sync.js

@@ -1,5 +1,5 @@
 import { removeEntrySync } from "./remove_entry_sync.js";
 
 export const removeFileSync = (url, options) => {
-  return removeEntrySync(url, options);
+  removeEntrySync(url, options);
 };