@@ -86,37 +86,13 @@ public virtual void Write(AngularWriteConfiguration configuration, List<ITransfe
86
86
List < HttpServiceActionParameterTransferObject > urlDirectParameters = action . Parameters . Where ( x => ! x . FromBody && ! x . Inline && ! x . AppendName ) . ToList ( ) ;
87
87
uri = urlParameters . Count > 0 ? $ "{ uri } ?{ urlParameters . First ( ) . Name } =" : urlDirectParameters . Count > 0 ? $ "{ uri } ?" : uri ;
88
88
MultilineCodeFragment code = Code . Multiline ( ) ;
89
- DeclareTemplate declareTemplate = null ;
90
89
bool hasReturnType = returnType . Name != "void" ;
91
- bool isPrimitive = this . IsPrimitive ( returnType ) ;
92
- if ( returnType . Name == "Array" )
90
+ ExecuteMethodTemplate nextMethod = Code . Local ( "subject" ) . Method ( "next" ) ;
91
+ if ( hasReturnType )
93
92
{
94
- TypeTemplate type = ( ( GenericTypeTemplate ) returnType ) . Types [ 0 ] ;
95
- ICodeFragment createModelCode = isPrimitive
96
- ? ( ICodeFragment ) Code . Cast ( type , Code . Local ( "entry" ) )
97
- : Code . InlineIf ( Code . Local ( "entry" ) . Equals ( ) . ForceNull ( ) . Or ( ) . Local ( "entry" ) . Equals ( ) . Undefined ( ) ,
98
- Code . Undefined ( ) ,
99
- Code . New ( type , Code . Local ( "entry" ) )
100
- ) ;
101
- declareTemplate = Code . Declare ( returnType , "list" , Code . TypeScript ( "[]" ) ) . Constant ( ) ;
102
- code . AddLine ( declareTemplate )
103
- . AddLine ( Code . TypeScript ( "for (const entry of result) {" ) . BreakLine ( ) /*.StartBlock()*/ )
104
- . AddLine ( Code . Local ( declareTemplate ) . Method ( "push" , createModelCode ) . Close ( ) )
105
- //.AddLine(Code.TypeScript("").EndBlock());
106
- . AddLine ( Code . TypeScript ( "}" ) . BreakLine ( ) ) ;
93
+ nextMethod . WithParameter ( Code . Local ( "result" ) ) ;
107
94
}
108
- else if ( hasReturnType )
109
- {
110
- ICodeFragment createModelCode = isPrimitive
111
- ? ( ICodeFragment ) Code . Cast ( returnType , Code . Local ( "result" ) )
112
- : Code . InlineIf ( Code . Local ( "result" ) . Equals ( ) . ForceNull ( ) . Or ( ) . Local ( "result" ) . Equals ( ) . Undefined ( ) ,
113
- Code . Undefined ( ) ,
114
- Code . New ( returnType , Code . Local ( "result" ) )
115
- ) ;
116
- declareTemplate = Code . Declare ( returnType , "model" , createModelCode ) . Constant ( ) ;
117
- code . AddLine ( declareTemplate ) ;
118
- }
119
- code . AddLine ( Code . Local ( "subject" ) . Method ( "next" ) . WithParameter ( declareTemplate . ToLocal ( ) ) . Close ( ) )
95
+ code . AddLine ( nextMethod . Close ( ) )
120
96
. AddLine ( Code . Local ( "subject" ) . Method ( "complete" ) . Close ( ) ) ;
121
97
ChainedCodeFragment parameterUrl = Code . This ( ) . Field ( serviceUrlField ) ;
122
98
if ( inlineParameters . Count == 0 )
0 commit comments