fixing invalid knownstructs

wailsapp · Jan 2, 2025 · 2d7ffaa · 2d7ffaa
1 parent 82a4952
commit 2d7ffaa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/v2/internal/binding/binding.go b/v2/internal/binding/binding.go
@@ -277,7 +277,7 @@ func (b *Bindings) AddStructToGenerateTS(packageName string, structName string,
 				continue
 			}
 			fqname := field.Type.String()
-			sNameSplit := strings.Split(fqname, ".")
+			sNameSplit := strings.SplitN(fqname, ".", 2)
 			if len(sNameSplit) < 2 {
 				continue
 			}
@@ -293,7 +293,7 @@ func (b *Bindings) AddStructToGenerateTS(packageName string, structName string,
 				continue
 			}
 			fqname := field.Type.Elem().String()
-			sNameSplit := strings.Split(fqname, ".")
+			sNameSplit := strings.SplitN(fqname, ".", 2)
 			if len(sNameSplit) < 2 {
 				continue
 			}

diff --git a/v2/internal/typescriptify/typescriptify.go b/v2/internal/typescriptify/typescriptify.go
@@ -689,9 +689,11 @@ func (t *TypeScriptify) convertType(depth int, typeOf reflect.Type, customCode m
 				}
 			}
 
-			isKnownType := true // t.KnownStructs.Contains(getStructFQN(field.Type.String()))
-			//println("KnownStructs:", t.KnownStructs.Join("\t"))
-			//println(getStructFQN(field.Type.String()))
+			isKnownType := t.KnownStructs.Contains(getStructFQN(field.Type.String()))
+			if !isKnownType {
+				println("KnownStructs:", t.KnownStructs.Join("\t"))
+				println("Not found:", getStructFQN(field.Type.String()))
+			}
 			builder.AddStructField(jsonFieldName, field, !isKnownType)
 		} else if field.Type.Kind() == reflect.Map {
 			t.logf(depth, "- map field %s.%s", typeOf.Name(), field.Name)
@@ -953,7 +955,7 @@ func indentLines(str string, i int) string {
 
 func getStructFQN(in string) string {
 	result := strings.ReplaceAll(in, "[]", "")
-	result = strings.ReplaceAll(result, "*", "")
+	//result = strings.ReplaceAll(result, "*", "")
 	return result
 }