Revert "add support for embedding"

This reverts commit 02ca4b7.

Author: moznion

go.mod

@@ -1,6 +1,6 @@
 module github.com/moznion/gonstructor
 
-go 1.15
+go 1.14
 
 require (
 	github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334

internal/constructor/field_collector.go

@@ -5,7 +5,6 @@ import (
 	"go/ast"
 	"go/types"
 	"reflect"
-	"strings"
 )
 
 const gonstructorTag = "gonstructor"
@@ -52,22 +51,9 @@ func convertStructFieldsToConstructorOnes(fields []*ast.Field) []*Field {
 			shouldIgnore = customTag.Get(gonstructorTag) == "-"
 		}
 
-		fieldType := types.ExprString(field.Type)
-
-		var fieldName string
-		if len(field.Names) > 0 {
-			fieldName = field.Names[0].Name
-		} else {
-			// split 'mypackage.MyType'
-			chunks := strings.Split(fieldType, ".")
-
-			// it could be a pointer: '*mypackage.MyType' or '*MyType'
-			fieldName = strings.TrimPrefix(chunks[len(chunks)-1], "*")
-		}
-
 		fs[i] = &Field{
-			FieldName:    fieldName,
-			FieldType:    fieldType,
+			FieldName:    field.Names[0].Name,
+			FieldType:    types.ExprString(field.Type),
 			ShouldIgnore: shouldIgnore,
 		}
 	}

internal/test/structure.go

@@ -26,19 +26,3 @@ type StructureWithInit struct {
 func (structure *StructureWithInit) initialize() {
 	structure.status = "ok"
 }
-
-type Embedded struct {
-	Bar string
-}
-
-//go:generate sh -c "$(cd ./\"$(git rev-parse --show-cdup)\" || exit; pwd)/dist/gonstructor_test --type=StructureWithEmbedding --constructorTypes=allArgs,builder --withGetter"
-type StructureWithEmbedding struct {
-	Embedded
-	foo string
-}
-
-//go:generate sh -c "$(cd ./\"$(git rev-parse --show-cdup)\" || exit; pwd)/dist/gonstructor_test --type=StructureWithPointerEmbedding --constructorTypes=allArgs,builder --withGetter"
-type StructureWithPointerEmbedding struct {
-	*Embedded
-	foo string
-}

internal/test/structure_test.go

@@ -84,49 +84,3 @@ func TestStructureWithInitBuilder(t *testing.T) {
 	assert.EqualValues(t, "ok", got.status)
 	assert.EqualValues(t, nil, got.qux)
 }
-
-func TestStructureWithEmbeddingAllArgsConstructor(t *testing.T) {
-	got := NewStructureWithEmbedding(Embedded{Bar: "bar"}, "foo")
-	assert.IsType(t, &StructureWithEmbedding{}, got)
-
-	assert.EqualValues(t, "foo", got.foo)
-	assert.EqualValues(t, "bar", got.Bar)
-	assert.EqualValues(t, "bar", got.Embedded.Bar)
-
-	// test for getters
-	assert.EqualValues(t, "foo", got.GetFoo())
-	assert.EqualValues(t, "bar", got.GetEmbedded().Bar)
-}
-
-func TestStructureWithEmbeddingBuilder(t *testing.T) {
-	b := NewStructureWithEmbeddingBuilder()
-	got := b.Foo("foo").Embedded(Embedded{Bar: "bar"}).Build()
-	assert.IsType(t, &StructureWithEmbedding{}, got)
-
-	assert.EqualValues(t, "foo", got.foo)
-	assert.EqualValues(t, "bar", got.Bar)
-	assert.EqualValues(t, "bar", got.Embedded.Bar)
-}
-
-func TestStructureWithPointerEmbeddingAllArgsConstructor(t *testing.T) {
-	got := NewStructureWithPointerEmbedding(Embedded{Bar: "bar"}, "foo")
-	assert.IsType(t, &StructureWithPointerEmbedding{}, got)
-
-	assert.EqualValues(t, "foo", got.foo)
-	assert.EqualValues(t, "bar", got.Bar)
-	assert.EqualValues(t, "bar", got.Embedded.Bar)
-
-	// test for getters
-	assert.EqualValues(t, "foo", got.GetFoo())
-	assert.EqualValues(t, "bar", got.GetEmbedded().Bar)
-}
-
-func TestStructureWithPointerEmbeddingBuilder(t *testing.T) {
-	b := NewStructureWithPointerEmbeddingBuilder()
-	got := b.Foo("foo").Embedded(Embedded{Bar: "bar"}).Build()
-	assert.IsType(t, &StructureWithPointerEmbedding{}, got)
-
-	assert.EqualValues(t, "foo", got.foo)
-	assert.EqualValues(t, "bar", got.Bar)
-	assert.EqualValues(t, "bar", got.Embedded.Bar)
-}