Merge pull request #29 from jeskew/chore/update-jest-dependency

jeskew · web-flow · commit f15518794a90 · 2017-06-30T14:31:43.000-07:00
Update Jest dependency version and ensure TS 2.4 compliance
diff --git a/package.json b/package.json
@@ -15,6 +15,12 @@
   "author": "aws-javascript-sdk-team@amazon.com",
   "license": "UNLICENSED",
   "devDependencies": {
-    "lerna": "^2.0.0-rc.4"
+    "lerna": "^2.0.0-rc.5",
+    "jest": "^20.0.4"
+  },
+  "jest": {
+    "projects": [
+      "<rootDir>/packages/*"
+    ]
   }
 }
diff --git a/packages/cancellation-token/package.json b/packages/cancellation-token/package.json
@@ -12,8 +12,8 @@
   "author": "aws-javascript-sdk-team@amazon.com",
   "license": "UNLICENSED",
   "devDependencies": {
-    "@types/jest": "^19.2.2",
-    "jest": "^19.0.2",
+    "@types/jest": "^20.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/credential-provider-base/package.json b/packages/credential-provider-base/package.json
@@ -19,8 +19,8 @@
     "@aws/types": "^0.0.1"
   },
   "devDependencies": {
-    "@types/jest": "^19.2.2",
-    "jest": "^19.0.2",
+    "@types/jest": "^20.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/credential-provider-env/package.json b/packages/credential-provider-env/package.json
@@ -21,9 +21,9 @@
     "@aws/types": "^0.0.1"
   },
   "devDependencies": {
-    "@types/jest": "^19.2.2",
+    "@types/jest": "^20.0.2",
     "@types/node": "^7.0.12",
-    "jest": "^19.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/credential-provider-imds/__tests__/remoteProvider/httpGet.ts b/packages/credential-provider-imds/__tests__/remoteProvider/httpGet.ts
@@ -13,7 +13,7 @@ function clearMatchers(): void {
 }
 
 function getOpenPort(candidatePort: number = 4321): Promise<number> {
-    return new Promise((resolve, reject) => {
+    return new Promise<number>((resolve, reject) => {
         const server = createServer();
         server.on('error', () => reject());
         server.listen(candidatePort);
@@ -65,7 +65,7 @@ describe('httpGet', () => {
                 () => {
                     throw new Error('The promise should have been rejected');
                 },
-                err => {
+                (err: any) => {
                     expect((err as CredentialError).tryNextLink).toBe(true);
                 }
             );
@@ -81,7 +81,7 @@ describe('httpGet', () => {
                 () => {
                     throw new Error('The promise should have been rejected');
                 },
-                err => {
+                (err: any) => {
                     expect((err as CredentialError).tryNextLink).toBe(true);
                 }
             );
diff --git a/packages/credential-provider-imds/lib/remoteProvider/httpGet.ts b/packages/credential-provider-imds/lib/remoteProvider/httpGet.ts
@@ -5,7 +5,7 @@ import {CredentialError} from '@aws/credential-provider-base';
 /**
  * @internal
  */
-export function httpGet(options: RequestOptions): Promise<Buffer> {
+export function httpGet(options: RequestOptions|string): Promise<Buffer> {
     return new Promise((resolve, reject) => {
         const request = get(options);
         request.on('error', err => {
diff --git a/packages/credential-provider-imds/package.json b/packages/credential-provider-imds/package.json
@@ -21,9 +21,9 @@
     "tslib": "^1.7.1"
   },
   "devDependencies": {
-    "@types/jest": "^19.2.2",
+    "@types/jest": "^20.0.2",
     "@types/node": "^7.0.12",
-    "jest": "^19.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/crypto-ie11-detection/package.json b/packages/crypto-ie11-detection/package.json
@@ -11,8 +11,8 @@
   "license": "UNLICENSED",
   "main": "index.js",
   "devDependencies": {
-    "@types/jest": "^19.2.2",
-    "jest": "^19.0.2",
+    "@types/jest": "^20.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/crypto-random-source-browser/package.json b/packages/crypto-random-source-browser/package.json
@@ -18,9 +18,9 @@
     "@aws/util-locate-window": "^0.0.1"
   },
   "devDependencies": {
-    "@types/jest": "^19.2.2",
+    "@types/jest": "^20.0.2",
     "@types/node": "^7.0.12",
-    "jest": "^19.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   },
   "jest": {
diff --git a/packages/crypto-random-source-node/package.json b/packages/crypto-random-source-node/package.json
@@ -13,9 +13,9 @@
     "@aws/types": "^0.0.1"
   },
   "devDependencies": {
-    "@types/jest": "^19.2.2",
+    "@types/jest": "^20.0.2",
     "@types/node": "^7.0.12",
-    "jest": "^19.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/crypto-random-source-universal/package.json b/packages/crypto-random-source-universal/package.json
@@ -16,9 +16,9 @@
     "@aws/types": "^0.0.1"
   },
   "devDependencies": {
-    "@types/jest": "^19.2.2",
+    "@types/jest": "^20.0.2",
     "@types/node": "^7.0.12",
-    "jest": "^19.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   },
   "browser": {
diff --git a/packages/crypto-sha256-browser/lib/ie11Sha256.ts b/packages/crypto-sha256-browser/lib/ie11Sha256.ts
@@ -46,7 +46,7 @@ export class Sha256 implements Hash {
     }
 
     digest(): Promise<Uint8Array> {
-        return this.operation.then(operation => new Promise((
+        return this.operation.then<Uint8Array>(operation => new Promise((
             resolve,
             reject
         ) => {
diff --git a/packages/crypto-sha256-browser/package.json b/packages/crypto-sha256-browser/package.json
@@ -22,9 +22,9 @@
     "@aws/util-utf8-browser": "^0.0.1"
   },
   "devDependencies": {
-    "@types/jest": "^19.2.2",
+    "@types/jest": "^20.0.2",
     "@types/node": "^7.0.12",
-    "jest": "^19.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/crypto-sha256-node/package.json b/packages/crypto-sha256-node/package.json
@@ -14,9 +14,9 @@
     "@aws/util-buffer-from": "^0.0.1"
   },
   "devDependencies": {
-    "@types/jest": "^19.2.2",
+    "@types/jest": "^20.0.2",
     "@types/node": "^7.0.12",
-    "jest": "^19.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/crypto-sha256-universal/package.json b/packages/crypto-sha256-universal/package.json
@@ -16,9 +16,9 @@
     "@aws/is-node": "^0.0.1"
   },
   "devDependencies": {
-    "@types/jest": "^19.2.2",
+    "@types/jest": "^20.0.2",
     "@types/node": "^7.0.12",
-    "jest": "^19.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/crypto-sjcl-aes/package.json b/packages/crypto-sjcl-aes/package.json
@@ -15,8 +15,8 @@
   },
   "devDependencies": {
     "sjcl": "^1.0.6",
-    "@types/jest": "^19.2.2",
-    "jest": "^19.0.2",
+    "@types/jest": "^20.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/crypto-sjcl-bitArray/package.json b/packages/crypto-sjcl-bitArray/package.json
@@ -12,8 +12,8 @@
   "main": "index.js",
   "devDependencies": {
     "sjcl": "^1.0.6",
-    "@types/jest": "^19.2.2",
-    "jest": "^19.0.2",
+    "@types/jest": "^20.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/crypto-sjcl-codecArrayBuffer/package.json b/packages/crypto-sjcl-codecArrayBuffer/package.json
@@ -15,8 +15,8 @@
   },
   "devDependencies": {
     "sjcl": "^1.0.6",
-    "@types/jest": "^19.2.2",
-    "jest": "^19.0.2",
+    "@types/jest": "^20.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/crypto-sjcl-codecHex/package.json b/packages/crypto-sjcl-codecHex/package.json
@@ -15,8 +15,8 @@
   },
   "devDependencies": {
     "sjcl": "^1.0.6",
-    "@types/jest": "^19.2.2",
-    "jest": "^19.0.2",
+    "@types/jest": "^20.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/crypto-sjcl-codecString/package.json b/packages/crypto-sjcl-codecString/package.json
@@ -15,8 +15,8 @@
   },
   "devDependencies": {
     "sjcl": "^1.0.6",
-    "@types/jest": "^19.2.2",
-    "jest": "^19.0.2",
+    "@types/jest": "^20.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/crypto-sjcl-hmac/package.json b/packages/crypto-sjcl-hmac/package.json
@@ -16,8 +16,8 @@
   },
   "devDependencies": {
     "sjcl": "^1.0.6",
-    "@types/jest": "^19.2.2",
-    "jest": "^19.0.2",
+    "@types/jest": "^20.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/crypto-sjcl-random/package.json b/packages/crypto-sjcl-random/package.json
@@ -21,7 +21,7 @@
   },
   "devDependencies": {
     "sjcl": "^1.0.6",
-    "@types/jest": "^19.2.2",
+    "@types/jest": "^20.0.2",
     "@types/node": "^7.0.12",
     "jest": "^20.0.4",
     "typescript": "^2.3"
diff --git a/packages/crypto-sjcl-sha256/package.json b/packages/crypto-sjcl-sha256/package.json
@@ -17,8 +17,8 @@
   "devDependencies": {
     "sjcl": "^1.0.6",
     "@aws/crypto-sjcl-codecHex": "^0.0.1",
-    "@types/jest": "^19.2.2",
-    "jest": "^19.0.2",
+    "@types/jest": "^20.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/crypto-supports-webCrypto/package.json b/packages/crypto-supports-webCrypto/package.json
@@ -11,8 +11,8 @@
   "license": "UNLICENSED",
   "main": "index.js",
   "devDependencies": {
-    "@types/jest": "^19.2.2",
-    "jest": "^19.0.2",
+    "@types/jest": "^20.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/is-node/package.json b/packages/is-node/package.json
@@ -11,9 +11,9 @@
   "license": "UNLICENSED",
   "main": "index.js",
   "devDependencies": {
-    "@types/jest": "^19.2.2",
+    "@types/jest": "^20.0.2",
     "@types/node": "^7.0.12",
-    "jest": "^19.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/protocol-timestamp/package.json b/packages/protocol-timestamp/package.json
@@ -15,8 +15,8 @@
     "@aws/types": "^0.0.1"
   },
   "devDependencies": {
-    "@types/jest": "^19.2.2",
-    "jest": "^19.0.2",
+    "@types/jest": "^20.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/service-model/lib/ApiModel/Shape.ts b/packages/service-model/lib/ApiModel/Shape.ts
@@ -200,7 +200,10 @@ function isTimestamp(arg: Shape): boolean {
         && ['undefined', 'string'].indexOf(typeof arg.timestampFormat) > -1;
 }
 
-function isXmlNamespace(arg: any): arg is XmlNamespace {
+/**
+ * @internal
+ */
+export function isXmlNamespace(arg: any): arg is XmlNamespace {
     return typeof arg === 'object'
         && arg !== null
         && ['undefined', 'string'].indexOf(typeof arg.prefix) > -1
diff --git a/packages/service-model/lib/TreeModel/parser.ts b/packages/service-model/lib/TreeModel/parser.ts
@@ -9,6 +9,7 @@ import {
     Double,
     Float,
     Integer,
+    isXmlNamespace,
     List,
     Long,
     Map,
@@ -267,7 +268,7 @@ function visitStructure(
 function convertXmlNamespace(
     ns: string|XmlNamespace|undefined
 ): XmlNamespace|undefined {
-    if (!ns || typeof ns === 'object') {
+    if (typeof ns === 'undefined' || isXmlNamespace(ns)) {
         return ns;
     }
 
diff --git a/packages/service-model/package.json b/packages/service-model/package.json
@@ -15,9 +15,9 @@
     "@aws/types": "^0.0.1"
   },
   "devDependencies": {
-    "@types/jest": "^19.2.2",
+    "@types/jest": "^20.0.2",
     "@types/node": "^7.0.12",
-    "jest": "^19.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/service-types-generator/package.json b/packages/service-types-generator/package.json
@@ -9,8 +9,8 @@
   },
   "devDependencies": {
     "@types/node": "^6.0.52",
-    "@types/jest": "^19.2.2",
-    "jest": "^19.0.2",
+    "@types/jest": "^20.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   },
   "scripts": {
diff --git a/packages/util-base64-browser/package.json b/packages/util-base64-browser/package.json
@@ -12,9 +12,9 @@
   "author": "aws-javascript-sdk-team@amazon.com",
   "license": "UNLICENSED",
   "devDependencies": {
-    "@types/jest": "^19.2.2",
+    "@types/jest": "^20.0.2",
     "@types/node": "^7.0.12",
-    "jest": "^19.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/util-base64-node/package.json b/packages/util-base64-node/package.json
@@ -12,9 +12,9 @@
   "author": "aws-javascript-sdk-team@amazon.com",
   "license": "UNLICENSED",
   "devDependencies": {
-    "@types/jest": "^19.2.2",
+    "@types/jest": "^20.0.2",
     "@types/node": "^7.0.12",
-    "jest": "^19.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/util-base64-universal/package.json b/packages/util-base64-universal/package.json
@@ -17,9 +17,9 @@
     "@aws/util-base64-node": "^0.0.1"
   },
   "devDependencies": {
-    "@types/jest": "^19.2.2",
+    "@types/jest": "^20.0.2",
     "@types/node": "^7.0.12",
-    "jest": "^19.0.2",
+    "jest": "^20.0.4",
     "typescript": "^2.3"
   }
 }
diff --git a/packages/util-buffer-from/package.json b/packages/util-buffer-from/package.json
diff --git a/packages/util-locate-window/package.json b/packages/util-locate-window/package.json
diff --git a/packages/util-utf8-browser/package.json b/packages/util-utf8-browser/package.json
diff --git a/packages/util-utf8-node/package.json b/packages/util-utf8-node/package.json
diff --git a/packages/util-utf8-universal/package.json b/packages/util-utf8-universal/package.json
diff --git a/packages/xml-builder/package.json b/packages/xml-builder/package.json

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,12 @@`
`15`	`15`	`"author": "[email protected]",`
`16`	`16`	`"license": "UNLICENSED",`
`17`	`17`	`"devDependencies": {`
`18`		`- "lerna": "^2.0.0-rc.4"`
	`18`	`+ "lerna": "^2.0.0-rc.5",`
	`19`	`+ "jest": "^20.0.4"`
	`20`	`+ },`
	`21`	`+ "jest": {`
	`22`	`+ "projects": [`
	`23`	`+ "<rootDir>/packages/*"`
	`24`	`+ ]`
`19`	`25`	`}`
`20`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@`
`12`	`12`	`"author": "[email protected]",`
`13`	`13`	`"license": "UNLICENSED",`
`14`	`14`	`"devDependencies": {`
`15`		`- "@types/jest": "^19.2.2",`
`16`		`- "jest": "^19.0.2",`
	`15`	`+ "@types/jest": "^20.0.2",`
	`16`	`+ "jest": "^20.0.4",`
`17`	`17`	`"typescript": "^2.3"`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@`
`19`	`19`	`"@aws/types": "^0.0.1"`
`20`	`20`	`},`
`21`	`21`	`"devDependencies": {`
`22`		`- "@types/jest": "^19.2.2",`
`23`		`- "jest": "^19.0.2",`
	`22`	`+ "@types/jest": "^20.0.2",`
	`23`	`+ "jest": "^20.0.4",`
`24`	`24`	`"typescript": "^2.3"`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@`
`21`	`21`	`"@aws/types": "^0.0.1"`
`22`	`22`	`},`
`23`	`23`	`"devDependencies": {`
`24`		`- "@types/jest": "^19.2.2",`
	`24`	`+ "@types/jest": "^20.0.2",`
`25`	`25`	`"@types/node": "^7.0.12",`
`26`		`- "jest": "^19.0.2",`
	`26`	`+ "jest": "^20.0.4",`
`27`	`27`	`"typescript": "^2.3"`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@`
`11`	`11`	`"license": "UNLICENSED",`
`12`	`12`	`"main": "index.js",`
`13`	`13`	`"devDependencies": {`
`14`		`- "@types/jest": "^19.2.2",`
`15`		`- "jest": "^19.0.2",`
	`14`	`+ "@types/jest": "^20.0.2",`
	`15`	`+ "jest": "^20.0.4",`
`16`	`16`	`"typescript": "^2.3"`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@`
`13`	`13`	`"@aws/types": "^0.0.1"`
`14`	`14`	`},`
`15`	`15`	`"devDependencies": {`
`16`		`- "@types/jest": "^19.2.2",`
	`16`	`+ "@types/jest": "^20.0.2",`
`17`	`17`	`"@types/node": "^7.0.12",`
`18`		`- "jest": "^19.0.2",`
	`18`	`+ "jest": "^20.0.4",`
`19`	`19`	`"typescript": "^2.3"`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ export class Sha256 implements Hash {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`digest(): Promise<Uint8Array> {`
`49`		`- return this.operation.then(operation => new Promise((`
	`49`	`+ return this.operation.then<Uint8Array>(operation => new Promise((`
`50`	`50`	`resolve,`
`51`	`51`	`reject`
`52`	`52`	`) => {`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@`
`22`	`22`	`"@aws/util-utf8-browser": "^0.0.1"`
`23`	`23`	`},`
`24`	`24`	`"devDependencies": {`
`25`		`- "@types/jest": "^19.2.2",`
	`25`	`+ "@types/jest": "^20.0.2",`
`26`	`26`	`"@types/node": "^7.0.12",`
`27`		`- "jest": "^19.0.2",`
	`27`	`+ "jest": "^20.0.4",`
`28`	`28`	`"typescript": "^2.3"`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@`
`14`	`14`	`"@aws/util-buffer-from": "^0.0.1"`
`15`	`15`	`},`
`16`	`16`	`"devDependencies": {`
`17`		`- "@types/jest": "^19.2.2",`
	`17`	`+ "@types/jest": "^20.0.2",`
`18`	`18`	`"@types/node": "^7.0.12",`
`19`		`- "jest": "^19.0.2",`
	`19`	`+ "jest": "^20.0.4",`
`20`	`20`	`"typescript": "^2.3"`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,9 @@`
`16`	`16`	`"@aws/is-node": "^0.0.1"`
`17`	`17`	`},`
`18`	`18`	`"devDependencies": {`
`19`		`- "@types/jest": "^19.2.2",`
	`19`	`+ "@types/jest": "^20.0.2",`
`20`	`20`	`"@types/node": "^7.0.12",`
`21`		`- "jest": "^19.0.2",`
	`21`	`+ "jest": "^20.0.4",`
`22`	`22`	`"typescript": "^2.3"`
`23`	`23`	`}`
`24`	`24`	`}`