Interestingly enough, most of which are both.
May I ask exactly what you mean? My own comment of Diesel “over” electric means the tried and proven efficiency of diesel engines driving generators to drive electric motors which I have studied in depth.
No batteries needed at all. We should have adopted this principle with automobiles and trucks 50 years ago. There is a very good reason why this is still the standard with locomotives.
There have been a very few arrangements like this produced and sold in mass, but they are Gasoline driven and not diesel driven. With only half the efficiency a diesel would be in the same arrangement.
New diesel technology can now make a diesel run just as clean as a gasoline engine with almost twice the mileage. But we refuse to allow this arrangement to be used in this country.