Merge pull request #24 from hildjj/plugin-issues

Fix issues arising from inclusion in eslint-plugin
peggyjs · Feb 18, 2024 · aaeb3b4 · aaeb3b4
2 parents 918186b + 90878a2
commit aaeb3b4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/src/ast.ts b/src/ast.ts
@@ -9,7 +9,7 @@ export const visitorKeys = {
   Program: ["body", "comments"],
   grammar: ["imports", "topLevelInitializer", "initializer", "rules"],
   grammar_import: ["what", "from"],
-  binding: [],
+  binding: ["id"],
   import_binding: ["binding"],
   import_binding_all: ["binding"],
   import_binding_default: ["binding"],
@@ -125,7 +125,7 @@ export interface ImportBindingRename extends BaseNode<"import_binding_rename"> {
 }
 
 export interface Binding extends BaseNode<"binding"> {
-  id?: string;
+  id?: Name;
 }
 
 export type ImportModuleSpecifier = QuotedString<"import_module_specifier">;

diff --git a/src/parser.peggy b/src/parser.peggy
@@ -203,10 +203,10 @@ ModuleExportName
   }
 
 BindingIdentifier = id:IdentifierName {
-  if (reservedWords.indexOf(id[0]) >= 0) {
-    error(`Binding identifier can't be a reserved word "${id[0]}"`, id[1]);
+  if (reservedWords.indexOf(id.value) >= 0) {
+    error(`Binding identifier can't be a reserved word "${id.value}"`, id.loc);
   }
-  return id[0];
+  return id;
 }
 
 TopLevelInitializer

diff --git a/src/visitor.ts b/src/visitor.ts
@@ -18,7 +18,7 @@ type VisitorFunction<T, U extends AST.Node> =
 type VisitorFunctionOptional<T, U extends AST.Node> =
   (node: U, opts?: VisitorOptions<T>) => T | undefined;
 
-interface VisitorFunctionMap<T> {
+export interface VisitorFunctionMap<T> {
   // This is the only one with optional options.
   "*"?: VisitorFunctionOptional<T, AST.Node>;
   Program?: VisitorFunctionOptional<T, AST.Program>;

diff --git a/test/fixtures/csv.peggy b/test/fixtures/csv.peggy
@@ -3,16 +3,12 @@ import {_} from './space.js'
 {
   let lineNum = 0;
 }
-csv = @line|0..{ return Infinity }, EOL| EOL*
+csv = @line|0..{ return 10000 }, EOL|
 
-// Each successive line requires at least one more field.
-line = fields:field|lineNum.., "," _ | {
-  lineNum++;
-  return fields;
-}
+line = field|lineNum.., "," _ |
 
 field
   = '"' @$[^"]* '"'
-  / $[^,"]*
+  / $[^,"\r\n]*
 
 EOL = [\r\n]+