excluding wasm from generation

alxmrs · Mar 4, 2020 · f69f99b · f69f99b
1 parent dcefb16
commit f69f99b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 39 deletions.
diff --git a/src/tools/schema2kotlin.ts b/src/tools/schema2kotlin.ts
@@ -54,9 +54,14 @@ package ${this.scope}
 // Current implementation doesn't support references or optional field detection
 
 import arcs.sdk.*
+${this.opts.wasm ?
+      `import arcs.sdk.wasm.*` :
+      `\
 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'}
+import arcs.core.data.util.toReferencable
+import arcs.core.data.util.ReferencablePrimitive
+import arcs.core.storage.api.toPrimitiveValue`}
 `;
   }
 
@@ -296,6 +301,7 @@ ${this.opts.wasm ? `
 
 class ${name}_Spec() : ${this.getType('EntitySpec')}<${name}> {
 
+${this.opts.wasm ? '' : `\
     companion object {
         init {
             SchemaRegistry.schemas.plusAssign(mapOf(
@@ -304,7 +310,7 @@ ${this.leftPad(this.createSchema(schemaHash), 16)}
             ))
         }
     }
-    
+`}
     override fun create() = ${name}()
     ${!this.opts.wasm ? `
     override fun deserialize(data: RawEntity): ${name} {

diff --git a/src/tools/tests/goldens/generated-schemas.jvm.kt b/src/tools/tests/goldens/generated-schemas.jvm.kt
@@ -11,10 +11,9 @@ package arcs.sdk
 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
 import arcs.core.data.util.ReferencablePrimitive
+import arcs.core.storage.api.toPrimitiveValue
 
 class GoldInternal1() : Entity {
 

diff --git a/src/tools/tests/goldens/generated-schemas.wasm.kt b/src/tools/tests/goldens/generated-schemas.wasm.kt
@@ -9,8 +9,6 @@ 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 {
@@ -71,21 +69,6 @@ class GoldInternal1() : WasmEntity {
 
 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()
 
@@ -223,24 +206,6 @@ class Gold_Data() : WasmEntity {
 
 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()