Merge pull request #30734 from andrewbranch/bug/30664 (#30892)

Fall back from `globalReadonlyArrayType` to `globalArrayType` when transpiling
microsoft · Apr 12, 2019 · 1871048 · 1871048
1 parent 7eb4739
commit 1871048
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 1 deletion.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -30293,7 +30293,7 @@ namespace ts {
                 autoArrayType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
             }
 
-            globalReadonlyArrayType = <GenericType>getGlobalTypeOrUndefined("ReadonlyArray" as __String, /*arity*/ 1);
+            globalReadonlyArrayType = <GenericType>getGlobalTypeOrUndefined("ReadonlyArray" as __String, /*arity*/ 1) || globalArrayType;
             anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
             globalThisType = <GenericType>getGlobalTypeOrUndefined("ThisType" as __String, /*arity*/ 1);
 

diff --git a/src/testRunner/unittests/services/transpile.ts b/src/testRunner/unittests/services/transpile.ts
@@ -445,5 +445,13 @@ var x = 0;`, {
                 }
             }
         });
+
+        transpilesCorrectly("Supports readonly keyword for arrays", "let x: readonly string[];", {
+            options: { compilerOptions: { module: ModuleKind.CommonJS } }
+        });
+
+        transpilesCorrectly("Supports 'as const' arrays", `([] as const).forEach(k => console.log(k));`, {
+            options: { compilerOptions: { module: ModuleKind.CommonJS } }
+        });
     });
 }
diff --git a/tests/baselines/reference/transpile/Supports as const arrays.js b/tests/baselines/reference/transpile/Supports as const arrays.js
diff --git a/tests/baselines/reference/transpile/Supports as const arrays.oldTranspile.js b/tests/baselines/reference/transpile/Supports as const arrays.oldTranspile.js
diff --git a/tests/baselines/reference/transpile/Supports readonly keyword for arrays.js b/tests/baselines/reference/transpile/Supports readonly keyword for arrays.js
diff --git a/tests/baselines/reference/transpile/Supports readonly keyword for arrays.oldTranspile.js b/tests/baselines/reference/transpile/Supports readonly keyword for arrays.oldTranspile.js