Generation adds to schema registry

Author: alxmrs

java/arcs/core/data/SchemaRegistry.kt

@@ -0,0 +1,5 @@
+package arcs.core.data
+
+object SchemaRegistry {
+    var schemas: MutableMap<String, Schema> = mutableMapOf()
+}

src/tools/schema2kotlin.ts

@@ -54,12 +54,9 @@ package ${this.scope}
 // Current implementation doesn't support references or optional field detection
 
 import arcs.sdk.*
+import arcs.sdk.Entity
 import arcs.core.data.*
 ${this.opts.wasm ? 'import arcs.sdk.wasm.*' : 'import arcs.core.storage.api.toPrimitiveValue\nimport arcs.core.data.RawEntity\nimport arcs.core.data.util.toReferencable\nimport arcs.core.data.util.ReferencablePrimitive'}
-
-object SchemaRegistry {
-  var schemas: Map<String, Schema> = mutableMapOf()
-}
 `;
   }
 
@@ -299,11 +296,13 @@ ${this.opts.wasm ? `
 
 class ${name}_Spec() : ${this.getType('EntitySpec')}<${name}> {
 
-    init {
-        SchemaRegistry.schemas += mapOf(
-            "${schemaHash}" to 
-${this.leftPad(this.createSchema(schemaHash), 12)}         
-        )
+    companion object {
+        init {
+            SchemaRegistry.schemas.plusAssign(mapOf(
+                "${schemaHash}" to 
+${this.leftPad(this.createSchema(schemaHash), 16)}         
+            ))
+        }
     }
     
     override fun create() = ${name}()

src/tools/tests/goldens/generated-schemas.jvm.kt

@@ -9,6 +9,8 @@ package arcs.sdk
 // Current implementation doesn't support references or optional field detection
 
 import arcs.sdk.*
+import arcs.sdk.Entity
+import arcs.core.data.*
 import arcs.core.storage.api.toPrimitiveValue
 import arcs.core.data.RawEntity
 import arcs.core.data.util.toReferencable
@@ -69,8 +71,25 @@ class GoldInternal1() : Entity {
     override fun toString() = "GoldInternal1(val_ = $val_)"
 }
 
+
 class GoldInternal1_Spec() : EntitySpec<GoldInternal1> {
 
+    companion object {
+        init {
+            SchemaRegistry.schemas.plusAssign(mapOf(
+                "485712110d89359a3e539dac987329cd2649d889" to
+                Schema(
+                    listOf(),
+                    SchemaFields(
+                        singletons = mapOf("val" to FieldType.Text),
+                        collections = emptyMap()
+                    ),
+                    "485712110d89359a3e539dac987329cd2649d889"
+                )
+            ))
+        }
+    }
+
     override fun create() = GoldInternal1()
 
     override fun deserialize(data: RawEntity): GoldInternal1 {
@@ -177,8 +196,28 @@ class Gold_Data() : Entity {
     override fun toString() = "Gold_Data(num = $num, txt = $txt, lnk = $lnk, flg = $flg)"
 }
 
+
 class Gold_Data_Spec() : EntitySpec<Gold_Data> {
 
+    companion object {
+        init {
+            SchemaRegistry.schemas.plusAssign(mapOf(
+                "d8058d336e472da47b289eafb39733f77eadb111" to
+                Schema(
+                    listOf(),
+                    SchemaFields(
+                        singletons = mapOf("num" to FieldType.Number,
+                            "txt" to FieldType.Text,
+                            "lnk" to FieldType.Text,
+                            "flg" to FieldType.Boolean),
+                        collections = emptyMap()
+                    ),
+                    "d8058d336e472da47b289eafb39733f77eadb111"
+                )
+            ))
+        }
+    }
+
     override fun create() = Gold_Data()
 
     override fun deserialize(data: RawEntity): Gold_Data {

src/tools/tests/goldens/generated-schemas.wasm.kt

@@ -9,6 +9,8 @@ package arcs.sdk
 // Current implementation doesn't support references or optional field detection
 
 import arcs.sdk.*
+import arcs.sdk.Entity
+import arcs.core.data.*
 import arcs.sdk.wasm.*
 
 class GoldInternal1() : WasmEntity {
@@ -66,8 +68,25 @@ class GoldInternal1() : WasmEntity {
     override fun toString() = "GoldInternal1(val_ = $val_)"
 }
 
+
 class GoldInternal1_Spec() : WasmEntitySpec<GoldInternal1> {
 
+    companion object {
+        init {
+            SchemaRegistry.schemas.plusAssign(mapOf(
+                "485712110d89359a3e539dac987329cd2649d889" to
+                Schema(
+                    listOf(),
+                    SchemaFields(
+                        singletons = mapOf("val" to FieldType.Text),
+                        collections = emptyMap()
+                    ),
+                    "485712110d89359a3e539dac987329cd2649d889"
+                )
+            ))
+        }
+    }
+
     override fun create() = GoldInternal1()
 
 
@@ -201,8 +220,28 @@ class Gold_Data() : WasmEntity {
     override fun toString() = "Gold_Data(num = $num, txt = $txt, lnk = $lnk, flg = $flg)"
 }
 
+
 class Gold_Data_Spec() : WasmEntitySpec<Gold_Data> {
 
+    companion object {
+        init {
+            SchemaRegistry.schemas.plusAssign(mapOf(
+                "d8058d336e472da47b289eafb39733f77eadb111" to
+                Schema(
+                    listOf(),
+                    SchemaFields(
+                        singletons = mapOf("num" to FieldType.Number,
+                            "txt" to FieldType.Text,
+                            "lnk" to FieldType.Text,
+                            "flg" to FieldType.Boolean),
+                        collections = emptyMap()
+                    ),
+                    "d8058d336e472da47b289eafb39733f77eadb111"
+                )
+            ))
+        }
+    }
+
     override fun create() = Gold_Data()