fix: semantic bugs — ternary depth, proxy name check, promoted struct ambiguity, interface proximity

Author: xaionaro@dx.center

tools/cmd/spec2cli/main.go

@@ -702,7 +702,11 @@ func run(
 			continue
 		}
 		shortName := parts[1]
-		if _, ok := typeByShortName[shortName]; !ok {
+		if existing, ok := typeByShortName[shortName]; ok {
+			if existing != key {
+				typeByShortName[shortName] = "" // ambiguous
+			}
+		} else {
 			typeByShortName[shortName] = key
 		}
 	}
@@ -1235,6 +1239,20 @@ func resolveTypeKey(
 				}
 			}
 		}
+		for key := range knownInterfaceGoTypes {
+			parts := strings.SplitN(key, ":", 2)
+			if len(parts) == 2 && parts[1] == bare {
+				prefix := commonPrefixLen(ifaceImportPath, parts[0])
+				depth := strings.Count(parts[0], "/") + 1
+				if prefix > bestPrefix ||
+					(prefix == bestPrefix && depth < bestDepth) ||
+					(prefix == bestPrefix && depth == bestDepth && key < bestKey) {
+					bestPrefix = prefix
+					bestDepth = depth
+					bestKey = key
+				}
+			}
+		}
 		if bestKey != "" {
 			return bestKey
 		}

tools/cmd/spec2go/main.go

@@ -818,7 +818,7 @@ func tryParseTernaryExpr(
 	}
 
 	rest := value[qIdx+3:]
-	cIdx := strings.Index(rest, " : ")
+	cIdx := lastIndexAtDepthZero(rest, " : ")
 	if cIdx < 0 {
 		return nil
 	}
@@ -1035,7 +1035,7 @@ func generateAccessorFiles(
 // IFoo -> FooProxy, Foo -> FooProxy. This mirrors the codegen convention.
 func deriveProxyName(interfaceName string) string {
 	base := interfaceName
-	if strings.HasPrefix(interfaceName, "I") && len(interfaceName) > 1 {
+	if len(interfaceName) >= 2 && interfaceName[0] == 'I' && interfaceName[1] >= 'A' && interfaceName[1] <= 'Z' {
 		base = interfaceName[1:]
 	}
 	return base + "Proxy"