@poe-platform/safe-js 0.1.582 → 0.1.583

package/dist/safe-js/workerd.js

@@ -4456,7 +4456,7 @@ var KEYWORDS = /* @__PURE__ */ new Set([
 ]);
 var EXPRESSION_ENDING_KEYWORDS = /* @__PURE__ */ new Set(["true", "false", "null"]);
 var RESERVED_IDENTIFIER_SPELLINGS = /* @__PURE__ */ new Set(["case", "default", "debugger", "enum", "export", "new", "switch", "var"]);
-var CONTROL_FLOW_PAREN_KEYWORDS = /* @__PURE__ */ new Set(["if", "while", "with", "for", "catch"]);
+var CONTROL_FLOW_PAREN_KEYWORDS = /* @__PURE__ */ new Set(["if", "while", "with", "for", "catch", "switch"]);
 var MAX_UNICODE_CODE_POINT = 1114111;
 var IDENTIFIER_START_PATTERN = /^\p{ID_Start}$/u;
 var IDENTIFIER_PART_PATTERN = /^\p{ID_Continue}$/u;
@@ -4537,7 +4537,7 @@ var Lexer = class {
   column = 1;
   tokens = [];
   groupingStack = [];
-  lastClosedControlParenthesis = false;
+  lastClosedStatementBoundary = false;
   legacyStringEscape = false;
   lineHasToken = false;
   tokenize() {
@@ -4710,7 +4710,7 @@ var Lexer = class {
     let depth = 1;
     const tokens = [];
     const groupingStack = [];
-    let lastClosedControlParenthesis = false;
+    let lastClosedStatementBoundary = false;
     while (!this.isAtEnd() && depth > 0) {
       this.skipTrivia();
       if (this.isAtEnd()) break;
@@ -4721,13 +4721,13 @@ var Lexer = class {
       if (char === "'" || char === '"') {
         this.skipQuotedString(char);
         tokens.push({ type: "string", value: char });
-        lastClosedControlParenthesis = false;
+        lastClosedStatementBoundary = false;
         continue;
       }
       if (char === "`") {
         this.skipNestedTemplate();
         tokens.push({ type: "template", value: "`" });
-        lastClosedControlParenthesis = false;
+        lastClosedStatementBoundary = false;
         continue;
       }
       if (char === "/" && this.peekChar(1) === "/") {
@@ -4766,22 +4766,22 @@ var Lexer = class {
           isStart = false;
         }
         tokens.push({ type: KEYWORDS.has(value) ? "keyword" : "identifier", value });
-        lastClosedControlParenthesis = false;
+        lastClosedStatementBoundary = false;
         continue;
       }
       if (isDecimalDigit(char) || char === "." && isDecimalDigit(this.peekChar(1))) {
         const start2 = this.position();
         const value = this.scanNumber(start2);
         tokens.push({ type: "numeric", value });
-        lastClosedControlParenthesis = false;
+        lastClosedStatementBoundary = false;
         continue;
       }
       if (char === "{") {
         depth += 1;
         this.advance();
-        groupingStack.push({ value: "{" });
+        updateGroupingState(groupingStack, tokens[tokens.length - 1], "{", lastClosedStatementBoundary);
         tokens.push({ type: "punctuator", value: "{" });
-        lastClosedControlParenthesis = false;
+        lastClosedStatementBoundary = false;
         continue;
       }
       if (char === "}") {
@@ -4790,19 +4790,18 @@ var Lexer = class {
         if (depth === 0) {
           return;
         }
-        popGroupingContext(groupingStack, "{");
+        lastClosedStatementBoundary = updateGroupingState(groupingStack, tokens[tokens.length - 1], "}", lastClosedStatementBoundary);
         tokens.push({ type: "punctuator", value: "}" });
-        lastClosedControlParenthesis = false;
         continue;
       }
-      if (char === "/" && shouldRejectRegexLiteral(tokens[tokens.length - 1], lastClosedControlParenthesis, tokens)) {
+      if (char === "/" && shouldRejectRegexLiteral(tokens[tokens.length - 1], lastClosedStatementBoundary, tokens)) {
         if (!this.options.allowRegexLiterals) {
           this.syntaxError("Regular expression literals are not supported", this.position());
         }
         const start2 = this.position();
         const value = this.scanRegexLiteral(start2);
         tokens.push({ type: "regex", value });
-        lastClosedControlParenthesis = false;
+        lastClosedStatementBoundary = false;
         continue;
       }
       const punctuator = matchPunctuator(this.source, this.index);
@@ -4810,10 +4809,13 @@ var Lexer = class {
         const previousToken = tokens[tokens.length - 1];
         this.advanceBy(punctuator.length);
         tokens.push({ type: "punctuator", value: punctuator });
-        lastClosedControlParenthesis = updateGroupingState(
+        lastClosedStatementBoundary = updateGroupingState(
           groupingStack,
           previousToken,
-          punctuator
+          punctuator,
+          lastClosedStatementBoundary,
+          false,
+          tokens[tokens.length - 3]
         );
         continue;
       }
@@ -5084,7 +5086,7 @@ var Lexer = class {
     }
   }
   readSlashOrPunctuator(start) {
-    if (this.currentChar() === "/" && shouldRejectRegexLiteral(this.lastSignificantToken(), this.lastClosedControlParenthesis, this.tokens)) {
+    if (this.currentChar() === "/" && shouldRejectRegexLiteral(this.lastSignificantToken(), this.lastClosedStatementBoundary, this.tokens)) {
       if (!this.options.allowRegexLiterals) {
         this.syntaxError("Regular expression literals are not supported", start);
       }
@@ -5171,14 +5173,17 @@ var Lexer = class {
     };
     this.tokens.push(token);
     if (type === "punctuator") {
-      this.lastClosedControlParenthesis = updateGroupingState(
+      this.lastClosedStatementBoundary = updateGroupingState(
         this.groupingStack,
         previousToken,
-        value
+        value,
+        this.lastClosedStatementBoundary,
+        this.options.statementList === true,
+        this.tokens[this.tokens.length - 3]
       );
       return;
     }
-    this.lastClosedControlParenthesis = false;
+    this.lastClosedStatementBoundary = false;
   }
   currentChar() {
     return this.source[this.index] ?? "";
@@ -5380,7 +5385,7 @@ function matchPunctuator(source, index) {
     (punctuator) => source.startsWith(punctuator, index) && (punctuator !== "?." || !isDecimalDigit(source[index + 2] ?? ""))
   );
 }
-function shouldRejectRegexLiteral(previousToken, lastClosedControlParenthesis, tokens) {
+function shouldRejectRegexLiteral(previousToken, lastClosedStatementBoundary, tokens) {
   if (previousToken === void 0) {
     return true;
   }
@@ -5391,8 +5396,8 @@ function shouldRejectRegexLiteral(previousToken, lastClosedControlParenthesis, t
     if (previousToken.value === "of") return endsWithForOfSeparator(tokens);
     return !EXPRESSION_ENDING_KEYWORDS.has(previousToken.value);
   }
-  if (previousToken.value === ")") {
-    return lastClosedControlParenthesis;
+  if (previousToken.value === ")" || previousToken.value === "}") {
+    return lastClosedStatementBoundary;
   }
   return !isExpressionEndingPunctuator(previousToken.value);
 }
@@ -5425,11 +5430,11 @@ function endsWithForOfSeparator(tokens) {
   }
   return false;
 }
-function updateGroupingState(groupingStack, previousToken, punctuator) {
+function updateGroupingState(groupingStack, previousToken, punctuator, previousStatementBoundary, initialStatementList = false, beforePreviousToken) {
   if (punctuator === "(") {
     groupingStack.push({
       value: "(",
-      isControlCondition: previousToken?.type === "keyword" && CONTROL_FLOW_PAREN_KEYWORDS.has(previousToken.value)
+      isControlCondition: (previousToken?.type === "keyword" || previousToken?.type === "identifier") && (CONTROL_FLOW_PAREN_KEYWORDS.has(previousToken.value) || previousToken.value === "await" && beforePreviousToken?.type === "keyword" && beforePreviousToken.value === "for") && beforePreviousToken?.value !== "." && beforePreviousToken?.value !== "?."
     });
     return false;
   }
@@ -5438,7 +5443,13 @@ function updateGroupingState(groupingStack, previousToken, punctuator) {
     return false;
   }
   if (punctuator === "{") {
-    groupingStack.push({ value: "{" });
+    const parent = groupingStack[groupingStack.length - 1];
+    const closesStatement = previousToken === void 0 ? initialStatementList : previousStatementBoundary || ["{", ";"].includes(previousToken.value) && (parent === void 0 || parent.statementList === true) || previousToken.type === "keyword" && ["else", "do", "try", "finally"].includes(previousToken.value);
+    groupingStack.push({
+      value: "{",
+      closesStatement,
+      statementList: closesStatement || previousToken?.value === ")" || previousToken?.value === "=>" || previousToken?.value === "static"
+    });
     return false;
   }
   if (punctuator === ")") {
@@ -5449,8 +5460,7 @@ function updateGroupingState(groupingStack, previousToken, punctuator) {
     return false;
   }
   if (punctuator === "}") {
-    popGroupingContext(groupingStack, "{");
-    return false;
+    return popGroupingContext(groupingStack, "{")?.closesStatement === true;
   }
   return false;
 }
@@ -6621,7 +6631,7 @@ function parseModule(source, filename = "<input>", owner) {
   try {
     const result = assignIds(
       new Parser(
-        tokenize(source, { allowRegexLiterals: true, compilation }),
+        tokenize(source, { allowRegexLiterals: true, statementList: true, compilation }),
         source,
         compilation
       ).parseModule()
@@ -6645,7 +6655,7 @@ function parseExecutableModule(source, filename = "<input>", owner) {
   try {
     const result = assignIds(
       new Parser(
-        tokenize(source, { allowRegexLiterals: true, compilation }),
+        tokenize(source, { allowRegexLiterals: true, statementList: true, compilation }),
         source,
         compilation,
         "top-level",
@@ -6677,6 +6687,7 @@ function parseEvalScript(source, context = {}, owner) {
     const grammar = { await: false, yield: false, strict: context.strict === true };
     const parser = new Parser(tokenize(source, {
       allowRegexLiterals: true,
+      statementList: true,
       allowLegacyNumbers: true,
       allowLegacyEscapes: true,
       allowHtmlComments: true,
@@ -6720,8 +6731,8 @@ ${body}
 }`;
     const source = `${prefix} anonymous(${parameters}
 ) ${bodySource}`;
-    const createParser = (text) => new Parser(
-      tokenize(text, { allowRegexLiterals: true, allowLegacyNumbers: true, allowLegacyEscapes: true, allowHtmlComments: true, compilation }),
+    const createParser = (text, statementList = false) => new Parser(
+      tokenize(text, { allowRegexLiterals: true, statementList, allowLegacyNumbers: true, allowLegacyEscapes: true, allowHtmlComments: true, compilation }),
       text,
       compilation,
       kind,
@@ -6733,7 +6744,7 @@ ${body}
       false
     );
     createParser(parameterSource).parseDynamicParameters();
-    createParser(bodySource).parseDynamicBody();
+    createParser(bodySource, true).parseDynamicBody();
     const node = assignIds(createParser(source).parseDynamicExpression());
     if (source.includes("#")) validatePrivateNames(node);
     return node;