Skip to content

Commit 4788eec

Browse files
wing328wing328
committed
2 parents 0155768 + a004b19 commit 4788eec

File tree

107 files changed

+27624
-120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+27624
-120
lines changed

‎bin/typescript-angular-petstore-all.sh

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@ echo "Typescript Petstore API client (with interfaces generated)"
3939
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l typescript-angular -o samples/client/petstore/typescript-angular-v2/with-interfaces -D withInterfaces=true --additional-properties ngVersion=2"
4040
java $JAVA_OPTS -jar $executable $ags
4141

42+
echo "Typescript Petstore API client (with interfaces generated and v4.3 HttpClientModule)"
43+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l typescript-angular -o samples/client/petstore/typescript-angular-v4.3/with-interfaces -D withInterfaces=true --additional-properties ngVersion=4.3"
44+
java $JAVA_OPTS -jar $executable $ags
45+
46+
echo "Typescript Petstore API client (with interfaces generated and v5 HttpClientModule)"
47+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l typescript-angular -o samples/client/petstore/typescript-angular-v5/with-interfaces -D withInterfaces=true --additional-properties ngVersion=5"
48+
java $JAVA_OPTS -jar $executable $ags
49+
4250
echo "Typescript Petstore API client (v4 { Adding InjectionToken Over OpaqueToken })"
4351
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l typescript-angular -c bin/typescript-petstore-npm.json -o samples/client/petstore/typescript-angular-v4/npm --additional-properties ngVersion=4"
4452
java $JAVA_OPTS -jar $executable $ags
@@ -49,4 +57,8 @@ java $JAVA_OPTS -jar $executable $ags
4957

5058
echo "Typescript Petstore API client (v5 { Uses latest version of ng-packagr })"
5159
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l typescript-angular -c bin/typescript-petstore-npm.json -o samples/client/petstore/typescript-angular-v5/npm --additional-properties ngVersion=5"
52-
java $JAVA_OPTS -jar $executable $ags
60+
java $JAVA_OPTS -jar $executable $ags
61+
62+
echo "Typescript Petstore API client (v6 { Uses RxJS version 6 })"
63+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l typescript-angular -c bin/typescript-petstore-npm.json -o samples/client/petstore/typescript-angular-v6/npm --additional-properties ngVersion=6"
64+
java $JAVA_OPTS -jar $executable $ags

‎bin/typescript-angular-v4.3-petstore-interfaces.sh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/bin/sh
2+
3+
SCRIPT="$0"
4+
5+
while [ -h "$SCRIPT" ] ; do
6+
ls=`ls -ld "$SCRIPT"`
7+
link=`expr "$ls" : '.*-> \(.*\)$'`
8+
if expr "$link" : '/.*' > /dev/null; then
9+
SCRIPT="$link"
10+
else
11+
SCRIPT=`dirname "$SCRIPT"`/"$link"
12+
fi
13+
done
14+
15+
if [ ! -d "${APP_DIR}" ]; then
16+
APP_DIR=`dirname "$SCRIPT"`/..
17+
APP_DIR=`cd "${APP_DIR}"; pwd`
18+
fi
19+
20+
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
21+
22+
if [ ! -f "$executable" ]
23+
then
24+
mvn clean package
25+
fi
26+
27+
# if you've executed sbt assembly previously it will use that instead.
28+
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
29+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l typescript-angular -o samples/client/petstore/typescript-angular-v4.3/with-interfaces -D withInterfaces=true --additional-properties ngVersion=4.3"
30+
31+
java $JAVA_OPTS -jar $executable $ags

‎bin/typescript-angular-v5-petstore-interfaces.sh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/bin/sh
2+
3+
SCRIPT="$0"
4+
5+
while [ -h "$SCRIPT" ] ; do
6+
ls=`ls -ld "$SCRIPT"`
7+
link=`expr "$ls" : '.*-> \(.*\)$'`
8+
if expr "$link" : '/.*' > /dev/null; then
9+
SCRIPT="$link"
10+
else
11+
SCRIPT=`dirname "$SCRIPT"`/"$link"
12+
fi
13+
done
14+
15+
if [ ! -d "${APP_DIR}" ]; then
16+
APP_DIR=`dirname "$SCRIPT"`/..
17+
APP_DIR=`cd "${APP_DIR}"; pwd`
18+
fi
19+
20+
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
21+
22+
if [ ! -f "$executable" ]
23+
then
24+
mvn clean package
25+
fi
26+
27+
# if you've executed sbt assembly previously it will use that instead.
28+
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
29+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l typescript-angular -o samples/client/petstore/typescript-angular-v5/with-interfaces -D withInterfaces=true --additional-properties ngVersion=5"
30+
31+
java $JAVA_OPTS -jar $executable $ags

‎bin/typescript-angular-v6-petstore-with-npm.sh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/bin/sh
2+
3+
SCRIPT="$0"
4+
5+
while [ -h "$SCRIPT" ] ; do
6+
ls=`ls -ld "$SCRIPT"`
7+
link=`expr "$ls" : '.*-> \(.*\)$'`
8+
if expr "$link" : '/.*' > /dev/null; then
9+
SCRIPT="$link"
10+
else
11+
SCRIPT=`dirname "$SCRIPT"`/"$link"
12+
fi
13+
done
14+
15+
if [ ! -d "${APP_DIR}" ]; then
16+
APP_DIR=`dirname "$SCRIPT"`/..
17+
APP_DIR=`cd "${APP_DIR}"; pwd`
18+
fi
19+
20+
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
21+
22+
if [ ! -f "$executable" ]
23+
then
24+
mvn clean package
25+
fi
26+
27+
# if you've executed sbt assembly previously it will use that instead.
28+
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
29+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l typescript-angular -c bin/typescript-petstore-npm.json -o samples/client/petstore/typescript-angular-v6/npm --additional-properties ngVersion=6"
30+
31+
java $JAVA_OPTS -jar $executable $ags

‎bin/windows/typescript-angular-petstore-all.bat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
call .\bin\windows\typescript-angular-v2-with-npm.bat
22
call .\bin\windows\typescript-angular-v2-interfaces.bat
3+
call .\bin\windows\typescript-angular-v4.3-interfaces.bat
4+
call .\bin\windows\typescript-angular-v5-interfaces.bat
35
call .\bin\windows\typescript-angular-v2.bat
46
call .\bin\windows\typescript-angular-v4-with-npm.bat
57
call .\bin\windows\typescript-angular-v4.3-with-npm.bat
68
call .\bin\windows\typescript-angular-v5-with-npm.bat
7-
9+
call .\bin\windows\typescript-angular-v6-with-npm.bat
810

‎bin/windows/typescript-angular-v4.3-interfaces.bat

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar
2+
3+
If Not Exist %executable% (
4+
mvn clean package
5+
)
6+
7+
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
8+
set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -c bin\typescript-petstore-npm.json -l typescript-angular -o samples\client\petstore\typescript-angular-v4.3\with-interfaces -D withInterfaces=true --additional-properties ngVersion=4.3
9+
10+
java %JAVA_OPTS% -jar %executable% %ags%

‎bin/windows/typescript-angular-v5-interfaces.bat

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar
2+
3+
If Not Exist %executable% (
4+
mvn clean package
5+
)
6+
7+
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
8+
set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -c bin\typescript-petstore-npm.json -l typescript-angular -o samples\client\petstore\typescript-angular-v5\with-interfaces -D withInterfaces=true --additional-properties ngVersion=5
9+
10+
java %JAVA_OPTS% -jar %executable% %ags%

‎bin/windows/typescript-angular-v6-with-npm.bat

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar
2+
3+
If Not Exist %executable% (
4+
mvn clean package
5+
)
6+
7+
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
8+
set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -c bin\typescript-petstore-npm.json -l typescript-angular -o samples\client\petstore\typescript-angular-v6\npm --additional-properties ngVersion=6
9+
10+
java %JAVA_OPTS% -jar %executable% %ags%

‎modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ public void processOpts() {
127127
additionalProperties.put("injectionToken", ngVersion.atLeast("4.0.0") ? "InjectionToken" : "OpaqueToken");
128128
additionalProperties.put("injectionTokenTyped", ngVersion.atLeast("4.0.0"));
129129
additionalProperties.put("useHttpClient", ngVersion.atLeast("4.3.0"));
130+
additionalProperties.put("useRxJS6", ngVersion.atLeast("6.0.0"));
130131
if (!ngVersion.atLeast("4.3.0")) {
131132
supportingFiles.add(new SupportingFile("rxjs-operators.mustache", getIndexDirectory(), "rxjs-operators.ts"));
132133
}

‎modules/swagger-codegen/src/main/resources/typescript-angular/api.service.mustache

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@ import { Response, ResponseContentType } from '@angular/http
1414
import { CustomQueryEncoderHelper } from '../encoder';
1515
{{/useHttpClient}}
1616

17+
{{^useRxJS6}}
1718
import { Observable } from 'rxjs/Observable';
19+
{{/useRxJS6}}
20+
{{#useRxJS6}}
21+
import { Observable } from 'rxjs';
22+
{{/useRxJS6}}
1823
{{^useHttpClient}}
1924
import '../rxjs-operators';
2025
{{/useHttpClient}}

0 commit comments

Comments
 (0)