Merge branch 'master' of github.com:abelkuruvilla/typescriptify-golang-structs into abelkuruvilla-master

Author: tkrajina

typescriptify/typescriptify.go

@@ -16,6 +16,7 @@ const (
 	tsDocTag            = "ts_doc"
 	tsTransformTag      = "ts_transform"
 	tsType              = "ts_type"
+	jsonTag             = "json"
 	tsConvertValuesFunc = `convertValues(a: any, classs: any, asMap: boolean = false): any {
 	if (!a) {
 		return a;
@@ -86,6 +87,7 @@ type TypeScriptify struct {
 	BackupDir         string // If empty no backup
 	DontExport        bool
 	CreateInterface   bool
+	CustomJsonTag     string
 	customImports     []string
 
 	structTypes []StructType
@@ -219,6 +221,11 @@ func (t *TypeScriptify) WithSuffix(s string) *TypeScriptify {
 	return t
 }
 
+func (t *TypeScriptify) WithCustomJsonTag(tag string) *TypeScriptify {
+	t.CustomJsonTag = tag
+	return t
+}
+
 func (t *TypeScriptify) Add(obj interface{}) *TypeScriptify {
 	switch ty := obj.(type) {
 	case StructType:
@@ -518,7 +525,11 @@ func (t *TypeScriptify) getFieldOptions(structType reflect.Type, field reflect.S
 
 func (t *TypeScriptify) getJSONFieldName(field reflect.StructField, isPtr bool) string {
 	jsonFieldName := ""
-	jsonTag := field.Tag.Get("json")
+	tag := jsonTag
+	if t.CustomJsonTag != "" {
+		tag = t.CustomJsonTag
+	}
+	jsonTag := field.Tag.Get(tag)
 	if len(jsonTag) > 0 {
 		jsonTagParts := strings.Split(jsonTag, ",")
 		if len(jsonTagParts) > 0 {

typescriptify/typescriptify_test.go

@@ -15,11 +15,11 @@ import (
 
 type Address struct {
 	// Used in html
-	Duration float64 `json:"duration"`
-	Text1    string  `json:"text,omitempty"`
+	Duration float64 `json:"duration" custom:"durationCustom"`
+	Text1    string  `json:"text,omitempty" custom:"textCustom,omitempty"`
 	// Ignored:
-	Text2 string `json:",omitempty"`
-	Text3 string `json:"-"`
+	Text2 string `json:",omitempty" custom:",omitempty"`
+	Text3 string `json:"-" custom:"-"`
 }
 
 type Dummy struct {
@@ -1018,3 +1018,19 @@ func TestTypescriptifyComment(t *testing.T) {
 }`
 	testConverter(t, converter, false, desiredResult, nil)
 }
+
+func TestTypescriptifyCustomJsonTag(t *testing.T) {
+	t.Parallel()
+
+	converter := New().WithCustomJsonTag("custom")
+
+	converter.AddType(reflect.TypeOf(Address{}))
+	converter.CreateConstructor = false
+	converter.BackupDir = ""
+
+	desiredResult := `export class Address {
+	durationCustom: number;
+	textCustom?: string;
+}`
+	testConverter(t, converter, false, desiredResult, nil)
+}