zio · kyri-petrou · Nov 12, 2024 · Nov 6, 2024 · Nov 7, 2024
diff --git a/core/js/src/main/scala/zio/SystemPlatformSpecific.scala b/core/js/src/main/scala/zio/SystemPlatformSpecific.scala
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2017-2024 John A. De Goes and the ZIO Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package zio
+
+import zio.internal.stacktracer.Tracer
+import zio.stacktracer.TracingImplicits.disableAutoTrace
+
+import scala.collection.mutable
+import scala.scalajs.js
+import scala.scalajs.js.Dynamic.global
+
+private[zio] trait SystemPlatformSpecific { self: System.type =>
+
+  private[zio] val environmentProvider = new EnvironmentProvider {
+    private val envMap: mutable.Map[String, String] = {
+      if (js.typeOf(global.process) != "undefined" && js.typeOf(global.process.env) != "undefined") {
+        global.process.env.asInstanceOf[js.Dictionary[String]]
+      } else {
+        mutable.Map.empty
+      }
+    }
+
+    override def env(variable: String): Option[String] =
+      envMap.get(variable)
+
+    override def envs: Map[String, String] =
+      envMap.toMap
+  }
+
+}
diff --git a/core/jvm-native/src/main/scala/zio/SystemPlatformSpecific.scala b/core/jvm-native/src/main/scala/zio/SystemPlatformSpecific.scala
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2017-2024 John A. De Goes and the ZIO Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package zio
+
+import zio.internal.stacktracer.Tracer
+import zio.stacktracer.TracingImplicits.disableAutoTrace
+
+import java.lang.{System => JSystem}
+import scala.annotation.nowarn
+import scala.collection.JavaConverters._
+
+private[zio] trait SystemPlatformSpecific { self: System.type =>
+
+  private[zio] val environmentProvider = new EnvironmentProvider {
+    override def env(variable: String): Option[String] =
+      Option(JSystem.getenv(variable))
+
+    @nowarn("msg=JavaConverters")
+    override def envs: Map[String, String] =
+      JSystem.getenv().asScala.toMap
+  }
+
+}
diff --git a/core/shared/src/main/scala/zio/System.scala b/core/shared/src/main/scala/zio/System.scala
@@ -101,7 +101,7 @@ trait System extends Serializable { self =>
     }
 }
 
-object System extends Serializable {
+object System extends SystemPlatformSpecific {
 
   val tag: Tag[System] = Tag[System]
 
@@ -140,17 +140,16 @@ object System extends Serializable {
     @transient override val unsafe: UnsafeAPI =
       new UnsafeAPI {
         override def env(variable: String)(implicit unsafe: Unsafe): Option[String] =
-          Option(JSystem.getenv(variable))
+          environmentProvider.env(variable)
 
         override def envOrElse(variable: String, alt: => String)(implicit unsafe: Unsafe): String =
           envOrElseWith(variable, alt)(env)
 
         override def envOrOption(variable: String, alt: => Option[String])(implicit unsafe: Unsafe): Option[String] =
           envOrOptionWith(variable, alt)(env)
 
-        @nowarn("msg=JavaConverters")
         override def envs()(implicit unsafe: Unsafe): Map[String, String] =
-          JSystem.getenv.asScala.toMap
+          environmentProvider.envs
 
         override def lineSeparator()(implicit unsafe: Unsafe): String =
           JSystem.lineSeparator
@@ -172,6 +171,11 @@ object System extends Serializable {
       }
   }
 
+  private[zio] trait EnvironmentProvider {
+    def env(variable: String): Option[String]
+    def envs: Map[String, String]
+  }
+
   private[zio] def envOrElseWith(variable: String, alt: => String)(env: String => Option[String]): String =
     env(variable).getOrElse(alt)