From e476ed711fc804066514c0fd2886ef97e2df1869 Mon Sep 17 00:00:00 2001 From: Sami Turcotte Date: Wed, 19 Dec 2018 12:14:41 -0500 Subject: [PATCH 1/7] Use typescript 3.2.x --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index b9191d4eb..119729e6b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3476,9 +3476,9 @@ "integrity": "sha1-bcJDPnjti+qOiHo6zeLzF4W9Yic=" }, "typescript": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.1.tgz", - "integrity": "sha512-Veu0w4dTc/9wlWNf2jeRInNodKlcdLgemvPsrNpfu5Pq39sgfFjvIIgTsvUHCoLBnMhPoUA+tFxsXjU6VexVRQ==" + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz", + "integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==" }, "uglify-js": { "version": "2.8.29", diff --git a/package.json b/package.json index 5194fc74f..e14b0efb5 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "progress": "^2.0.0", "shelljs": "^0.8.2", "typedoc-default-themes": "^0.5.0", - "typescript": "3.1.x" + "typescript": "3.2.x" }, "devDependencies": { "@types/mocha": "^5.2.4", From 8b63527adc8e92e84fd38a3ac788e88dce92a18e Mon Sep 17 00:00:00 2001 From: Sami Turcotte Date: Wed, 19 Dec 2018 12:51:25 -0500 Subject: [PATCH 2/7] Fix failing tests --- examples/basic/src/typescript-1.5.ts | 6 ++++-- src/test/converter/destructuring/destructuring.ts | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/examples/basic/src/typescript-1.5.ts b/examples/basic/src/typescript-1.5.ts index d9574e2f4..ceafe8e08 100644 --- a/examples/basic/src/typescript-1.5.ts +++ b/examples/basic/src/typescript-1.5.ts @@ -9,15 +9,17 @@ var {destructObjectA, destructObjectB, destructObjectC} = {destructObjectA:0, de */ var [destructArrayA, destructArrayB, destructArrayC = 10] = [0, 'string', 0]; +const numberArray = [1, 2, 3, 4]; + /** * Array Destructuring with rest */ -var [destructArrayWithRestA, destructArrayWithRestB, ...destructArrayWithRest] = [1, 2, 3, 4]; +const [destructArrayWithRestA, destructArrayWithRestB, ...destructArrayWithRest] = numberArray; /** * Array Destructuring with ignores */ -var [destructArrayWithIgnoresA, , ...destructArrayWithIgnoresRest] = [1, 2, 3, 4]; +const [destructArrayWithIgnoresA, , ...destructArrayWithIgnoresRest] = numberArray; /** * Destructuring function parameters. diff --git a/src/test/converter/destructuring/destructuring.ts b/src/test/converter/destructuring/destructuring.ts index 255e7bafb..d06a03368 100644 --- a/src/test/converter/destructuring/destructuring.ts +++ b/src/test/converter/destructuring/destructuring.ts @@ -9,15 +9,17 @@ const {destructObjectA, destructObjectB, destructObjectC} = {destructObjectA:0, */ const [destructArrayA, destructArrayB, destructArrayC = 10] = [0, 'string', 0]; +const numberArray = [1, 2, 3, 4]; + /** * Array Destructuring with rest */ -const [destructArrayWithRestA, destructArrayWithRestB, ...destructArrayWithRest] = [1, 2, 3, 4]; +const [destructArrayWithRestA, destructArrayWithRestB, ...destructArrayWithRest] = numberArray; /** * Array Destructuring with ignores */ -const [destructArrayWithIgnoresA, , ...destructArrayWithIgnoresRest] = [1, 2, 3, 4]; +const [destructArrayWithIgnoresA, , ...destructArrayWithIgnoresRest] = numberArray; /** * Destructuring function parameters. From 744514ac6734893b2585dc957b8202b7ecd6792a Mon Sep 17 00:00:00 2001 From: Sami Turcotte Date: Wed, 19 Dec 2018 13:33:41 -0500 Subject: [PATCH 3/7] Revert "Fix failing tests" This reverts commit 8b63527adc8e92e84fd38a3ac788e88dce92a18e. --- examples/basic/src/typescript-1.5.ts | 6 ++---- src/test/converter/destructuring/destructuring.ts | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/examples/basic/src/typescript-1.5.ts b/examples/basic/src/typescript-1.5.ts index ceafe8e08..d9574e2f4 100644 --- a/examples/basic/src/typescript-1.5.ts +++ b/examples/basic/src/typescript-1.5.ts @@ -9,17 +9,15 @@ var {destructObjectA, destructObjectB, destructObjectC} = {destructObjectA:0, de */ var [destructArrayA, destructArrayB, destructArrayC = 10] = [0, 'string', 0]; -const numberArray = [1, 2, 3, 4]; - /** * Array Destructuring with rest */ -const [destructArrayWithRestA, destructArrayWithRestB, ...destructArrayWithRest] = numberArray; +var [destructArrayWithRestA, destructArrayWithRestB, ...destructArrayWithRest] = [1, 2, 3, 4]; /** * Array Destructuring with ignores */ -const [destructArrayWithIgnoresA, , ...destructArrayWithIgnoresRest] = numberArray; +var [destructArrayWithIgnoresA, , ...destructArrayWithIgnoresRest] = [1, 2, 3, 4]; /** * Destructuring function parameters. diff --git a/src/test/converter/destructuring/destructuring.ts b/src/test/converter/destructuring/destructuring.ts index d06a03368..255e7bafb 100644 --- a/src/test/converter/destructuring/destructuring.ts +++ b/src/test/converter/destructuring/destructuring.ts @@ -9,17 +9,15 @@ const {destructObjectA, destructObjectB, destructObjectC} = {destructObjectA:0, */ const [destructArrayA, destructArrayB, destructArrayC = 10] = [0, 'string', 0]; -const numberArray = [1, 2, 3, 4]; - /** * Array Destructuring with rest */ -const [destructArrayWithRestA, destructArrayWithRestB, ...destructArrayWithRest] = numberArray; +const [destructArrayWithRestA, destructArrayWithRestB, ...destructArrayWithRest] = [1, 2, 3, 4]; /** * Array Destructuring with ignores */ -const [destructArrayWithIgnoresA, , ...destructArrayWithIgnoresRest] = numberArray; +const [destructArrayWithIgnoresA, , ...destructArrayWithIgnoresRest] = [1, 2, 3, 4]; /** * Destructuring function parameters. From 38bf09d9776442f92ea4fb9479ceaf8274afa9df Mon Sep 17 00:00:00 2001 From: Sami Turcotte Date: Wed, 19 Dec 2018 14:09:15 -0500 Subject: [PATCH 4/7] Fix destructuring specs --- src/test/converter/destructuring/specs.json | 32 +++++++++++++------ .../specs/modules/_typescript_1_5_.html | 4 +-- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/test/converter/destructuring/specs.json b/src/test/converter/destructuring/specs.json index 06bb4503c..06f3f45db 100644 --- a/src/test/converter/destructuring/specs.json +++ b/src/test/converter/destructuring/specs.json @@ -109,11 +109,17 @@ } ], "type": { - "type": "array", - "elementType": { - "type": "intrinsic", - "name": "number" - } + "type": "tuple", + "elements": [ + { + "type": "intrinsic", + "name": "number" + }, + { + "type": "intrinsic", + "name": "number" + } + ] } }, { @@ -130,11 +136,17 @@ } ], "type": { - "type": "array", - "elementType": { - "type": "intrinsic", - "name": "number" - } + "type": "tuple", + "elements": [ + { + "type": "intrinsic", + "name": "number" + }, + { + "type": "intrinsic", + "name": "number" + } + ] } }, { diff --git a/src/test/renderer/specs/modules/_typescript_1_5_.html b/src/test/renderer/specs/modules/_typescript_1_5_.html index 5591f39ab..ac8ded936 100644 --- a/src/test/renderer/specs/modules/_typescript_1_5_.html +++ b/src/test/renderer/specs/modules/_typescript_1_5_.html @@ -140,7 +140,7 @@

destructArrayWithIgnoresA

destructArrayWithIgnoresRest

-
destructArrayWithIgnoresRest: number[]
+
destructArrayWithIgnoresRest: [number, number]