fix: import and export types

gabotechs · Dec 24, 2022 · 9244f11 · 9244f11
1 parent da15ea6
commit 9244f11
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/internal/js/grammar/export.go b/internal/js/grammar/export.go
@@ -11,7 +11,7 @@ type ExportDeconstruction struct {
 }
 
 type DeclarationExport struct {
-	Name string `"export" "async"? ("let"|"const"|"var"|"function"|"class") ALL? @Ident`
+	Name string `"export" "async"? ("let"|"const"|"var"|"function"|"class"|"type"|"interface") ALL? @Ident`
 }
 
 type ListExport struct {

diff --git a/internal/js/grammar/export_test.go b/internal/js/grammar/export_test.go
@@ -41,6 +41,14 @@ func TestExport(t *testing.T) {
 			Name:                `export function* generatorFunctionName() { /* … */ }`,
 			ExpectedDeclaration: []string{"generatorFunctionName"},
 		},
+		{
+			Name:                `export type MyType`,
+			ExpectedDeclaration: []string{"MyType"},
+		},
+		{
+			Name:                `export interface MyInterface`,
+			ExpectedDeclaration: []string{"MyInterface"},
+		},
 		{
 			Name: `export { name1, nameN };`,
 			ExpectedList: []AliasedName{

diff --git a/internal/js/grammar/import.go b/internal/js/grammar/import.go
@@ -20,7 +20,7 @@ type Imported struct {
 }
 
 type StaticImport struct {
-	Imported *Imported `"import" (@@ "from")?`
+	Imported *Imported `"import" "type"? (@@ "from")?`
 	Path     string    `@String`
 }
 

diff --git a/internal/js/grammar/import_test.go b/internal/js/grammar/import_test.go
@@ -39,6 +39,10 @@ func TestImport(t *testing.T) {
 			Name:           "import { Something } from 'file'",
 			ExpectedStatic: []string{"file"},
 		},
+		{
+			Name:           "import type { Something } from 'file'",
+			ExpectedStatic: []string{"file"},
+		},
 		{
 			Name:           "import { One, Other } from 'file'",
 			ExpectedStatic: []string{"file"},