@ricsam/formula-engine 0.2.9 → 0.2.10

package/dist/cjs/parser/parser.cjs

@@ -75,6 +75,9 @@ class Parser {
       }
       if (token.type === "RBRACKET") {
         const nextToken = this.tokens.peekAhead(pos + 1);
+        if (nextToken?.type === "EXCLAMATION") {
+          return { isWorkbookReference: true };
+        }
         if (nextToken && nextToken.type === "IDENTIFIER") {
           let lookPos = pos + 2;
           while (lookPos < pos + 10) {
@@ -117,6 +120,10 @@ class Parser {
     }
     const workbookName = this.input.substring(workbookStartPos, workbookEndPos);
     this.tokens.consume();
+    if (this.tokens.match("EXCLAMATION")) {
+      this.tokens.consume();
+      return this.parseWorkbookQualifiedTableReference(workbookName, start);
+    }
     if (!this.tokens.match("IDENTIFIER")) {
       throw new ParseError("Expected sheet name after workbook reference", this.tokens.peek().position);
     }
@@ -179,6 +186,16 @@ class Parser {
       });
     }
   }
+  parseWorkbookQualifiedTableReference(workbookName, startPos) {
+    if (!this.tokens.match("IDENTIFIER")) {
+      throw new ParseError(`Expected table name after [${workbookName}]!`, this.tokens.peek().position);
+    }
+    const tableName = this.tokens.consume().value;
+    if (!this.tokens.match("LBRACKET")) {
+      throw new ParseError(`Workbook-qualified references without a sheet only support tables. Use [${workbookName}]!${tableName}[...] for tables or [${workbookName}]Sheet!A1 for sheet references`, this.tokens.peek().position);
+    }
+    return this.parseTableReference(tableName, startPos, { workbookName });
+  }
   parseBareColumnReference() {
     const startPos = this.tokens.peek().position.start;
     this.tokens.consume();
@@ -693,7 +710,8 @@ class Parser {
       sheetName: parsed.sheet
     });
   }
-  parseTableReference(tableName, startPos) {
+  parseTableReference(tableName, startPos, qualifiers) {
+    const { sheetName, workbookName } = qualifiers ?? {};
     this.tokens.consume();
     let selector;
     let cols;
@@ -891,6 +909,8 @@ class Parser {
     }
     return import_ast.createStructuredReferenceNode({
       tableName,
+      sheetName,
+      workbookName,
       cols,
       selector,
       isCurrentRow,
@@ -901,212 +921,7 @@ class Parser {
     });
   }
   parseTableReferenceWithSheet(tableName, sheetName, startPos) {
-    this.tokens.consume();
-    let selector;
-    let cols;
-    let isCurrentRow = false;
-    if (this.tokens.match("LBRACKET")) {
-      this.tokens.consume();
-      if (this.tokens.match("HASH")) {
-        this.tokens.consume();
-        if (!this.tokens.match("IDENTIFIER")) {
-          throw new ParseError("Expected selector name after #", this.tokens.peek().position);
-        }
-        const selectorName = this.tokens.consume().value;
-        selector = `#${selectorName}`;
-        if (!this.tokens.match("RBRACKET")) {
-          throw new ParseError("Expected ] after selector", this.tokens.peek().position);
-        }
-        this.tokens.consume();
-        if (this.tokens.match("COMMA")) {
-          this.tokens.consume();
-          if (!this.tokens.match("LBRACKET")) {
-            throw new ParseError("Expected [ after comma", this.tokens.peek().position);
-          }
-          this.tokens.consume();
-          if (!this.tokens.match("IDENTIFIER") && !this.tokens.match("FUNCTION") && !this.tokens.match("NUMBER") && !this.tokens.match("OPERATOR")) {
-            throw new ParseError("Expected column name", this.tokens.peek().position);
-          }
-          const colStart = this.parseColumnName();
-          if (this.tokens.match("COLON") && !this.tokens.peekAhead(1)?.type.match(/RBRACKET/)) {
-            this.tokens.consume();
-            if (!this.tokens.match("IDENTIFIER") && !this.tokens.match("FUNCTION") && !this.tokens.match("NUMBER") && !this.tokens.match("OPERATOR")) {
-              throw new ParseError("Expected end column name after :", this.tokens.peek().position);
-            }
-            const colEnd = this.parseColumnName();
-            cols = {
-              startCol: colStart,
-              endCol: colEnd
-            };
-          } else {
-            cols = {
-              startCol: colStart,
-              endCol: colStart
-            };
-          }
-          if (!this.tokens.match("RBRACKET")) {
-            throw new ParseError("Expected ] after column specification", this.tokens.peek().position);
-          }
-          this.tokens.consume();
-          if (this.tokens.match("COLON")) {
-            this.tokens.consume();
-            if (!this.tokens.match("LBRACKET")) {
-              throw new ParseError("Expected [ after : in column range", this.tokens.peek().position);
-            }
-            this.tokens.consume();
-            if (!this.tokens.match("IDENTIFIER") && !this.tokens.match("FUNCTION") && !this.tokens.match("NUMBER") && !this.tokens.match("OPERATOR")) {
-              throw new ParseError("Expected end column name", this.tokens.peek().position);
-            }
-            const colEnd = this.parseColumnName();
-            if (!this.tokens.match("RBRACKET")) {
-              throw new ParseError("Expected ] after end column name", this.tokens.peek().position);
-            }
-            this.tokens.consume();
-            cols = {
-              startCol: colStart,
-              endCol: colEnd
-            };
-          }
-        }
-        if (!this.tokens.match("RBRACKET")) {
-          throw new ParseError("Expected ] to close table reference", this.tokens.peek().position);
-        }
-        this.tokens.consume();
-      } else if (this.tokens.match("IDENTIFIER") || this.tokens.match("FUNCTION") || this.tokens.match("NUMBER") || this.tokens.match("OPERATOR")) {
-        const colStart = this.parseColumnName();
-        if (!this.tokens.match("RBRACKET")) {
-          throw new ParseError("Expected ] after column name", this.tokens.peek().position);
-        }
-        this.tokens.consume();
-        if (this.tokens.match("COLON")) {
-          this.tokens.consume();
-          if (!this.tokens.match("LBRACKET")) {
-            throw new ParseError("Expected [ before second column name", this.tokens.peek().position);
-          }
-          this.tokens.consume();
-          const colEnd = this.parseColumnName();
-          if (!this.tokens.match("RBRACKET")) {
-            throw new ParseError("Expected ] after second column name", this.tokens.peek().position);
-          }
-          this.tokens.consume();
-          if (!this.tokens.match("RBRACKET")) {
-            throw new ParseError("Expected ] to close table reference", this.tokens.peek().position);
-          }
-          this.tokens.consume();
-          cols = {
-            startCol: colStart,
-            endCol: colEnd
-          };
-        } else {
-          if (!this.tokens.match("RBRACKET")) {
-            throw new ParseError("Expected ] to close table reference", this.tokens.peek().position);
-          }
-          this.tokens.consume();
-          cols = {
-            startCol: colStart,
-            endCol: colStart
-          };
-        }
-      }
-    } else if (this.tokens.match("AT")) {
-      this.tokens.consume();
-      isCurrentRow = true;
-      if (this.tokens.match("LBRACKET")) {
-        this.tokens.consume();
-        const colStart = this.parseColumnName();
-        if (!this.tokens.match("RBRACKET")) {
-          throw new ParseError("Expected ] after column name", this.tokens.peek().position);
-        }
-        this.tokens.consume();
-        if (this.tokens.match("COLON")) {
-          this.tokens.consume();
-          if (!this.tokens.match("LBRACKET")) {
-            throw new ParseError("Expected [ before second column name", this.tokens.peek().position);
-          }
-          this.tokens.consume();
-          const colEnd = this.parseColumnName();
-          if (!this.tokens.match("RBRACKET")) {
-            throw new ParseError("Expected ] after second column name", this.tokens.peek().position);
-          }
-          this.tokens.consume();
-          cols = {
-            startCol: colStart,
-            endCol: colEnd
-          };
-        } else {
-          cols = {
-            startCol: colStart,
-            endCol: colStart
-          };
-        }
-        if (!this.tokens.match("RBRACKET")) {
-          throw new ParseError("Expected ] to close table reference", this.tokens.peek().position);
-        }
-        this.tokens.consume();
-      } else {
-        const colStart = this.parseColumnName();
-        if (this.tokens.match("COLON")) {
-          this.tokens.consume();
-          const colEnd = this.parseColumnName();
-          cols = {
-            startCol: colStart,
-            endCol: colEnd
-          };
-        } else {
-          cols = {
-            startCol: colStart,
-            endCol: colStart
-          };
-        }
-        if (!this.tokens.match("RBRACKET")) {
-          throw new ParseError("Expected ] after column reference", this.tokens.peek().position);
-        }
-        this.tokens.consume();
-      }
-    } else if (this.tokens.match("IDENTIFIER") || this.tokens.match("FUNCTION") || this.tokens.match("NUMBER") || this.tokens.match("OPERATOR")) {
-      const colStart = this.parseColumnName();
-      if (this.tokens.match("COLON")) {
-        this.tokens.consume();
-        const colEnd = this.parseColumnName();
-        cols = {
-          startCol: colStart,
-          endCol: colEnd
-        };
-      } else {
-        cols = {
-          startCol: colStart,
-          endCol: colStart
-        };
-      }
-      if (!this.tokens.match("RBRACKET")) {
-        throw new ParseError("Expected ] after column name", this.tokens.peek().position);
-      }
-      this.tokens.consume();
-    } else if (this.tokens.match("HASH")) {
-      this.tokens.consume();
-      if (!this.tokens.match("IDENTIFIER")) {
-        throw new ParseError("Expected selector name after #", this.tokens.peek().position);
-      }
-      const selectorName = this.tokens.consume().value;
-      selector = `#${selectorName}`;
-      if (!this.tokens.match("RBRACKET")) {
-        throw new ParseError("Expected ] after selector", this.tokens.peek().position);
-      }
-      this.tokens.consume();
-    } else {
-      throw new ParseError("Expected column name or selector in table reference", this.tokens.peek().position);
-    }
-    return import_ast.createStructuredReferenceNode({
-      tableName,
-      sheetName,
-      cols,
-      selector,
-      isCurrentRow,
-      position: {
-        start: startPos,
-        end: this.tokens.peek().position?.end ?? 0
-      }
-    });
+    return this.parseTableReference(tableName, startPos, { sheetName });
   }
   parseCellOrRangeAfterSheets() {
     const start = this.tokens.peek().position?.start ?? 0;
@@ -1280,13 +1095,6 @@ class Parser {
     rangeNode.workbookName = workbookName;
     return rangeNode;
   }
-  parseTableReferenceWithWorkbookAndSheet(tableName, workbookName, sheetName, startPos) {
-    const tableRef = this.parseTableReferenceWithSheet(tableName, sheetName, startPos);
-    if (tableRef.type === "structured-reference") {
-      tableRef.workbookName = workbookName;
-    }
-    return tableRef;
-  }
   parseRange(startRef, endRef, startPos, endPos) {
     let fullRange = `${startRef}:${endRef}`;
     let sheetName;
@@ -1598,7 +1406,7 @@ class Parser {
       const identifier2 = this.tokens.consume();
       ref += identifier2.value;
       if (this.tokens.match("LBRACKET")) {
-        return this.parseTableReferenceWithWorkbookAndSheet(identifier2.value, workbookName, sheetName, startPos);
+        throw new ParseError(`Cross-workbook table references use [${workbookName}]!${identifier2.value}[...] instead of [${workbookName}]${sheetName}!${identifier2.value}[...]`, this.tokens.peek().position);
       }
       if (this.tokens.match("COLON")) {
         this.tokens.consume();
@@ -1707,4 +1515,4 @@ function parseFormula(formula) {
   return Parser.parse(formula);
 }
 
-//# debugId=BE109E0931441DC764756E2164756E21
+//# debugId=B6F0346D15B1EFC164756E2164756E21