@atlaskit/jql-editor 6.4.7 → 6.5.0

package/dist/es2019/plugins/rich-inline-nodes/nodes/lozenge-with-avatar/styled.js

@@ -0,0 +1,97 @@
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+import { css } from '@emotion/react';
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+import styled from '@emotion/styled';
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
+export const LozengeWithAvatarContainer =
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled -- Ignored via go/DSP-18766
+styled.span({
+  display: 'inline-flex',
+  alignItems: 'baseline',
+  paddingLeft: `${"var(--ds-space-025, 2px)"}`,
+  borderRadius: "var(--ds-radius-xlarge, 12px)",
+  cursor: 'pointer',
+  userSelect: 'none'
+},
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-dynamic-styles -- Ignored via go/DSP-18766
+({
+  selected,
+  error
+}) => {
+  if (selected) {
+    if (error) {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+      return css({
+        color: "var(--ds-text-inverse, #FFFFFF)",
+        backgroundColor: "var(--ds-background-danger-bold, #C9372C)",
+        textDecoration: 'wavy underline',
+        textDecorationThickness: '1px',
+        textDecorationSkipInk: 'none',
+        textDecorationColor: "var(--ds-text-inverse, #FFFFFF)"
+      });
+    } else {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+      return css({
+        color: "var(--ds-text, #292A2E)",
+        backgroundColor: "var(--ds-background-selected, #E9F2FE)",
+        boxShadow: `0 0 0 1px ${"var(--ds-border-selected, #1868DB)"}`
+      });
+    }
+  } else {
+    if (error) {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+      return css({
+        color: "var(--ds-text-subtle, #505258)",
+        backgroundColor: "var(--ds-background-neutral, #0515240F)",
+        textDecoration: 'wavy underline',
+        textDecorationThickness: '1px',
+        textDecorationSkipInk: 'none',
+        textDecorationColor: "var(--ds-text-danger, #AE2E24)",
+        '&:hover': {
+          backgroundColor: "var(--ds-background-neutral-hovered, #0B120E24)"
+        }
+      });
+    } else {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+      return css({
+        color: "var(--ds-text-subtle, #505258)",
+        backgroundColor: "var(--ds-background-neutral, #0515240F)",
+        '&:hover': {
+          backgroundColor: "var(--ds-background-neutral-hovered, #0B120E24)"
+        }
+      });
+    }
+  }
+});
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
+export const NameContainer =
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled -- Ignored via go/DSP-18766
+styled.span({
+  marginLeft: "var(--ds-space-075, 6px)",
+  marginRight: "var(--ds-space-100, 8px)",
+  // eslint-disable-next-line -- Ignored via go/DSP-18766
+  lineHeight: "var(--ds-space-250, 20px)"
+});
+
+/* Override Avatar styles to match design spec */
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
+export const AvatarWrapper =
+// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage, @atlaskit/ui-styling-standard/no-styled -- Ignored via go/DSP-18766
+styled.div({
+  height: "var(--ds-space-200, 16px)",
+  width: "var(--ds-space-200, 16px)",
+  alignSelf: 'center',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '> div span': {
+    margin: "var(--ds-space-0, 0px)"
+  },
+  // Fix fallback avatar icon vertical alignment.
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+  '> div > span:has(> span)': {
+    position: 'relative',
+    top: '-2px'
+  }
+});

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

@@ -13,30 +13,40 @@ export const replaceRichInlineNodes = (editorState, hydratedValues) => {
   transaction.setMeta('addToHistory', false);
   Object.entries(hydratedValues).forEach(([fieldName, values]) => {
     values.forEach(value => {
-      if (value.type === 'user' || value.type === 'team' || value.type === 'goal' && FeatureGates.getExperimentValue('anip-1095-goals-in-harmonised-filter', 'isEnabled', false) || value.type === 'project' && FeatureGates.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1) {
-        // First try to find as direct value operand (e.g., Team[Team] = uuid)
+      if (fg('jql-function-arg-hydration')) {
+        // Skip deprecated fields
+        if (value.type === 'deprecated-field') {
+          return;
+        }
+        // When the gate is on, collect both direct value operands and function argument
+        // operands for all node types
+        const astNodes = [...getValueNodes(ast, fieldName, value.id), ...getFunctionArgumentNodes(ast, fieldName, value.id)];
+        replaceAstNodesWithRichInlineNodes(transaction, astNodes, fieldName, value);
+      } else if (value.type === 'user' || value.type === 'team' || value.type === 'goal' && FeatureGates.getExperimentValue('anip-1095-goals-in-harmonised-filter', 'isEnabled', false) || value.type === 'project' && FeatureGates.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1) {
+        // Legacy path: direct value operands only, with membersOf fallback for teams.
         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-membersof-team-support')) {
           astNodes = getMembersOfArgumentNodes(ast, value.id);
         }
-        astNodes.forEach(astNode => {
-          if (astNode.position) {
-            const [from, to] = astNode.position;
-            const documentFrom = getDocumentPosition(transaction.doc, from);
-            if (!isRichInlineNode(transaction.doc, documentFrom)) {
-              const documentTo = getDocumentPosition(transaction.doc, to);
-              const node = getRichInlineNode(fieldName, value, astNode.text);
-              transaction.replaceWith(documentFrom, documentTo, node);
-            }
-          }
-        });
+        replaceAstNodesWithRichInlineNodes(transaction, astNodes, fieldName, value);
       }
     });
   });
   return transaction;
 };
+const replaceAstNodesWithRichInlineNodes = (transaction, astNodes, fieldName, value) => {
+  astNodes.forEach(astNode => {
+    if (astNode.position) {
+      const [from, to] = astNode.position;
+      const documentFrom = getDocumentPosition(transaction.doc, from);
+      if (!isRichInlineNode(transaction.doc, documentFrom)) {
+        const documentTo = getDocumentPosition(transaction.doc, to);
+        const node = getRichInlineNode(fieldName, value, astNode.text);
+        transaction.replaceWith(documentFrom, documentTo, node);
+      }
+    }
+  });
+};
 const getRichInlineNode = (fieldName, value, text) => {
   switch (value.type) {
     case 'user':
@@ -71,6 +81,14 @@ const getRichInlineNode = (fieldName, value, text) => {
           fieldName
         }, textContent);
       }
+    case 'lozengeWithAvatar':
+      {
+        const textContent = JQLEditorSchema.text(text);
+        return JQLEditorSchema.nodes.lozengeWithAvatar.create({
+          ...value,
+          fieldName
+        }, textContent);
+      }
     default:
       {
         throw new Error(`Unsupported hydrated value type ${value.type}`);
@@ -93,6 +111,12 @@ const getMembersOfArgumentNodes = (ast, teamId) => {
   }
   return ast.query.accept(new FindMembersOfArgumentsVisitor(teamId));
 };
+const getFunctionArgumentNodes = (ast, fieldName, valueId) => {
+  if (!ast.query) {
+    return [];
+  }
+  return ast.query.accept(new FindFunctionArgumentsVisitor(fieldName, valueId));
+};
 
 /**
  * Base visitor class for traversing JQL AST to find specific nodes.
@@ -161,6 +185,30 @@ class FindValuesVisitor extends BaseAstNodeFinder {
   }
 }
 
+/**
+ * Visitor that finds function arguments for a specific field matching a target value id.
+ * This visitor is field-aware: it processes clauses for the given field and matches arguments by their raw value.
+ */
+class FindFunctionArgumentsVisitor extends BaseAstNodeFinder {
+  constructor(fieldName, targetValueId) {
+    super();
+    _defineProperty(this, "visitTerminalClause", terminalClause => {
+      if (!this.equalsIgnoreCase(terminalClause.field.value, this.fieldName)) {
+        return [];
+      }
+      if (terminalClause.operand === undefined) {
+        return [];
+      }
+      return terminalClause.operand.accept(this);
+    });
+    _defineProperty(this, "visitFunctionOperand", functionOperand => {
+      return functionOperand.arguments.filter(arg => this.equalsIgnoreCase(arg.value.trim(), this.targetValueId));
+    });
+    this.fieldName = fieldName;
+    this.targetValueId = targetValueId.trim();
+  }
+}
+
 /**
  * Visitor that finds membersOf function arguments matching a specific team ID.
  * Used for queries like "assignee in membersOf("id: <uuid>")".

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

@@ -59,14 +59,14 @@ export class ValidQueryVisitor extends AbstractJastVisitor {
       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-membersof-team-support')) {
-        return '';
-      }
       const args = functionOperand.arguments.map(arg => arg.text).join(', ');
-      return `${functionOperand.function.text}(${args})`;
+
+      // The generic gate supersedes the legacy membersOf-specific gate: when
+      // jql-function-arg-hydration is on, any function with arguments is included (covering
+      // membersOf and all others). Otherwise fall back to the legacy membersOf-only path.
+      const shouldIncludeFunction = fg('jql-function-arg-hydration') ? functionOperand.arguments.length > 0 : functionName === 'membersof' && fg('jira-membersof-team-support');
+      return shouldIncludeFunction ? `${functionOperand.function.text}(${args})` : '';
     });
   }
   defaultResult() {

package/dist/es2019/state/index.js

@@ -927,14 +927,24 @@ export const useHydratedGoal = createHook(Store, {
     return goal && goal.type === 'goal' ? goal : undefined;
   }
 });
+export const useHydratedLozengeWithAvatar = createHook(Store, {
+  selector: (state, {
+    id,
+    fieldName
+  }) => {
+    var _state$hydratedValues0;
+    const value = (_state$hydratedValues0 = state.hydratedValues[normaliseHydrationKey(fieldName)]) === null || _state$hydratedValues0 === void 0 ? void 0 : _state$hydratedValues0.get(normaliseJqlString(id));
+    return value && value.type === 'lozengeWithAvatar' ? value : undefined;
+  }
+});
 export const useHydratedDeprecations = createHook(Store, {
   selector: state => {
     const ast = getJastFromState(state.editorState);
     const fieldsInQuery = getFieldNodes(ast);
     const toReturn = [];
     Object.entries(state.hydratedValues).forEach(([fieldName]) => {
-      var _state$hydratedValues0;
-      (_state$hydratedValues0 = state.hydratedValues[fieldName]) === null || _state$hydratedValues0 === void 0 ? void 0 : _state$hydratedValues0.forEach(value => {
+      var _state$hydratedValues1;
+      (_state$hydratedValues1 = state.hydratedValues[fieldName]) === null || _state$hydratedValues1 === void 0 ? void 0 : _state$hydratedValues1.forEach(value => {
         if (value.type === 'deprecated-field') {
           if (fieldsInQuery.has(value.id.toLowerCase())) {
             toReturn.push(value);

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", "6.4.6", ANALYTICS_CHANNEL);
+  return useJqlPackageAnalytics(analyticsSource, "@atlaskit/jql-editor", "6.4.7", ANALYTICS_CHANNEL);
 };

package/dist/esm/plugins/rich-inline-nodes/nodes/index.js

@@ -1,8 +1,10 @@
 import { goal } from './goal';
+import { lozengeWithAvatar } from './lozenge-with-avatar';
 import { project } from './project';
 import { team } from './team';
 import { user } from './user';
 export var richInlineNodes = {
+  lozengeWithAvatar: lozengeWithAvatar,
   user: user,
   team: team,
   project: project,

package/dist/esm/plugins/rich-inline-nodes/nodes/lozenge-with-avatar/index.js

@@ -0,0 +1,34 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import React from 'react';
+import Avatar from '@atlaskit/avatar';
+import { useHydratedLozengeWithAvatar } from '../../../../state';
+import { AvatarWrapper, LozengeWithAvatarContainer, NameContainer } from './styled';
+var LozengeWithAvatar = function LozengeWithAvatar(_ref) {
+  var id = _ref.id,
+    name = _ref.name,
+    fieldName = _ref.fieldName,
+    selected = _ref.selected,
+    error = _ref.error;
+  var _useHydratedLozengeWi = useHydratedLozengeWithAvatar({
+      id: id,
+      fieldName: fieldName
+    }),
+    _useHydratedLozengeWi2 = _slicedToArray(_useHydratedLozengeWi, 1),
+    lozengeWithAvatar = _useHydratedLozengeWi2[0];
+  return /*#__PURE__*/React.createElement(LozengeWithAvatarContainer, {
+    selected: selected,
+    error: error
+  }, /*#__PURE__*/React.createElement(AvatarWrapper, null, /*#__PURE__*/React.createElement(Avatar, {
+    src: lozengeWithAvatar === null || lozengeWithAvatar === void 0 ? void 0 : lozengeWithAvatar.avatarUrl,
+    borderColor: "transparent",
+    size: "xsmall"
+  })), /*#__PURE__*/React.createElement(NameContainer, null, name));
+};
+export var lozengeWithAvatar = {
+  component: LozengeWithAvatar,
+  attrs: {
+    id: {},
+    name: {},
+    fieldName: {}
+  }
+};

package/dist/esm/plugins/rich-inline-nodes/nodes/lozenge-with-avatar/styled.js

@@ -0,0 +1,96 @@
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+import { css } from '@emotion/react';
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+import styled from '@emotion/styled';
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
+export var LozengeWithAvatarContainer =
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled -- Ignored via go/DSP-18766
+styled.span({
+  display: 'inline-flex',
+  alignItems: 'baseline',
+  paddingLeft: "var(--ds-space-025, 2px)",
+  borderRadius: "var(--ds-radius-xlarge, 12px)",
+  cursor: 'pointer',
+  userSelect: 'none'
+},
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-dynamic-styles -- Ignored via go/DSP-18766
+function (_ref) {
+  var selected = _ref.selected,
+    error = _ref.error;
+  if (selected) {
+    if (error) {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+      return css({
+        color: "var(--ds-text-inverse, #FFFFFF)",
+        backgroundColor: "var(--ds-background-danger-bold, #C9372C)",
+        textDecoration: 'wavy underline',
+        textDecorationThickness: '1px',
+        textDecorationSkipInk: 'none',
+        textDecorationColor: "var(--ds-text-inverse, #FFFFFF)"
+      });
+    } else {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+      return css({
+        color: "var(--ds-text, #292A2E)",
+        backgroundColor: "var(--ds-background-selected, #E9F2FE)",
+        boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)")
+      });
+    }
+  } else {
+    if (error) {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+      return css({
+        color: "var(--ds-text-subtle, #505258)",
+        backgroundColor: "var(--ds-background-neutral, #0515240F)",
+        textDecoration: 'wavy underline',
+        textDecorationThickness: '1px',
+        textDecorationSkipInk: 'none',
+        textDecorationColor: "var(--ds-text-danger, #AE2E24)",
+        '&:hover': {
+          backgroundColor: "var(--ds-background-neutral-hovered, #0B120E24)"
+        }
+      });
+    } else {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+      return css({
+        color: "var(--ds-text-subtle, #505258)",
+        backgroundColor: "var(--ds-background-neutral, #0515240F)",
+        '&:hover': {
+          backgroundColor: "var(--ds-background-neutral-hovered, #0B120E24)"
+        }
+      });
+    }
+  }
+});
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
+export var NameContainer =
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled -- Ignored via go/DSP-18766
+styled.span({
+  marginLeft: "var(--ds-space-075, 6px)",
+  marginRight: "var(--ds-space-100, 8px)",
+  // eslint-disable-next-line -- Ignored via go/DSP-18766
+  lineHeight: "var(--ds-space-250, 20px)"
+});
+
+/* Override Avatar styles to match design spec */
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
+export var AvatarWrapper =
+// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage, @atlaskit/ui-styling-standard/no-styled -- Ignored via go/DSP-18766
+styled.div({
+  height: "var(--ds-space-200, 16px)",
+  width: "var(--ds-space-200, 16px)",
+  alignSelf: 'center',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '> div span': {
+    margin: "var(--ds-space-0, 0px)"
+  },
+  // Fix fallback avatar icon vertical alignment.
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+  '> div > span:has(> span)': {
+    position: 'relative',
+    top: '-2px'
+  }
+});

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

@@ -1,10 +1,10 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 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; })(); }
@@ -27,32 +27,42 @@ export var replaceRichInlineNodes = function replaceRichInlineNodes(editorState,
       fieldName = _ref2[0],
       values = _ref2[1];
     values.forEach(function (value) {
-      if (value.type === 'user' || value.type === 'team' || value.type === 'goal' && FeatureGates.getExperimentValue('anip-1095-goals-in-harmonised-filter', 'isEnabled', false) || value.type === 'project' && FeatureGates.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1) {
-        // 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-membersof-team-support')) {
-          astNodes = getMembersOfArgumentNodes(ast, value.id);
+      if (fg('jql-function-arg-hydration')) {
+        // Skip deprecated fields
+        if (value.type === 'deprecated-field') {
+          return;
         }
-        astNodes.forEach(function (astNode) {
-          if (astNode.position) {
-            var _astNode$position = _slicedToArray(astNode.position, 2),
-              from = _astNode$position[0],
-              to = _astNode$position[1];
-            var documentFrom = getDocumentPosition(transaction.doc, from);
-            if (!isRichInlineNode(transaction.doc, documentFrom)) {
-              var documentTo = getDocumentPosition(transaction.doc, to);
-              var node = getRichInlineNode(fieldName, value, astNode.text);
-              transaction.replaceWith(documentFrom, documentTo, node);
-            }
-          }
-        });
+        // When the gate is on, collect both direct value operands and function argument
+        // operands for all node types
+        var astNodes = [].concat(_toConsumableArray(getValueNodes(ast, fieldName, value.id)), _toConsumableArray(getFunctionArgumentNodes(ast, fieldName, value.id)));
+        replaceAstNodesWithRichInlineNodes(transaction, astNodes, fieldName, value);
+      } else if (value.type === 'user' || value.type === 'team' || value.type === 'goal' && FeatureGates.getExperimentValue('anip-1095-goals-in-harmonised-filter', 'isEnabled', false) || value.type === 'project' && FeatureGates.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1) {
+        // Legacy path: direct value operands only, with membersOf fallback for teams.
+        var _astNodes = getValueNodes(ast, fieldName, value.id);
+        if (_astNodes.length === 0 && value.type === 'team' && fg('jira-membersof-team-support')) {
+          _astNodes = getMembersOfArgumentNodes(ast, value.id);
+        }
+        replaceAstNodesWithRichInlineNodes(transaction, _astNodes, fieldName, value);
       }
     });
   });
   return transaction;
 };
+var replaceAstNodesWithRichInlineNodes = function replaceAstNodesWithRichInlineNodes(transaction, astNodes, fieldName, value) {
+  astNodes.forEach(function (astNode) {
+    if (astNode.position) {
+      var _astNode$position = _slicedToArray(astNode.position, 2),
+        from = _astNode$position[0],
+        to = _astNode$position[1];
+      var documentFrom = getDocumentPosition(transaction.doc, from);
+      if (!isRichInlineNode(transaction.doc, documentFrom)) {
+        var documentTo = getDocumentPosition(transaction.doc, to);
+        var node = getRichInlineNode(fieldName, value, astNode.text);
+        transaction.replaceWith(documentFrom, documentTo, node);
+      }
+    }
+  });
+};
 var getRichInlineNode = function getRichInlineNode(fieldName, value, text) {
   switch (value.type) {
     case 'user':
@@ -83,6 +93,13 @@ var getRichInlineNode = function getRichInlineNode(fieldName, value, text) {
           fieldName: fieldName
         }), _textContent3);
       }
+    case 'lozengeWithAvatar':
+      {
+        var _textContent4 = JQLEditorSchema.text(text);
+        return JQLEditorSchema.nodes.lozengeWithAvatar.create(_objectSpread(_objectSpread({}, value), {}, {
+          fieldName: fieldName
+        }), _textContent4);
+      }
     default:
       {
         throw new Error("Unsupported hydrated value type ".concat(value.type));
@@ -105,6 +122,12 @@ var getMembersOfArgumentNodes = function getMembersOfArgumentNodes(ast, teamId)
   }
   return ast.query.accept(new FindMembersOfArgumentsVisitor(teamId));
 };
+var getFunctionArgumentNodes = function getFunctionArgumentNodes(ast, fieldName, valueId) {
+  if (!ast.query) {
+    return [];
+  }
+  return ast.query.accept(new FindFunctionArgumentsVisitor(fieldName, valueId));
+};
 
 /**
  * Base visitor class for traversing JQL AST to find specific nodes.
@@ -191,21 +214,51 @@ var FindValuesVisitor = /*#__PURE__*/function (_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>")".
+ * Visitor that finds function arguments for a specific field matching a target value id.
+ * This visitor is field-aware: it processes clauses for the given field and matches arguments by their raw value.
  */
-var FindMembersOfArgumentsVisitor = /*#__PURE__*/function (_BaseAstNodeFinder3) {
-  function FindMembersOfArgumentsVisitor(teamId) {
+var FindFunctionArgumentsVisitor = /*#__PURE__*/function (_BaseAstNodeFinder3) {
+  function FindFunctionArgumentsVisitor(fieldName, targetValueId) {
     var _this3;
-    _classCallCheck(this, FindMembersOfArgumentsVisitor);
-    _this3 = _callSuper(this, FindMembersOfArgumentsVisitor);
+    _classCallCheck(this, FindFunctionArgumentsVisitor);
+    _this3 = _callSuper(this, FindFunctionArgumentsVisitor);
     _defineProperty(_this3, "visitTerminalClause", function (terminalClause) {
+      if (!_this3.equalsIgnoreCase(terminalClause.field.value, _this3.fieldName)) {
+        return [];
+      }
       if (terminalClause.operand === undefined) {
         return [];
       }
       return terminalClause.operand.accept(_this3);
     });
     _defineProperty(_this3, "visitFunctionOperand", function (functionOperand) {
+      return functionOperand.arguments.filter(function (arg) {
+        return _this3.equalsIgnoreCase(arg.value.trim(), _this3.targetValueId);
+      });
+    });
+    _this3.fieldName = fieldName;
+    _this3.targetValueId = targetValueId.trim();
+    return _this3;
+  }
+  _inherits(FindFunctionArgumentsVisitor, _BaseAstNodeFinder3);
+  return _createClass(FindFunctionArgumentsVisitor);
+}(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 (_BaseAstNodeFinder4) {
+  function FindMembersOfArgumentsVisitor(teamId) {
+    var _this4;
+    _classCallCheck(this, FindMembersOfArgumentsVisitor);
+    _this4 = _callSuper(this, FindMembersOfArgumentsVisitor);
+    _defineProperty(_this4, "visitTerminalClause", function (terminalClause) {
+      if (terminalClause.operand === undefined) {
+        return [];
+      }
+      return terminalClause.operand.accept(_this4);
+    });
+    _defineProperty(_this4, "visitFunctionOperand", function (functionOperand) {
       var functionName = functionOperand.function.value.toLowerCase();
 
       // Only process membersOf function
@@ -216,18 +269,18 @@ var FindMembersOfArgumentsVisitor = /*#__PURE__*/function (_BaseAstNodeFinder3)
       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)) {
+        var normalizedArgValue = _this4.normalizeValue(arg.value);
+        var normalizedTeamId = _this4.normalizeValue(_this4.teamId);
+        if (_this4.equalsIgnoreCase(normalizedArgValue, normalizedTeamId)) {
           matchingArgs.push(arg);
         }
       });
       return matchingArgs;
     });
-    _this3.teamId = teamId;
-    return _this3;
+    _this4.teamId = teamId;
+    return _this4;
   }
-  _inherits(FindMembersOfArgumentsVisitor, _BaseAstNodeFinder3);
+  _inherits(FindMembersOfArgumentsVisitor, _BaseAstNodeFinder4);
   return _createClass(FindMembersOfArgumentsVisitor, [{
     key: "normalizeValue",
     value:

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

@@ -79,16 +79,16 @@ export var ValidQueryVisitor = /*#__PURE__*/function (_AbstractJastVisitor) {
       }).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-membersof-team-support')) {
-        return '';
-      }
       var args = functionOperand.arguments.map(function (arg) {
         return arg.text;
       }).join(', ');
-      return "".concat(functionOperand.function.text, "(").concat(args, ")");
+
+      // The generic gate supersedes the legacy membersOf-specific gate: when
+      // jql-function-arg-hydration is on, any function with arguments is included (covering
+      // membersOf and all others). Otherwise fall back to the legacy membersOf-only path.
+      var shouldIncludeFunction = fg('jql-function-arg-hydration') ? functionOperand.arguments.length > 0 : functionName === 'membersof' && fg('jira-membersof-team-support');
+      return shouldIncludeFunction ? "".concat(functionOperand.function.text, "(").concat(args, ")") : '';
     });
     return _this;
   }