jseption 0.0.4 → 0.0.6

package/dist/parser.js

@@ -890,9 +890,13 @@ function js_parse_number(s, p) {
     if (last_was_sep)
         return [js_parse_error_pos(s, p, 'invalid number literal'), p];
     let is_bigint = false;
+    /* a fraction or an exponent (decimal literals only) rules out the BigInt suffix; the digits
+       themselves are not inspected, since 'e' is a hex digit */
+    let is_float = false;
     if (radix === 10 && !is_legacy_octal) {
         /* fraction and exponent */
         if (buf.charCodeAt(p) === 46 /* . */) {
+            is_float = true;
             text += '.';
             p++;
             last_was_sep = false;
@@ -949,6 +953,7 @@ function js_parse_number(s, p) {
                 if (last_was_sep)
                     return [js_parse_error_pos(s, q, 'invalid number literal'), q];
                 text += etext;
+                is_float = true;
                 p = q;
             }
             else {
@@ -959,7 +964,7 @@ function js_parse_number(s, p) {
     else if (ndigits === 0) {
         return [js_parse_error_pos(s, start, 'invalid number literal'), p];
     }
-    if (buf.charCodeAt(p) === 110 /* n */ && !is_legacy_octal && !text.includes('.') && !/e/i.test(text)) {
+    if (buf.charCodeAt(p) === 110 /* n */ && !is_legacy_octal && !is_float) {
         is_bigint = true;
         p++;
     }
@@ -4474,7 +4479,8 @@ function js_parse_property_name(s, out, allow_method, allow_var, allow_private)
         else if (tv(s) === 91 /* [ */) {
             if (next_token(s))
                 return -1;
-            if (js_parse_expr(s))
+            /* ComputedPropertyName: [ AssignmentExpression ] (a comma expression is a syntax error) */
+            if (js_parse_assign_expr(s))
                 return -1;
             if (js_parse_expect(s, 93))
                 return -1;
@@ -5552,6 +5558,9 @@ function js_parse_postfix_expr(s, parse_flags) {
         let has_optional_chain = false;
         let action = 'none';
         if (tv(s) === -89 /* TOK.QUESTION_MARK_DOT */) {
+            /* the callee of `new` cannot contain an optional chain (`new a?.b()`) */
+            if ((parse_flags & PF_POSTFIX_CALL) === 0)
+                return js_parse_error(s, 'new keyword cannot be used with an optional chain');
             op_token_ptr = s.token.ptr;
             /* optional chaining */
             if (next_token(s))
@@ -6810,6 +6819,8 @@ function js_parse_var(s, parse_flags, tok, export_flag) {
             if (export_flag && add_local_export(s, name))
                 return -1;
             if (tv(s) === 61 /* = */) {
+                /* an error storing the value is reported at the '=' (upstream 14a1536) */
+                const source_ptr = s.token.ptr;
                 if (next_token(s))
                     return -1;
                 if (need_var_reference(s, tok)) {
@@ -6823,12 +6834,14 @@ function js_parse_var(s, parse_flags, tok, export_flag) {
                     if (js_parse_assign_expr2(s, parse_flags))
                         return -1;
                     set_object_name(s, name);
+                    emit_source_pos(s, source_ptr);
                     put_lvalue(s, lv, 0 /* PutLValueEnum.PUT_LVALUE_NOKEEP */, false);
                 }
                 else {
                     if (js_parse_assign_expr2(s, parse_flags))
                         return -1;
                     set_object_name(s, name);
+                    emit_source_pos(s, source_ptr);
                     emit_op(s, (tok === -55 /* TOK.CONST */ || tok === -47 /* TOK.LET */) ? 191 /* OP.scope_put_var_init */ : 187 /* OP.scope_put_var */);
                     emit_atom(s, name);
                     emit_u16(s, fd.scope_level);
@@ -7006,8 +7019,7 @@ function js_parse_for_in_of(s, label_name, is_async) {
         }
     }
     if (token_is_pseudo_keyword(s, JS_ATOM_of)) {
-        break_entry.has_iterator = is_for_of = true;
-        break_entry.drop_count += 2;
+        is_for_of = true;
         if (has_initializer)
             return js_parse_error(s, "a declaration in the head of a for-of loop can't have an initializer");
     }
@@ -7034,6 +7046,10 @@ function js_parse_for_in_of(s, label_name, is_async) {
     /* close the scope after having evaluated the expression so that the TDZ values are in the closures */
     close_scopes(s, fd.scope_level, block_scope_level);
     if (is_for_of) {
+        /* set has_iterator after the iterable expression is parsed so that a yield in the expression
+           does not try to close a not-yet-created iterator */
+        break_entry.has_iterator = true;
+        break_entry.drop_count += 2;
         if (is_async)
             emit_op(s, 128 /* OP.for_await_of_start */);
         else
@@ -9087,7 +9103,7 @@ function js_parse_module_export_name(s, out) {
     let atom;
     if (tv(s) === -127 /* TOK.STRING */) {
         if (!is_well_formed_string(s.token.str)) {
-            js_parse_error(s, 'invalid module export name');
+            js_parse_error(s, 'contains unpaired surrogate');
             return JS_ATOM_NULL;
         }
         atom = JS_NewAtom(s.ctx, s.token.str);
@@ -9131,21 +9147,22 @@ function js_parse_with_clause(s, out) {
         return -1;
     const attrs = Object.create(null);
     while (tv(s) !== 125) {
+        const key_token_ptr = s.token.ptr;
         let key;
         if (tv(s) === -127 /* TOK.STRING */)
             key = s.token.str;
         else if (token_is_ident_or_keyword(tv(s)) || token_is_ident(tv(s)))
             key = JS_AtomGetStr(s.ctx, s.token.atom);
         else
-            return js_parse_error(s, 'identifier or string expected');
-        if (Object.prototype.hasOwnProperty.call(attrs, key))
-            return js_parse_error(s, `duplicate import attribute '${key}'`);
+            return js_parse_error(s, 'identifier expected');
         if (next_token(s))
             return -1;
         if (js_parse_expect(s, 58))
             return -1;
         if (tv(s) !== -127 /* TOK.STRING */)
-            return js_parse_error(s, 'string expected');
+            return js_parse_error_pos(s, key_token_ptr, 'string expected');
+        if (Object.prototype.hasOwnProperty.call(attrs, key))
+            return js_parse_error(s, 'duplicate with key');
         attrs[key] = s.token.str;
         if (next_token(s))
             return -1;