How can I create new components in circuitikz in order to distinguish between sinusoidal sources?

Question

So in circuitikz, there is no distinction between a sinusoidal votage source sV and a sinusoidal voltage current source sI. The same goes for controlled sinusoidal voltage sources csV and controlled sinusoidal current sources csI.
My textbook, Engineering circuit analysis by William Hayt 8th Ed. uses their own symbols in order to distinguish them so I would be really grateful if someone can help me draw these components on the images below.

    \documentclass[border=5mm]{standalone}
    \usepackage{circuitikz}[american]

    %======================================================================
    %My goal is to merge the two components on each line and make them one!
    %======================================================================
    \begin{document}
    \begin{tikzpicture}\draw
    (0,0) to [sI] (0,2)
    (1.5,0) to [american current source] (1.5, 2)
    (0,-3) to [csI] (0,-1)
    (1.5,-3) to [american controlled current source] (1.5,-1)
    ;\end{tikzpicture}
    \end{document}

Answer 1

Defined two custom components:

• sIx - sinusoidal independent current source
• csIx - sinusoidal dependent current source

so that it can be used like any bipole. Example:

\begin{circuitikz}
  \draw (0,0) to[sIx] (0,2);
  \draw (2,0) to[csIx] (2,2);
\end{circuitikz}

Result:

MWE

\documentclass[margin=1cm]{standalone}
\usepackage{circuitikz}

\makeatletter
\pgfcircdeclarebipole{} % independent sinusoidal current source
    {\ctikzvalof{bipoles/isourcesin/height}}
    {sIx}
    {\ctikzvalof{bipoles/isourcesin/height}}
    {\ctikzvalof{bipoles/isourcesin/width}}
    {
        \pgfpointorigin
        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
        \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
        \pgfusepath{draw}
        \pgf@circ@res@up = .5\pgf@circ@res@up        
        \pgfscope
            \pgftransformrotate{90}
            \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@up}{0cm}}
            \pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
            \pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
            \pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
            \pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
            \pgfusepath{draw}
        \endpgfscope

        \pgfpathmoveto{\pgfpoint{.7\pgf@circ@res@left}{\pgf@circ@res@zero}}
        \pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{\pgf@circ@res@zero}}
        \pgfusepath{draw}
        \pgfscope
            \pgftransformshift{\pgfpoint{.5\pgf@circ@res@right}{\pgf@circ@res@zero}}
            \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
        \endpgfscope
    }


\pgfcircdeclarebipole{} % dependent sinusoidal current source
    {\ctikzvalof{bipoles/cvsourcesin/height}}
    {csIx}
    {\ctikzvalof{bipoles/cvsourcesin/height}}
    {\ctikzvalof{bipoles/cvsourcesin/width}}
    {
        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
        \pgfscope
            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
            \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
            \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
            \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@down}}
            \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
            \pgfusepath{draw}       
        \endpgfscope    

        \pgf@circ@res@up = .5\pgf@circ@res@up
        \pgfscope
            \pgftransformrotate{90}
            \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@up}{0cm}}
            \pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
            \pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
            \pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
            \pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
            \pgfusepath{draw}
        \endpgfscope
        \pgfpathmoveto{\pgfpoint{.7\pgf@circ@res@left}{\pgf@circ@res@zero}}
        \pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{\pgf@circ@res@zero}}
        \pgfusepath{draw}
        \pgfscope
            \pgftransformshift{\pgfpoint{.5\pgf@circ@res@right}{\pgf@circ@res@zero}}
            \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
        \endpgfscope
    }

  \def\pgf@circ@sIx@path#1{\pgf@circ@bipole@path{sIx}{#1}}
  \def\pgf@circ@csIx@path#1{\pgf@circ@bipole@path{csIx}{#1}}
  \compattikzset{sIx/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@sIx@path, label=#1}}
  \compattikzset{csIx/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@csIx@path, label=#1}}
\makeatother

\begin{document}
\begin{circuitikz}
\draw (0,0) to[sIx] (0,2);
\draw (2,0) to[csIx] (2,2);
\end{circuitikz}
\end{document}

Made by editing code from circuitkz.

Answer 2

How about the following?

\documentclass[border=5mm]{standalone}
\usepackage{circuitikz}[american]

% ======================================================================
% My goal is to merge the two components on each line and make them one!
% ======================================================================
\begin{document}
\begin{tikzpicture}
  \draw (0,0) to [sI] (0,2)
  (0,0) to [american current source] (0, 2)
  (1.5,0) to [csI] (1.5,2)
  (1.5,0) to [american controlled current source] (1.5,2);
\end{tikzpicture}
\end{document}

Update: An alternative to simplify input, as requested in the comments:

\documentclass[border=5mm]{standalone}
\usepackage{circuitikz}[american]

% ======================================================================
% My goal is to merge the two components on each line and make them one!
% ======================================================================

\newcommand{\mandresybillycsIarrow}[4]{
  \draw (#1,#2) to [csI] (#3,#4)
  (#1,#2) to [american controlled current source] (#3,#4);
}

\newcommand{\mandresybillysIarrow}[4]{
  \draw (#1,#2) to [sI] (#3,#4)
  (#1,#2) to [american current source] (#3,#4);
}

\begin{document}
\begin{circuitikz}
  \mandresybillysIarrow{0}{0}{0}{2}
  \mandresybillycsIarrow{1.5}{0}{1.5}{2}
\end{circuitikz}
\end{document}