make the proto-package and scala-package uniform across {node,family,…

…std,aux}

build.sc

@@ -627,7 +627,7 @@ object vercors extends Module {
       }
 
       def root = T.source(protobufGit.repo())
-      def jobs = T { 8 }
+      def jobs = T { 2 }
 
       override def cMakeBuild: T[PathRef] = T {
         os.proc("cmake", "-B", T.dest, "-S", root().path).call(cwd = T.dest)
@@ -643,8 +643,20 @@ object vercors extends Module {
         def target = T { "protoc" }
       }
 
-      def protoPath = T.sources(vercors.col.helpers.megacol().path / os.up, settings.src / "serialize")
-      def proto = T { vercors.col.helpers.megacol() +: os.walk(settings.src / "serialize").filter(_.ext == "proto").map(PathRef(_)) }
+      object scalaPBDummy extends ScalaPBModule
+
+      def protoPath =
+        T.sources(
+          vercors.col.helpers.megacol().path / os.up,
+          settings.src / "serialize",
+          scalaPBDummy.scalaPBUnpackProto().path
+        )
+
+      def proto = T {
+        Seq(vercors.col.helpers.megacol()) ++
+          os.walk(scalaPBDummy.scalaPBUnpackProto().path).filter(_.ext == "proto").map(PathRef(_)) ++
+          os.walk(settings.src / "serialize").filter(_.ext == "proto").map(PathRef(_))
+      }
 
       def generate = T {
         os.proc(protoc.executable().path, protoPath().map(p => "-I=" + p.path.toString),  "--cpp_out=" + T.dest.toString, proto().map(_.path)).call()

src/helpers/vct/col/ast/helpers/generator/ProtoAuxTypes.scala

@@ -26,7 +26,7 @@ class ProtoAuxTypes extends AllNodesGenerator {
       Using(Files.newBufferedWriter(dir.resolve(aux.name.last + ".proto"))) { writer =>
         Proto.Source(
           Seq("scalapb", "scalapb") +: aux.imports,
-          Proto.renderOptions(Proto.OPAQUE_SUBMESSAGES_OPTIONS),
+          Proto.renderOptions(Proto.OPAQUE_SUBMESSAGES_OPTIONS.updated("package_name", ProtoNaming.scalaPackageOption(aux.name))),
           aux,
         ).write(writer)
       }

src/helpers/vct/col/ast/helpers/generator/Serialize.scala

@@ -75,7 +75,7 @@ class Serialize extends NodeGenerator {
     }
 
   def mk(name: Seq[String], args: Term*): Term =
-    q"new ${typ(structure.Name(name))}(..${args.toList})"
+    q"new ${typ(structure.Name(ProtoNaming.scalaPackage(name) :+ name.last))}(..${args.toList})"
 
   def serializeTerm(term: Term, structureType: ST, protoType: Proto.PrimitiveType): Term =
     (structureType, protoType) match {

src/serialize/vct/col/ast/BigDecimal.proto

@@ -2,8 +2,16 @@ syntax = "proto2";
 
 package vct.col.ast;
 
+import "scalapb/scalapb.proto";
 import "vct/col/ast/BigInt.proto";
 
+option (scalapb.options) = {
+  lenses: false
+  getters: false
+  no_default_values_in_constructor: true
+  package_name: "vct.col.ast.serialize"
+};
+
 message BigDecimal {
   required int32 scale = 1;
   required BigInt unscaledValue = 2;

src/serialize/vct/col/ast/BigInt.proto

@@ -2,6 +2,15 @@ syntax = "proto2";
 
 package vct.col.ast;
 
+import "scalapb/scalapb.proto";
+
+option (scalapb.options) = {
+  lenses: false
+  getters: false
+  no_default_values_in_constructor: true
+  package_name: "vct.col.ast.serialize"
+};
+
 /* Big-endian two's complement variable-length integer. If the most
  * significant bit of the first byte is 1, you may imagine that this bit is
  * "sign-extended" left into infinity.

src/serialize/vct/col/ast/BitString.proto

@@ -2,6 +2,15 @@ syntax = "proto2";
 
 package vct.col.ast;
 
+import "scalapb/scalapb.proto";
+
+option (scalapb.options) = {
+  lenses: false
+  getters: false
+  no_default_values_in_constructor: true
+  package_name: "vct.col.ast.serialize"
+};
+
 message BitString {
   required bytes data = 1;
   required int32 skipAtLastByte = 2;

src/serialize/vct/col/ast/Blame.proto

@@ -2,6 +2,15 @@ syntax = "proto2";
 
 package vct.col.ast;
 
+import "scalapb/scalapb.proto";
+
+option (scalapb.options) = {
+  lenses: false
+  getters: false
+  no_default_values_in_constructor: true
+  package_name: "vct.col.ast.serialize"
+};
+
 message Blame {
   oneof blame {
     BlameInput blame_input = 1;

src/serialize/vct/col/ast/ExpectedError.proto

@@ -2,6 +2,15 @@ syntax = "proto2";
 
 package vct.col.ast;
 
+import "scalapb/scalapb.proto";
+
+option (scalapb.options) = {
+  lenses: false
+  getters: false
+  no_default_values_in_constructor: true
+  package_name: "vct.col.ast.serialize"
+};
+
 message ExpectedError {
   // this
   //      message

src/serialize/vct/col/ast/Origin.proto

@@ -2,6 +2,15 @@ syntax = "proto2";
 
 package vct.col.ast;
 
+import "scalapb/scalapb.proto";
+
+option (scalapb.options) = {
+  lenses: false
+  getters: false
+  no_default_values_in_constructor: true
+  package_name: "vct.col.ast.serialize"
+};
+
 message Origin {
   repeated OriginContent content = 1;
 }

src/serialize/vct/col/ast/Ref.proto

@@ -2,6 +2,15 @@ syntax = "proto2";
 
 package vct.col.ast;
 
+import "scalapb/scalapb.proto";
+
+option (scalapb.options) = {
+  lenses: false
+  getters: false
+  no_default_values_in_constructor: true
+  package_name: "vct.col.ast.serialize"
+};
+
 message Ref {
   required int64 id = 1;
 }