Fix prototype bug (#18)

* fix: has scope: 'prototype' and arguments use @{SendEmail()} error panic: runtime error: invalid memory address or nil pointer dereference * fix: PackageName is empty Co-authored-by: wuji <[email protected]>
elliotchance · Feb 26, 2021 · 9912c52 · 9912c52
1 parent 832e079
commit 9912c52
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/dingotest/dingo.yml b/dingotest/dingo.yml
@@ -90,3 +90,18 @@ services:
     type: '*HTTPSignerClient'
     properties:
       CreateSigner: '@{Signer}'
+
+  CustomerWelcomePrototype:
+    type: '*CustomerWelcome'
+    returns: NewCustomerWelcome(@{SendEmail})
+    arguments:
+      appid: 'string'
+    scope: 'prototype'
+  CustomerWelcomePrototype2:
+    type: '*CustomerWelcome'
+    returns: NewCustomerWelcome(@{SendEmail})
+    arguments:
+      canaryConfig: '*v1.ObjectMetaAccessor'
+    scope: 'prototype'
+    import:
+      - 'k8s.io/apimachinery/pkg/apis/meta/v1'
diff --git a/service.go b/service.go
@@ -182,6 +182,9 @@ func (service *Service) astFunctionBody(file *File, services Services, name, ser
 	if name != "" && service.Scope == ScopePrototype {
 		var arguments []string
 		for _, dep := range service.Returns.Dependencies() {
+			if dep[len(dep)-1:]!=")" {
+				dep = dep+"()"
+			}
 			arguments = append(arguments, fmt.Sprintf("container.Get%s", dep))
 		}
 		arguments = append(arguments, service.Arguments.Names()...)

diff --git a/type.go b/type.go
@@ -60,7 +60,9 @@ func (ty Type) LocalPackageName() string {
 
 	pkgNameParts := strings.Split(ty.UnversionedPackageName(), "/")
 	lastPart := pkgNameParts[len(pkgNameParts)-1]
-
+	if lastPart == "" {
+		lastPart = ty.PackageName()
+	}
 	return strings.Replace(lastPart, "-", "_", -1)
 }