Merge pull request #25 from vigoo/js-native

ScalaJS and ScalaNative builds
zio · Jan 31, 2022 · c3beb4d · c3beb4d
2 parents f983e9d + c3b6f30
commit c3beb4d
Show file tree

Hide file tree

Showing 26 changed files with 32 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,7 +49,7 @@ jobs:
       matrix:
         java: ['[email protected]', '[email protected]']
         scala: ['2.12.15', '2.13.8', '3.1.0']
-        platform: ['JVM']
+        platform: ['JVM', 'JS', 'Native']
     steps:
       - name: Checkout current branch
         uses: actions/[email protected]

diff --git a/build.sbt b/build.sbt
@@ -31,14 +31,24 @@ addCommandAlias("check", "; scalafmtSbtCheck; scalafmtCheckAll; compile:scalafix
 
 addCommandAlias(
   "testJVM",
-  ";zioParser/test; calibanParser/test"
+  ";zioParserJVM/test; calibanParser/test"
+)
+addCommandAlias(
+  "testJS",
+  ";zioParserJS/test"
+)
+addCommandAlias(
+  "testNative",
+  ";zioParserNative/test"
 )
 
 val zioVersion = "2.0.0-RC2"
 
 lazy val root = (project in file("."))
   .aggregate(
-    zioParser,
+    zioParserJVM,
+    zioParserJS,
+    zioParserNative,
     calibanParser,
     docs
   )
@@ -47,8 +57,10 @@ lazy val root = (project in file("."))
     publish / skip     := true
   )
 
-lazy val zioParser = (project in file("zio-parser"))
+lazy val zioParser = crossProject(JSPlatform, JVMPlatform, NativePlatform)
+  .in(file("zio-parser"))
   .settings(stdSettings("zio-parser"))
+  .settings(crossProjectSettings)
   .settings(dottySettings)
   .settings(buildInfoSettings("zio.parser"))
   .settings(
@@ -70,10 +82,20 @@ lazy val zioParser = (project in file("zio-parser"))
   )
   .enablePlugins(BuildInfoPlugin)
 
-lazy val calibanParser = (project in file("zio-parser-caliban"))
+lazy val zioParserJVM = zioParser.jvm
+lazy val zioParserJS  = zioParser.js
+  .settings(libraryDependencies += "dev.zio" %%% "zio-test-sbt" % zioVersion % Test)
+  .settings(scalaJSUseMainModuleInitializer := true)
+
+lazy val zioParserNative = zioParser.native
+  .settings(nativeSettings)
+  .settings(libraryDependencies += "dev.zio" %%% "zio-test-sbt" % zioVersion % Test)
+
+lazy val calibanParser = project
+  .in(file("zio-parser-caliban"))
   .settings(stdSettings("zio-parser-caliban"))
   .settings(dottySettings)
-  .dependsOn(zioParser)
+  .dependsOn(zioParserJVM)
   .settings(
     publish / skip := true,
     libraryDependencies ++= Seq(
@@ -103,7 +125,7 @@ lazy val benchmarks = (project in file("benchmarks"))
     testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework")
   )
   .enablePlugins(JmhPlugin)
-  .dependsOn(zioParser)
+  .dependsOn(zioParserJVM)
 
 lazy val docs = project
   .in(file("zio-parser-docs"))
@@ -114,11 +136,11 @@ lazy val docs = project
     moduleName                                 := "zio-parser-docs",
     scalacOptions -= "-Yno-imports",
     scalacOptions -= "-Xfatal-warnings",
-    ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(zioParser),
+    ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(zioParserJVM),
     ScalaUnidoc / unidoc / target              := (LocalRootProject / baseDirectory).value / "website" / "static" / "api",
     cleanFiles += (ScalaUnidoc / unidoc / target).value,
     docusaurusCreateSite                       := docusaurusCreateSite.dependsOn(Compile / unidoc).value,
     docusaurusPublishGhpages                   := docusaurusPublishGhpages.dependsOn(Compile / unidoc).value
   )
-  .dependsOn(zioParser)
+  .dependsOn(zioParserJVM)
   .enablePlugins(MdocPlugin, DocusaurusPlugin, ScalaUnidocPlugin)
diff --git a/...er/src/main/scala/zio/parser/Parser.scala → ...ed/src/main/scala/zio/parser/Parser.scala b/...er/src/main/scala/zio/parser/Parser.scala → ...ed/src/main/scala/zio/parser/Parser.scala
diff --git a/...ala/zio/parser/ParserImplementation.scala → ...ala/zio/parser/ParserImplementation.scala b/...ala/zio/parser/ParserImplementation.scala → ...ala/zio/parser/ParserImplementation.scala
diff --git a/...r/src/main/scala/zio/parser/Printer.scala → ...d/src/main/scala/zio/parser/Printer.scala b/...r/src/main/scala/zio/parser/Printer.scala → ...d/src/main/scala/zio/parser/Printer.scala
@@ -456,7 +456,7 @@ object Printer {
   /** Printer that just prints the input string */
   val anyString: Printer[Nothing, Char, String, String] =
     unsafeRegex(Regex.anyChar.atLeast(0))
-      .transform(s => String.copyValueOf(s.toArray), (s: String) => Chunk.fromArray(s.toCharArray))
+      .transform(s => String.valueOf(s.toArray), (s: String) => Chunk.fromArray(s.toCharArray))
 
   /** Prints a specific string 'str' and results in 'value' */
   def string[Result](str: String, value: Result): Printer[Nothing, Char, Result, Result] =

diff --git a/...ser/src/main/scala/zio/parser/Regex.scala → ...red/src/main/scala/zio/parser/Regex.scala b/...ser/src/main/scala/zio/parser/Regex.scala → ...red/src/main/scala/zio/parser/Regex.scala
diff --git a/...er/src/main/scala/zio/parser/Syntax.scala → ...ed/src/main/scala/zio/parser/Syntax.scala b/...er/src/main/scala/zio/parser/Syntax.scala → ...ed/src/main/scala/zio/parser/Syntax.scala
diff --git a/...ain/scala/zio/parser/internal/Debug.scala → ...ain/scala/zio/parser/internal/Debug.scala b/...ain/scala/zio/parser/internal/Debug.scala → ...ain/scala/zio/parser/internal/Debug.scala
diff --git a/...ala/zio/parser/internal/PUnzippable.scala → ...ala/zio/parser/internal/PUnzippable.scala b/...ala/zio/parser/internal/PUnzippable.scala → ...ala/zio/parser/internal/PUnzippable.scala
diff --git a/...scala/zio/parser/internal/PZippable.scala → ...scala/zio/parser/internal/PZippable.scala b/...scala/zio/parser/internal/PZippable.scala → ...scala/zio/parser/internal/PZippable.scala
diff --git a/...ala/zio/parser/internal/PrinterImpl.scala → ...ala/zio/parser/internal/PrinterImpl.scala b/...ala/zio/parser/internal/PrinterImpl.scala → ...ala/zio/parser/internal/PrinterImpl.scala
diff --git a/...ain/scala/zio/parser/internal/Stack.scala → ...ain/scala/zio/parser/internal/Stack.scala b/...ain/scala/zio/parser/internal/Stack.scala → ...ain/scala/zio/parser/internal/Stack.scala
diff --git a/...rser/internal/recursive/ParserState.scala → ...rser/internal/recursive/ParserState.scala b/...rser/internal/recursive/ParserState.scala → ...rser/internal/recursive/ParserState.scala
diff --git a/...r/internal/stacksafe/CharParserImpl.scala → ...r/internal/stacksafe/CharParserImpl.scala b/...r/internal/stacksafe/CharParserImpl.scala → ...r/internal/stacksafe/CharParserImpl.scala
diff --git a/.../parser/internal/stacksafe/ParserOp.scala → .../parser/internal/stacksafe/ParserOp.scala b/.../parser/internal/stacksafe/ParserOp.scala → .../parser/internal/stacksafe/ParserOp.scala
diff --git a/...r/src/main/scala/zio/parser/package.scala → ...d/src/main/scala/zio/parser/package.scala b/...r/src/main/scala/zio/parser/package.scala → ...d/src/main/scala/zio/parser/package.scala
diff --git a/...scala/zio/parser/target/ChunkTarget.scala → ...scala/zio/parser/target/ChunkTarget.scala b/...scala/zio/parser/target/ChunkTarget.scala → ...scala/zio/parser/target/ChunkTarget.scala
diff --git a/...main/scala/zio/parser/target/Target.scala → ...main/scala/zio/parser/target/Target.scala b/...main/scala/zio/parser/target/Target.scala → ...main/scala/zio/parser/target/Target.scala
diff --git a/...ala/zio/parser/target/ZStreamTarget.scala → ...ala/zio/parser/target/ZStreamTarget.scala b/...ala/zio/parser/target/ZStreamTarget.scala → ...ala/zio/parser/target/ZStreamTarget.scala
diff --git a/...rc/test/scala/zio/parser/ParserSpec.scala → ...rc/test/scala/zio/parser/ParserSpec.scala b/...rc/test/scala/zio/parser/ParserSpec.scala → ...rc/test/scala/zio/parser/ParserSpec.scala
diff --git a/...c/test/scala/zio/parser/PrinterSpec.scala → ...c/test/scala/zio/parser/PrinterSpec.scala b/...c/test/scala/zio/parser/PrinterSpec.scala → ...c/test/scala/zio/parser/PrinterSpec.scala
diff --git a/...src/test/scala/zio/parser/RegexSpec.scala → ...src/test/scala/zio/parser/RegexSpec.scala b/...src/test/scala/zio/parser/RegexSpec.scala → ...src/test/scala/zio/parser/RegexSpec.scala
diff --git a/...r/examples/BashPrettyPrinterExample.scala → ...r/examples/BashPrettyPrinterExample.scala b/...r/examples/BashPrettyPrinterExample.scala → ...r/examples/BashPrettyPrinterExample.scala
diff --git a/...o/parser/examples/ContextualExample.scala → ...o/parser/examples/ContextualExample.scala b/...o/parser/examples/ContextualExample.scala → ...o/parser/examples/ContextualExample.scala
diff --git a/...o/parser/examples/ExpressionExample.scala → ...o/parser/examples/ExpressionExample.scala b/...o/parser/examples/ExpressionExample.scala → ...o/parser/examples/ExpressionExample.scala
diff --git a/...ala/zio/parser/examples/JsonExample.scala → ...ala/zio/parser/examples/JsonExample.scala b/...ala/zio/parser/examples/JsonExample.scala → ...ala/zio/parser/examples/JsonExample.scala