Replace Options with dynamic JsObject (#45)

05nelsonm · Feb 12, 2024 · db51783 · db51783
1 parent 364d2d8
commit db51783
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 49 deletions.
diff --git a/library/file/src/jsMain/kotlin/io/matthewnelson/kmp/file/internal/JsFs.kt b/library/file/src/jsMain/kotlin/io/matthewnelson/kmp/file/internal/JsFs.kt
@@ -29,7 +29,7 @@ internal actual external fun fs_exists(path: String): Boolean
 
 /** [docs](https://nodejs.org/api/fs.html#fsmkdirsyncpath-options) */
 @JsName("mkdirSync")
-internal external fun fs_mkdirSync(path: String, options: Options.Mkdir): String?
+internal external fun fs_mkdirSync(path: String, options: dynamic): String?
 
 /** [docs](https://nodejs.org/api/fs.html#fsreadfilesyncpath-options) */
 @JsName("readFileSync")
@@ -41,11 +41,11 @@ internal external fun fs_realpathSync(path: String): String
 
 /** [docs](https://nodejs.org/api/fs.html#fsrmsyncpath-options) */
 @JsName("rmSync")
-internal external fun fs_rmSync(path: String, options: Options.Remove)
+internal external fun fs_rmSync(path: String, options: dynamic)
 
 /** [docs](https://nodejs.org/api/fs.html#fsrmdirsyncpath-options) */
 @JsName("rmdirSync")
-internal external fun fs_rmdirSync(path: String, options: Options.Remove)
+internal external fun fs_rmdirSync(path: String, options: dynamic)
 
 /** [docs](https://nodejs.org/api/fs.html#fsunlinksyncpath) */
 @JsName("unlinkSync")

diff --git a/library/file/src/jsMain/kotlin/io/matthewnelson/kmp/file/internal/JsPlatform.kt b/library/file/src/jsMain/kotlin/io/matthewnelson/kmp/file/internal/JsPlatform.kt
@@ -133,12 +133,16 @@ internal actual fun fs_remove(path: String): Boolean {
         if (t.errorCode == "ENOENT") return false
     }
 
+    val options = js("{}")
+    options["force"] = true
+    options["recursive"] = false
+
     return try {
-        fs_rmSync(path, Options.Remove(force = true, recursive = false))
+        fs_rmSync(path, options)
         true
     } catch (_: Throwable) {
         try {
-            fs_rmdirSync(path, Options.Remove(force = true, recursive = false))
+            fs_rmdirSync(path, options)
             true
         } catch (t: Throwable) {
             throw t.toIOException()
@@ -148,7 +152,11 @@ internal actual fun fs_remove(path: String): Boolean {
 
 internal actual fun fs_mkdir(path: String): Boolean {
     return try {
-        fs_mkdirSync(path, Options.Mkdir())
+        val options = js("{}")
+        options["recursive"] = false
+        options["mode"] = "775"
+
+        fs_mkdirSync(path, options)
         true
     } catch (_: Throwable) {
         false

diff --git a/library/file/src/jsMain/kotlin/io/matthewnelson/kmp/file/internal/Options.kt b/library/file/src/jsMain/kotlin/io/matthewnelson/kmp/file/internal/Options.kt