@atlaskit/jql-editor 6.4.7 → 6.6.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/jql-editor
 
+## 6.6.0
+
+### Minor Changes
+
+- [`506238c0247fd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/506238c0247fd) -
+  PTC-16709: Added changes to show autocomplete for membersOf function to fetch Teams
+
+### Patch Changes
+
+- Updated dependencies
+
+## 6.5.0
+
+### Minor Changes
+
+- [`9ead91bedc94b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9ead91bedc94b) -
+  [ux] Add function argument hydration support behind feature flag
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 6.4.7
 
 ### Patch 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", "6.4.6", _jqlEditorCommon.ANALYTICS_CHANNEL);
+  return (0, _jqlEditorCommon.useJqlPackageAnalytics)(analyticsSource, "@atlaskit/jql-editor", "6.5.0", _jqlEditorCommon.ANALYTICS_CHANNEL);
 };

package/dist/cjs/plugins/autocomplete/constants.js

@@ -30,6 +30,9 @@ var defaultAutocompleteProvider = exports.defaultAutocompleteProvider = {
   },
   onFunctions: function onFunctions() {
     return (0, _empty.empty)();
+  },
+  onFunctionArguments: function onFunctionArguments() {
+    return (0, _empty.empty)();
   }
 };
 var JQLAutocompletePluginKey = exports.JQLAutocompletePluginKey = new _state.PluginKey(AUTOCOMPLETE_PLUGIN_NAME);

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

@@ -5,10 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.richInlineNodes = void 0;
 var _goal = require("./goal");
+var _lozengeWithAvatar = require("./lozenge-with-avatar");
 var _project = require("./project");
 var _team = require("./team");
 var _user = require("./user");
 var richInlineNodes = exports.richInlineNodes = {
+  lozengeWithAvatar: _lozengeWithAvatar.lozengeWithAvatar,
   user: _user.user,
   team: _team.team,
   project: _project.project,

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

@@ -0,0 +1,41 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.lozengeWithAvatar = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireDefault(require("react"));
+var _avatar = _interopRequireDefault(require("@atlaskit/avatar"));
+var _state = require("../../../../state");
+var _styled = require("./styled");
+var LozengeWithAvatar = function LozengeWithAvatar(_ref) {
+  var id = _ref.id,
+    name = _ref.name,
+    fieldName = _ref.fieldName,
+    selected = _ref.selected,
+    error = _ref.error;
+  var _useHydratedLozengeWi = (0, _state.useHydratedLozengeWithAvatar)({
+      id: id,
+      fieldName: fieldName
+    }),
+    _useHydratedLozengeWi2 = (0, _slicedToArray2.default)(_useHydratedLozengeWi, 1),
+    lozengeWithAvatar = _useHydratedLozengeWi2[0];
+  return /*#__PURE__*/_react.default.createElement(_styled.LozengeWithAvatarContainer, {
+    selected: selected,
+    error: error
+  }, /*#__PURE__*/_react.default.createElement(_styled.AvatarWrapper, null, /*#__PURE__*/_react.default.createElement(_avatar.default, {
+    src: lozengeWithAvatar === null || lozengeWithAvatar === void 0 ? void 0 : lozengeWithAvatar.avatarUrl,
+    borderColor: "transparent",
+    size: "xsmall"
+  })), /*#__PURE__*/_react.default.createElement(_styled.NameContainer, null, name));
+};
+var lozengeWithAvatar = exports.lozengeWithAvatar = {
+  component: LozengeWithAvatar,
+  attrs: {
+    id: {},
+    name: {},
+    fieldName: {}
+  }
+};

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

@@ -0,0 +1,105 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.NameContainer = exports.LozengeWithAvatarContainer = exports.AvatarWrapper = void 0;
+var _react = require("@emotion/react");
+var _styled = _interopRequireDefault(require("@emotion/styled"));
+// 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
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
+var LozengeWithAvatarContainer = exports.LozengeWithAvatarContainer =
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled -- Ignored via go/DSP-18766
+_styled.default.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 (0, _react.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 (0, _react.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 (0, _react.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 (0, _react.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
+var NameContainer = exports.NameContainer =
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled -- Ignored via go/DSP-18766
+_styled.default.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
+var AvatarWrapper = exports.AvatarWrapper =
+// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage, @atlaskit/ui-styling-standard/no-styled -- Ignored via go/DSP-18766
+_styled.default.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/cjs/plugins/rich-inline-nodes/util/replace-nodes-transaction.js

@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.replaceRichInlineNodes = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
 var _jqlAst = require("@atlaskit/jql-ast");
@@ -34,32 +34,42 @@ var replaceRichInlineNodes = exports.replaceRichInlineNodes = function replaceRi
       fieldName = _ref2[0],
       values = _ref2[1];
     values.forEach(function (value) {
-      if (value.type === 'user' || value.type === 'team' || value.type === 'goal' && _featureGateJsClient.default.getExperimentValue('anip-1095-goals-in-harmonised-filter', 'isEnabled', false) || value.type === 'project' && _featureGateJsClient.default.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' && (0, _platformFeatureFlags.fg)('jira-membersof-team-support')) {
-          astNodes = getMembersOfArgumentNodes(ast, value.id);
+      if ((0, _platformFeatureFlags.fg)('jql-function-arg-hydration')) {
+        // Skip deprecated fields
+        if (value.type === 'deprecated-field') {
+          return;
         }
-        astNodes.forEach(function (astNode) {
-          if (astNode.position) {
-            var _astNode$position = (0, _slicedToArray2.default)(astNode.position, 2),
-              from = _astNode$position[0],
-              to = _astNode$position[1];
-            var documentFrom = (0, _getDocumentPosition.default)(transaction.doc, from);
-            if (!isRichInlineNode(transaction.doc, documentFrom)) {
-              var documentTo = (0, _getDocumentPosition.default)(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((0, _toConsumableArray2.default)(getValueNodes(ast, fieldName, value.id)), (0, _toConsumableArray2.default)(getFunctionArgumentNodes(ast, fieldName, value.id)));
+        replaceAstNodesWithRichInlineNodes(transaction, astNodes, fieldName, value);
+      } else if (value.type === 'user' || value.type === 'team' || value.type === 'goal' && _featureGateJsClient.default.getExperimentValue('anip-1095-goals-in-harmonised-filter', 'isEnabled', false) || value.type === 'project' && _featureGateJsClient.default.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' && (0, _platformFeatureFlags.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 = (0, _slicedToArray2.default)(astNode.position, 2),
+        from = _astNode$position[0],
+        to = _astNode$position[1];
+      var documentFrom = (0, _getDocumentPosition.default)(transaction.doc, from);
+      if (!isRichInlineNode(transaction.doc, documentFrom)) {
+        var documentTo = (0, _getDocumentPosition.default)(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':
@@ -90,6 +100,13 @@ var getRichInlineNode = function getRichInlineNode(fieldName, value, text) {
           fieldName: fieldName
         }), _textContent3);
       }
+    case 'lozengeWithAvatar':
+      {
+        var _textContent4 = _schema.JQLEditorSchema.text(text);
+        return _schema.JQLEditorSchema.nodes.lozengeWithAvatar.create(_objectSpread(_objectSpread({}, value), {}, {
+          fieldName: fieldName
+        }), _textContent4);
+      }
     default:
       {
         throw new Error("Unsupported hydrated value type ".concat(value.type));
@@ -112,6 +129,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.
@@ -198,21 +221,51 @@ var FindValuesVisitor = /*#__PURE__*/function (_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>")".
+ * 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;
-    (0, _classCallCheck2.default)(this, FindMembersOfArgumentsVisitor);
-    _this3 = _callSuper(this, FindMembersOfArgumentsVisitor);
+    (0, _classCallCheck2.default)(this, FindFunctionArgumentsVisitor);
+    _this3 = _callSuper(this, FindFunctionArgumentsVisitor);
     (0, _defineProperty2.default)(_this3, "visitTerminalClause", function (terminalClause) {
+      if (!_this3.equalsIgnoreCase(terminalClause.field.value, _this3.fieldName)) {
+        return [];
+      }
       if (terminalClause.operand === undefined) {
         return [];
       }
       return terminalClause.operand.accept(_this3);
     });
     (0, _defineProperty2.default)(_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;
+  }
+  (0, _inherits2.default)(FindFunctionArgumentsVisitor, _BaseAstNodeFinder3);
+  return (0, _createClass2.default)(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;
+    (0, _classCallCheck2.default)(this, FindMembersOfArgumentsVisitor);
+    _this4 = _callSuper(this, FindMembersOfArgumentsVisitor);
+    (0, _defineProperty2.default)(_this4, "visitTerminalClause", function (terminalClause) {
+      if (terminalClause.operand === undefined) {
+        return [];
+      }
+      return terminalClause.operand.accept(_this4);
+    });
+    (0, _defineProperty2.default)(_this4, "visitFunctionOperand", function (functionOperand) {
       var functionName = functionOperand.function.value.toLowerCase();
 
       // Only process membersOf function
@@ -223,18 +276,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;
   }
-  (0, _inherits2.default)(FindMembersOfArgumentsVisitor, _BaseAstNodeFinder3);
+  (0, _inherits2.default)(FindMembersOfArgumentsVisitor, _BaseAstNodeFinder4);
   return (0, _createClass2.default)(FindMembersOfArgumentsVisitor, [{
     key: "normalizeValue",
     value:

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

@@ -85,16 +85,16 @@ var ValidQueryVisitor = exports.ValidQueryVisitor = /*#__PURE__*/function (_Abst
       }).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-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 = (0, _platformFeatureFlags.fg)('jql-function-arg-hydration') ? functionOperand.arguments.length > 0 : functionName === 'membersof' && (0, _platformFeatureFlags.fg)('jira-membersof-team-support');
+      return shouldIncludeFunction ? "".concat(functionOperand.function.text, "(").concat(args, ")") : '';
     });
     return _this;
   }

package/dist/cjs/state/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useStoreActions = exports.useScopedId = exports.useRichInlineNodesEnabled = exports.useOnSyntaxHelp = exports.useLineNumbersVisible = exports.useJqlError = exports.useIsSearching = exports.useIntl = exports.useIdPrefix = exports.useHydratedValue = exports.useHydratedUser = exports.useHydratedTeam = exports.useHydratedProject = exports.useHydratedGoal = exports.useHydratedDeprecations = exports.useExternalMessages = exports.useEditorViewHasFocus = exports.useEditorView = exports.useEditorStateHasJqlError = exports.useEditorState = exports.useCustomErrorComponent = exports.useAutocompleteProvider = exports.useAutocompletePosition = exports.useAutocompleteOptions = exports.useAutocompleteLoading = exports.useAutocompleteIsOpen = exports.useAutocomplete = exports.initialState = exports.actions = exports.EditorStateContainer = void 0;
+exports.useStoreActions = exports.useScopedId = exports.useRichInlineNodesEnabled = exports.useOnSyntaxHelp = exports.useLineNumbersVisible = exports.useJqlError = exports.useIsSearching = exports.useIntl = exports.useIdPrefix = exports.useHydratedValue = exports.useHydratedUser = exports.useHydratedTeam = exports.useHydratedProject = exports.useHydratedLozengeWithAvatar = exports.useHydratedGoal = exports.useHydratedDeprecations = exports.useExternalMessages = exports.useEditorViewHasFocus = exports.useEditorView = exports.useEditorStateHasJqlError = exports.useEditorState = exports.useCustomErrorComponent = exports.useAutocompleteProvider = exports.useAutocompletePosition = exports.useAutocompleteOptions = exports.useAutocompleteLoading = exports.useAutocompleteIsOpen = exports.useAutocomplete = exports.initialState = exports.actions = exports.EditorStateContainer = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -19,6 +19,7 @@ var _view = require("@atlaskit/editor-prosemirror/view");
 var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
 var _jqlAst = require("@atlaskit/jql-ast");
 var _jqlAutocomplete = require("@atlaskit/jql-autocomplete");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../analytics");
 var _selectErrorCommand = require("../commands/select-error-command");
 var _constants = require("../common/constants");
@@ -336,10 +337,26 @@ var actions = exports.actions = {
         onFields = _getState$autocomplet.onFields,
         onOperators = _getState$autocomplet.onOperators,
         onValues = _getState$autocomplet.onValues,
-        onFunctions = _getState$autocomplet.onFunctions;
+        onFunctions = _getState$autocomplet.onFunctions,
+        onFunctionArguments = _getState$autocomplet.onFunctionArguments;
       var optionTypes = [];
       var observables = [];
-      if (rules.value || rules.function ||
+      if (rules.functionArgument && onFunctionArguments && (0, _platformFeatureFlags.fg)('enable-jql-membersof-autocomplete')) {
+        var _context$field, _context$functionName;
+        // When the caret is inside a function argument (e.g. membersOf("...")), we call
+        // onFunctionArguments unconditionally in preference to the generic value/function
+        // providers. rules.functionArgument can co-exist with rules.function so we must check it
+        // first — before the outer rules.value/rules.function block — to avoid it being
+        // swallowed by the else-if chain.
+        var _rules$functionArgume = rules.functionArgument,
+          matchedText = _rules$functionArgume.matchedText,
+          context = _rules$functionArgume.context;
+        var fieldName = (_context$field = context === null || context === void 0 ? void 0 : context.field) !== null && _context$field !== void 0 ? _context$field : '';
+        var functionName = (_context$functionName = context === null || context === void 0 ? void 0 : context.functionName) !== null && _context$functionName !== void 0 ? _context$functionName : '';
+        var functionArguments$ = onFunctionArguments(fieldName, matchedText, functionName);
+        optionTypes.push('values');
+        observables.push(dispatch(actions.appendOptionsForObservable('values', functionArguments$, rules.functionArgument, 'value')));
+      } else if (rules.value || rules.function ||
       // If EMPTY is suggested as a token, we are also in "operand mode" and we don't want to call other providers
       // e.g. "assignee is " will return "EMPTY" token and "operator" rule as suggestions (because of "is not")
       tokens.values.includes('EMPTY')) {
@@ -357,16 +374,16 @@ var actions = exports.actions = {
         }
       } else if (rules.operator) {
         var _rules$operator = rules.operator,
-          context = _rules$operator.context,
-          matchedText = _rules$operator.matchedText;
-        var operators$ = (0, _autocomplete.sortOperators)(onOperators(matchedText, context === null || context === void 0 ? void 0 : context.field));
+          _context = _rules$operator.context,
+          _matchedText = _rules$operator.matchedText;
+        var operators$ = (0, _autocomplete.sortOperators)(onOperators(_matchedText, _context === null || _context === void 0 ? void 0 : _context.field));
         optionTypes.push('operators');
         observables.push(dispatch(actions.appendOptionsForObservable('operators', operators$, rules.operator, 'operator')));
       } else if (rules.field) {
         var _rules$field = rules.field,
-          _context = _rules$field.context,
-          _matchedText = _rules$field.matchedText;
-        var fields$ = onFields(_matchedText, _context === null || _context === void 0 ? void 0 : _context.clause);
+          _context2 = _rules$field.context,
+          _matchedText2 = _rules$field.matchedText;
+        var fields$ = onFields(_matchedText2, _context2 === null || _context2 === void 0 ? void 0 : _context2.clause);
         optionTypes.push('fields');
         observables.push(dispatch(actions.appendOptionsForObservable('fields', fields$, rules.field, 'field')));
       }
@@ -950,16 +967,25 @@ var useHydratedGoal = exports.useHydratedGoal = (0, _reactSweetState.createHook)
     return goal && goal.type === 'goal' ? goal : undefined;
   }
 });
+var useHydratedLozengeWithAvatar = exports.useHydratedLozengeWithAvatar = (0, _reactSweetState.createHook)(Store, {
+  selector: function selector(state, _ref43) {
+    var _state$hydratedValues0;
+    var id = _ref43.id,
+      fieldName = _ref43.fieldName;
+    var value = (_state$hydratedValues0 = state.hydratedValues[(0, _util.normaliseHydrationKey)(fieldName)]) === null || _state$hydratedValues0 === void 0 ? void 0 : _state$hydratedValues0.get((0, _jqlAst.normaliseJqlString)(id));
+    return value && value.type === 'lozengeWithAvatar' ? value : undefined;
+  }
+});
 var useHydratedDeprecations = exports.useHydratedDeprecations = (0, _reactSweetState.createHook)(Store, {
   selector: function selector(state) {
     var ast = (0, _jqlAst2.getJastFromState)(state.editorState);
     var fieldsInQuery = (0, _util2.getFieldNodes)(ast);
     var toReturn = [];
-    Object.entries(state.hydratedValues).forEach(function (_ref43) {
-      var _state$hydratedValues0;
-      var _ref44 = (0, _slicedToArray2.default)(_ref43, 1),
-        fieldName = _ref44[0];
-      (_state$hydratedValues0 = state.hydratedValues[fieldName]) === null || _state$hydratedValues0 === void 0 || _state$hydratedValues0.forEach(function (value) {
+    Object.entries(state.hydratedValues).forEach(function (_ref44) {
+      var _state$hydratedValues1;
+      var _ref45 = (0, _slicedToArray2.default)(_ref44, 1),
+        fieldName = _ref45[0];
+      (_state$hydratedValues1 = state.hydratedValues[fieldName]) === null || _state$hydratedValues1 === void 0 || _state$hydratedValues1.forEach(function (value) {
         if (value.type === 'deprecated-field') {
           if (fieldsInQuery.has(value.id.toLowerCase())) {
             toReturn.push(value);
@@ -982,19 +1008,19 @@ var useOnSyntaxHelp = exports.useOnSyntaxHelp = (0, _reactSweetState.createHook)
 });
 var EditorStateContainer = exports.EditorStateContainer = (0, _reactSweetState.createContainer)(Store, {
   onInit: function onInit() {
-    return function (_ref45, _ref46) {
-      var getState = _ref45.getState,
-        setState = _ref45.setState,
-        dispatch = _ref45.dispatch;
-      var intlRef = _ref46.intlRef,
-        query = _ref46.query,
-        isSearching = _ref46.isSearching,
-        autocompleteProvider = _ref46.autocompleteProvider,
-        externalMessages = _ref46.externalMessages,
-        enableRichInlineNodes = _ref46.enableRichInlineNodes,
-        onDebugUnsafeMessage = _ref46.onDebugUnsafeMessage,
-        onSyntaxHelp = _ref46.onSyntaxHelp,
-        customComponents = _ref46.customComponents;
+    return function (_ref46, _ref47) {
+      var getState = _ref46.getState,
+        setState = _ref46.setState,
+        dispatch = _ref46.dispatch;
+      var intlRef = _ref47.intlRef,
+        query = _ref47.query,
+        isSearching = _ref47.isSearching,
+        autocompleteProvider = _ref47.autocompleteProvider,
+        externalMessages = _ref47.externalMessages,
+        enableRichInlineNodes = _ref47.enableRichInlineNodes,
+        onDebugUnsafeMessage = _ref47.onDebugUnsafeMessage,
+        onSyntaxHelp = _ref47.onSyntaxHelp,
+        customComponents = _ref47.customComponents;
       setState({
         controlledQuery: query,
         query: query,
@@ -1023,18 +1049,18 @@ var EditorStateContainer = exports.EditorStateContainer = (0, _reactSweetState.c
     };
   },
   onUpdate: function onUpdate() {
-    return function (_ref47, _ref48) {
-      var getState = _ref47.getState,
-        setState = _ref47.setState,
-        dispatch = _ref47.dispatch;
-      var controlledQueryProp = _ref48.query,
-        isSearching = _ref48.isSearching,
-        autocompleteProvider = _ref48.autocompleteProvider,
-        externalMessages = _ref48.externalMessages,
-        enableRichInlineNodes = _ref48.enableRichInlineNodes,
-        onDebugUnsafeMessage = _ref48.onDebugUnsafeMessage,
-        onSyntaxHelp = _ref48.onSyntaxHelp,
-        customComponents = _ref48.customComponents;
+    return function (_ref48, _ref49) {
+      var getState = _ref48.getState,
+        setState = _ref48.setState,
+        dispatch = _ref48.dispatch;
+      var controlledQueryProp = _ref49.query,
+        isSearching = _ref49.isSearching,
+        autocompleteProvider = _ref49.autocompleteProvider,
+        externalMessages = _ref49.externalMessages,
+        enableRichInlineNodes = _ref49.enableRichInlineNodes,
+        onDebugUnsafeMessage = _ref49.onDebugUnsafeMessage,
+        onSyntaxHelp = _ref49.onSyntaxHelp,
+        customComponents = _ref49.customComponents;
       var _getState12 = getState(),
         controlledQuery = _getState12.controlledQuery,
         query = _getState12.query;

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

package/dist/es2019/plugins/autocomplete/constants.js

@@ -16,6 +16,7 @@ export const defaultAutocompleteProvider = {
   onFields: () => empty(),
   onOperators: () => empty(),
   onValues: () => empty(),
-  onFunctions: () => empty()
+  onFunctions: () => empty(),
+  onFunctionArguments: () => empty()
 };
 export const JQLAutocompletePluginKey = new PluginKey(AUTOCOMPLETE_PLUGIN_NAME);

package/dist/es2019/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 const richInlineNodes = {
+  lozengeWithAvatar,
   user,
   team,
   project,

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

@@ -0,0 +1,32 @@
+import React from 'react';
+import Avatar from '@atlaskit/avatar';
+import { useHydratedLozengeWithAvatar } from '../../../../state';
+import { AvatarWrapper, LozengeWithAvatarContainer, NameContainer } from './styled';
+const LozengeWithAvatar = ({
+  id,
+  name,
+  fieldName,
+  selected,
+  error
+}) => {
+  const [lozengeWithAvatar] = useHydratedLozengeWithAvatar({
+    id,
+    fieldName
+  });
+  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 const lozengeWithAvatar = {
+  component: LozengeWithAvatar,
+  attrs: {
+    id: {},
+    name: {},
+    fieldName: {}
+  }
+};