From f6a424280654ce3194c73a60667450eeb19532ef Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 30 Jul 2020 10:35:39 +0800 Subject: [PATCH] migrate typescript.sh to new config format --- bin/configs/typescript-consolidated-deno.yaml | 6 +++ .../typescript-consolidated-inversify.yaml | 7 +++ .../typescript-consolidated-jquery.yaml | 6 +++ ...t-consolidated-node-object-parameters.yaml | 7 +++ bin/configs/typescript-consolidated-node.yaml | 6 +++ bin/typescript.sh | 51 ------------------- 6 files changed, 32 insertions(+), 51 deletions(-) create mode 100644 bin/configs/typescript-consolidated-deno.yaml create mode 100644 bin/configs/typescript-consolidated-inversify.yaml create mode 100644 bin/configs/typescript-consolidated-jquery.yaml create mode 100644 bin/configs/typescript-consolidated-node-object-parameters.yaml create mode 100644 bin/configs/typescript-consolidated-node.yaml delete mode 100755 bin/typescript.sh diff --git a/bin/configs/typescript-consolidated-deno.yaml b/bin/configs/typescript-consolidated-deno.yaml new file mode 100644 index 000000000000..67fdb69573d5 --- /dev/null +++ b/bin/configs/typescript-consolidated-deno.yaml @@ -0,0 +1,6 @@ +generatorName: typescript +outputDir: samples/openapi3/client/petstore/typescript/builds/deno +inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +additionalProperties: + platform: deno + npmName: ts-petstore-client diff --git a/bin/configs/typescript-consolidated-inversify.yaml b/bin/configs/typescript-consolidated-inversify.yaml new file mode 100644 index 000000000000..70277c6e7ad0 --- /dev/null +++ b/bin/configs/typescript-consolidated-inversify.yaml @@ -0,0 +1,7 @@ +generatorName: typescript +outputDir: samples/openapi3/client/petstore/typescript/builds/inversify +inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +additionalProperties: + platform: node + npmName: ts-petstore-client + useInversify: true diff --git a/bin/configs/typescript-consolidated-jquery.yaml b/bin/configs/typescript-consolidated-jquery.yaml new file mode 100644 index 000000000000..2a9e79af1b2e --- /dev/null +++ b/bin/configs/typescript-consolidated-jquery.yaml @@ -0,0 +1,6 @@ +generatorName: typescript +outputDir: samples/openapi3/client/petstore/typescript/builds/jquery +inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +additionalProperties: + framework: jquery + npmName: ts-petstore-client diff --git a/bin/configs/typescript-consolidated-node-object-parameters.yaml b/bin/configs/typescript-consolidated-node-object-parameters.yaml new file mode 100644 index 000000000000..40171df194d7 --- /dev/null +++ b/bin/configs/typescript-consolidated-node-object-parameters.yaml @@ -0,0 +1,7 @@ +generatorName: typescript +outputDir: samples/openapi3/client/petstore/typescript/builds/object_params +inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +additionalProperties: + platform: node + npmName: ts-petstore-client + useObjectParameters: true diff --git a/bin/configs/typescript-consolidated-node.yaml b/bin/configs/typescript-consolidated-node.yaml new file mode 100644 index 000000000000..137a5242ed96 --- /dev/null +++ b/bin/configs/typescript-consolidated-node.yaml @@ -0,0 +1,6 @@ +generatorName: typescript +outputDir: samples/openapi3/client/petstore/typescript/builds/default +inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +additionalProperties: + platform: node + npmName: ts-petstore-client diff --git a/bin/typescript.sh b/bin/typescript.sh deleted file mode 100755 index c9c07a7b01aa..000000000000 --- a/bin/typescript.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh - -SCRIPT="$0" -echo "# START SCRIPT: $SCRIPT" - -while [ -h "$SCRIPT" ] ; do - ls=`ls -ld "$SCRIPT"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - SCRIPT="$link" - else - SCRIPT=`dirname "$SCRIPT"`/"$link" - fi -done - -if [ ! -d "${APP_DIR}" ]; then - APP_DIR=`dirname "$SCRIPT"`/.. - APP_DIR=`cd "${APP_DIR}"; pwd` -fi - -executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar" -common_args="generate -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g typescript" -samples="samples/openapi3/client/petstore/typescript/builds" - -if [ ! -f "$executable" ] -then - mvn -B clean package -fi - -# if you've executed sbt assembly previously it will use that instead. -export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" - -printf "\033[32m## Creating default (fetch) client!\033[0m\n" -args="-o $samples/default --additional-properties=platform=node,npmName=ts-petstore-client $@" -java $JAVA_OPTS -jar $executable $common_args $args - -printf "\033[32m## Creating jquery client!\033[0m\n" -args="-o $samples/jquery --additional-properties=framework=jquery,npmName=ts-petstore-client $@" -java $JAVA_OPTS -jar $executable $common_args $args - -printf "\033[32m## Creating fetch object client!\033[0m\n" -args="-o $samples/object_params --additional-properties=platform=node,npmName=ts-petstore-client,useObjectParameters=true $@" -java $JAVA_OPTS -jar $executable $common_args $args - -printf "\033[32m## Creating fetch client with InversifyJS support!\033[0m\n" -args="-o $samples/inversify --additional-properties=platform=node,npmName=ts-petstore-client,useInversify=true $@" -java $JAVA_OPTS -jar $executable $common_args $args - -printf "\033[32m## Creating Deno (fetch) client!\033[0m\n" -args="-o $samples/deno --additional-properties=platform=deno $@" -java $JAVA_OPTS -jar $executable $common_args $args