swap mapSingleton and mapValue
fix package.json