Ensure typescript samples are up to date (#444)

macjohnny · jmini · commit 3408866b7923 · 2018-07-06T07:56:51.000+02:00
See #80
diff --git a/bin/utils/ensure-up-to-date b/bin/utils/ensure-up-to-date
@@ -25,6 +25,11 @@ sleep 5
 ./bin/php-slim-petstore-server.sh > /dev/null 2>&1
 ./bin/php-ze-ph-petstore-server.sh > /dev/null 2>&1
 ./bin/openapi3/php-petstore.sh > /dev/null 2>&1
+./bin/typescript-angular-petstore-all.sh > /dev/null 2>&1
+./bin/typescript-fetch-petstore-all.sh > /dev/null 2>&1
+./bin/typescript-node-petstore-all.sh > /dev/null 2>&1
+./bin/typescript-inversify-petstore.sh > /dev/null 2>&1
+
 
 # Check:
 if [ -n "$(git status --porcelain)" ]; then
diff --git a/bin/windows/typescript-angular-v2-interfaces.bat b/bin/windows/typescript-angular-v2-interfaces.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -c bin\typescript-petstore-npm.json -g typescript-angular -o samples\client\petstore\typescript-angular-v2\with-interfaces -D withInterfaces=true --additional-properties ngVersion=2
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g typescript-angular -o samples\client\petstore\typescript-angular-v2\with-interfaces -D withInterfaces=true --additional-properties ngVersion=2
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/typescript-angular-v6-provided-in-root-with-npm.bat b/bin/windows/typescript-angular-v6-provided-in-root-with-npm.bat
@@ -4,9 +4,6 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l typescript-angular -o samples\client\petstore\typescript-angular-v6-provided-in-root\default --additional-properties ngVersion=6.0.0
-REM it is same like like setting  -D providedInRoot=true
-REM set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l typescript-angular -c bin\typescript-angular-v6-petstore-provided-in-root-with-npm.json -o samples\client\petstore\typescript-angular-v6-provided-in-root\builds\with-npm -D providedInRoot=true --additional-properties ngVersion=6.0.0
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l typescript-angular -c bin/typescript-angular-v6-petstore-provided-in-root-with-npm.json -o samples\client\petstore\typescript-angular-v6-provided-in-root\builds\with-npm --additional-properties ngVersion=6.0.0
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/typescript-angular-v6-provided-in-root.bat b/bin/windows/typescript-angular-v6-provided-in-root.bat
@@ -4,9 +4,6 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l typescript-angular -o samples\client\petstore\typescript-angular-v6-provided-in-root\default --additional-properties ngVersion=6.0.0
-REM it is same like like setting  -D providedInRoot=true
-REM set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l typescript-angular -o samples\client\petstore\typescript-angular-v6-provided-in-root\builds\default -D providedInRoot=true --additional-properties ngVersion=6.0.0
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l typescript-angular -o samples\client\petstore\typescript-angular-v6-provided-in-root\builds\default --additional-properties ngVersion=6.0.0
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/typescript-inversify-petstore.bat b/bin/windows/typescript-inversify-petstore.bat
@@ -1,14 +1,10 @@
-@ECHO OFF
-
 set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
 
 If Not Exist %executable% (
   mvn clean package
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-
-echo 
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g typescript-inversify -o samples\client\petstore\typescript-inversify\builds\default
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g typescript-inversify -o samples\client\petstore\typescript-inversify
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/typescript-inversify.bat b/bin/windows/typescript-inversify.bat
diff --git a/bin/windows/typescript-node-petstore-all.bat b/bin/windows/typescript-node-petstore-all.bat
@@ -0,0 +1,2 @@
+call .\bin\windows\typescript-node-petstore.bat
+call .\bin\windows\typescript-node-petstore-with-npm.bat
diff --git a/bin/windows/typescript-node-petstore-with-npm.bat b/bin/windows/typescript-node-petstore-with-npm.bat
diff --git a/bin/windows/typescript-node-petstore.bat b/bin/windows/typescript-node-petstore.bat
diff --git a/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.2-SNAPSHOT
+3.1.0-SNAPSHOT
diff --git a/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.2-SNAPSHOT
+3.1.0-SNAPSHOT
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.2-SNAPSHOT
+3.1.0-SNAPSHOT
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/README.md b/samples/client/petstore/typescript-angular-v2/with-interfaces/README.md
@@ -1,4 +1,4 @@
-## @swagger/angular2-typescript-petstore@0.0.1
+## @
 
 ### Building
 
@@ -19,7 +19,7 @@ Navigate to the folder of your consuming project and run one of next commands.
 _published:_
 
 ```
-npm install @swagger/angular2-typescript-petstore@0.0.1 --save
+npm install @ --save
 ```
 
 _without publishing (not recommended):_
@@ -37,7 +37,7 @@ npm link
 
 In your project:
 ```
-npm link @swagger/angular2-typescript-petstore
+npm link 
 ```
 
 __Note for Windows users:__ The Angular CLI has troubles to use linked npm packages.
@@ -52,7 +52,7 @@ In your Angular project:
 
 ```
 // without configuring providers
-import { ApiModule } from '@swagger/angular2-typescript-petstore';
+import { ApiModule } from '';
 
 import { HttpModule } from '@angular/http';
 
@@ -70,7 +70,7 @@ export class AppModule {}
 
 ```
 // configuring providers
-import { ApiModule, Configuration, ConfigurationParameters } from '@swagger/angular2-typescript-petstore';
+import { ApiModule, Configuration, ConfigurationParameters } from '';
 
 export function apiConfigFactory (): Configuration => {
   const params: ConfigurationParameters = {
@@ -89,7 +89,7 @@ export class AppModule {}
 ```
 
 ```
-import { DefaultApi } from '@swagger/angular2-typescript-petstore';
+import { DefaultApi } from '';
 
 export class AppComponent {
 	 constructor(private apiGateway: DefaultApi) { }
@@ -126,7 +126,7 @@ export class AppModule {
 If different than the generated base path, during app bootstrap, you can provide the base path to your service. 
 
 ```
-import { BASE_PATH } from '@swagger/angular2-typescript-petstore';
+import { BASE_PATH } from '';
 
 bootstrap(AppComponent, [
     { provide: BASE_PATH, useValue: 'https://your-web-service.com' },
@@ -135,7 +135,7 @@ bootstrap(AppComponent, [
 or
 
 ```
-import { BASE_PATH } from '@swagger/angular2-typescript-petstore';
+import { BASE_PATH } from '';
 
 @NgModule({
     imports: [],
@@ -159,7 +159,7 @@ export const environment = {
 
 In the src/app/app.module.ts:
 ```
-import { BASE_PATH } from '@swagger/angular2-typescript-petstore';
+import { BASE_PATH } from '';
 import { environment } from '../environments/environment';
 
 @NgModule({
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.2-SNAPSHOT
+3.1.0-SNAPSHOT
diff --git a/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.2-SNAPSHOT
+3.1.0-SNAPSHOT
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.2-SNAPSHOT
+3.1.0-SNAPSHOT
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.2-SNAPSHOT
+3.1.0-SNAPSHOT
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/default/.openapi-generator/VERSION
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.2-SNAPSHOT
+3.1.0-SNAPSHOT
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.2-SNAPSHOT
+3.1.0-SNAPSHOT
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-provided-in-root/default/.openapi-generator/VERSION
diff --git a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.0-SNAPSHOT
+3.1.0-SNAPSHOT
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.0-SNAPSHOT
+3.1.0-SNAPSHOT
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/README.md b/samples/client/petstore/typescript-fetch/builds/es6-target/README.md
@@ -19,7 +19,7 @@ It can be used in both TypeScript and JavaScript. In TypeScript, the definition
 
 ### Building
 
-To build an compile the typescript sources to javascript use:
+To build and compile the typescript sources to javascript use:
 ```
 npm install
 npm run build
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/package.json b/samples/client/petstore/typescript-fetch/builds/es6-target/package.json
@@ -13,7 +13,7 @@
   "license": "Unlicense",
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
-  "scripts": {
+  "scripts" : {
     "build": "tsc --outDir dist/",
     "prepublishOnly": "npm run build"
   },
@@ -24,7 +24,7 @@
     "@types/node": "^8.0.9",
     "typescript": "^2.0"
   },
-  "publishConfig": {
-    "registry": "https://skimdb.npmjs.com/registry"
+  "publishConfig":{
+    "registry":"https://skimdb.npmjs.com/registry"
   }
 }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.0-SNAPSHOT
+3.1.0-SNAPSHOT
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.0-SNAPSHOT
+3.1.0-SNAPSHOT
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/README.md b/samples/client/petstore/typescript-fetch/builds/with-npm-version/README.md
@@ -19,7 +19,7 @@ It can be used in both TypeScript and JavaScript. In TypeScript, the definition
 
 ### Building
 
-To build an compile the typescript sources to javascript use:
+To build and compile the typescript sources to javascript use:
 ```
 npm install
 npm run build
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/package.json b/samples/client/petstore/typescript-fetch/builds/with-npm-version/package.json
@@ -13,7 +13,7 @@
   "license": "Unlicense",
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
-  "scripts": {
+  "scripts" : {
     "build": "tsc --outDir dist/",
     "prepublishOnly": "npm run build"
   },
@@ -24,7 +24,7 @@
     "@types/node": "^8.0.9",
     "typescript": "^2.0"
   },
-  "publishConfig": {
-    "registry": "https://skimdb.npmjs.com/registry"
+  "publishConfig":{
+    "registry":"https://skimdb.npmjs.com/registry"
   }
 }
diff --git a/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION b/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.0-SNAPSHOT
+3.1.0-SNAPSHOT
diff --git a/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.3-SNAPSHOT
+3.1.0-SNAPSHOT
diff --git a/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.3-SNAPSHOT
+3.1.0-SNAPSHOT

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@ If Not Exist %executable% (`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M`
`8`		`-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -c bin\typescript-petstore-npm.json -g typescript-angular -o samples\client\petstore\typescript-angular-v2\with-interfaces -D withInterfaces=true --additional-properties ngVersion=2`
	`8`	`+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g typescript-angular -o samples\client\petstore\typescript-angular-v2\with-interfaces -D withInterfaces=true --additional-properties ngVersion=2`
`9`	`9`
`10`	`10`	`java %JAVA_OPTS% -jar %executable% %ags%`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,6 @@ If Not Exist %executable% (`
`4`	`4`	`mvn clean package`
`5`	`5`	`)`
`6`	`6`
`7`		`-REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M`
`8`		`-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l typescript-angular -o samples\client\petstore\typescript-angular-v6-provided-in-root\default --additional-properties ngVersion=6.0.0`
`9`		`-REM it is same like like setting -D providedInRoot=true`
`10`		`-REM set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l typescript-angular -c bin\typescript-angular-v6-petstore-provided-in-root-with-npm.json -o samples\client\petstore\typescript-angular-v6-provided-in-root\builds\with-npm -D providedInRoot=true --additional-properties ngVersion=6.0.0`
	`7`	`+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l typescript-angular -c bin/typescript-angular-v6-petstore-provided-in-root-with-npm.json -o samples\client\petstore\typescript-angular-v6-provided-in-root\builds\with-npm --additional-properties ngVersion=6.0.0`
`11`	`8`
`12`	`9`	`java %JAVA_OPTS% -jar %executable% %ags%`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+call .\bin\windows\typescript-node-petstore.bat`
	`2`	`+call .\bin\windows\typescript-node-petstore-with-npm.bat`