Fix initialization of class fields with instance type "string" (#499)

Author: ZimmerA

schema_salad/tests/class_field_test.yml

@@ -0,0 +1,29 @@
+$base: "https://example.com/classFieldTest#"
+
+$namespaces:
+  classFieldTest: "https://example.com/classFieldTest#"
+
+$graph:
+- name: ClassFieldString
+  type: record
+  documentRoot: true
+  fields:
+    - name: "class"
+      jsonldPredicate:
+        "_id": "@type"
+        "_type": "@vocab"
+      type: string
+
+- name: ClassFieldEnum
+  type: record
+  documentRoot: true
+  fields:
+    - name: class
+      jsonldPredicate:
+        "_id": "@type"
+        "_type": "@vocab"
+      type:
+        type: enum
+        name: ClassFieldEnum_class
+        symbols:
+          - classFieldTest:ClassFieldEnum

schema_salad/tests/test_typescript_codegen.py

@@ -46,6 +46,35 @@ def test_meta_schema_gen(tmp_path: Path) -> None:
         )
 
 
+def test_class_field(tmp_path: Path) -> None:
+    schema_path = get_data_uri("tests/class_field_test.yml")
+    assert schema_path
+    target_dir = tmp_path / "target"
+
+    target_dir.mkdir()
+    typescript_codegen(schema_path, target_dir)
+
+    package_json_path = target_dir / "package.json"
+    assert package_json_path.exists
+
+    tests_dir = target_dir / "src" / "test"
+    assert tests_dir.exists()
+
+    with open(target_dir / "src" / "ClassFieldString.ts") as f:
+        assert (
+            "  constructor ({loadingOptions, extensionFields, class_ = 'ClassFieldString'} :"
+            + " {loadingOptions?: LoadingOptions} & Internal.ClassFieldStringProperties) {\n"
+            in f.read()
+        )
+    with open(target_dir / "src" / "ClassFieldEnum.ts") as f:
+        assert (
+            "  constructor ({loadingOptions, extensionFields, class_ = "
+            + "Internal.ClassFieldEnum_class.CLASSFIELDENUM} :"
+            + " {loadingOptions?: LoadingOptions} & Internal.ClassFieldEnumProperties) {\n"
+            in f.read()
+        )
+
+
 def get_data_uri(resource_path: str) -> str:
     path = get_data(resource_path)
     assert path

schema_salad/typescript_codegen.py

@@ -525,13 +525,22 @@ def declare_field(
                 )
             )
         if fieldname == "class":
-            self.current_constructor_signature.write(
-                ", {safename} = {type}.{val}".format(
-                    safename=safename,
-                    type=fieldtype.instance_type,
-                    val=self.current_class.replace("-", "_").replace(".", "_").upper(),
+            if fieldtype.instance_type == "string":
+                self.current_constructor_signature.write(
+                    ", {safename} = '{val}'".format(
+                        safename=safename, val=self.current_class
+                    )
+                )
+            else:
+                self.current_constructor_signature.write(
+                    ", {safename} = {type}.{val}".format(
+                        safename=safename,
+                        type=fieldtype.instance_type,
+                        val=self.current_class.replace("-", "_")
+                        .replace(".", "_")
+                        .upper(),
+                    )
                 )
-            )
         else:
             self.current_constructor_signature.write(
                 ", {safename}".format(