@arcgis/arcade-languageservice 5.1.0-next.9 → 5.1.0-next.90

package/dist/index.d.ts

@@ -152,7 +152,7 @@ declare interface CallExpression extends NodeBase<typeof NodeTypes.CallExpressio
      * Example: foo(1, 2, 3)
      * The callee is foo.
      */
-    callee: Identifier | MemberExpression | SafeMemberExpression;
+    callee: Expression;
     /**
      * The arguments of the call expression.
      * Example: foo(1, 2, 3)

package/dist/index.js

@@ -1,6 +1,6 @@
-import { CompletionItemKind as g, InsertTextFormat as B, InsertTextMode as S, DiagnosticSeverity as A } from "vscode-languageserver-types";
+import { CompletionItemKind as x, InsertTextFormat as B, InsertTextMode as S, DiagnosticSeverity as A } from "vscode-languageserver-types";
 import { DiagnosticSeverity as fi } from "vscode-languageserver-types";
-import { isDictionaryVariable as Je, isValueVariable as Ee, ApiService as Qe } from "@arcgis/languages-api-utils";
+import { isDictionaryVariable as Ge, isValueVariable as Ee, ApiService as Je } from "@arcgis/languages-api-utils";
 const V = {
   False: "false",
   Null: "null",
@@ -58,7 +58,7 @@ const V = {
   VariableDeclaration: "VariableDeclaration",
   VariableDeclarator: "VariableDeclarator",
   WhileStatement: "WhileStatement"
-}, ue = ["++", "--"], Ne = ["-", "+", "!", "~"], Me = ["=", "/=", "*=", "%=", "+=", "-="], Ue = ["||", "&&"], Ze = [
+}, ue = ["++", "--"], Ne = ["-", "+", "!", "~"], Me = ["=", "/=", "*=", "%=", "+=", "-="], Ue = ["||", "&&"], Qe = [
   "|",
   "&",
   ">>",
@@ -188,22 +188,22 @@ class z extends Error {
     );
   }
 }
-function Xe(n) {
+function Ze(n) {
   return !!n && typeof n == "object" && "type" in n && n.type === u.Program;
 }
-function I(n) {
+function b(n) {
   return !!n && typeof n == "object" && "type" in n && n.type === u.BlockStatement;
 }
-function Ye(n) {
+function Xe(n) {
   return !!n && typeof n == "object" && "type" in n && n.type === u.BlockComment;
 }
 function pe(n) {
   return !!n && typeof n == "object" && "type" in n && n.type === u.EmptyStatement;
 }
-function et(n) {
+function Ye(n) {
   return !!n && typeof n == "object" && "type" in n && n.type === u.ExpressionStatement;
 }
-function xe(n) {
+function ge(n) {
   return !!n && typeof n == "object" && "type" in n && n.type === u.FunctionDeclaration;
 }
 function ae(n) {
@@ -218,7 +218,7 @@ function J(n) {
 function oe(n) {
   return !!n && typeof n == "object" && "type" in n && n.type === u.BinaryExpression;
 }
-function b(n) {
+function I(n) {
   return !!n && typeof n == "object" && "type" in n && n.type === u.Identifier;
 }
 function ze(n) {
@@ -227,28 +227,28 @@ function ze(n) {
 function ce(n) {
   return !!n && typeof n == "object" && "type" in n && n.type === u.LogicalExpression;
 }
-function ge(n) {
+function xe(n) {
   return !!n && typeof n == "object" && "type" in n && n.type === u.ObjectExpression;
 }
 function Fe(n) {
   return !!n && typeof n == "object" && "type" in n && n.type === u.MemberExpression;
 }
-function tt(n) {
+function et(n) {
   return !!n && typeof n == "object" && "type" in n && n.type === u.SafeMemberExpression;
 }
-function it(n) {
+function tt(n) {
   return !!n && typeof n == "object" && "type" in n && n.type === u.MemberAccessChainExpression;
 }
-function nt(n) {
+function it(n) {
   return !!n && typeof n == "object" && "type" in n && n.type === u.UnaryExpression;
 }
-function rt(n) {
+function nt(n) {
   return !!n && typeof n == "object" && "type" in n && n.type === u.UpdateExpression;
 }
 function Ve(n) {
   return !!n && typeof n == "object" && "type" in n && n.type === u.VariableDeclarator;
 }
-function st(n) {
+function rt(n) {
   return !!n && typeof n == "object" && "type" in n && n.type === u.Property;
 }
 function ie(n, e) {
@@ -257,12 +257,12 @@ function ie(n, e) {
 function Ae(n, e) {
   return n.range[0] >= e.range[0] && n.range[1] <= e.range[1];
 }
-class ut {
+class st {
   constructor() {
     this.comments = [], this._nodeStack = [], this._newComments = [];
   }
   insertInnerComments(e) {
-    if (!I(e) || e.body.length !== 0)
+    if (!b(e) || e.body.length !== 0)
       return;
     const t = [];
     for (let i = this._newComments.length - 1; i >= 0; i--) {
@@ -275,7 +275,7 @@ class ut {
     const t = this._nodeStack.at(-1);
     if (!t)
       return;
-    if (I(e) && Ae(t, e))
+    if (b(e) && Ae(t, e))
       for (let r = this._newComments.length - 1; r >= 0; r--) {
         const s = this._newComments[r];
         Ae(s, e) && (t.trailingComments = [...t.trailingComments ?? [], s], this._newComments.splice(r, 1));
@@ -312,7 +312,7 @@ class ut {
           i.unshift(a), t.leadingComments.splice(s, 1);
           continue;
         }
-        Ve(e) && !Ye(a) && (r.unshift(a), t.leadingComments.splice(s, 1));
+        Ve(e) && !Xe(a) && (r.unshift(a), t.leadingComments.splice(s, 1));
       }
       t.leadingComments.length === 0 && delete t.leadingComments, i.length && (e.leadingComments = i), r.length && (e.trailingComments = [...r, ...e.trailingComments ?? []]);
       return;
@@ -324,7 +324,7 @@ class ut {
     i.length && (e.leadingComments = i);
   }
   attachComments(e) {
-    if (Xe(e) && e.body.length > 0) {
+    if (Ze(e) && e.body.length > 0) {
       const t = this._nodeStack.at(-1);
       if (t) {
         t.trailingComments = [...t.trailingComments ?? [], ...this._newComments], this._newComments.length = 0, this._nodeStack.pop();
@@ -339,10 +339,10 @@ class ut {
     this.comments.push(e), this._newComments.push(e);
   }
 }
-const at = /\$\{(.*?)\}/gu;
+const ut = /\$\{(.*?)\}/gu;
 function he(n, e) {
   const t = je[n];
-  return e ? t.replace(at, (i, r) => e[r]?.toString() ?? "") : t;
+  return e ? t.replace(ut, (i, r) => e[r]?.toString() ?? "") : t;
 }
 class _e {
   constructor(e = !1) {
@@ -450,7 +450,7 @@ ue.forEach((n) => N[n.length - 1].push(n));
 Ne.forEach((n) => N[n.length - 1].push(n));
 Ue.forEach((n) => N[n.length - 1].push(n));
 Me.forEach((n) => N[n.length - 1].push(n));
-Ze.forEach((n) => N[n.length - 1].push(n));
+Qe.forEach((n) => N[n.length - 1].push(n));
 N[w.length - 1].push(w);
 class $e {
   constructor(e, t) {
@@ -993,11 +993,11 @@ const y = {
   AsObject: 0,
   Automatic: 1
 };
-function be(n, e = 0) {
+function Ie(n, e = 0) {
   let t = n.start - n.lineStart, i = n.lineNumber;
   return t < 0 && (t += e, i -= 1), { index: n.start, line: i, column: t };
 }
-function Ie(n) {
+function be(n) {
   return [
     { index: n.range[0], ...n.loc.start },
     { index: n.range[1], ...n.loc.end }
@@ -1006,13 +1006,13 @@ function Ie(n) {
 function we(n) {
   return n in q ? q[n] : 0;
 }
-class ot {
+class at {
   constructor(e, t = {}, i) {
     this.delegate = i, this.hasLineTerminator = !1, this.options = {
       tokens: typeof t.tokens == "boolean" && t.tokens,
       comments: typeof t.comments == "boolean" && t.comments,
       tolerant: typeof t.tolerant == "boolean" && t.tolerant
-    }, this.options.comments && (this.commentHandler = new ut()), this.errorHandler = new _e(this.options.tolerant), this.scanner = new $e(e, this.errorHandler), this.context = {
+    }, this.options.comments && (this.commentHandler = new st()), this.errorHandler = new _e(this.options.tolerant), this.scanner = new $e(e, this.errorHandler), this.context = {
       isAssignmentTarget: !1,
       blockContext: y.None,
       curlyParsingType: re.AsObject
@@ -1079,11 +1079,11 @@ class ot {
     i ??= h.UnexpectedToken, r ??= { value: s };
     const a = he(i, r);
     if (t) {
-      const d = t.start, C = t.lineNumber, F = t.start - t.lineStart + 1;
+      const d = t.start, E = t.lineNumber, F = t.start - t.lineStart + 1;
       return new z({
         code: i,
         index: d,
-        line: C,
+        line: E,
         column: F,
         len: t.end - t.start - 1,
         data: r,
@@ -1421,50 +1421,48 @@ class ot {
   }
   parseLeftHandSideExpression() {
     const e = this.captureStartMarker();
-    let t = this.inheritCoverGrammar(this.parsePrimaryExpression.bind(this));
-    const i = this.captureStartMarker();
-    let r = !1, s;
-    for (; s = this.getMatchingPunctuator(["(", "[", ".", w]); ) {
-      let a = !1;
-      switch (s === w && (r = !0, a = !0, this.expectPunctuator(w), this.getMatchingPunctuator("[") ? s = "[" : s = "."), s) {
+    let t = this.inheritCoverGrammar(this.parsePrimaryExpression.bind(this)), i = !1, r;
+    for (; r = this.getMatchingPunctuator(["(", "[", ".", w]); ) {
+      let s = !1;
+      switch (r === w && (i = !0, s = !0, this.expectPunctuator(w), this.getMatchingPunctuator("[") ? r = "[" : r = "."), r) {
         case "(": {
-          this.context.isAssignmentTarget = !1, t.type !== u.Identifier && t.type !== u.MemberExpression && t.type !== u.SafeMemberExpression && this.throwError(h.IdentifierExpected, e, i);
-          const o = this.parseArguments();
+          this.context.isAssignmentTarget = !1;
+          const a = this.parseArguments();
           t = this.finalize({
             type: u.CallExpression,
             callee: t,
-            arguments: o,
+            arguments: a,
             ...this.getItemLocation(e)
           });
           continue;
         }
         case "[": {
-          this.context.isAssignmentTarget = !a, this.expectPunctuator("[");
-          const o = this.isolateCoverGrammar(() => this.parseExpression());
+          this.context.isAssignmentTarget = !s, this.expectPunctuator("[");
+          const a = this.isolateCoverGrammar(() => this.parseExpression());
           this.expectPunctuator("]"), t = this.finalize({
-            type: a ? u.SafeMemberExpression : u.MemberExpression,
+            type: s ? u.SafeMemberExpression : u.MemberExpression,
             computed: !0,
             object: t,
-            property: o,
+            property: a,
             ...this.getItemLocation(e)
           });
           continue;
         }
         case ".": {
-          this.context.isAssignmentTarget = !a, a || this.expectPunctuator(".");
-          const o = this.parseMemberName();
+          this.context.isAssignmentTarget = !s, s || this.expectPunctuator(".");
+          const a = this.parseMemberName();
           t = this.finalize({
-            type: a ? u.SafeMemberExpression : u.MemberExpression,
+            type: s ? u.SafeMemberExpression : u.MemberExpression,
             computed: !1,
             object: t,
-            property: o,
+            property: a,
             ...this.getItemLocation(e)
           });
           continue;
         }
       }
     }
-    return r ? this.finalize({
+    return i ? this.finalize({
       type: u.MemberAccessChainExpression,
       expression: t,
       ...this.getItemLocation(e)
@@ -1529,27 +1527,27 @@ class ot {
         o = c.pop();
         const k = c.pop();
         d.pop(), a = c.pop(), s.pop();
-        const R = s[s.length - 1], ee = be(R, R.lineStart);
+        const R = s[s.length - 1], ee = Ie(R, R.lineStart);
         c.push(this.finalize(this.createBinaryOrLogicalExpression(ee, k, a, o)));
       }
       c.push(this.rawToken.value), d.push(r), s.push(this.rawToken), this.readNextRawToken(), c.push(this.inheritCoverGrammar(this.parseUnaryExpression.bind(this)));
     }
-    let C = c.length - 1;
-    t = c[C];
+    let E = c.length - 1;
+    t = c[E];
     let F = s.pop();
-    for (; C > 1; ) {
+    for (; E > 1; ) {
       const k = s.pop();
       if (!k)
         break;
-      const R = F?.lineStart, ee = be(k, R), Ge = c[C - 1];
+      const R = F?.lineStart, ee = Ie(k, R), qe = c[E - 1];
       t = this.finalize(
-        this.createBinaryOrLogicalExpression(ee, Ge, c[C - 2], t)
-      ), C -= 2, F = k;
+        this.createBinaryOrLogicalExpression(ee, qe, c[E - 2], t)
+      ), E -= 2, F = k;
     }
     return t;
   }
   createBinaryOrLogicalExpression(e, t, i, r) {
-    return Ue.includes(t) ? ((i.type === u.AssignmentExpression || i.type === u.UpdateExpression) && this.throwError(h.InvalidExpression, ...Ie(i)), (r.type === u.AssignmentExpression || r.type === u.UpdateExpression) && this.throwError(h.InvalidExpression, ...Ie(i)), {
+    return Ue.includes(t) ? ((i.type === u.AssignmentExpression || i.type === u.UpdateExpression) && this.throwError(h.InvalidExpression, ...be(i)), (r.type === u.AssignmentExpression || r.type === u.UpdateExpression) && this.throwError(h.InvalidExpression, ...be(i)), {
       type: u.LogicalExpression,
       operator: t,
       left: i,
@@ -1703,20 +1701,20 @@ class ot {
     if (this.expectKeyword(f.For), this.expectPunctuator("("), this.matchKeyword(f.Var)) {
       const d = this.captureStartMarker();
       this.readNextRawToken();
-      const C = this.parseVariableDeclarators();
+      const E = this.parseVariableDeclarators();
       t = this.finalize({
         type: u.VariableDeclaration,
-        declarations: C,
+        declarations: E,
         kind: "var",
         ...this.getItemLocation(d)
       });
       const F = this.matchKeyword(f.In), k = this.matchContextualKeyword(te.Of);
-      C.length === 1 && (F || k) && (C[0].init && this.throwError(h.ForInOfLoopInitializer, d), e = F ? u.ForInStatement : u.ForOfStatement, s = t);
+      E.length === 1 && (F || k) && (E[0].init && this.throwError(h.ForInOfLoopInitializer, d), e = F ? u.ForInStatement : u.ForOfStatement, s = t);
     } else if (!this.matchPunctuator(";")) {
-      const d = this.context.isAssignmentTarget, C = this.captureStartMarker();
+      const d = this.context.isAssignmentTarget, E = this.captureStartMarker();
       t = this.inheritCoverGrammar(this.parseAssignmentExpression.bind(this));
       const F = this.matchKeyword(f.In), k = this.matchContextualKeyword(te.Of);
-      F || k ? (this.context.isAssignmentTarget || this.tolerateError(h.InvalidLeftHandSideInForIn, C), t.type !== u.Identifier && this.throwError(h.InvalidLeftHandSideInForIn, C), e = F ? u.ForInStatement : u.ForOfStatement, s = t) : this.context.isAssignmentTarget = d;
+      F || k ? (this.context.isAssignmentTarget || this.tolerateError(h.InvalidLeftHandSideInForIn, E), t.type !== u.Identifier && this.throwError(h.InvalidLeftHandSideInForIn, E), e = F ? u.ForInStatement : u.ForOfStatement, s = t) : this.context.isAssignmentTarget = d;
     }
     e === u.ForStatement ? (this.expectPunctuator(";"), i = this.matchPunctuator(";") ? null : this.isolateCoverGrammar(this.parseExpression.bind(this)), this.expectPunctuator(";"), r = this.matchPunctuator(")") ? null : this.isolateCoverGrammar(this.parseExpression.bind(this))) : (this.readNextRawToken(), a = this.parseExpression()), this.expectPunctuator(")");
     const c = this.withBlockContext(
@@ -1871,7 +1869,7 @@ class ot {
     });
   }
 }
-class ct {
+class ot {
   constructor(e, t) {
     this.errorHandler = new _e(), this.errorHandler.tolerant = t ? typeof t.tolerant == "boolean" && t.tolerant : !1, this.scanner = new $e(e, this.errorHandler), this.trackComments = t ? typeof t.comment == "boolean" && t.comment : !1, this.buffer = [];
   }
@@ -1912,10 +1910,10 @@ class ct {
   }
 }
 function Re(n, e, t) {
-  return new ot(n, e, t).parseScript();
+  return new at(n, e, t).parseScript();
 }
-function ht(n, e, t) {
-  const i = new ct(n, e), r = [];
+function ct(n, e, t) {
+  const i = new ot(n, e), r = [];
   let s;
   try {
     let a;
@@ -1948,7 +1946,7 @@ const p = {
   UnexpectedEmptyFunction: "UnexpectedEmptyFunction",
   UnexpectedPropertyIdentifier: "UnexpectedPropertyIdentifier",
   UnknownPropertyIdentifier: "UnknownPropertyIdentifier"
-}, lt = {
+}, ht = {
   [p.AlreadyDefined]: "'${identifier}' is already defined.",
   [p.ApiConflict]: "'${identifier}' is already defined as an Arcade constant or function.",
   [p.AssignedNeverUsed]: "'${identifier}' is assigned but never used.",
@@ -1975,19 +1973,19 @@ const p = {
 function Q(n, e) {
   return n.line - e.line || n.column - e.column;
 }
-function Dt(n, e) {
+function lt(n, e) {
   const t = {
     start: n.loc.start,
     end: n.loc.end
-  }, i = (r) => pt(t, r.loc);
+  }, i = (r) => Dt(t, r.loc);
   return Q(t.start, t.end) < 0 && (t.start = { ...t.start }, e.skipSpaces(t.start), Q(t.start, t.end) < 0 && (t.end = { ...t.end }, e.skipSpaces(t.end, !0))), n.leadingComments?.forEach(i), n.trailingComments?.forEach(i), t;
 }
-function pt(n, e) {
+function Dt(n, e) {
   Q(e.start, n.start) < 0 && (n.start = e.start), Q(n.end, e.end) < 0 && (n.end = e.end);
 }
-const dt = /\S/u;
+const pt = /\S/u;
 function W(n = "") {
-  return !dt.test(n);
+  return !pt.test(n);
 }
 const se = {
   indentWidth: 2,
@@ -2001,7 +1999,7 @@ function de(n) {
     quote: n?.quote ?? se.quote
   };
 }
-const mt = /^\s*/u, ft = /\u000D\u000A|\u000D(?!\u000A)|\u000A|\u2028|\u2029/u;
+const dt = /^\s*/u, mt = /\u000D\u000A|\u000D(?!\u000A)|\u000A|\u2028|\u2029/u;
 class Z {
   // private cachedIndentWidth: number | void = void 0;
   constructor(e) {
@@ -2013,11 +2011,11 @@ class Z {
       return e;
     const i = t?.indentWidth;
     return new Z(
-      e.split(ft).map((s) => {
-        const a = mt.exec(s)?.[0] ?? "";
+      e.split(mt).map((s) => {
+        const a = dt.exec(s)?.[0] ?? "";
         return {
           line: s,
-          indentation: Ct(a, i),
+          indentation: ft(a, i),
           // Boolean indicating whether this line can be re-indented.
           locked: !1,
           sliceStart: a.length,
@@ -2118,7 +2116,7 @@ class Z {
 `);
   }
 }
-function Ct(n, e = 2) {
+function ft(n, e = 2) {
   let t = 0;
   const i = n.length;
   for (let r = 0; r < i; r++)
@@ -2136,7 +2134,6 @@ function Ct(n, e = 2) {
       // '\r'
       case 65279:
         break;
-      case 32:
       // ' '
       default:
         t += 1;
@@ -2157,13 +2154,13 @@ function O(n, e, t) {
 function ke(n, e, t) {
   return !n && !t ? "" : n ? t ? `${n}${e}${t}` : n : t;
 }
-const Et = /\u000D\u000A|\u000D(?!\u000A)|\u000A|\u2028|\u2029/u;
+const Ct = /\u000D\u000A|\u000D(?!\u000A)|\u000A|\u2028|\u2029/u;
 class D {
   constructor(e = []) {
     this.lines = e;
   }
   static fromString(e) {
-    return new D(e.split(Et));
+    return new D(e.split(Ct));
   }
   /**
    * Append the elements lines together into a new FormattedLines.
@@ -2252,10 +2249,10 @@ function M(n = 0, e) {
 function K(n) {
   return n.replace(/['"]/gu, (e) => e === '"' ? "'" : '"');
 }
-function xt(n, e) {
+function Et(n, e) {
   switch (n.type) {
     case u.UnaryExpression:
-      return (Fe(e) || tt(e)) && e.object === n;
+      return (Fe(e) || et(e)) && e.object === n;
     case u.BinaryExpression:
     case u.LogicalExpression:
       switch (e.type) {
@@ -2297,7 +2294,7 @@ function xt(n, e) {
       return !1;
   }
 }
-function E(n, e, t) {
+function C(n, e, t) {
   switch (n?.type) {
     case u.BinaryExpression:
     case u.LogicalExpression:
@@ -2306,11 +2303,11 @@ function E(n, e, t) {
       return new fe(n, e, t);
     case u.MemberExpression:
     case u.SafeMemberExpression:
-      return new He(n, e, t);
+      return new At(n, e, t);
     case u.Identifier:
       return new le(n, e, t);
     case u.CallExpression:
-      return new At(n, e, t);
+      return new Ft(n, e, t);
     case u.ObjectExpression:
       return U(n, e, t);
     case u.ArrayExpression:
@@ -2334,7 +2331,7 @@ function U(n, e, t) {
   switch (n.type) {
     case u.ArrayExpression:
       return i.setupCollection(
-        n.elements.map((r) => E(r, n, t)),
+        n.elements.map((r) => C(r, n, t)),
         "SquareBrackets"
       ), i;
     case u.ObjectExpression:
@@ -2349,15 +2346,15 @@ function U(n, e, t) {
       ), i;
     case u.FunctionDeclaration:
       return i.prefix = `function ${n.id.name}`, i.setupCollection(
-        n.params.map((r) => E(r, n, t)),
+        n.params.map((r) => C(r, n, t)),
         "Parentheses"
       ), i;
     case u.ForStatement:
       return i.prefix = "for ", i.setupCollection(
         [
-          E(n.init, n, t),
-          E(n.test, n, t),
-          E(n.update, n, t)
+          C(n.init, n, t),
+          C(n.test, n, t),
+          C(n.update, n, t)
         ],
         "Parentheses",
         ";"
@@ -2366,9 +2363,9 @@ function U(n, e, t) {
     case u.ForOfStatement:
       return i.prefix = "for ", i.setupCollection([new fe(n, e, t)], "Parentheses", ""), i;
     case u.IfStatement:
-      return i.prefix = "if ", i.setupCollection([E(n.test, n, t)], "Parentheses", ""), i;
+      return i.prefix = "if ", i.setupCollection([C(n.test, n, t)], "Parentheses", ""), i;
     case u.WhileStatement:
-      return i.prefix = "while ", i.setupCollection([E(n.test, n, t)], "Parentheses", ""), i;
+      return i.prefix = "while ", i.setupCollection([C(n.test, n, t)], "Parentheses", ""), i;
     default:
       return i;
   }
@@ -2380,7 +2377,7 @@ function gt(n, e, t) {
   const r = [
     ...X(n.left, n.operator),
     ...X(n.right, n.operator)
-  ].map((a) => E(a, n, t)), s = new Y(n, e, t);
+  ].map((a) => C(a, n, t)), s = new Y(n, e, t);
   return s.setupCollection(r, "None", ` ${n.operator}`), s;
 }
 function X(n, e) {
@@ -2391,7 +2388,7 @@ function X(n, e) {
 }
 class L {
   constructor(e, t, i) {
-    this.node = e, this.parent = t, this.options = i, this.prefix = "", this.suffix = "", this.groupingParentheses = !1, this.groupingParentheses = xt(e, t);
+    this.node = e, this.parent = t, this.options = i, this.prefix = "", this.suffix = "", this.groupingParentheses = !1, this.groupingParentheses = Et(e, t);
   }
   get openingParenthesis() {
     return this.groupingParentheses ? "(" : "";
@@ -2445,7 +2442,7 @@ class Y extends L {
     }
   }
   getLinesLevel(e = 0) {
-    return this.bracketsType !== "None" || et(this.parent) || Ve(this.parent) || (ce(this.node) || oe(this.node)) && (ce(this.parent) || oe(this.parent)) ? e + 1 : e;
+    return this.bracketsType !== "None" || Ye(this.parent) || Ve(this.parent) || (ce(this.node) || oe(this.node)) && (ce(this.parent) || oe(this.parent)) ? e + 1 : e;
   }
   finalize(e, t = "singleLine", i = 0) {
     if (this.bracketsType === "None")
@@ -2487,17 +2484,17 @@ class Y extends L {
     return this.finalize(i, e, t);
   }
 }
-const Ft = /^[a-zA-Z_$][a-zA-Z_$0-9]*$/u;
+const xt = /^[a-zA-Z_$][a-zA-Z_$0-9]*$/u;
 class le extends L {
   constructor(e, t, i) {
     super(e, t, i), this.node = e, this.parent = t, this.options = i, this.type = "StringPrinter";
   }
   format() {
-    if (b(this.node))
+    if (I(this.node))
       return this.finalize(this.node.name);
     if (typeof this.node.value != "string")
       return this.finalize(this.node.raw);
-    if (st(this.parent) && this.parent.key === this.node && ze(this.node) && typeof this.node.value == "string" && Ft.test(this.node.value))
+    if (rt(this.parent) && this.parent.key === this.node && ze(this.node) && typeof this.node.value == "string" && xt.test(this.node.value))
       return this.finalize(this.node.value);
     switch (this.options.quote) {
       case "auto": {
@@ -2514,16 +2511,16 @@ class le extends L {
 class Ke extends L {
   constructor(e, t, i) {
     super(e, t, i), this.node = e, this.parent = t, this.options = i, this.type = "SingleExpressionPrinter";
-    const r = nt(e), s = rt(e);
+    const r = it(e), s = nt(e);
     if (r || s) {
-      this.prefix = r ? e.operator : "", this.suffix = s && !e.prefix ? e.operator : "", this.printer = E(e.argument, e, this.options);
+      this.prefix = r ? e.operator : "", this.suffix = s && !e.prefix ? e.operator : "", this.printer = C(e.argument, e, this.options);
       return;
     }
-    if (it(e)) {
-      this.printer = E(e.expression, e, this.options);
+    if (tt(e)) {
+      this.printer = C(e.expression, e, this.options);
       return;
     }
-    this.printer = E(e, t, this.options);
+    this.printer = C(e, t, this.options);
   }
   format(e = "singleLine", t = 0) {
     return this.finalize(this.printer.format(e, t));
@@ -2537,28 +2534,28 @@ class De extends L {
     return this.finalize(this.printer.format(e, t));
   }
 }
-class At extends L {
+class Ft extends L {
   constructor(e, t, i) {
     super(e, t, i), this.node = e, this.parent = t, this.options = i, this.type = "CallExpressionPrinter", this.argumentsPrinter = new Y(e, t, i), this.argumentsPrinter.setupCollection(
-      e.arguments.map((r) => E(r, e, i)),
+      e.arguments.map((r) => C(r, e, i)),
       "Parentheses"
-    ), b(e.callee) ? this.argumentsPrinter.prefix = e.callee.name : this.memberExpressionPrinter = new He(e.callee, t, i);
+    ), I(e.callee) ? this.argumentsPrinter.prefix = e.callee.name : this.calleePrinter = C(e.callee, t, i);
   }
   format(e = "singleLine", t = 0) {
-    if (!this.memberExpressionPrinter)
+    if (!this.calleePrinter)
       return this.finalize(this.argumentsPrinter.format(e, t));
-    let i = this.memberExpressionPrinter.format("singleLine", t), r = this.argumentsPrinter.format("singleLine", t);
+    let i = this.calleePrinter.format("singleLine", t), r = this.argumentsPrinter.format("singleLine", t);
     if (e === "singleLine")
       return this.finalize(D.joinLines([i, r]));
     let s = me(t, this.options) + this.leadingString.length + i.firstLineLength;
-    return s + 1 < this.options.wrapColumn ? (r = this.argumentsPrinter.format("multiline", t), this.finalize(D.joinLines([i, r]))) : (i = this.memberExpressionPrinter.format("multiline", t), s = i.lastLineLength, s + r.maxLineLength > this.options.wrapColumn && (r = this.argumentsPrinter.format("multiline", t + 1)), this.finalize(D.joinLines([i, r])));
+    return s + 1 < this.options.wrapColumn ? (r = this.argumentsPrinter.format("multiline", t), this.finalize(D.joinLines([i, r]))) : (i = this.calleePrinter.format("multiline", t), s = i.lastLineLength, s + r.maxLineLength > this.options.wrapColumn && (r = this.argumentsPrinter.format("multiline", t + 1)), this.finalize(D.joinLines([i, r])));
   }
 }
-class He extends L {
+class At extends L {
   constructor(e, t, i) {
-    if (super(e, t, i), this.node = e, this.parent = t, this.options = i, this.type = "MemberExpressionPrinter", this.objectPrinter = E(e.object, e, this.options), e.computed) {
+    if (super(e, t, i), this.node = e, this.parent = t, this.options = i, this.type = "MemberExpressionPrinter", this.objectPrinter = C(e.object, e, this.options), e.computed) {
       const r = new Y(e.property, e, this.options);
-      r.setupCollection([E(e.property, e, this.options)], "SquareBrackets"), r.prefix = e.type === "SafeMemberExpression" ? w : "", this.propertyPrinter = r;
+      r.setupCollection([C(e.property, e, this.options)], "SquareBrackets"), r.prefix = e.type === "SafeMemberExpression" ? w : "", this.propertyPrinter = r;
     } else {
       const r = new Ke(e.property, e, this.options);
       r.prefix = e.type === "SafeMemberExpression" ? w : ".", this.propertyPrinter = r;
@@ -2581,7 +2578,7 @@ class He extends L {
 }
 class yt extends L {
   constructor(e, t, i) {
-    super(e, t, i), this.node = e, this.parent = t, this.options = i, this.type = "PropertyPrinter", this.key = E(e.key, e, this.options), e.shorthand || (this.key.suffix = ":", this.value = E(e.value, e, this.options));
+    super(e, t, i), this.node = e, this.parent = t, this.options = i, this.type = "PropertyPrinter", this.key = C(e.key, e, this.options), e.shorthand || (this.key.suffix = ":", this.value = C(e.value, e, this.options));
   }
   format(e = "singleLine", t = 0) {
     if (this.node.shorthand || !this.value)
@@ -2604,18 +2601,18 @@ class fe extends L {
   constructor(e, t, i) {
     switch (super(e, t, i), this.node = e, this.parent = t, this.options = i, this.type = "OperationPrinter", this.operator = "", this.noNewLineWrapping = !1, e.type) {
       case u.AssignmentExpression:
-        this.leftPrinter = E(e.left, e, this.options), this.operator = ` ${e.operator}`, this.rightPrinter = E(e.right, e, this.options), this.noNewLineWrapping = (b(e.left) || ze(e.left)) && (J(e.right) || ge(e.right));
+        this.leftPrinter = C(e.left, e, this.options), this.operator = ` ${e.operator}`, this.rightPrinter = C(e.right, e, this.options), this.noNewLineWrapping = (I(e.left) || ze(e.left)) && (J(e.right) || xe(e.right));
         return;
       case u.VariableDeclarator:
-        this.leftPrinter = E(e.id, e, this.options), e.init && (this.operator = " =", this.rightPrinter = E(e.init, e, this.options)), this.noNewLineWrapping = J(e.init) || ge(e.init);
+        this.leftPrinter = C(e.id, e, this.options), e.init && (this.operator = " =", this.rightPrinter = C(e.init, e, this.options)), this.noNewLineWrapping = J(e.init) || xe(e.init);
         return;
       case u.ForInStatement:
       case u.ForOfStatement:
-        this.leftPrinter = E(e.left, e, this.options), this.operator = e.type === "ForInStatement" ? " in" : " of", this.rightPrinter = E(e.right, e, this.options);
+        this.leftPrinter = C(e.left, e, this.options), this.operator = e.type === "ForInStatement" ? " in" : " of", this.rightPrinter = C(e.right, e, this.options);
         return;
       case u.BinaryExpression:
       case u.LogicalExpression:
-        this.leftPrinter = E(e.left, e, this.options), this.operator = ` ${e.operator}`, this.rightPrinter = E(e.right, e, this.options);
+        this.leftPrinter = C(e.left, e, this.options), this.operator = ` ${e.operator}`, this.rightPrinter = C(e.right, e, this.options);
         return;
     }
   }
@@ -2638,7 +2635,7 @@ class Bt extends L {
   constructor(e, t, i) {
     super(e, t, i), this.node = e, this.parent = t, this.options = i, this.type = "TemplateLiteralPrinter", this.parts = [];
     const r = e.expressions.map(
-      (s) => E(s, e, this.options)
+      (s) => C(s, e, this.options)
     );
     this.parts.push("`"), e.quasis.forEach((s, a) => {
       this.parts.push(s.value.raw), a < r.length && (this.parts.push("${"), this.parts.push(r[a]), this.parts.push("}"));
@@ -2654,7 +2651,7 @@ function St(n) {
   const e = { ...n.leadingComments?.slice(0, 1)[0]?.loc.start ?? n.loc.start }, t = { ...n.trailingComments?.slice(-1)[0]?.loc.end ?? n.loc.end };
   return { start: e, end: t };
 }
-function bt(n) {
+function It(n) {
   return n.trailingComments?.slice(-1)[0]?.type === u.LineComment;
 }
 class T {
@@ -2689,7 +2686,7 @@ class T {
       case u.EmptyStatement:
       case u.BreakStatement:
       case u.ContinueStatement:
-        return new It(e, this.node, this.options);
+        return new bt(e, this.node, this.options);
       default:
         throw new Error(`unknown type: ${JSON.stringify(e)}`);
     }
@@ -2772,7 +2769,7 @@ class T {
     ) ?? { formattedLines: s }).formattedLines;
   }
   formatInnerComments(e = 0) {
-    if (!I(this.node) || !Array.isArray(this.node.innerComments) || !this.node.innerComments.length)
+    if (!b(this.node) || !Array.isArray(this.node.innerComments) || !this.node.innerComments.length)
       return new D();
     const t = this.getIndentation(e);
     return this.node.innerComments.reduce(
@@ -2793,12 +2790,7 @@ class T {
     ).formattedLines;
   }
   formatComment(e) {
-    switch (e.type) {
-      case u.BlockComment:
-        return D.fromString(e.value).surroundWith("/*", "*/");
-      default:
-        return D.fromString(e.value.trimEnd()).surroundWith("//");
-    }
+    return e.type === u.BlockComment ? D.fromString(e.value).surroundWith("/*", "*/") : D.fromString(e.value.trimEnd()).surroundWith("//");
   }
   /**
    * Invoked for a single line format. Measure is the length of the statement would fit
@@ -2819,7 +2811,7 @@ class $ extends T {
   format(e = 0) {
     if (this.printers.length === 0)
       return this.formatEmptyBlock(e);
-    const t = [], i = I(this.node);
+    const t = [], i = b(this.node);
     i && t.push("{");
     const r = i ? e + 1 : e;
     let s;
@@ -2831,13 +2823,13 @@ class $ extends T {
     }), i && t.push(`${this.getIndentation(e)}}`), this.addComments(D.appendLines(t), e);
   }
   formatEmptyBlock(e = 0) {
-    if (!I(this.node))
+    if (!b(this.node))
       return this.addComments(D.fromString(""), e);
     const t = this.formatInnerComments(e + 1), i = "{", r = `${this.getIndentation(e)}}`;
     return t.isEmpty ? ae(this.parent) ? this.addComments(D.appendLines([i, r]), e) : this.addComments(D.fromString("{}"), e) : this.addComments(D.appendLines([i, t, r]), e);
   }
 }
-class It extends T {
+class bt extends T {
   constructor(e, t, i) {
     switch (super(e, t, i), this.node = e, this.keyword = "", this.node.type) {
       case u.ContinueStatement:
@@ -2874,9 +2866,9 @@ class Le extends T {
 }
 class Te extends T {
   constructor(e, t, i) {
-    if (super(e, t, i), this.node = e, xe(e))
+    if (super(e, t, i), this.node = e, ge(e))
       this.header = U(e, t, i), this.body = new $(e.body, e, i);
-    else if (xe(e.declaration))
+    else if (ge(e.declaration))
       this.header = U(e.declaration, t, i), this.header.prefix = "export ", this.body = new $(e.declaration.body, e, i);
     else
       throw new Error(`invalid type: ${JSON.stringify(e)}`);
@@ -2900,12 +2892,12 @@ class wt extends T {
   format(e = 0, t = "optimized") {
     let i = !1, r;
     if (t === "singleLine" || t === "optimized") {
-      const c = this.header.format("singleLine", e), d = I(this.node.consequent) ? 2 : 0;
+      const c = this.header.format("singleLine", e), d = b(this.node.consequent) ? 2 : 0;
       (t === "singleLine" || this.canFitSingleLine(c, e, d)) && (r = c);
     }
     r || (i = !0, r = this.header.format("multiline", e));
     let s;
-    if (I(this.node.consequent)) {
+    if (b(this.node.consequent)) {
       const c = this.consequent.format(e, "optimized");
       s = D.joinLines([r, " ", c]);
     } else if (i || ae(this.node.consequent)) {
@@ -2919,9 +2911,9 @@ class wt extends T {
     }
     if (!this.alternate)
       return this.addComments(s, e);
-    const a = bt(this.node.consequent) || !I(this.node.consequent);
+    const a = It(this.node.consequent) || !b(this.node.consequent);
     let o;
-    if (this.alternate.externalOffset = 0, I(this.node.alternate) || ae(this.node.alternate))
+    if (this.alternate.externalOffset = 0, b(this.node.alternate) || ae(this.node.alternate))
       this.alternate.indentStatementFirstLine = !1, this.alternate.externalOffset = a ? 5 : s.lastLineLength + 6, o = this.alternate.format(e, "optimized"), o = D.joinLines(["else ", o]);
     else {
       const c = a ? 4 : s.lastLineLength + 4;
@@ -2948,7 +2940,7 @@ class kt extends T {
 }
 class Lt extends T {
   constructor(e, t, i) {
-    super(e, t, i), this.node = e, this.expression = E(e.expression, e, i);
+    super(e, t, i), this.node = e, this.expression = C(e.expression, e, i);
   }
   format(e = 0, t = "optimized") {
     if (t === "singleLine" || t === "optimized") {
@@ -2961,7 +2953,7 @@ class Lt extends T {
 }
 class Tt extends T {
   constructor(e, t, i) {
-    super(e, t, i), this.node = e, this.argument = E(e.argument, e, i);
+    super(e, t, i), this.node = e, this.argument = C(e.argument, e, i);
   }
   format(e = 0, t = "optimized") {
     if (t === "singleLine" || t === "optimized") {
@@ -2979,7 +2971,7 @@ class Tt extends T {
 }
 class vt extends T {
   constructor(e, t, i) {
-    super(e, t, i), this.node = e, this.libraryNamePrinter = E(e.specifiers[0].local, e, i), this.librarySourcePrinter = E(e.source, e, i);
+    super(e, t, i), this.node = e, this.libraryNamePrinter = C(e.specifiers[0].local, e, i), this.librarySourcePrinter = C(e.source, e, i);
   }
   format(e = 0) {
     return this.addComments(
@@ -3009,13 +3001,13 @@ function Nt(n, e) {
   const t = de(e), i = Z.fromString(n, t), r = i.toString(), s = Re(r, {
     tolerant: !0,
     comments: !0
-  }), a = Dt(s, i);
+  }), a = lt(s, i);
   return s.loc.start = a.start, s.loc.end = a.end, new $(s, null, t).format().toString();
 }
-const Mt = Object.values(f), Ut = Object.values(V), Ot = ["case", "catch", "debugger", "switch", "try"], jt = Ut.map((n) => ({ label: n, kind: g.Constant })), zt = Mt.map((n) => ({ label: n, kind: g.Keyword })), Vt = [
+const Mt = Object.values(f), Ut = Object.values(V), Ot = ["case", "catch", "debugger", "switch", "try"], jt = Ut.map((n) => ({ label: n, kind: x.Constant })), zt = Mt.map((n) => ({ label: n, kind: x.Keyword })), Vt = [
   {
     label: "exportfunction",
-    kind: g.Snippet,
+    kind: x.Snippet,
     detail: "Export Function Statement",
     insertText: `export function \${1:functionName} ($2) {
 	$0
@@ -3025,7 +3017,7 @@ const Mt = Object.values(f), Ut = Object.values(V), Ot = ["case", "catch", "debu
   },
   {
     label: "exportvar",
-    kind: g.Snippet,
+    kind: x.Snippet,
     detail: "Export Variable Statement",
     insertText: "export var ${0:variableName}\n",
     insertTextMode: S.adjustIndentation,
@@ -3033,7 +3025,7 @@ const Mt = Object.values(f), Ut = Object.values(V), Ot = ["case", "catch", "debu
   },
   {
     label: "for",
-    kind: g.Snippet,
+    kind: x.Snippet,
     detail: "For Loop Statement",
     insertText: "for (var ${1:i} = 0; ${1:i} < ${2:array.length}; ${1:i}++) {\n	$0\n}",
     insertTextMode: S.adjustIndentation,
@@ -3041,7 +3033,7 @@ const Mt = Object.values(f), Ut = Object.values(V), Ot = ["case", "catch", "debu
   },
   {
     label: "forin",
-    kind: g.Snippet,
+    kind: x.Snippet,
     detail: "For-In Loop Statement",
     insertText: "for (var ${1:i} in ${2:arrayOrObject}) {\n	$0\n}",
     insertTextMode: S.adjustIndentation,
@@ -3049,7 +3041,7 @@ const Mt = Object.values(f), Ut = Object.values(V), Ot = ["case", "catch", "debu
   },
   {
     label: "forof",
-    kind: g.Snippet,
+    kind: x.Snippet,
     detail: "For-Of Loop Statement",
     insertText: "for (var ${1:i} of ${2:arrayOrObject}) {\n	$0\n}",
     insertTextMode: S.adjustIndentation,
@@ -3057,7 +3049,7 @@ const Mt = Object.values(f), Ut = Object.values(V), Ot = ["case", "catch", "debu
   },
   {
     label: "function",
-    kind: g.Snippet,
+    kind: x.Snippet,
     detail: "Function Statement",
     insertText: `function \${1:functionName} ($2) {
 	$0
@@ -3067,7 +3059,7 @@ const Mt = Object.values(f), Ut = Object.values(V), Ot = ["case", "catch", "debu
   },
   {
     label: "if",
-    kind: g.Snippet,
+    kind: x.Snippet,
     detail: "If Statement",
     insertText: `if (\${1:1==1}) {
 	$0
@@ -3077,7 +3069,7 @@ const Mt = Object.values(f), Ut = Object.values(V), Ot = ["case", "catch", "debu
   },
   {
     label: "ifelse",
-    kind: g.Snippet,
+    kind: x.Snippet,
     detail: "If-Else Statement",
     insertText: `if (\${1:1==1}) {
 	$0
@@ -3089,7 +3081,7 @@ const Mt = Object.values(f), Ut = Object.values(V), Ot = ["case", "catch", "debu
   },
   {
     label: "else",
-    kind: g.Snippet,
+    kind: x.Snippet,
     detail: "Else Statement",
     insertText: `else {
 	$0
@@ -3099,7 +3091,7 @@ const Mt = Object.values(f), Ut = Object.values(V), Ot = ["case", "catch", "debu
   },
   {
     label: "import",
-    kind: g.Snippet,
+    kind: x.Snippet,
     detail: "Import Statement",
     insertText: 'import ${1:namespace} from "${0:uri}"',
     insertTextMode: S.adjustIndentation,
@@ -3107,7 +3099,7 @@ const Mt = Object.values(f), Ut = Object.values(V), Ot = ["case", "catch", "debu
   },
   {
     label: "while",
-    kind: g.Snippet,
+    kind: x.Snippet,
     detail: "While Loop Statement",
     insertText: `while (\${1:false}) {
 	$0
@@ -3126,10 +3118,10 @@ function $t(n, e) {
 function Rt(n, e) {
   return n.line < e.start.line;
 }
-function qe(n, e) {
+function He(n, e) {
   return !(Rt(n, e) || $t(n, e) || n.line === e.start.line && n.column < e.start.column || n.line === e.end.line && n.column > e.end.column);
 }
-const x = {
+const g = {
   None: 0,
   Keywords: 1,
   All: 255,
@@ -3144,27 +3136,27 @@ const x = {
   keywords: "c"
 };
 function Wt(n, e, t, i = {}) {
-  const r = n.getText({ start: { line: 0, character: 0 }, end: e }), { tokens: s, errors: a = [] } = ht(r, { loc: !0, tolerant: !0 });
+  const r = n.getText({ start: { line: 0, character: 0 }, end: e }), { tokens: s, errors: a = [] } = ct(r, { loc: !0, tolerant: !0 });
   if (a.length)
     return { isIncomplete: !1, items: [] };
   let o = s.at(s.length - 1), c = "";
   const d = ni(e);
-  o?.type === "Identifier" && qe(d, o.loc) && (c = o.value, s.pop(), o = s[s.length - 1]);
-  const C = {
+  o?.type === "Identifier" && He(d, o.loc) && (c = o.value, s.pop(), o = s[s.length - 1]);
+  const E = {
     variables: i.profile?.variables ?? [],
     additionalCompletionItems: (i.snippets ?? []).map((F) => ({
-      kind: g.Snippet,
+      kind: x.Snippet,
       insertTextMode: S.adjustIndentation,
       insertTextFormat: B.Snippet,
       ...F
     })),
     apiDatabase: t
   };
-  return o?.type === "Punctuator" && (o.value === "." || o.value === w) ? Ht(s, c, C) : Kt(s, c, d, C);
+  return o?.type === "Punctuator" && (o.value === "." || o.value === w) ? Ht(s, c, E) : Kt(s, c, d, E);
 }
 function Kt(n, e, t, i) {
   const r = Jt(n, t);
-  if (r === x.None)
+  if (r === g.None)
     return { isIncomplete: !1, items: [] };
   const s = Xt(n), a = [], o = new RegExp(e.replaceAll(Ce, "\\$&"), "i");
   return s.forEach((c, d) => {
@@ -3182,8 +3174,8 @@ function Kt(n, e, t, i) {
   }), i.apiDatabase.constantDefinitions.forEach((c, d) => {
     c.type === "constant" && c.disableDocumentation === !0 || !o.test(d) || a.push({ ...c.completion, sortText: v.constants });
   }), i.apiDatabase.functionDefinitions.forEach((c, d) => {
-    o.test(d) && c.overloads.forEach((C) => {
-      C.disableDocumentation || a.push({ ...C.completion, sortText: v.functions });
+    o.test(d) && c.overloads.forEach((E) => {
+      E.disableDocumentation || a.push({ ...E.completion, sortText: v.functions });
     });
   }), { isIncomplete: !1, items: a };
 }
@@ -3217,8 +3209,8 @@ function Gt(n, e, t, i) {
     return null;
   let r = n.shift(), s = i.variables;
   for (; r; ) {
-    const d = s.find((C) => C.name.toLowerCase() === r);
-    if (!Je(d))
+    const d = s.find((E) => E.name.toLowerCase() === r);
+    if (!Ge(d))
       return null;
     s = d.properties ?? [], r = n.shift();
   }
@@ -3228,40 +3220,40 @@ function Gt(n, e, t, i) {
   }), { isIncomplete: !1, items: a };
 }
 function ve(n) {
-  return (n & x.Keywords) === x.Keywords;
+  return (n & g.Keywords) === g.Keywords;
 }
 function Jt(n, e) {
   if (!n.length)
-    return x.All;
+    return g.All;
   const t = n[n.length - 1];
   switch (t.type) {
     case "Identifier":
-      return x.All;
+      return g.All;
     case "Keyword":
-      return ["return", "in", "else"].includes(t.value) ? x.NoKeywords : x.None;
+      return ["return", "in", "else"].includes(t.value) ? g.NoKeywords : g.None;
     case "Punctuator":
       return Qt(n);
     case "Template":
-      return t.value.endsWith("${") ? x.NoKeywords : x.All;
+      return t.value.endsWith("${") ? g.NoKeywords : g.All;
     default:
-      return qe(e, t.loc) ? x.None : x.All;
+      return He(e, t.loc) ? g.None : g.All;
   }
 }
 function Qt(n) {
   const e = [...n];
   let t = e.pop();
   if (!t)
-    return x.All;
+    return g.All;
   if (t.type !== "Punctuator")
-    return x.None;
+    return g.None;
   if (t.value !== "(" && t.value !== ",")
-    return x.All;
+    return g.All;
   if (t.value === "(")
     return Pe(e);
   let i = 0;
   for (t = e.pop(); t; ) {
     if (t.type === "Keyword")
-      return x.None;
+      return g.None;
     if (t.type !== "Punctuator") {
       t = e.pop();
       continue;
@@ -3272,7 +3264,7 @@ function Qt(n) {
     }
     if (t.value === "[") {
       if (i === 0)
-        return x.NoKeywords;
+        return g.NoKeywords;
       i += 1, t = e.pop();
       continue;
     }
@@ -3284,12 +3276,12 @@ function Qt(n) {
     }
     t = e.pop();
   }
-  return x.None;
+  return g.None;
 }
 function Pe(n) {
   const e = [...n];
   let t = e.pop();
-  return t ? t.type === "Keyword" ? t.value.toLowerCase() === "for" ? x.All : x.NoKeywords : t.type !== "Identifier" ? x.All : (t = e.pop(), t?.type === "Keyword" && t.value.toLowerCase() === "function" ? x.None : x.NoKeywords) : x.All;
+  return t ? t.type === "Keyword" ? t.value.toLowerCase() === "for" ? g.All : g.NoKeywords : t.type !== "Identifier" ? g.All : (t = e.pop(), t?.type === "Keyword" && t.value.toLowerCase() === "function" ? g.None : g.NoKeywords) : g.All;
 }
 class Zt {
   constructor(e) {
@@ -3341,7 +3333,7 @@ function Yt(n, e) {
     const t = n.current.value, i = t.toLowerCase();
     e.set(i, {
       label: t,
-      kind: g.Variable,
+      kind: x.Variable,
       detail: _(H.variableFormat, { name: t })
     });
     const r = n.increment();
@@ -3363,7 +3355,7 @@ function ei(n, e) {
       return;
     const t = n.current.value, i = t.toLowerCase(), r = {
       label: t,
-      kind: g.Function,
+      kind: x.Function,
       detail: _(H.functionFormat, { name: t, paramsDetail: "" }),
       insertText: `${t}()`,
       insertTextMode: S.adjustIndentation,
@@ -3382,7 +3374,7 @@ function ei(n, e) {
         name: r.label,
         paramsDetail: a.join(", ")
       });
-      const d = a.map((C, F) => `\${${F + 1}:${C}}`).join(", ");
+      const d = a.map((E, F) => `\${${F + 1}:${E}}`).join(", ");
       r.insertText = `${r.label}(${d})`;
     }
     if (!P(s, ")") || (s = n.increment(), !P(s, "{")))
@@ -3395,10 +3387,10 @@ function ei(n, e) {
     if (c === 0)
       return;
     n.currentIndex = o, a.forEach((d) => {
-      const C = d.toLowerCase();
-      e.set(C, {
+      const E = d.toLowerCase();
+      e.set(E, {
         label: d,
-        kind: g.Variable,
+        kind: x.Variable,
         detail: _(H.parameterFormat, { name: d })
       });
     });
@@ -3598,7 +3590,7 @@ class si {
     const i = {
       severity: A.Error,
       ...t,
-      message: _(lt[t.code], t.data),
+      message: _(ht[t.code], t.data),
       range: {
         start: { line: e.start.line - 1, character: e.start.column },
         end: { line: e.end.line - 1, character: e.end.column }
@@ -3662,7 +3654,7 @@ class si {
     }), this.inBlock(this.validateStatement, e.body);
   }
   validateForInOfStatement(e) {
-    if (b(e.left)) {
+    if (I(e.left)) {
       const t = this._assignmentValidationMode;
       this._assignmentValidationMode = "left", this._identifierBeingAssigned = e.left.name.toLowerCase(), this.validateExpression(e.left), this._assignmentValidationMode = t;
     } else
@@ -3683,11 +3675,11 @@ class si {
   }
   validateAssignmentExpression(e) {
     const t = this._identifierBeingAssigned, i = this._assignmentValidationMode;
-    b(e.left) && (this._identifierBeingAssigned = e.left.name.toLowerCase(), this._assignmentValidationMode = "left"), this.validateExpression(e.left), b(e.left) && (this._assignmentValidationMode = "right"), this.validateExpression(e.right), this._identifierBeingAssigned = t, this._assignmentValidationMode = i;
+    I(e.left) && (this._identifierBeingAssigned = e.left.name.toLowerCase(), this._assignmentValidationMode = "left"), this.validateExpression(e.left), I(e.left) && (this._assignmentValidationMode = "right"), this.validateExpression(e.right), this._identifierBeingAssigned = t, this._assignmentValidationMode = i;
   }
   validateCallExpression(e) {
     const t = this._isInCallExpression;
-    if (this._isInCallExpression = !0, this.validateExpression(e.callee), b(e.callee)) {
+    if (this._isInCallExpression = !0, this.validateExpression(e.callee), I(e.callee)) {
       const i = e.callee.name.toLowerCase(), r = this.getIdentifierInfo(i), s = this._apiDatabase?.functionDefinitions.get(i);
       if (!r && s) {
         const a = ai(s, e.arguments.length);
@@ -3771,13 +3763,13 @@ class si {
   }
   validateMemberExpression(e) {
     const t = this.flattenMemberExpressionAndValidate(e), i = t[0].object;
-    this.disableRecordIdentifierAssignment(this.validateExpression, i), b(i) && (this.getIdentifierInfo(i.name.toLowerCase()) || this.validateMemberExpressionWithProfile(t) || this.validateConstantMemberExpression(t));
+    this.disableRecordIdentifierAssignment(this.validateExpression, i), I(i) && (this.getIdentifierInfo(i.name.toLowerCase()) || this.validateMemberExpressionWithProfile(t) || this.validateConstantMemberExpression(t));
   }
   flattenMemberExpressionAndValidate(e) {
     switch (e.type) {
       case u.SafeMemberExpression:
       case u.MemberExpression:
-        return (!b(e.property) || e.computed) && this.validateExpression(e.property), [...this.flattenMemberExpressionAndValidate(e.object), e];
+        return (!I(e.property) || e.computed) && this.validateExpression(e.property), [...this.flattenMemberExpressionAndValidate(e.object), e];
       default:
         return [];
     }
@@ -3794,7 +3786,7 @@ class si {
   }
   validateConstantMemberExpression(e) {
     const t = e[0];
-    if (!b(t.object))
+    if (!I(t.object))
       return !1;
     const i = t.object.name.toLowerCase(), r = this._apiDatabase?.constantDefinitions.get(i);
     if (!r)
@@ -3856,7 +3848,7 @@ class si {
       );
       if (!c) {
         const d = s.properties.reduce(
-          (C, F) => `${C}${C ? " | " : ""}${F.name.split(".").pop()}`,
+          (E, F) => `${E}${E ? " | " : ""}${F.name.split(".").pop()}`,
           ""
         );
         return this.logDiagnostic(e[a].property.loc, {
@@ -3949,7 +3941,7 @@ function ui(n) {
   return !!n && n.name === "ParsingError";
 }
 function j(n) {
-  return pe(n) || I(n) && !n.body.length;
+  return pe(n) || b(n) && !n.body.length;
 }
 function ai(n, e) {
   const { min: t, max: i } = n.overloads.reduce(
@@ -3967,7 +3959,7 @@ function ci(n = "") {
 }
 class pi {
   configure(e) {
-    this.apiService = new Qe(e);
+    this.apiService = new Je(e);
   }
   async doValidation(e, t) {
     if (!this.apiService)
@@ -3987,7 +3979,7 @@ export {
   pi as ArcadeLanguageService,
   Ut as ArcadeLiterals,
   Ot as ArcadeReservedKeywords,
-  lt as DiagnosticMessages,
+  ht as DiagnosticMessages,
   fi as DiagnosticSeverity,
   p as ValidationDiagnosticCodes,
   Di as arcadeFormat,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcgis/arcade-languageservice",
-  "version": "5.1.0-next.9",
+  "version": "5.1.0-next.90",
   "description": "Arcade Language Service",
   "homepage": "https://developers.arcgis.com/javascript/latest/",
   "type": "module",
@@ -15,6 +15,6 @@
     "tslib": "^2.8.1",
     "vscode-languageserver-textdocument": "^1.0.11",
     "vscode-languageserver-types": "^3.17.5",
-    "@arcgis/languages-api-utils": "5.1.0-next.9"
+    "@arcgis/languages-api-utils": "5.1.0-next.90"
   }
 }