@atlaskit/jql-editor 5.9.0 → 5.9.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/jql-editor
 
+## 5.9.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 5.9.1
+
+### Patch Changes
+
+- [`965e86d051f6d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/965e86d051f6d) -
+  [ux] Lozenege support(avatar + disaply name) added for membersOf(id:<team_id>) in JQL
+
 ## 5.9.0
 
 ### Minor Changes

package/dist/cjs/analytics/util.js

@@ -6,5 +6,5 @@ Object.defineProperty(exports, "__esModule", {
 exports.useJqlEditorAnalytics = void 0;
 var _jqlEditorCommon = require("@atlaskit/jql-editor-common");
 var useJqlEditorAnalytics = exports.useJqlEditorAnalytics = function useJqlEditorAnalytics(analyticsSource) {
-  return (0, _jqlEditorCommon.useJqlPackageAnalytics)(analyticsSource, "@atlaskit/jql-editor", "5.8.5", _jqlEditorCommon.ANALYTICS_CHANNEL);
+  return (0, _jqlEditorCommon.useJqlPackageAnalytics)(analyticsSource, "@atlaskit/jql-editor", "5.9.1", _jqlEditorCommon.ANALYTICS_CHANNEL);
 };

package/dist/cjs/plugins/rich-inline-nodes/util/replace-nodes-transaction.js

@@ -34,7 +34,13 @@ var replaceRichInlineNodes = exports.replaceRichInlineNodes = function replaceRi
       values = _ref2[1];
     values.forEach(function (value) {
       if (value.type === 'user' || value.type === 'team' && (0, _platformFeatureFlags.fg)('jira_update_jql_teams')) {
+        // First try to find as direct value operand (e.g., Team[Team] = uuid)
         var astNodes = getValueNodes(ast, fieldName, value.id);
+
+        // If not found as direct value and it's a team, try to find in membersOf function arguments
+        if (astNodes.length === 0 && value.type === 'team' && (0, _platformFeatureFlags.fg)('jira_update_jql_membersof_teams')) {
+          astNodes = getMembersOfArgumentNodes(ast, value.id);
+        }
         astNodes.forEach(function (astNode) {
           if (astNode.position) {
             var _astNode$position = (0, _slicedToArray2.default)(astNode.position, 2),
@@ -85,11 +91,25 @@ var getValueNodes = function getValueNodes(ast, field, value) {
   }
   return ast.query.accept(new FindValuesVisitor(field, value));
 };
-var FindValuesVisitor = /*#__PURE__*/function (_AbstractJastVisitor) {
-  function FindValuesVisitor(field, value) {
+var getMembersOfArgumentNodes = function getMembersOfArgumentNodes(ast, teamId) {
+  if (!ast.query) {
+    return [];
+  }
+  return ast.query.accept(new FindMembersOfArgumentsVisitor(teamId));
+};
+
+/**
+ * Base visitor class for traversing JQL AST to find specific nodes.
+ * Provides common traversal logic - subclasses implement specific matching.
+ */
+var BaseAstNodeFinder = /*#__PURE__*/function (_AbstractJastVisitor) {
+  function BaseAstNodeFinder() {
     var _this;
-    (0, _classCallCheck2.default)(this, FindValuesVisitor);
-    _this = _callSuper(this, FindValuesVisitor);
+    (0, _classCallCheck2.default)(this, BaseAstNodeFinder);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _callSuper(this, BaseAstNodeFinder, [].concat(args));
     (0, _defineProperty2.default)(_this, "visitQuery", function (query) {
       if (query.where === undefined) {
         return [];
@@ -97,39 +117,22 @@ var FindValuesVisitor = /*#__PURE__*/function (_AbstractJastVisitor) {
       return query.where.accept(_this);
     });
     (0, _defineProperty2.default)(_this, "visitCompoundClause", function (compoundClause) {
-      return compoundClause.clauses.reduce(function (operands, compoundClause) {
-        return [].concat((0, _toConsumableArray2.default)(operands), (0, _toConsumableArray2.default)(compoundClause.accept(_this)));
+      return compoundClause.clauses.reduce(function (results, clause) {
+        return [].concat((0, _toConsumableArray2.default)(results), (0, _toConsumableArray2.default)(clause.accept(_this)));
       }, []);
     });
-    (0, _defineProperty2.default)(_this, "visitTerminalClause", function (terminalClause) {
-      if (!_this.equalsIgnoreCase(terminalClause.field.value, _this.field)) {
-        return [];
-      }
-      if (terminalClause.operand === undefined) {
-        return [];
-      }
-      return terminalClause.operand.accept(_this);
-    });
     (0, _defineProperty2.default)(_this, "visitNotClause", function (notClause) {
       return notClause.clause.accept(_this);
     });
-    (0, _defineProperty2.default)(_this, "visitValueOperand", function (valueOperand) {
-      if (!_this.equalsIgnoreCase(valueOperand.value, _this.value)) {
-        return [];
-      }
-      return [valueOperand];
-    });
     (0, _defineProperty2.default)(_this, "visitListOperand", function (listOperand) {
-      return listOperand.values.reduce(function (values, operand) {
-        return [].concat((0, _toConsumableArray2.default)(values), (0, _toConsumableArray2.default)(operand.accept(_this)));
+      return listOperand.values.reduce(function (results, operand) {
+        return [].concat((0, _toConsumableArray2.default)(results), (0, _toConsumableArray2.default)(operand.accept(_this)));
       }, []);
     });
-    _this.field = field;
-    _this.value = value;
     return _this;
   }
-  (0, _inherits2.default)(FindValuesVisitor, _AbstractJastVisitor);
-  return (0, _createClass2.default)(FindValuesVisitor, [{
+  (0, _inherits2.default)(BaseAstNodeFinder, _AbstractJastVisitor);
+  return (0, _createClass2.default)(BaseAstNodeFinder, [{
     key: "aggregateResult",
     value: function aggregateResult(aggregate, nextResult) {
       return [].concat((0, _toConsumableArray2.default)(aggregate), (0, _toConsumableArray2.default)(nextResult));
@@ -147,4 +150,85 @@ var FindValuesVisitor = /*#__PURE__*/function (_AbstractJastVisitor) {
       }) === 0;
     }
   }]);
-}(_jqlAst.AbstractJastVisitor);
+}(_jqlAst.AbstractJastVisitor);
+/**
+ * Visitor that finds value operands matching a specific field and value.
+ * Used for direct value queries like "assignee = john-doe" or "Team[team] = uuid".
+ */
+var FindValuesVisitor = /*#__PURE__*/function (_BaseAstNodeFinder2) {
+  function FindValuesVisitor(field, value) {
+    var _this2;
+    (0, _classCallCheck2.default)(this, FindValuesVisitor);
+    _this2 = _callSuper(this, FindValuesVisitor);
+    (0, _defineProperty2.default)(_this2, "visitTerminalClause", function (terminalClause) {
+      if (!_this2.equalsIgnoreCase(terminalClause.field.value, _this2.field)) {
+        return [];
+      }
+      if (terminalClause.operand === undefined) {
+        return [];
+      }
+      return terminalClause.operand.accept(_this2);
+    });
+    (0, _defineProperty2.default)(_this2, "visitValueOperand", function (valueOperand) {
+      if (!_this2.equalsIgnoreCase(valueOperand.value, _this2.value)) {
+        return [];
+      }
+      return [valueOperand];
+    });
+    _this2.field = field;
+    _this2.value = value;
+    return _this2;
+  }
+  (0, _inherits2.default)(FindValuesVisitor, _BaseAstNodeFinder2);
+  return (0, _createClass2.default)(FindValuesVisitor);
+}(BaseAstNodeFinder);
+/**
+ * Visitor that finds membersOf function arguments matching a specific team ID.
+ * Used for queries like "assignee in membersOf("id: <uuid>")".
+ */
+var FindMembersOfArgumentsVisitor = /*#__PURE__*/function (_BaseAstNodeFinder3) {
+  function FindMembersOfArgumentsVisitor(teamId) {
+    var _this3;
+    (0, _classCallCheck2.default)(this, FindMembersOfArgumentsVisitor);
+    _this3 = _callSuper(this, FindMembersOfArgumentsVisitor);
+    (0, _defineProperty2.default)(_this3, "visitTerminalClause", function (terminalClause) {
+      if (terminalClause.operand === undefined) {
+        return [];
+      }
+      return terminalClause.operand.accept(_this3);
+    });
+    (0, _defineProperty2.default)(_this3, "visitFunctionOperand", function (functionOperand) {
+      var functionName = functionOperand.function.value.toLowerCase();
+
+      // Only process membersOf function
+      if (functionName !== 'membersof') {
+        return [];
+      }
+      var matchingArgs = [];
+      functionOperand.arguments.forEach(function (arg) {
+        // Normalize both values by removing extra whitespace for comparison
+        // This handles both "id: uuid" and "id:uuid" formats
+        var normalizedArgValue = _this3.normalizeValue(arg.value);
+        var normalizedTeamId = _this3.normalizeValue(_this3.teamId);
+        if (_this3.equalsIgnoreCase(normalizedArgValue, normalizedTeamId)) {
+          matchingArgs.push(arg);
+        }
+      });
+      return matchingArgs;
+    });
+    _this3.teamId = teamId;
+    return _this3;
+  }
+  (0, _inherits2.default)(FindMembersOfArgumentsVisitor, _BaseAstNodeFinder3);
+  return (0, _createClass2.default)(FindMembersOfArgumentsVisitor, [{
+    key: "normalizeValue",
+    value:
+    /**
+     * Normalize value by removing extra whitespace around colons and trimming.
+     * This handles variations like "id: uuid" vs "id:uuid" vs "id:  uuid".
+     */
+    function normalizeValue(value) {
+      return value.replace(/\s*:\s*/g, ':').trim();
+    }
+  }]);
+}(BaseAstNodeFinder);

package/dist/cjs/state/hydration/util.js

@@ -12,6 +12,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _jqlAst = require("@atlaskit/jql-ast");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 /**
@@ -31,10 +32,10 @@ var ValidQueryVisitor = exports.ValidQueryVisitor = /*#__PURE__*/function (_Abst
   function ValidQueryVisitor() {
     var _this;
     (0, _classCallCheck2.default)(this, ValidQueryVisitor);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
+    for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
+      _args[_key] = arguments[_key];
     }
-    _this = _callSuper(this, ValidQueryVisitor, [].concat(args));
+    _this = _callSuper(this, ValidQueryVisitor, [].concat(_args));
     (0, _defineProperty2.default)(_this, "visitQuery", function (query) {
       if (!query.where) {
         return '';
@@ -74,6 +75,18 @@ var ValidQueryVisitor = exports.ValidQueryVisitor = /*#__PURE__*/function (_Abst
         return !!value;
       }).join(', '), ")");
     });
+    (0, _defineProperty2.default)(_this, "visitFunctionOperand", function (functionOperand) {
+      // Only include membersOf function as it has arguments that need hydration
+      // Other functions like currentUser() don't have hydratable arguments
+      var functionName = functionOperand.function.value.toLowerCase();
+      if (functionName !== 'membersof' || !(0, _platformFeatureFlags.fg)('jira_update_jql_membersof_teams')) {
+        return '';
+      }
+      var args = functionOperand.arguments.map(function (arg) {
+        return arg.text;
+      }).join(', ');
+      return "".concat(functionOperand.function.text, "(").concat(args, ")");
+    });
     return _this;
   }
   (0, _inherits2.default)(ValidQueryVisitor, _AbstractJastVisitor);

package/dist/es2019/analytics/util.js

@@ -1,4 +1,4 @@
 import { ANALYTICS_CHANNEL, useJqlPackageAnalytics } from '@atlaskit/jql-editor-common';
 export const useJqlEditorAnalytics = analyticsSource => {
-  return useJqlPackageAnalytics(analyticsSource, "@atlaskit/jql-editor", "5.8.5", ANALYTICS_CHANNEL);
+  return useJqlPackageAnalytics(analyticsSource, "@atlaskit/jql-editor", "5.9.1", ANALYTICS_CHANNEL);
 };

package/dist/es2019/plugins/rich-inline-nodes/util/replace-nodes-transaction.js

@@ -13,7 +13,13 @@ export const replaceRichInlineNodes = (editorState, hydratedValues) => {
   Object.entries(hydratedValues).forEach(([fieldName, values]) => {
     values.forEach(value => {
       if (value.type === 'user' || value.type === 'team' && fg('jira_update_jql_teams')) {
-        const astNodes = getValueNodes(ast, fieldName, value.id);
+        // First try to find as direct value operand (e.g., Team[Team] = uuid)
+        let astNodes = getValueNodes(ast, fieldName, value.id);
+
+        // If not found as direct value and it's a team, try to find in membersOf function arguments
+        if (astNodes.length === 0 && value.type === 'team' && fg('jira_update_jql_membersof_teams')) {
+          astNodes = getMembersOfArgumentNodes(ast, value.id);
+        }
         astNodes.forEach(astNode => {
           if (astNode.position) {
             const [from, to] = astNode.position;
@@ -64,9 +70,20 @@ const getValueNodes = (ast, field, value) => {
   }
   return ast.query.accept(new FindValuesVisitor(field, value));
 };
-class FindValuesVisitor extends AbstractJastVisitor {
-  constructor(field, value) {
-    super();
+const getMembersOfArgumentNodes = (ast, teamId) => {
+  if (!ast.query) {
+    return [];
+  }
+  return ast.query.accept(new FindMembersOfArgumentsVisitor(teamId));
+};
+
+/**
+ * Base visitor class for traversing JQL AST to find specific nodes.
+ * Provides common traversal logic - subclasses implement specific matching.
+ */
+class BaseAstNodeFinder extends AbstractJastVisitor {
+  constructor(...args) {
+    super(...args);
     _defineProperty(this, "visitQuery", query => {
       if (query.where === undefined) {
         return [];
@@ -74,10 +91,39 @@ class FindValuesVisitor extends AbstractJastVisitor {
       return query.where.accept(this);
     });
     _defineProperty(this, "visitCompoundClause", compoundClause => {
-      return compoundClause.clauses.reduce((operands, compoundClause) => {
-        return [...operands, ...compoundClause.accept(this)];
+      return compoundClause.clauses.reduce((results, clause) => {
+        return [...results, ...clause.accept(this)];
       }, []);
     });
+    _defineProperty(this, "visitNotClause", notClause => {
+      return notClause.clause.accept(this);
+    });
+    _defineProperty(this, "visitListOperand", listOperand => {
+      return listOperand.values.reduce((results, operand) => {
+        return [...results, ...operand.accept(this)];
+      }, []);
+    });
+  }
+  aggregateResult(aggregate, nextResult) {
+    return [...aggregate, ...nextResult];
+  }
+  defaultResult() {
+    return [];
+  }
+  equalsIgnoreCase(a, b) {
+    return a.localeCompare(b, undefined, {
+      sensitivity: 'base'
+    }) === 0;
+  }
+}
+
+/**
+ * Visitor that finds value operands matching a specific field and value.
+ * Used for direct value queries like "assignee = john-doe" or "Team[team] = uuid".
+ */
+class FindValuesVisitor extends BaseAstNodeFinder {
+  constructor(field, value) {
+    super();
     _defineProperty(this, "visitTerminalClause", terminalClause => {
       if (!this.equalsIgnoreCase(terminalClause.field.value, this.field)) {
         return [];
@@ -87,32 +133,56 @@ class FindValuesVisitor extends AbstractJastVisitor {
       }
       return terminalClause.operand.accept(this);
     });
-    _defineProperty(this, "visitNotClause", notClause => {
-      return notClause.clause.accept(this);
-    });
     _defineProperty(this, "visitValueOperand", valueOperand => {
       if (!this.equalsIgnoreCase(valueOperand.value, this.value)) {
         return [];
       }
       return [valueOperand];
     });
-    _defineProperty(this, "visitListOperand", listOperand => {
-      return listOperand.values.reduce((values, operand) => {
-        return [...values, ...operand.accept(this)];
-      }, []);
-    });
     this.field = field;
     this.value = value;
   }
-  aggregateResult(aggregate, nextResult) {
-    return [...aggregate, ...nextResult];
-  }
-  defaultResult() {
-    return [];
+}
+
+/**
+ * Visitor that finds membersOf function arguments matching a specific team ID.
+ * Used for queries like "assignee in membersOf("id: <uuid>")".
+ */
+class FindMembersOfArgumentsVisitor extends BaseAstNodeFinder {
+  constructor(teamId) {
+    super();
+    _defineProperty(this, "visitTerminalClause", terminalClause => {
+      if (terminalClause.operand === undefined) {
+        return [];
+      }
+      return terminalClause.operand.accept(this);
+    });
+    _defineProperty(this, "visitFunctionOperand", functionOperand => {
+      const functionName = functionOperand.function.value.toLowerCase();
+
+      // Only process membersOf function
+      if (functionName !== 'membersof') {
+        return [];
+      }
+      const matchingArgs = [];
+      functionOperand.arguments.forEach(arg => {
+        // Normalize both values by removing extra whitespace for comparison
+        // This handles both "id: uuid" and "id:uuid" formats
+        const normalizedArgValue = this.normalizeValue(arg.value);
+        const normalizedTeamId = this.normalizeValue(this.teamId);
+        if (this.equalsIgnoreCase(normalizedArgValue, normalizedTeamId)) {
+          matchingArgs.push(arg);
+        }
+      });
+      return matchingArgs;
+    });
+    this.teamId = teamId;
   }
-  equalsIgnoreCase(a, b) {
-    return a.localeCompare(b, undefined, {
-      sensitivity: 'base'
-    }) === 0;
+  /**
+   * Normalize value by removing extra whitespace around colons and trimming.
+   * This handles variations like "id: uuid" vs "id:uuid" vs "id:  uuid".
+   */
+  normalizeValue(value) {
+    return value.replace(/\s*:\s*/g, ':').trim();
   }
 }

package/dist/es2019/state/hydration/util.js

@@ -1,5 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { AbstractJastVisitor } from '@atlaskit/jql-ast';
+import { fg } from '@atlaskit/platform-feature-flags';
 
 /**
  * Given an AST with parse errors, this visitor returns a valid query that is equivalent for hydration purposes
@@ -15,8 +16,8 @@ import { AbstractJastVisitor } from '@atlaskit/jql-ast';
  * - Equivalent query: "project = EM and status in (Done)"
  */
 export class ValidQueryVisitor extends AbstractJastVisitor {
-  constructor(...args) {
-    super(...args);
+  constructor(..._args) {
+    super(..._args);
     _defineProperty(this, "visitQuery", query => {
       if (!query.where) {
         return '';
@@ -50,6 +51,16 @@ export class ValidQueryVisitor extends AbstractJastVisitor {
     _defineProperty(this, "visitListOperand", listOperand => {
       return `(${listOperand.values.map(value => value.accept(this)).filter(value => !!value).join(', ')})`;
     });
+    _defineProperty(this, "visitFunctionOperand", functionOperand => {
+      // Only include membersOf function as it has arguments that need hydration
+      // Other functions like currentUser() don't have hydratable arguments
+      const functionName = functionOperand.function.value.toLowerCase();
+      if (functionName !== 'membersof' || !fg('jira_update_jql_membersof_teams')) {
+        return '';
+      }
+      const args = functionOperand.arguments.map(arg => arg.text).join(', ');
+      return `${functionOperand.function.text}(${args})`;
+    });
   }
   defaultResult() {
     return '';

package/dist/esm/analytics/util.js

@@ -1,4 +1,4 @@
 import { ANALYTICS_CHANNEL, useJqlPackageAnalytics } from '@atlaskit/jql-editor-common';
 export var useJqlEditorAnalytics = function useJqlEditorAnalytics(analyticsSource) {
-  return useJqlPackageAnalytics(analyticsSource, "@atlaskit/jql-editor", "5.8.5", ANALYTICS_CHANNEL);
+  return useJqlPackageAnalytics(analyticsSource, "@atlaskit/jql-editor", "5.9.1", ANALYTICS_CHANNEL);
 };

package/dist/esm/plugins/rich-inline-nodes/util/replace-nodes-transaction.js

@@ -27,7 +27,13 @@ export var replaceRichInlineNodes = function replaceRichInlineNodes(editorState,
       values = _ref2[1];
     values.forEach(function (value) {
       if (value.type === 'user' || value.type === 'team' && fg('jira_update_jql_teams')) {
+        // First try to find as direct value operand (e.g., Team[Team] = uuid)
         var astNodes = getValueNodes(ast, fieldName, value.id);
+
+        // If not found as direct value and it's a team, try to find in membersOf function arguments
+        if (astNodes.length === 0 && value.type === 'team' && fg('jira_update_jql_membersof_teams')) {
+          astNodes = getMembersOfArgumentNodes(ast, value.id);
+        }
         astNodes.forEach(function (astNode) {
           if (astNode.position) {
             var _astNode$position = _slicedToArray(astNode.position, 2),
@@ -78,11 +84,25 @@ var getValueNodes = function getValueNodes(ast, field, value) {
   }
   return ast.query.accept(new FindValuesVisitor(field, value));
 };
-var FindValuesVisitor = /*#__PURE__*/function (_AbstractJastVisitor) {
-  function FindValuesVisitor(field, value) {
+var getMembersOfArgumentNodes = function getMembersOfArgumentNodes(ast, teamId) {
+  if (!ast.query) {
+    return [];
+  }
+  return ast.query.accept(new FindMembersOfArgumentsVisitor(teamId));
+};
+
+/**
+ * Base visitor class for traversing JQL AST to find specific nodes.
+ * Provides common traversal logic - subclasses implement specific matching.
+ */
+var BaseAstNodeFinder = /*#__PURE__*/function (_AbstractJastVisitor) {
+  function BaseAstNodeFinder() {
     var _this;
-    _classCallCheck(this, FindValuesVisitor);
-    _this = _callSuper(this, FindValuesVisitor);
+    _classCallCheck(this, BaseAstNodeFinder);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _callSuper(this, BaseAstNodeFinder, [].concat(args));
     _defineProperty(_this, "visitQuery", function (query) {
       if (query.where === undefined) {
         return [];
@@ -90,39 +110,22 @@ var FindValuesVisitor = /*#__PURE__*/function (_AbstractJastVisitor) {
       return query.where.accept(_this);
     });
     _defineProperty(_this, "visitCompoundClause", function (compoundClause) {
-      return compoundClause.clauses.reduce(function (operands, compoundClause) {
-        return [].concat(_toConsumableArray(operands), _toConsumableArray(compoundClause.accept(_this)));
+      return compoundClause.clauses.reduce(function (results, clause) {
+        return [].concat(_toConsumableArray(results), _toConsumableArray(clause.accept(_this)));
       }, []);
     });
-    _defineProperty(_this, "visitTerminalClause", function (terminalClause) {
-      if (!_this.equalsIgnoreCase(terminalClause.field.value, _this.field)) {
-        return [];
-      }
-      if (terminalClause.operand === undefined) {
-        return [];
-      }
-      return terminalClause.operand.accept(_this);
-    });
     _defineProperty(_this, "visitNotClause", function (notClause) {
       return notClause.clause.accept(_this);
     });
-    _defineProperty(_this, "visitValueOperand", function (valueOperand) {
-      if (!_this.equalsIgnoreCase(valueOperand.value, _this.value)) {
-        return [];
-      }
-      return [valueOperand];
-    });
     _defineProperty(_this, "visitListOperand", function (listOperand) {
-      return listOperand.values.reduce(function (values, operand) {
-        return [].concat(_toConsumableArray(values), _toConsumableArray(operand.accept(_this)));
+      return listOperand.values.reduce(function (results, operand) {
+        return [].concat(_toConsumableArray(results), _toConsumableArray(operand.accept(_this)));
       }, []);
     });
-    _this.field = field;
-    _this.value = value;
     return _this;
   }
-  _inherits(FindValuesVisitor, _AbstractJastVisitor);
-  return _createClass(FindValuesVisitor, [{
+  _inherits(BaseAstNodeFinder, _AbstractJastVisitor);
+  return _createClass(BaseAstNodeFinder, [{
     key: "aggregateResult",
     value: function aggregateResult(aggregate, nextResult) {
       return [].concat(_toConsumableArray(aggregate), _toConsumableArray(nextResult));
@@ -140,4 +143,85 @@ var FindValuesVisitor = /*#__PURE__*/function (_AbstractJastVisitor) {
       }) === 0;
     }
   }]);
-}(AbstractJastVisitor);
+}(AbstractJastVisitor);
+/**
+ * Visitor that finds value operands matching a specific field and value.
+ * Used for direct value queries like "assignee = john-doe" or "Team[team] = uuid".
+ */
+var FindValuesVisitor = /*#__PURE__*/function (_BaseAstNodeFinder2) {
+  function FindValuesVisitor(field, value) {
+    var _this2;
+    _classCallCheck(this, FindValuesVisitor);
+    _this2 = _callSuper(this, FindValuesVisitor);
+    _defineProperty(_this2, "visitTerminalClause", function (terminalClause) {
+      if (!_this2.equalsIgnoreCase(terminalClause.field.value, _this2.field)) {
+        return [];
+      }
+      if (terminalClause.operand === undefined) {
+        return [];
+      }
+      return terminalClause.operand.accept(_this2);
+    });
+    _defineProperty(_this2, "visitValueOperand", function (valueOperand) {
+      if (!_this2.equalsIgnoreCase(valueOperand.value, _this2.value)) {
+        return [];
+      }
+      return [valueOperand];
+    });
+    _this2.field = field;
+    _this2.value = value;
+    return _this2;
+  }
+  _inherits(FindValuesVisitor, _BaseAstNodeFinder2);
+  return _createClass(FindValuesVisitor);
+}(BaseAstNodeFinder);
+/**
+ * Visitor that finds membersOf function arguments matching a specific team ID.
+ * Used for queries like "assignee in membersOf("id: <uuid>")".
+ */
+var FindMembersOfArgumentsVisitor = /*#__PURE__*/function (_BaseAstNodeFinder3) {
+  function FindMembersOfArgumentsVisitor(teamId) {
+    var _this3;
+    _classCallCheck(this, FindMembersOfArgumentsVisitor);
+    _this3 = _callSuper(this, FindMembersOfArgumentsVisitor);
+    _defineProperty(_this3, "visitTerminalClause", function (terminalClause) {
+      if (terminalClause.operand === undefined) {
+        return [];
+      }
+      return terminalClause.operand.accept(_this3);
+    });
+    _defineProperty(_this3, "visitFunctionOperand", function (functionOperand) {
+      var functionName = functionOperand.function.value.toLowerCase();
+
+      // Only process membersOf function
+      if (functionName !== 'membersof') {
+        return [];
+      }
+      var matchingArgs = [];
+      functionOperand.arguments.forEach(function (arg) {
+        // Normalize both values by removing extra whitespace for comparison
+        // This handles both "id: uuid" and "id:uuid" formats
+        var normalizedArgValue = _this3.normalizeValue(arg.value);
+        var normalizedTeamId = _this3.normalizeValue(_this3.teamId);
+        if (_this3.equalsIgnoreCase(normalizedArgValue, normalizedTeamId)) {
+          matchingArgs.push(arg);
+        }
+      });
+      return matchingArgs;
+    });
+    _this3.teamId = teamId;
+    return _this3;
+  }
+  _inherits(FindMembersOfArgumentsVisitor, _BaseAstNodeFinder3);
+  return _createClass(FindMembersOfArgumentsVisitor, [{
+    key: "normalizeValue",
+    value:
+    /**
+     * Normalize value by removing extra whitespace around colons and trimming.
+     * This handles variations like "id: uuid" vs "id:uuid" vs "id:  uuid".
+     */
+    function normalizeValue(value) {
+      return value.replace(/\s*:\s*/g, ':').trim();
+    }
+  }]);
+}(BaseAstNodeFinder);

package/dist/esm/state/hydration/util.js

@@ -7,6 +7,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import { AbstractJastVisitor } from '@atlaskit/jql-ast';
+import { fg } from '@atlaskit/platform-feature-flags';
 
 /**
  * Given an AST with parse errors, this visitor returns a valid query that is equivalent for hydration purposes
@@ -25,10 +26,10 @@ export var ValidQueryVisitor = /*#__PURE__*/function (_AbstractJastVisitor) {
   function ValidQueryVisitor() {
     var _this;
     _classCallCheck(this, ValidQueryVisitor);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
+    for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
+      _args[_key] = arguments[_key];
     }
-    _this = _callSuper(this, ValidQueryVisitor, [].concat(args));
+    _this = _callSuper(this, ValidQueryVisitor, [].concat(_args));
     _defineProperty(_this, "visitQuery", function (query) {
       if (!query.where) {
         return '';
@@ -68,6 +69,18 @@ export var ValidQueryVisitor = /*#__PURE__*/function (_AbstractJastVisitor) {
         return !!value;
       }).join(', '), ")");
     });
+    _defineProperty(_this, "visitFunctionOperand", function (functionOperand) {
+      // Only include membersOf function as it has arguments that need hydration
+      // Other functions like currentUser() don't have hydratable arguments
+      var functionName = functionOperand.function.value.toLowerCase();
+      if (functionName !== 'membersof' || !fg('jira_update_jql_membersof_teams')) {
+        return '';
+      }
+      var args = functionOperand.arguments.map(function (arg) {
+        return arg.text;
+      }).join(', ');
+      return "".concat(functionOperand.function.text, "(").concat(args, ")");
+    });
     return _this;
   }
   _inherits(ValidQueryVisitor, _AbstractJastVisitor);

package/dist/types/state/hydration/util.d.ts

@@ -1,4 +1,4 @@
-import { AbstractJastVisitor, type CompoundClause, type ListOperand, type NotClause, type Query, type TerminalClause, type ValueOperand } from '@atlaskit/jql-ast';
+import { AbstractJastVisitor, type CompoundClause, type FunctionOperand, type ListOperand, type NotClause, type Query, type TerminalClause, type ValueOperand } from '@atlaskit/jql-ast';
 /**
  * Given an AST with parse errors, this visitor returns a valid query that is equivalent for hydration purposes
  * (i.e. just fields, operators and values). Resulting query is generated on a best-effort basis and depends on
@@ -19,5 +19,6 @@ export declare class ValidQueryVisitor extends AbstractJastVisitor<string> {
     visitNotClause: (notClause: NotClause) => string;
     visitValueOperand: (valueOperand: ValueOperand) => string;
     visitListOperand: (listOperand: ListOperand) => string;
+    visitFunctionOperand: (functionOperand: FunctionOperand) => string;
     protected defaultResult(): string;
 }

package/dist/types-ts4.5/state/hydration/util.d.ts

@@ -1,4 +1,4 @@
-import { AbstractJastVisitor, type CompoundClause, type ListOperand, type NotClause, type Query, type TerminalClause, type ValueOperand } from '@atlaskit/jql-ast';
+import { AbstractJastVisitor, type CompoundClause, type FunctionOperand, type ListOperand, type NotClause, type Query, type TerminalClause, type ValueOperand } from '@atlaskit/jql-ast';
 /**
  * Given an AST with parse errors, this visitor returns a valid query that is equivalent for hydration purposes
  * (i.e. just fields, operators and values). Resulting query is generated on a best-effort basis and depends on
@@ -19,5 +19,6 @@ export declare class ValidQueryVisitor extends AbstractJastVisitor<string> {
     visitNotClause: (notClause: NotClause) => string;
     visitValueOperand: (valueOperand: ValueOperand) => string;
     visitListOperand: (listOperand: ListOperand) => string;
+    visitFunctionOperand: (functionOperand: FunctionOperand) => string;
     protected defaultResult(): string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/jql-editor",
-	"version": "5.9.0",
+	"version": "5.9.2",
 	"description": "This package allows consumers to render an advanced JQL editor component to enable autocomplete-assisted authoring and validation of JQL queries.",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -36,9 +36,9 @@
 		"@atlaskit/analytics-gas-types": "^5.1.0",
 		"@atlaskit/analytics-next": "^11.1.0",
 		"@atlaskit/avatar": "^25.5.0",
-		"@atlaskit/button": "^23.6.0",
+		"@atlaskit/button": "^23.7.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/form": "^14.3.0",
+		"@atlaskit/form": "^15.0.0",
 		"@atlaskit/icon": "^29.0.0",
 		"@atlaskit/jql-ast": "^3.3.0",
 		"@atlaskit/jql-autocomplete": "^2.0.0",
@@ -54,7 +54,7 @@
 		"@atlaskit/teams-avatar": "^2.4.0",
 		"@atlaskit/theme": "^21.0.0",
 		"@atlaskit/tokens": "^8.4.0",
-		"@atlaskit/tooltip": "^20.10.0",
+		"@atlaskit/tooltip": "^20.11.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"@emotion/styled": "^11.0.0",
@@ -146,6 +146,9 @@
 		"jira_update_jql_teams": {
 			"type": "boolean"
 		},
+		"jira_update_jql_membersof_teams": {
+			"type": "boolean"
+		},
 		"list_lovability_improving_filters": {
 			"type": "boolean"
 		},