meriyah 4.5.0 → 5.0.0

package/src/common.ts

@@ -28,15 +28,15 @@ export const enum Context {
   InIteration = 1 << 17,
   SuperProperty = 1 << 18,
   SuperCall = 1 << 19,
-  InYieldContext = 1 << 21,
-  InAwaitContext = 1 << 22,
-  InArgumentList = 1 << 23,
-  InConstructor = 1 << 24,
-  InMethod = 1 << 25,
-  AllowNewTarget = 1 << 26,
-  DisallowIn = 1 << 27,
-  AllowEscapedKeyword = 1 << 28,
-  OptionsUniqueKeyInPattern = 1 << 29,
+  InYieldContext = 1 << 20,
+  InAwaitContext = 1 << 21,
+  InArgumentList = 1 << 22,
+  InConstructor = 1 << 23,
+  InMethod = 1 << 24,
+  AllowNewTarget = 1 << 25,
+  DisallowIn = 1 << 26,
+  AllowEscapedKeyword = 1 << 27,
+  OptionsUniqueKeyInPattern = 1 << 28
 }
 
 /**
@@ -91,7 +91,7 @@ export const enum Origin {
   Declaration = 1 << 3,
   Arrow = 1 << 4,
   ForStatement = 1 << 5,
-  Export = 1 << 6,
+  Export = 1 << 6
 }
 
 /**
@@ -131,7 +131,7 @@ export const enum Flags {
   SimpleParameterList = 1 << 7,
   HasStrictReserved = 1 << 8,
   StrictEvalArguments = 1 << 9,
-  DisallowCall   = 1 << 10,
+  DisallowCall = 1 << 10,
   HasOptionalChaining = 1 << 11
 }
 
@@ -163,13 +163,16 @@ export const enum ScopeKind {
   FunctionRoot = 1 << 8,
   FunctionParams = 1 << 9,
   ArrowParams = 1 << 10,
-  CatchIdentifier = 1 << 11,
+  CatchIdentifier = 1 << 11
 }
 
 /**
  * The type of the `onComment` option.
  */
-export type OnComment = void | Comment[] | ((type: string, value: string, start: number, end: number, loc: SourceLocation) => any);
+export type OnComment =
+  | void
+  | Comment[]
+  | ((type: string, value: string, start: number, end: number, loc: SourceLocation) => any);
 
 /**
  * The type of the `onInsertedSemicolon` option.
@@ -215,7 +218,8 @@ export interface ParserState {
   colPos: number;
   linePos: number;
   end: number;
-  token: Token;
+  getToken(): Token;
+  setToken(token: Token): Token;
   onComment: any;
   onInsertedSemicolon: any;
   onToken: any;
@@ -243,12 +247,8 @@ export interface ParserState {
  */
 
 export function matchOrInsertSemicolon(parser: ParserState, context: Context): void {
-
-  if (
-    (parser.flags & Flags.NewLine) === 0 &&
-    (parser.token & Token.IsAutoSemicolon) !== Token.IsAutoSemicolon
-  ) {
-    report(parser, Errors.UnexpectedToken, KeywordDescTable[parser.token & Token.Type]);
+  if ((parser.flags & Flags.NewLine) === 0 && (parser.getToken() & Token.IsAutoSemicolon) !== Token.IsAutoSemicolon) {
+    report(parser, Errors.UnexpectedToken, KeywordDescTable[parser.getToken() & Token.Type]);
   }
 
   if (!consumeOpt(parser, context, Token.Semicolon)) {
@@ -259,7 +259,7 @@ export function matchOrInsertSemicolon(parser: ParserState, context: Context): v
 
 export function isValidStrictMode(parser: ParserState, index: number, tokenPos: number, tokenValue: string): 0 | 1 {
   if (index - tokenPos < 13 && tokenValue === 'use strict') {
-    if ((parser.token & Token.IsAutoSemicolon) === Token.IsAutoSemicolon || parser.flags & Flags.NewLine) {
+    if ((parser.getToken() & Token.IsAutoSemicolon) === Token.IsAutoSemicolon || parser.flags & Flags.NewLine) {
       return 1;
     }
   }
@@ -275,7 +275,7 @@ export function isValidStrictMode(parser: ParserState, index: number, tokenPos:
  * @param token The type of token to consume
  */
 export function optionalBit(parser: ParserState, context: Context, t: Token): 0 | 1 {
-  if (parser.token !== t) return 0;
+  if (parser.getToken() !== t) return 0;
   nextToken(parser, context);
   return 1;
 }
@@ -289,7 +289,7 @@ export function optionalBit(parser: ParserState, context: Context, t: Token): 0
  * @param token The type of token to consume
  */
 export function consumeOpt(parser: ParserState, context: Context, t: Token): boolean {
-  if (parser.token !== t) return false;
+  if (parser.getToken() !== t) return false;
   nextToken(parser, context);
   return true;
 }
@@ -303,7 +303,7 @@ export function consumeOpt(parser: ParserState, context: Context, t: Token): boo
  * @param t The type of token to consume
  */
 export function consume(parser: ParserState, context: Context, t: Token): void {
-  if (parser.token !== t) report(parser, Errors.ExpectedToken, KeywordDescTable[t & Token.Type]);
+  if (parser.getToken() !== t) report(parser, Errors.ExpectedToken, KeywordDescTable[t & Token.Type]);
   nextToken(parser, context);
 }
 
@@ -316,21 +316,23 @@ export function consume(parser: ParserState, context: Context, t: Token): void {
  */
 export function reinterpretToPattern(state: ParserState, node: any): void {
   switch (node.type) {
-    case 'ArrayExpression':
+    case 'ArrayExpression': {
       node.type = 'ArrayPattern';
-      const elements = node.elements;
+      const { elements } = node;
       for (let i = 0, n = elements.length; i < n; ++i) {
         const element = elements[i];
         if (element) reinterpretToPattern(state, element);
       }
       return;
-    case 'ObjectExpression':
+    }
+    case 'ObjectExpression': {
       node.type = 'ObjectPattern';
-      const properties = node.properties;
+      const { properties } = node;
       for (let i = 0, n = properties.length; i < n; ++i) {
         reinterpretToPattern(state, properties[i]);
       }
       return;
+    }
     case 'AssignmentExpression':
       node.type = 'AssignmentPattern';
       if (node.operator !== '=') report(state, Errors.InvalidDestructuringTarget);
@@ -343,7 +345,7 @@ export function reinterpretToPattern(state: ParserState, node: any): void {
     case 'SpreadElement':
       node.type = 'RestElement';
       reinterpretToPattern(state, node.argument);
-    default: // ignore
+    // No default
   }
 }
 
@@ -363,9 +365,7 @@ export function validateBindingIdentifier(
   t: Token,
   skipEvalArgCheck: 0 | 1
 ): void {
-
   if (context & Context.Strict) {
-
     if ((t & Token.FutureReserved) === Token.FutureReserved) {
       report(parser, Errors.UnexpectedStrictReserved);
     }
@@ -395,14 +395,8 @@ export function validateBindingIdentifier(
   }
 }
 
-export function validateFunctionName(
-  parser: ParserState,
-  context: Context,
-  t: Token
-): void {
-
+export function validateFunctionName(parser: ParserState, context: Context, t: Token): void {
   if (context & Context.Strict) {
-
     if ((t & Token.FutureReserved) === Token.FutureReserved) {
       report(parser, Errors.UnexpectedStrictReserved);
     }
@@ -413,11 +407,11 @@ export function validateFunctionName(
 
     if (t === Token.EscapedFutureReserved) {
       report(parser, Errors.InvalidEscapedKeyword);
-     }
+    }
 
     if (t === Token.EscapedReserved) {
       report(parser, Errors.InvalidEscapedKeyword);
-     }
+    }
   }
 
   if ((t & Token.Reserved) === Token.Reserved) {
@@ -569,7 +563,7 @@ export function createArrowHeadParsingScope(parser: ParserState, context: Contex
 
 /**
  * Record duplicate binding errors that may occur in a arrow head or function parameters
-*
+ *
  * @param parser Parser state
  * @param type Errors type
  */
@@ -664,6 +658,7 @@ export function addBlockName(
       value & BindingKind.FunctionLexical &&
       origin & Origin.BlockStatement
     ) {
+      // No op
     } else {
       report(parser, Errors.DuplicateBinding, name);
     }
@@ -671,7 +666,8 @@ export function addBlockName(
 
   if (
     scope.type & ScopeKind.FunctionBody &&
-    ((scope as any).parent['#' + name] && ((scope as any).parent['#' + name] & BindingKind.Empty) === 0)
+    (scope as any).parent['#' + name] &&
+    ((scope as any).parent['#' + name] & BindingKind.Empty) === 0
   ) {
     report(parser, Errors.DuplicateBinding, name);
   }
@@ -718,6 +714,7 @@ export function addVarName(
         ((kind & BindingKind.FunctionStatement && value & BindingKind.LexicalOrFunction) ||
           (value & BindingKind.FunctionStatement && kind & BindingKind.LexicalOrFunction))
       ) {
+        // No op
       } else {
         report(parser, Errors.DuplicateBinding, name);
       }
@@ -776,7 +773,7 @@ export function addBindingToExports(parser: ParserState, name: string): void {
 }
 
 export function pushComment(context: Context, array: any[]): any {
-  return function(type: string, value: string, start: number, end: number, loc: SourceLocation) {
+  return function (type: string, value: string, start: number, end: number, loc: SourceLocation) {
     const comment: any = {
       type,
       value
@@ -795,7 +792,7 @@ export function pushComment(context: Context, array: any[]): any {
 }
 
 export function pushToken(context: Context, array: any[]): any {
-  return function(token: string, start: number, end: number, loc: SourceLocation) {
+  return function (token: string, start: number, end: number, loc: SourceLocation) {
     const tokens: any = {
       token
     };
@@ -827,11 +824,7 @@ export function isValidIdentifier(context: Context, t: Token): boolean {
   );
 }
 
-export function classifyIdentifier(
-  parser: ParserState,
-  context: Context,
-  t: Token
-): any {
+export function classifyIdentifier(parser: ParserState, context: Context, t: Token): any {
   if ((t & Token.IsEvalOrArguments) === Token.IsEvalOrArguments) {
     if (context & Context.Strict) report(parser, Errors.StrictEvalArguments);
     parser.flags |= Flags.StrictEvalArguments;

package/src/errors.ts

@@ -138,6 +138,7 @@ export const enum Errors {
   InvalidNestedStatement,
   UnknownLabel,
   InvalidImportTail,
+  InvalidJSONImportBinding,
   ImportNotOneArg,
   InvalidImportNew,
   InvalidSpreadInImport,
@@ -316,6 +317,7 @@ export const errorMessages: {
   [Errors.InvalidNestedStatement]: 'continue statement must be nested within an iteration statement',
   [Errors.UnknownLabel]: "Undefined label '%0'",
   [Errors.InvalidImportTail]: 'Trailing comma is disallowed inside import(...) arguments',
+  [Errors.InvalidJSONImportBinding]: 'Invalid binding in JSON import',
   [Errors.ImportNotOneArg]: 'import() requires exactly one argument',
   [Errors.InvalidImportNew]: 'Cannot use new with import(...)',
   [Errors.InvalidSpreadInImport]: '... is not allowed in import()',
@@ -356,7 +358,7 @@ export class ParseError extends SyntaxError {
   public line: number;
   public column: number;
   public description: string;
-  /*eslint-disable*/
+
   constructor(startindex: number, line: number, column: number, type: Errors, ...params: string[]) {
     const message =
       '[' + line + ':' + column + ']: ' + errorMessages[type].replace(/%(\d+)/g, (_: string, i: number) => params[i]);

package/src/estree.ts

@@ -82,6 +82,7 @@ export type Node =
   | Import
   | ImportDeclaration
   | ImportDefaultSpecifier
+  | ImportAttribute
   | ImportNamespaceSpecifier
   | ImportSpecifier
   | JSXNamespacedName
@@ -338,6 +339,7 @@ export interface BreakStatement extends _Node {
 export interface ImportExpression extends _Node {
   type: 'ImportExpression';
   source: Expression;
+  options?: Expression | null;
 }
 
 export interface ChainExpression extends _Node {
@@ -371,7 +373,7 @@ export interface PropertyDefinition extends _Node {
   type: 'PropertyDefinition';
   key: PrivateIdentifier | Expression;
   value: any;
-  decorators?: Decorator[] | null;
+  decorators?: Decorator[];
   computed: boolean;
   static: boolean;
 }
@@ -424,6 +426,7 @@ export interface ExportAllDeclaration extends _Node {
   type: 'ExportAllDeclaration';
   source: Literal;
   exported: Identifier | null;
+  attributes?: ImportAttribute[];
 }
 
 export interface ExportDefaultDeclaration extends _Node {
@@ -500,6 +503,13 @@ export interface ImportDeclaration extends _Node {
   type: 'ImportDeclaration';
   source: Literal;
   specifiers: ImportClause[];
+  attributes?: ImportAttribute[];
+}
+
+export interface ImportAttribute extends _Node {
+  type: 'ImportAttribute';
+  key: Identifier | Literal;
+  value: Literal;
 }
 
 export interface ImportDefaultSpecifier extends _Node {

package/src/lexer/comments.ts

@@ -22,7 +22,7 @@ export const CommentTypes = ['SingleLine', 'MultiLine', 'HTMLOpen', 'HTMLClose',
 export function skipHashBang(parser: ParserState): void {
   // HashbangComment ::
   //   #!  SingleLineCommentChars_opt
-  const source = parser.source;
+  const { source } = parser;
   if (parser.currentChar === Chars.Hash && source.charCodeAt(parser.index + 1) === Chars.Exclamation) {
     advanceChar(parser);
     advanceChar(parser);

package/src/lexer/decodeHTML.ts

@@ -2163,11 +2163,9 @@ export function decodeHTMLStrict(text: string): string {
   return text.replace(/&(?:[a-zA-Z]+|#[xX][\da-fA-F]+|#\d+);/g, (key) => {
     if (key.charAt(1) === '#') {
       const secondChar = key.charAt(2);
-    const codePoint =
-      secondChar === 'X' || secondChar === 'x'
-        ? parseInt(key.slice(3), 16)
-        : parseInt(key.slice(2), 10);
-    return decodeCodePoint(codePoint);
+      const codePoint =
+        secondChar === 'X' || secondChar === 'x' ? parseInt(key.slice(3), 16) : parseInt(key.slice(2), 10);
+      return decodeCodePoint(codePoint);
     }
     return entities[key.slice(1, -1)] || key;
   });

package/src/lexer/identifier.ts

@@ -12,7 +12,7 @@ import { report, reportScannerError, Errors } from '../errors';
  * @param context Context masks
  */
 export function scanIdentifier(parser: ParserState, context: Context, isValidAsKeyword: 0 | 1): Token {
-  while (isIdPart[advanceChar(parser)]) {}
+  while (isIdPart[advanceChar(parser)]);
   parser.tokenValue = parser.source.slice(parser.tokenPos, parser.index);
 
   return parser.currentChar !== Chars.Backslash && parser.currentChar <= 0x7e
@@ -69,7 +69,7 @@ export function scanIdentifierSlowCase(
     parser.tokenValue += parser.source.slice(start, parser.index);
   }
 
-  const length = parser.tokenValue.length;
+  const { length } = parser.tokenValue;
 
   if (isValidAsKeyword && length >= 2 && length <= 11) {
     const token: Token | undefined = descKeywordTable[parser.tokenValue];
@@ -110,8 +110,8 @@ export function scanIdentifierSlowCase(
       return context & Context.AllowEscapedKeyword
         ? Token.AnyIdentifier
         : context & Context.InYieldContext
-        ? Token.EscapedReserved
-        : token;
+          ? Token.EscapedReserved
+          : token;
     }
 
     // async is not reserved; it can be used as a variable name

package/src/lexer/jsx.ts

@@ -16,11 +16,12 @@ export function scanJSXAttributeValue(parser: ParserState, context: Context): To
   parser.startPos = parser.tokenPos = parser.index;
   parser.startColumn = parser.colPos = parser.column;
   parser.startLine = parser.linePos = parser.line;
-  parser.token =
+  parser.setToken(
     CharTypes[parser.currentChar] & CharFlags.StringLiteral
       ? scanJSXString(parser, context)
-      : scanSingleToken(parser, context, LexerState.None);
-  return parser.token;
+      : scanSingleToken(parser, context, LexerState.None)
+  );
+  return parser.getToken();
 }
 
 /**
@@ -55,7 +56,7 @@ export function scanJSXToken(parser: ParserState, context: Context): Token {
   parser.startColumn = parser.colPos = parser.column;
   parser.startLine = parser.linePos = parser.line;
 
-  if (parser.index >= parser.end) return (parser.token = Token.EOF);
+  if (parser.index >= parser.end) return parser.setToken(Token.EOF);
 
   const token = TokenLookup[parser.source.charCodeAt(parser.index)];
 
@@ -65,9 +66,9 @@ export function scanJSXToken(parser: ParserState, context: Context): Token {
       advanceChar(parser);
       if (parser.currentChar === Chars.Slash) {
         advanceChar(parser);
-        parser.token = Token.JSXClose;
+        parser.setToken(Token.JSXClose);
       } else {
-        parser.token = Token.LessThan;
+        parser.setToken(Token.LessThan);
       }
 
       break;
@@ -75,7 +76,7 @@ export function scanJSXToken(parser: ParserState, context: Context): Token {
     // '{'
     case Token.LeftBrace: {
       advanceChar(parser);
-      parser.token = Token.LeftBrace;
+      parser.setToken(Token.LeftBrace);
       break;
     }
     default: {
@@ -100,11 +101,11 @@ export function scanJSXToken(parser: ParserState, context: Context): Token {
       const raw = parser.source.slice(parser.tokenPos, parser.index);
       if (context & Context.OptionsRaw) parser.tokenRaw = raw;
       parser.tokenValue = decodeHTMLStrict(raw);
-      parser.token = Token.JSXText;
+      parser.setToken(Token.JSXText);
     }
   }
 
-  return parser.token;
+  return parser.getToken();
 }
 
 /**
@@ -113,7 +114,7 @@ export function scanJSXToken(parser: ParserState, context: Context): Token {
  * @param parser The parser instance
  */
 export function scanJSXIdentifier(parser: ParserState): Token {
-  if ((parser.token & Token.IsIdentifier) === Token.IsIdentifier) {
+  if ((parser.getToken() & Token.IsIdentifier) === Token.IsIdentifier) {
     const { index } = parser;
     let char = parser.currentChar;
     while (CharTypes[char] & (CharFlags.Hyphen | CharFlags.IdentifierPart)) {
@@ -121,6 +122,6 @@ export function scanJSXIdentifier(parser: ParserState): Token {
     }
     parser.tokenValue += parser.source.slice(index, parser.index);
   }
-  parser.token = Token.Identifier;
-  return parser.token;
+  parser.setToken(Token.Identifier);
+  return parser.getToken();
 }

package/src/lexer/numeric.ts

@@ -212,8 +212,8 @@ export function scanNumber(parser: ParserState, context: Context, kind: NumberKi
     kind & (NumberKind.ImplicitOctal | NumberKind.Binary | NumberKind.Hex | NumberKind.Octal)
       ? value
       : kind & NumberKind.NonOctalDecimal
-      ? parseFloat(parser.source.substring(parser.tokenPos, parser.index))
-      : +value;
+        ? parseFloat(parser.source.substring(parser.tokenPos, parser.index))
+        : +value;
 
   if (context & Context.OptionsRaw) parser.tokenRaw = parser.source.slice(parser.tokenPos, parser.index);
 

package/src/lexer/regexp.ts

@@ -47,7 +47,7 @@ export function scanRegularExpression(parser: ParserState, context: Context): To
         case Chars.LineSeparator:
         case Chars.ParagraphSeparator:
           report(parser, Errors.UnterminatedRegExp);
-        default: // ignore
+        // No default
       }
     }
 
@@ -143,13 +143,13 @@ export function scanRegularExpression(parser: ParserState, context: Context): To
 function validate(parser: ParserState, pattern: string, flags: string): RegExp | null | Token {
   try {
     return new RegExp(pattern, flags);
-  } catch (e) {
+  } catch {
     try {
       // Some JavaScript engine has not supported flag "d".
       new RegExp(pattern, flags.replace('d', ''));
       // Use null as tokenValue according to ESTree spec
       return null;
-    } catch (e) {
+    } catch {
       report(parser, Errors.UnterminatedRegExp);
     }
   }

package/src/lexer/scan.ts

@@ -176,8 +176,8 @@ export function nextToken(parser: ParserState, context: Context): void {
   parser.startPos = parser.index;
   parser.startColumn = parser.column;
   parser.startLine = parser.line;
-  parser.token = scanSingleToken(parser, context, LexerState.None);
-  if (parser.onToken && parser.token !== Token.EOF) {
+  parser.setToken(scanSingleToken(parser, context, LexerState.None));
+  if (parser.onToken && parser.getToken() !== Token.EOF) {
     const loc = {
       start: {
         line: parser.linePos,
@@ -188,14 +188,14 @@ export function nextToken(parser: ParserState, context: Context): void {
         column: parser.column
       }
     };
-    parser.onToken(convertTokenType(parser.token), parser.tokenPos, parser.index, loc);
+    parser.onToken(convertTokenType(parser.getToken()), parser.tokenPos, parser.index, loc);
   }
 }
 
 export function scanSingleToken(parser: ParserState, context: Context, state: LexerState): Token {
   const isStartOfLine = parser.index === 0;
 
-  const source = parser.source;
+  const { source } = parser;
 
   // These three are only for HTMLClose comment
   let startPos = parser.index;
@@ -271,7 +271,7 @@ export function scanSingleToken(parser: ParserState, context: Context, state: Le
           break;
 
         // `<`, `<=`, `<<`, `<<=`, `</`, `<!--`
-        case Token.LessThan:
+        case Token.LessThan: {
           let ch = advanceChar(parser);
           if (parser.index < parser.end) {
             if (ch === Chars.LessThan) {
@@ -325,6 +325,7 @@ export function scanSingleToken(parser: ParserState, context: Context, state: Le
             }
           }
           return Token.LessThan;
+        }
 
         // `=`, `==`, `===`, `=>`
         case Token.Assign: {
@@ -491,7 +492,7 @@ export function scanSingleToken(parser: ParserState, context: Context, state: Le
         }
 
         // `.`, `...`, `.123` (numeric literal)
-        case Token.Period:
+        case Token.Period: {
           const next = advanceChar(parser);
           if (next >= Chars.Zero && next <= Chars.Nine)
             return scanNumber(parser, context, NumberKind.Float | NumberKind.Decimal);
@@ -504,6 +505,7 @@ export function scanSingleToken(parser: ParserState, context: Context, state: Le
             }
           }
           return Token.Period;
+        }
 
         // `|`, `||`, `|=`, `||=`
         case Token.BitwiseOr: {

package/src/lexer/string.ts

@@ -214,7 +214,7 @@ export function parseEscape(parser: ParserState, context: Context, first: number
     case Chars.Eight:
     case Chars.Nine:
       if ((context & Context.OptionsWebCompat) === 0) return Escape.EightOrNine;
-
+    // fallthrough
     default:
       return first;
   }
@@ -237,6 +237,6 @@ export function handleStringError(state: ParserState, code: Escape, isTemplate:
     case Escape.OutOfRange:
       report(state, Errors.UnicodeOverflow);
 
-    default:
+    // No default
   }
 }

package/src/meriyah.ts

@@ -2,8 +2,7 @@ import { Context } from './common';
 import { parseSource, Options } from './parser';
 import * as ESTree from './estree';
 // Current version
-import * as meta from '../package.json';
-const version: string = meta.version;
+import { version } from '../package.json';
 
 /**
  * Parse a script, optionally with various options.