Renames v5

.github/workflows/ci.yaml

@@ -6,14 +6,14 @@ on:
       - build.sbt
       - project/**
       - deps/**
-      - utils/**
-      - client/**
-      - snapi-client/**
+      - utils-core/**
+      - utils-sources/**
+      - compiler/**
       - snapi-frontend/**
-      - parsers/**
       - snapi-truffle/**
-      - python-client/**
-      - sql-client/**
+      - snapi-compiler/**
+      - python-compiler/**
+      - sql-compiler/**
       - .github/workflows/ci.yaml
   workflow_dispatch:
 
@@ -45,10 +45,11 @@ jobs:
       fail-fast: false
       matrix:
         component:
+          - utils-sources
           - snapi-frontend
-          - snapi-client
-          - sql-client
-          - python-client
+          - snapi-compiler
+          - sql-compiler
+          - python-compiler
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v4

build.sbt

@@ -36,16 +36,17 @@ writeVersionToFile := {
 
 lazy val root = (project in file("."))
   .aggregate(
-    protocol,
-    utils,
-    sources,
-    client,
+    protocolCompiler,
+    protocolRaw,
+    utilsCore,
+    utilsSources,
+    compiler,
     snapiParser,
     snapiFrontend,
     snapiTruffle,
-    snapiClient,
+    snapiCompiler,
     sqlParser,
-    sqlClient
+    sqlCompiler
   )
   .settings(
     commonSettings,
@@ -57,7 +58,7 @@ lazy val root = (project in file("."))
     publishLocal / skip := true
   )
 
-lazy val utils = (project in file("utils"))
+lazy val utilsCore = (project in file("utils-core"))
   .settings(
     commonSettings,
     scalaCompileSettings,
@@ -77,9 +78,9 @@ lazy val utils = (project in file("utils"))
       jacksonDeps
   )
 
-lazy val sources = (project in file("sources"))
+lazy val utilsSources = (project in file("utils-sources"))
   .dependsOn(
-    utils % "compile->compile;test->test"
+    utilsCore % "compile->compile;test->test"
   )
   .settings(
     commonSettings,
@@ -102,7 +103,7 @@ lazy val sources = (project in file("sources"))
     )
   )
 
-lazy val protocol = (project in file("protocol"))
+lazy val protocolRaw = (project in file("protocol-raw"))
   .enablePlugins(ProtobufPlugin)
   .settings(
     commonSettings,
@@ -113,10 +114,21 @@ lazy val protocol = (project in file("protocol"))
     Compile / unmanagedResourceDirectories += (ProtobufConfig / sourceDirectory).value
   )
 
-lazy val client = (project in file("client"))
+lazy val protocolCompiler = (project in file("protocol-compiler"))
+  .enablePlugins(ProtobufPlugin)
+  .settings(
+    commonSettings,
+    commonCompileSettings,
+    testSettings,
+    ProtobufConfig / version := "3.25.4",
+    // Include the protobuf files in the JAR
+    Compile / unmanagedResourceDirectories += (ProtobufConfig / sourceDirectory).value
+  )
+
+lazy val compiler = (project in file("compiler"))
   .dependsOn(
-    utils % "compile->compile;test->test",
-    protocol % "compile->compile;test->test"
+    utilsCore % "compile->compile;test->test",
+    protocolCompiler % "compile->compile;test->test"
   )
   .settings(
     commonSettings,
@@ -133,9 +145,9 @@ lazy val snapiParser = (project in file("snapi-parser"))
     javaSrcBasePath := s"${baseDirectory.value}/src/main/java",
     parserDefinitions := List(
       (
-        s"${javaSrcBasePath.value}/raw/compiler/rql2/generated",
-        "raw.compiler.rql2.generated",
-        s"${javaSrcBasePath.value}/raw/snapi/grammar",
+        s"${javaSrcBasePath.value}/com/rawlabs/snapi/parser/generated",
+        "com.rawlabs.snapi.parser.generated",
+        s"${javaSrcBasePath.value}/com/rawlabs/snapi/parser/grammar",
         "Snapi"
       )
     ),
@@ -148,9 +160,9 @@ lazy val snapiParser = (project in file("snapi-parser"))
 
 lazy val snapiFrontend = (project in file("snapi-frontend"))
   .dependsOn(
-    utils % "compile->compile;test->test",
-    client % "compile->compile;test->test",
-    sources % "compile->compile;test->test",
+    utilsCore % "compile->compile;test->test",
+    compiler % "compile->compile;test->test",
+    utilsSources % "compile->compile;test->test",
     snapiParser % "compile->compile;test->test"
   )
   .settings(
@@ -184,7 +196,7 @@ val annotationProcessors = Seq(
 
 lazy val snapiTruffle = (project in file("snapi-truffle"))
   .dependsOn(
-    utils % "compile->compile;test->test",
+    utilsCore % "compile->compile;test->test",
     snapiFrontend % "compile->compile;test->test"
   )
   .enablePlugins(JavaAnnotationProcessorPlugin)
@@ -245,9 +257,9 @@ lazy val snapiTruffle = (project in file("snapi-truffle"))
     publishSigned := (publishSigned dependsOn runJavaAnnotationProcessor).value
   )
 
-lazy val snapiClient = (project in file("snapi-client"))
+lazy val snapiCompiler = (project in file("snapi-compiler"))
   .dependsOn(
-    client % "compile->compile;test->test",
+    compiler % "compile->compile;test->test",
     snapiFrontend % "compile->compile;test->test",
     snapiTruffle % "compile->compile;test->test"
   )
@@ -265,9 +277,9 @@ lazy val sqlParser = (project in file("sql-parser"))
     javaSrcBasePath := s"${baseDirectory.value}/src/main/java",
     parserDefinitions := List(
       (
-        s"${javaSrcBasePath.value}/raw/client/sql/generated",
-        "raw.client.sql.generated",
-        s"${javaSrcBasePath.value}/raw/psql/grammar",
+        s"${javaSrcBasePath.value}/com/rawlabs/sql/parser/generated",
+        "com.rawlabs.sql.parser.generated",
+        s"${javaSrcBasePath.value}/com/rawlabs/sql/parser/grammar",
         "Psql"
       )
     ),
@@ -278,9 +290,9 @@ lazy val sqlParser = (project in file("sql-parser"))
     )
   )
 
-lazy val sqlClient = (project in file("sql-client"))
+lazy val sqlCompiler = (project in file("sql-compiler"))
   .dependsOn(
-    client % "compile->compile;test->test",
+    compiler % "compile->compile;test->test",
     sqlParser % "compile->compile;test->test"
   )
   .settings(
@@ -296,9 +308,9 @@ lazy val sqlClient = (project in file("sql-client"))
     )
   )
 
-lazy val pythonClient = (project in file("python-client"))
+lazy val pythonCompiler = (project in file("python-compiler"))
   .dependsOn(
-    client % "compile->compile;test->test"
+    compiler % "compile->compile;test->test"
   )
   .settings(
     commonSettings,

client/src/main/java/module-info.java → compiler/src/main/java/module-info.java

@@ -10,7 +10,9 @@
  * licenses/APL.txt.
  */
 
-module raw.client {
+import com.rawlabs.compiler.CompilerServiceBuilder;
+
+module raw.compiler {
   requires scala.library;
   requires org.slf4j;
   requires org.graalvm.polyglot;
@@ -20,15 +22,15 @@
   requires com.fasterxml.jackson.scala;
   requires com.fasterxml.jackson.datatype.jsr310;
   requires com.fasterxml.jackson.datatype.jdk8;
-  requires raw.utils;
-  requires raw.protocol;
+  requires raw.utils.core;
+  requires raw.protocol.compiler;
 
-  exports raw.client.api;
-  exports raw.client.writers;
-  exports raw.client.utils;
+  exports com.rawlabs.compiler;
+  exports com.rawlabs.compiler.writers;
+  exports com.rawlabs.compiler.utils;
 
-  opens raw.client.api to
+  opens com.rawlabs.compiler to
       com.fasterxml.jackson.databind;
 
-  uses raw.client.api.CompilerServiceBuilder;
+  uses CompilerServiceBuilder;
 }

client/src/main/scala/raw/client/api/CompilerService.scala → compiler/src/main/scala/com/rawlabs/compiler/CompilerService.scala

@@ -10,15 +10,15 @@
  * licenses/APL.txt.
  */
 
-package raw.client.api
+package com.rawlabs.compiler
 
 import com.fasterxml.jackson.annotation.{JsonSubTypes, JsonTypeInfo}
 import org.graalvm.polyglot.Engine
-import raw.utils.{RawException, RawService, RawSettings}
 
 import java.io.OutputStream
 import scala.collection.mutable
 import com.fasterxml.jackson.annotation.JsonSubTypes.{Type => JsonType}
+import com.rawlabs.utils.core.{RawException, RawService, RawSettings}
 
 // Exception that wraps the underlying error so that it includes the extra debug info.
 final class CompilerServiceException(

client/src/main/scala/raw/client/api/CompilerServiceBuilder.scala → compiler/src/main/scala/com/rawlabs/compiler/CompilerServiceBuilder.scala

@@ -10,9 +10,9 @@
  * licenses/APL.txt.
  */
 
-package raw.client.api
+package com.rawlabs.compiler
 
-import raw.utils.RawSettings
+import com.rawlabs.utils.core.RawSettings
 
 trait CompilerServiceBuilder {
 

client/src/main/scala/raw/client/api/CompilerServiceProvider.scala → compiler/src/main/scala/com/rawlabs/compiler/CompilerServiceProvider.scala

@@ -10,9 +10,9 @@
  * licenses/APL.txt.
  */
 
-package raw.client.api
+package com.rawlabs.compiler
 
-import raw.utils.RawSettings
+import com.rawlabs.utils.core.RawSettings
 
 import java.util.ServiceLoader
 import scala.collection.JavaConverters._
@@ -36,7 +36,7 @@ object CompilerServiceProvider {
   }
 
   // This method is only used by the test framework.
-  private[raw] def set(language: Set[String], instance: CompilerService): Unit = {
+  def set(language: Set[String], instance: CompilerService): Unit = {
     instanceLock.synchronized {
       if (instance == null) {
         // Stop and remove entries that match the `language`, regardless the class loader.

client/src/main/scala/raw/client/api/Docs.scala → compiler/src/main/scala/com/rawlabs/compiler/Docs.scala

@@ -10,7 +10,7 @@
  * licenses/APL.txt.
  */
 
-package raw.client.api
+package com.rawlabs.compiler
 
 /**
  * Package documentation.

client/src/main/scala/raw/client/api/Entrypoint.scala → compiler/src/main/scala/com/rawlabs/compiler/Entrypoint.scala

@@ -10,7 +10,7 @@
  * licenses/APL.txt.
  */
 
-package raw.client.api
+package com.rawlabs.compiler
 
 // TODO (msb): Add methods for execution so that same interface is respected by all.
 trait Entrypoint {

client/src/main/scala/raw/client/api/Errors.scala → compiler/src/main/scala/com/rawlabs/compiler/Errors.scala

@@ -10,11 +10,11 @@
  * licenses/APL.txt.
  */
 
-package raw.client.api
+package com.rawlabs.compiler
 
 import com.fasterxml.jackson.annotation.{JsonSubTypes, JsonTypeInfo}
-import raw.utils.RawException
 import com.fasterxml.jackson.annotation.JsonSubTypes.{Type => JsonType}
+import com.rawlabs.utils.core.RawException
 
 /**
  * Used for errors that are found during semantic analysis.

client/src/main/scala/raw/client/api/ProgramDescription.scala → compiler/src/main/scala/com/rawlabs/compiler/ProgramDescription.scala

@@ -10,7 +10,7 @@
  * licenses/APL.txt.
  */
 
-package raw.client.api
+package com.rawlabs.compiler
 
 final case class ProgramDescription(
     decls: Map[String, List[DeclDescription]],

client/src/main/scala/raw/client/api/ProgramEnvironment.scala → compiler/src/main/scala/com/rawlabs/compiler/ProgramEnvironment.scala

@@ -10,7 +10,7 @@
  * licenses/APL.txt.
  */
 
-package raw.client.api
+package com.rawlabs.compiler
 
 import com.fasterxml.jackson.core.{JsonGenerator, JsonParser}
 import com.fasterxml.jackson.databind.module.SimpleModule
@@ -24,9 +24,8 @@ import com.fasterxml.jackson.databind.{
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.module.scala.{ClassTagExtensions, DefaultScalaModule}
-
-import raw.utils.RawUid
-import raw.protocol.LocationConfig
+import com.rawlabs.protocol.compiler.LocationConfig
+import com.rawlabs.utils.core.RawUid
 
 final case class ProgramEnvironment(
     uid: RawUid,

client/src/main/scala/raw/client/api/RawTypes.scala → compiler/src/main/scala/com/rawlabs/compiler/RawTypes.scala

@@ -10,7 +10,7 @@
  * licenses/APL.txt.
  */
 
-package raw.client.api
+package com.rawlabs.compiler
 
 import com.fasterxml.jackson.annotation.JsonSubTypes.{Type => JsonType}
 import com.fasterxml.jackson.annotation.{JsonSubTypes, JsonTypeInfo}

client/src/main/scala/raw/client/api/RawValues.scala → compiler/src/main/scala/com/rawlabs/compiler/RawValues.scala

@@ -10,7 +10,7 @@
  * licenses/APL.txt.
  */
 
-package raw.client.api
+package com.rawlabs.compiler
 
 import com.fasterxml.jackson.annotation.JsonSubTypes.{Type => JsonType}
 import com.fasterxml.jackson.annotation.{JsonSubTypes, JsonTypeInfo}

client/src/main/scala/raw/client/utils/RecordFieldsNaming.scala → compiler/src/main/scala/com/rawlabs/compiler/utils/RecordFieldsNaming.scala

@@ -10,7 +10,7 @@
  * licenses/APL.txt.
  */
 
-package raw.client.utils
+package com.rawlabs.compiler.utils
 
 import scala.collection.mutable
 

client/src/main/scala/raw/client/writers/PolyglotBinaryWriter.scala → compiler/src/main/scala/com/rawlabs/compiler/writers/PolyglotBinaryWriter.scala

@@ -10,7 +10,7 @@
  * licenses/APL.txt.
  */
 
-package raw.client.writers
+package com.rawlabs.compiler.writers
 
 import org.graalvm.polyglot.Value
 

client/src/main/scala/raw/client/writers/PolyglotCsvWriter.scala → compiler/src/main/scala/com/rawlabs/compiler/writers/PolyglotCsvWriter.scala

@@ -10,7 +10,7 @@
  * licenses/APL.txt.
  */
 
-package raw.client.writers
+package com.rawlabs.compiler.writers
 
 import com.fasterxml.jackson.core.{JsonEncoding, JsonGenerator, JsonParser}
 import com.fasterxml.jackson.dataformat.csv.CsvFactory

client/src/main/scala/raw/client/writers/PolyglotJsonWriter.scala → compiler/src/main/scala/com/rawlabs/compiler/writers/PolyglotJsonWriter.scala

@@ -10,7 +10,7 @@
  * licenses/APL.txt.
  */
 
-package raw.client.writers
+package com.rawlabs.compiler.writers
 
 import com.fasterxml.jackson.core.{JsonEncoding, JsonFactory, JsonGenerator, JsonParser}
 import org.graalvm.polyglot.{PolyglotException, Value}