Move rule type into parser

leeyi45 · leeyi45 · commit 96fda16589b8 · 2025-03-13T22:32:30.000-06:00
diff --git a/src/parser/source/index.ts b/src/parser/source/index.ts
@@ -2,7 +2,8 @@ import { parse as acornParse, Token, tokenizer } from 'acorn'
 import * as es from 'estree'
 
 import { DEFAULT_ECMA_VERSION } from '../../constants'
-import { Chapter, Context, Node, Rule, SourceError, Variant } from '../../types'
+import { Chapter, Context, Node, SourceError, Variant } from '../../types'
+import { Rule } from '../types'
 import { ancestor, AncestorWalkerFn } from '../../utils/walkers'
 import { DisallowedConstructError, FatalSyntaxError } from '../errors'
 import { AcornOptions, Parser } from '../types'
diff --git a/src/parser/source/rules/bracesAroundFor.ts b/src/parser/source/rules/bracesAroundFor.ts
@@ -2,7 +2,8 @@ import { generate } from 'astring'
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 
 export class BracesAroundForError implements SourceError {
   public type = ErrorType.SYNTAX
diff --git a/src/parser/source/rules/bracesAroundIfElse.ts b/src/parser/source/rules/bracesAroundIfElse.ts
@@ -2,7 +2,8 @@ import { generate } from 'astring'
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 import { stripIndent } from '../../../utils/formatters'
 
 export class BracesAroundIfElseError implements SourceError {
diff --git a/src/parser/source/rules/bracesAroundWhile.ts b/src/parser/source/rules/bracesAroundWhile.ts
@@ -2,7 +2,8 @@ import { generate } from 'astring'
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 
 export class BracesAroundWhileError implements SourceError {
   public type = ErrorType.SYNTAX
diff --git a/src/parser/source/rules/forStatementMustHaveAllParts.ts b/src/parser/source/rules/forStatementMustHaveAllParts.ts
@@ -1,7 +1,8 @@
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { ErrorSeverity, ErrorType, Rule, SourceError } from '../../../types'
+import { ErrorSeverity, ErrorType, SourceError } from '../../../types'
+import { Rule } from '../../types'
 import { stripIndent } from '../../../utils/formatters'
 
 export class ForStatmentMustHaveAllParts implements SourceError {
diff --git a/src/parser/source/rules/index.ts b/src/parser/source/rules/index.ts
@@ -1,4 +1,5 @@
-import { Node, Rule } from '../../../types'
+import { Node } from '../../../types'
+import { Rule } from '../../types'
 import bracesAroundFor from './bracesAroundFor'
 import bracesAroundIfElse from './bracesAroundIfElse'
 import bracesAroundWhile from './bracesAroundWhile'
@@ -7,6 +8,7 @@ import noDeclareMutable from './noDeclareMutable'
 import noDotAbbreviation from './noDotAbbreviation'
 import noEval from './noEval'
 import noExportNamedDeclarationWithDefault from './noExportNamedDeclarationWithDefault'
+import noExportNamedDeclarationWithSource from './noExportNamedDeclarationWithSource'
 import noFunctionDeclarationWithoutIdentifier from './noFunctionDeclarationWithoutIdentifier'
 import noHolesInArrays from './noHolesInArrays'
 import noIfWithoutElse from './noIfWithoutElse'
@@ -31,6 +33,7 @@ const rules: Rule<Node>[] = [
   noDeclareMutable,
   noDotAbbreviation,
   noExportNamedDeclarationWithDefault,
+  noExportNamedDeclarationWithSource,
   noFunctionDeclarationWithoutIdentifier,
   noIfWithoutElse,
   noImportSpecifierWithDefault,
diff --git a/src/parser/source/rules/noDeclareMutable.ts b/src/parser/source/rules/noDeclareMutable.ts
@@ -2,7 +2,8 @@ import { generate } from 'astring'
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { Chapter, ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { Chapter, ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 
 const mutableDeclarators = ['let', 'var']
 
diff --git a/src/parser/source/rules/noDotAbbreviation.ts b/src/parser/source/rules/noDotAbbreviation.ts
@@ -1,7 +1,8 @@
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { Chapter, ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { Chapter, ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 
 export class NoDotAbbreviationError implements SourceError {
   public type = ErrorType.SYNTAX
diff --git a/src/parser/source/rules/noEval.ts b/src/parser/source/rules/noEval.ts
@@ -1,7 +1,8 @@
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 
 export class NoEval implements SourceError {
   public type = ErrorType.SYNTAX
diff --git a/src/parser/source/rules/noExportNamedDeclarationWithDefault.ts b/src/parser/source/rules/noExportNamedDeclarationWithDefault.ts
@@ -2,7 +2,8 @@ import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
 import { defaultExportLookupName } from '../../../stdlib/localImport.prelude'
-import { ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 import syntaxBlacklist from '../syntax'
 
 export class NoExportNamedDeclarationWithDefaultError implements SourceError {
diff --git a/src/parser/source/rules/noExportNamedDeclarationWithSource.ts b/src/parser/source/rules/noExportNamedDeclarationWithSource.ts
@@ -0,0 +1,37 @@
+import type { ExportNamedDeclaration } from "estree";
+import { UNKNOWN_LOCATION } from "../../../constants";
+import { ErrorSeverity, ErrorType, type SourceError } from "../../../types";
+import { type Rule } from '../../types';
+
+export class NoExportNamedDeclarationWithSourceError implements SourceError {
+  public type = ErrorType.SYNTAX
+  public severity = ErrorSeverity.ERROR
+
+  constructor(public node: ExportNamedDeclaration) {}
+
+  get location() {
+    return this.node.loc ?? UNKNOWN_LOCATION
+  }
+
+  public explain() {
+    return 'exports of the form export { a } from "./file.js"; are not allowed.'
+  }
+
+  public elaborate() {
+    return 'Import what you are trying to export, then export it again.'
+  }
+}
+
+const noExportNamedDeclarationWithSource: Rule<ExportNamedDeclaration> = {
+  name: 'no-export-named-declaration-with-source',
+  checkers: {
+    ExportNamedDeclaration(node) {
+      if (node.source !== null) {
+        return [new NoExportNamedDeclarationWithSourceError(node)]
+      }
+      return []
+    }
+  }
+}
+
+export default noExportNamedDeclarationWithSource
diff --git a/src/parser/source/rules/noFunctionDeclarationWithoutIdentifier.ts b/src/parser/source/rules/noFunctionDeclarationWithoutIdentifier.ts
@@ -1,7 +1,8 @@
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 
 export class NoFunctionDeclarationWithoutIdentifierError implements SourceError {
   public type = ErrorType.SYNTAX
diff --git a/src/parser/source/rules/noHolesInArrays.ts b/src/parser/source/rules/noHolesInArrays.ts
@@ -1,7 +1,8 @@
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { ErrorSeverity, ErrorType, Rule, SourceError } from '../../../types'
+import { ErrorSeverity, ErrorType, SourceError } from '../../../types'
+import { Rule } from '../../types'
 import { stripIndent } from '../../../utils/formatters'
 
 export class NoHolesInArrays implements SourceError {
diff --git a/src/parser/source/rules/noIfWithoutElse.ts b/src/parser/source/rules/noIfWithoutElse.ts
@@ -2,7 +2,8 @@ import { generate } from 'astring'
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { Chapter, ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { Chapter, ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 import { stripIndent } from '../../../utils/formatters'
 
 export class NoIfWithoutElseError implements SourceError {
diff --git a/src/parser/source/rules/noImplicitDeclareUndefined.ts b/src/parser/source/rules/noImplicitDeclareUndefined.ts
@@ -1,7 +1,8 @@
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 import { stripIndent } from '../../../utils/formatters'
 
 export class NoImplicitDeclareUndefinedError implements SourceError {
diff --git a/src/parser/source/rules/noImplicitReturnUndefined.ts b/src/parser/source/rules/noImplicitReturnUndefined.ts
@@ -1,7 +1,8 @@
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 import { stripIndent } from '../../../utils/formatters'
 
 export class NoImplicitReturnUndefinedError implements SourceError {
diff --git a/src/parser/source/rules/noImportSpecifierWithDefault.ts b/src/parser/source/rules/noImportSpecifierWithDefault.ts
@@ -2,7 +2,8 @@ import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
 import { defaultExportLookupName } from '../../../stdlib/localImport.prelude'
-import { ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 import syntaxBlacklist from '../syntax'
 
 export class NoImportSpecifierWithDefaultError implements SourceError {
diff --git a/src/parser/source/rules/noNull.ts b/src/parser/source/rules/noNull.ts
@@ -1,7 +1,8 @@
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { Chapter, ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { Chapter, ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 
 export class NoNullError implements SourceError {
   public type = ErrorType.SYNTAX
diff --git a/src/parser/source/rules/noSpreadInArray.ts b/src/parser/source/rules/noSpreadInArray.ts
@@ -1,7 +1,8 @@
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 
 export class NoSpreadInArray implements SourceError {
   public type = ErrorType.SYNTAX
diff --git a/src/parser/source/rules/noTemplateExpression.ts b/src/parser/source/rules/noTemplateExpression.ts
@@ -1,7 +1,8 @@
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 
 export class NoTemplateExpressionError implements SourceError {
   public type = ErrorType.SYNTAX
diff --git a/src/parser/source/rules/noTypeofOperator.ts b/src/parser/source/rules/noTypeofOperator.ts
@@ -1,6 +1,7 @@
 import * as es from 'estree'
 
-import { Rule, Variant } from '../../../types'
+import { Variant } from '../../../types'
+import { Rule } from '../../types'
 import { NoUnspecifiedOperatorError } from './noUnspecifiedOperator'
 
 const noTypeofOperator: Rule<es.UnaryExpression> = {
diff --git a/src/parser/source/rules/noUnspecifiedLiteral.ts b/src/parser/source/rules/noUnspecifiedLiteral.ts
@@ -1,7 +1,8 @@
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 
 const specifiedLiterals = ['boolean', 'string', 'number']
 
diff --git a/src/parser/source/rules/noUnspecifiedOperator.ts b/src/parser/source/rules/noUnspecifiedOperator.ts
@@ -1,7 +1,8 @@
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 
 export class NoUnspecifiedOperatorError implements SourceError {
   public type = ErrorType.SYNTAX
diff --git a/src/parser/source/rules/noUpdateAssignment.ts b/src/parser/source/rules/noUpdateAssignment.ts
@@ -2,7 +2,8 @@ import { generate } from 'astring'
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 
 export class NoUpdateAssignment implements SourceError {
   public type = ErrorType.SYNTAX
diff --git a/src/parser/source/rules/noVar.ts b/src/parser/source/rules/noVar.ts
@@ -2,7 +2,8 @@ import { generate } from 'astring'
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 
 export class NoVarError implements SourceError {
   public type = ErrorType.SYNTAX
diff --git a/src/parser/source/rules/singleVariableDeclaration.ts b/src/parser/source/rules/singleVariableDeclaration.ts
@@ -2,7 +2,8 @@ import { generate } from 'astring'
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 
 export class MultipleDeclarationsError implements SourceError {
   public type = ErrorType.SYNTAX
diff --git a/src/parser/source/rules/strictEquality.ts b/src/parser/source/rules/strictEquality.ts
@@ -1,7 +1,8 @@
 import * as es from 'estree'
 
 import { UNKNOWN_LOCATION } from '../../../constants'
-import { ErrorSeverity, ErrorType, Node, Rule, SourceError } from '../../../types'
+import { ErrorSeverity, ErrorType, Node, SourceError } from '../../../types'
+import { Rule } from '../../types'
 
 export class StrictEqualityError implements SourceError {
   public type = ErrorType.SYNTAX
diff --git a/src/parser/types.ts b/src/parser/types.ts
@@ -1,11 +1,9 @@
-import { ParserOptions } from '@babel/parser'
-import { Options } from 'acorn'
-import { Program } from 'estree'
+import type { Program } from 'estree'
 
-import { Context } from '../types'
+import type { Context, Chapter, Node, SourceError, Variant } from '../types'
 
-export type AcornOptions = Options
-export type BabelOptions = ParserOptions
+export type { Options as AcornOptions } from 'acorn';
+export type { ParserOptions as BabelOptions } from '@babel/parser'
 
 export interface Parser<TOptions> {
   parse(
@@ -16,3 +14,12 @@ export interface Parser<TOptions> {
   ): Program | null
   validate(ast: Program, context: Context, throwOnError?: boolean): boolean
 }
+
+export interface Rule<T extends Node> {
+  name: string
+  disableFromChapter?: Chapter
+  disableForVariants?: Variant[]
+  checkers: {
+    [name: string]: (node: T, ancestors: Node[]) => SourceError[]
+  }
+}
diff --git a/src/types.ts b/src/types.ts
@@ -47,15 +47,6 @@ export interface SourceError {
   elaborate(): string
 }
 
-export interface Rule<T extends Node> {
-  name: string
-  disableFromChapter?: Chapter
-  disableForVariants?: Variant[]
-  checkers: {
-    [name: string]: (node: T, ancestors: Node[]) => SourceError[]
-  }
-}
-
 export interface Comment {
   type: 'Line' | 'Block'
   value: string
