@poe-platform/safe-js 0.1.582 → 0.1.584

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;
@@ -4536,8 +4536,8 @@ var Lexer = class {
   line = 1;
   column = 1;
   tokens = [];
-  groupingStack = [];
-  lastClosedControlParenthesis = false;
+  groupingState = { stack: [], classHeads: [], tokenCount: 0 };
+  lastClosedStatementBoundary = false;
   legacyStringEscape = false;
   lineHasToken = false;
   tokenize() {
@@ -4709,8 +4709,8 @@ var Lexer = class {
   skipTemplateExpression(start) {
     let depth = 1;
     const tokens = [];
-    const groupingStack = [];
-    let lastClosedControlParenthesis = false;
+    const groupingState = { stack: [], classHeads: [], tokenCount: 0 };
+    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,23 @@ 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: "{" });
+        const previousToken = tokens[tokens.length - 1];
         tokens.push({ type: "punctuator", value: "{" });
-        lastClosedControlParenthesis = false;
+        updateGroupingState(groupingState, previousToken, "{", lastClosedStatementBoundary, false, tokens);
+        lastClosedStatementBoundary = false;
         continue;
       }
       if (char === "}") {
@@ -4790,19 +4791,19 @@ var Lexer = class {
         if (depth === 0) {
           return;
         }
-        popGroupingContext(groupingStack, "{");
+        const previousToken = tokens[tokens.length - 1];
         tokens.push({ type: "punctuator", value: "}" });
-        lastClosedControlParenthesis = false;
+        lastClosedStatementBoundary = updateGroupingState(groupingState, previousToken, "}", lastClosedStatementBoundary, false, tokens);
         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 +4811,13 @@ var Lexer = class {
         const previousToken = tokens[tokens.length - 1];
         this.advanceBy(punctuator.length);
         tokens.push({ type: "punctuator", value: punctuator });
-        lastClosedControlParenthesis = updateGroupingState(
-          groupingStack,
+        lastClosedStatementBoundary = updateGroupingState(
+          groupingState,
           previousToken,
-          punctuator
+          punctuator,
+          lastClosedStatementBoundary,
+          false,
+          tokens
         );
         continue;
       }
@@ -5084,7 +5088,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 +5175,17 @@ var Lexer = class {
     };
     this.tokens.push(token);
     if (type === "punctuator") {
-      this.lastClosedControlParenthesis = updateGroupingState(
-        this.groupingStack,
+      this.lastClosedStatementBoundary = updateGroupingState(
+        this.groupingState,
         previousToken,
-        value
+        value,
+        this.lastClosedStatementBoundary,
+        this.options.statementList === true,
+        this.tokens
       );
       return;
     }
-    this.lastClosedControlParenthesis = false;
+    this.lastClosedStatementBoundary = false;
   }
   currentChar() {
     return this.source[this.index] ?? "";
@@ -5380,7 +5387,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 +5398,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 +5432,39 @@ function endsWithForOfSeparator(tokens) {
   }
   return false;
 }
-function updateGroupingState(groupingStack, previousToken, punctuator) {
+function updateGroupingState(state, previousToken, punctuator, previousStatementBoundary, initialStatementList, tokens) {
+  const groupingStack = state.stack;
+  const functionBody = state.functionBody;
+  state.functionBody = false;
+  for (let index = state.tokenCount; index < tokens.length; index++) {
+    const token = tokens[index];
+    if (token.type !== "keyword" || token.value !== "class") continue;
+    const before = tokens[index - 1];
+    if (before?.value === "." || before?.value === "?.") continue;
+    const next = tokens[index + 1]?.value;
+    const afterName = tokens[index + 2]?.value;
+    if (next !== "{" && next !== "extends" && afterName !== "{" && afterName !== "extends") continue;
+    const parent = groupingStack[groupingStack.length - 1];
+    if (parent?.classBody && (before === void 0 || ["{", "}", ";", "static"].includes(before.value) || ["identifier", "numeric", "string", "template", "regex"].includes(before.type))) continue;
+    state.classHeads.push({
+      depth: groupingStack.length,
+      declaration: isDeclarationPosition(tokens, index, groupingStack, initialStatementList)
+    });
+  }
+  state.tokenCount = tokens.length;
+  const beforePreviousToken = tokens[tokens.length - 3];
   if (punctuator === "(") {
+    let functionIndex = tokens.length - 2;
+    if (tokens[functionIndex]?.value !== "function") {
+      if (tokens[functionIndex]?.value !== "*") functionIndex--;
+      if (tokens[functionIndex]?.value === "*") functionIndex--;
+    }
+    const functionParameters = tokens[functionIndex]?.type === "keyword" && tokens[functionIndex].value === "function";
+    const functionDeclaration = functionParameters && isDeclarationPosition(tokens, functionIndex, groupingStack, initialStatementList);
     groupingStack.push({
       value: "(",
-      isControlCondition: previousToken?.type === "keyword" && CONTROL_FLOW_PAREN_KEYWORDS.has(previousToken.value)
+      functionParameters,
+      isControlCondition: functionDeclaration || (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,22 +5473,42 @@ function updateGroupingState(groupingStack, previousToken, punctuator) {
     return false;
   }
   if (punctuator === "{") {
-    groupingStack.push({ value: "{" });
+    const classHead = state.classHeads[state.classHeads.length - 1];
+    if (!functionBody && previousToken?.value !== "=>" && classHead?.depth === groupingStack.length) {
+      state.classHeads.pop();
+      groupingStack.push({ value: "{", classBody: true, closesStatement: classHead.declaration });
+      return false;
+    }
+    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 === ")") {
-    return popGroupingContext(groupingStack, "(")?.isControlCondition === true;
+    const group = popGroupingContext(groupingStack, "(");
+    state.functionBody = group?.functionParameters === true;
+    return group?.isControlCondition === true;
   }
   if (punctuator === "]") {
     popGroupingContext(groupingStack, "[");
     return false;
   }
   if (punctuator === "}") {
-    popGroupingContext(groupingStack, "{");
-    return false;
+    return popGroupingContext(groupingStack, "{")?.closesStatement === true;
   }
   return false;
 }
+function isDeclarationPosition(tokens, index, groupingStack, initialStatementList) {
+  const parent = groupingStack[groupingStack.length - 1];
+  if (parent === void 0 ? !initialStatementList : parent.statementList !== true) return false;
+  if (tokens[index - 1]?.value === "async") index--;
+  const previous = tokens[index - 1];
+  return previous === void 0 || ["{", "}", ";", ")", "]", "export", "default"].includes(previous.value) || ["identifier", "numeric", "string", "template", "regex"].includes(previous.type) || previous.type === "keyword" && EXPRESSION_ENDING_KEYWORDS.has(previous.value);
+}
 function popGroupingContext(groupingStack, expected) {
   const top = groupingStack[groupingStack.length - 1];
   if (top?.value !== expected) {
@@ -6621,7 +6676,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 +6700,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 +6732,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 +6776,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 +6789,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;