fix: mkdir path resolve (#841)

* Fix mkdir path resolve

* remove unused import

* Clippy

Author: richarddavison

modules/llrt_fs/src/mkdir.rs

@@ -1,13 +1,15 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 use crate::chmod::{set_mode, set_mode_sync};
+
+use llrt_path::resolve_path;
 use llrt_utils::result::ResultExt;
 use ring::rand::{SecureRandom, SystemRandom};
 use rquickjs::{function::Opt, Ctx, Object, Result};
 use tokio::fs;
 
 pub async fn mkdir<'js>(ctx: Ctx<'js>, path: String, options: Opt<Object<'js>>) -> Result<String> {
-    let (recursive, mode) = get_params(options);
+    let (recursive, mode, path) = get_params(&path, options)?;
 
     if recursive {
         fs::create_dir_all(&path).await
@@ -22,7 +24,7 @@ pub async fn mkdir<'js>(ctx: Ctx<'js>, path: String, options: Opt<Object<'js>>)
 }
 
 pub fn mkdir_sync<'js>(ctx: Ctx<'js>, path: String, options: Opt<Object<'js>>) -> Result<String> {
-    let (recursive, mode) = get_params(options);
+    let (recursive, mode, path) = get_params(&path, options)?;
 
     if recursive {
         std::fs::create_dir_all(&path)
@@ -36,15 +38,16 @@ pub fn mkdir_sync<'js>(ctx: Ctx<'js>, path: String, options: Opt<Object<'js>>) -
     Ok(path)
 }
 
-fn get_params(options: Opt<Object>) -> (bool, u32) {
+fn get_params(path: &str, options: Opt<Object>) -> Result<(bool, u32, String)> {
     let mut recursive = false;
     let mut mode = 0o777;
 
     if let Some(options) = options.0 {
         recursive = options.get("recursive").unwrap_or_default();
         mode = options.get("mode").unwrap_or(0o777);
     }
-    (recursive, mode)
+    let path = resolve_path([path])?;
+    Ok((recursive, mode, path))
 }
 
 const CHARS: &[u8] = b"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";

tests/unit/fs.test.ts

@@ -220,13 +220,26 @@ describe("mkdir", () => {
 
     await fs.mkdir(dirPath, { recursive: true });
 
+    // Helper function to check if directory exists
+    const checkDirExists = async (dirPath: string) => {
+      return await fs
+        .stat(dirPath)
+        .then(() => true)
+        .catch(() => false);
+    };
+
     // Check that the directory exists
-    const dirExists = await fs
-      .stat(dirPath)
-      .then(() => true)
-      .catch(() => false);
+    const dirExists = await checkDirExists(dirPath);
     expect(dirExists).toBeTruthy();
 
+    await fs.rmdir(dirPath, { recursive: true });
+
+    await fs.mkdir(`${dirPath}/./`, { recursive: true });
+
+    // Check that the directory exists
+    const dirExists2 = await checkDirExists(dirPath);
+    expect(dirExists2).toBeTruthy();
+
     // Clean up the directory
     await fs.rmdir(dirPath, { recursive: true });
   });