Merge branch 'main' into fix2

dudykr · Sep 19, 2023 · 79cdd39 · 79cdd39
2 parents 4220a7a + 8ac1d0d
commit 79cdd39
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/crates/stc_ts_file_analyzer/src/analyzer/expr/meta_prop.rs b/crates/stc_ts_file_analyzer/src/analyzer/expr/meta_prop.rs
@@ -19,7 +19,12 @@ impl Analyzer<'_, '_> {
                 Ok(Type::any(e.span, Default::default()))
             }
 
-            _ => {
+            MetaPropKind::ImportMeta => {
+                if let Ok(mut ty) = self.env.get_global_type(e.span(), &"ImportMeta".into()) {
+                    ty.reposition(e.span());
+                    return Ok(ty);
+                }
+
                 todo!("Unsupported meta property {:?}", e)
             }
         }

diff --git a/crates/stc_ts_type_checker/tests/conformance.pass.txt b/crates/stc_ts_type_checker/tests/conformance.pass.txt
@@ -475,6 +475,7 @@ es2018/es2018IntlAPIs.ts
 es2018/usePromiseFinally.ts
 es2018/useRegexpGroups.ts
 es2019/globalThisTypeIndexAccess.ts
+es2019/importMeta/importMetaNarrowing.ts
 es2020/bigintMissingES2019.ts
 es2020/bigintMissingES2020.ts
 es2020/bigintMissingESNext.ts
@@ -1018,6 +1019,7 @@ es6/templates/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01.ts
 es6/templates/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01_ES6.ts
 es6/templates/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes02.ts
 es6/templates/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes02_ES6.ts
+es6/templates/taggedTemplateStringsPldirectives/ts-expect-error-nocheck.ts
 es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts
 es6/templates/taggedTemplateStringsWithIncompatibleTypedTagsES6.ts
 es6/templates/taggedTemplateStringsWithManyCallAndMemberExpressions.ts
@@ -1148,6 +1150,7 @@ es6/templates/templateStringWithEmbeddedObjectLiteral.ts
 es6/templates/templateStringWithEmbeddedObjectLiteralES6.ts
 es6/templates/templateStringWithEmbeddedTemplateString.ts
 es6/templates/templateStringWithEmbeddedTemplateStringES6.ts
+es6/templates/templateStringWithEmbeddedTypdirectives/ts-expect-error-nocheck.ts
 es6/templates/templateStringWithEmbeddedTypeAssertionOnAddition.ts
 es6/templates/templateStringWithEmbeddedTypeAssertionOnAdditionES6.ts
 es6/templates/templateStringWithEmbeddedTypeOfOperator.ts

diff --git a/...r/tests/conformance/es2019/importMeta/importMetaNarrowing(module=es2020).stats.rust-debug b/...r/tests/conformance/es2019/importMeta/importMetaNarrowing(module=es2020).stats.rust-debug
@@ -2,5 +2,5 @@ Stats {
     required_error: 0,
     matched_error: 0,
     extra_error: 0,
-    panic: 1,
+    panic: 0,
 }
diff --git a/...r/tests/conformance/es2019/importMeta/importMetaNarrowing(module=esnext).stats.rust-debug b/...r/tests/conformance/es2019/importMeta/importMetaNarrowing(module=esnext).stats.rust-debug
@@ -2,5 +2,5 @@ Stats {
     required_error: 0,
     matched_error: 0,
     extra_error: 0,
-    panic: 1,
+    panic: 0,
 }
diff --git a/...r/tests/conformance/es2019/importMeta/importMetaNarrowing(module=system).stats.rust-debug b/...r/tests/conformance/es2019/importMeta/importMetaNarrowing(module=system).stats.rust-debug
@@ -2,5 +2,5 @@ Stats {
     required_error: 0,
     matched_error: 0,
     extra_error: 0,
-    panic: 1,
+    panic: 0,
 }
diff --git a/crates/stc_ts_type_checker/tests/tsc-stats.rust-debug b/crates/stc_ts_type_checker/tests/tsc-stats.rust-debug
@@ -2,5 +2,5 @@ Stats {
     required_error: 2869,
     matched_error: 7166,
     extra_error: 1098,
-    panic: 9,
+    panic: 6,
 }