@atlaskit/editor-plugin-autocomplete 3.3.0 → 3.4.0

package/dist/es2019/pm-plugins/local-slow-lane-client.js

@@ -481,6 +481,14 @@ export const createLocalSlowLaneClient = (config = {}) => {
   let lastRequestedText = '';
   let requestCounter = 0;
   let latestRequestId = -1;
+  let inferenceInFlight = false;
+  let activeInferenceText = null;
+  // The requestId of the inference currently in flight. Tracked so the
+  // in-flight dedup path can restore `latestRequestId` to it — otherwise an
+  // intermediate keystroke that bumped `latestRequestId` would cause the
+  // in-flight (still-current) result to be discarded as stale.
+  let activeInferenceRequestId = -1;
+  let pendingInference = null;
   let ready = false;
   let destroyed = false;
   let initFailed = false;
@@ -708,8 +716,8 @@ export const createLocalSlowLaneClient = (config = {}) => {
         hasLmLogits: storedLmLogits !== null
       });
     } catch (err) {
-      // Discard errors for stale requests
-      if (requestId < latestRequestId) {
+      // Discard errors for stale requests or after teardown
+      if (requestId < latestRequestId || destroyed) {
         return;
       }
       storedContextVector = null;
@@ -729,10 +737,46 @@ export const createLocalSlowLaneClient = (config = {}) => {
 
   // ── Context update (debounced) ─────────────────────────────────────────
 
+  const startInference = (text, requestId) => {
+    // Self-contained guard: never start a new inference cycle after teardown,
+    // regardless of caller discipline.
+    if (destroyed) {
+      return;
+    }
+    inferenceInFlight = true;
+    activeInferenceText = text;
+    activeInferenceRequestId = requestId;
+    void ensureEngineInitialized().then(() => runInference(text, requestId)).catch(() => {}).finally(() => {
+      inferenceInFlight = false;
+      activeInferenceText = null;
+      activeInferenceRequestId = -1;
+      const next = pendingInference;
+      pendingInference = null;
+      if (next && !destroyed) {
+        startInference(next.text, next.requestId);
+      }
+    });
+  };
   const doUpdateContext = text => {
+    var _pendingInference;
     if (destroyed || !text || text.trim().length === 0) {
       return;
     }
+    if (inferenceInFlight && text === activeInferenceText) {
+      // The latest desired text already matches the in-flight inference, so
+      // re-running it would be wasted work. But an intermediate keystroke may
+      // have bumped `latestRequestId` past the in-flight request (and then been
+      // coalesced away), which would cause runInference to discard the
+      // still-current result as stale. Pin `latestRequestId` back to the active
+      // request so its result is accepted, and drop any now-superseded pending
+      // request.
+      latestRequestId = activeInferenceRequestId;
+      pendingInference = null;
+      return;
+    }
+    if (inferenceInFlight && ((_pendingInference = pendingInference) === null || _pendingInference === void 0 ? void 0 : _pendingInference.text) === text) {
+      return;
+    }
     const requestId = ++requestCounter;
     latestRequestId = requestId;
     if (isAutocompleteDebugEnabled()) {
@@ -746,12 +790,27 @@ export const createLocalSlowLaneClient = (config = {}) => {
       // eslint-disable-next-line no-console
       console.groupEnd();
     }
-    void ensureEngineInitialized().then(() => runInference(text, requestId)).catch(() => {});
+    if (inferenceInFlight) {
+      pendingInference = {
+        text,
+        requestId
+      };
+      return;
+    }
+    startInference(text, requestId);
   };
   const updateContextDebounced = text => {
     if (debounceTimer) {
       clearTimeout(debounceTimer);
     }
+    if (inferenceInFlight) {
+      pendingInference = null;
+      if (text === activeInferenceText) {
+        latestRequestId = activeInferenceRequestId;
+        lastRequestedText = text;
+        return;
+      }
+    }
     lastRequestedText = text;
     debounceTimer = setTimeout(() => {
       debounceTimer = null;
@@ -784,6 +843,10 @@ export const createLocalSlowLaneClient = (config = {}) => {
         unloadEngine(engineToUnload);
       }
       engineInitPromise = null;
+      inferenceInFlight = false;
+      activeInferenceText = null;
+      activeInferenceRequestId = -1;
+      pendingInference = null;
       storedContextVector = null;
       storedLmLogits = null;
     }

package/dist/esm/pm-plugins/autocomplete-plugin.js

@@ -1,4 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
@@ -7,12 +11,26 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { keydownHandler } from '@atlaskit/editor-prosemirror/keymap';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { isAutocompleteDebugEnabled } from './debug-mode';
 import { createGhostTextDecorationSet } from './ghost-text-decoration';
 import { createLocalSlowLaneClient } from './local-slow-lane-client';
 import { createSlowLaneClient, setDefaultSlowLaneClient, isWordBoundary } from './slow-lane-client';
 import { predict, loadDefaultVocabulary, loadVectorsAsync, incrementSessionFreq, ingestDocumentPage } from './text-predictor';
 export var autocompletePluginKey = new PluginKey('autocomplete');
 var DEBOUNCE_MS = 150;
+var NETWORK_SLOW_LANE_DEBOUNCE_MS = 300;
+var LOCAL_SLOW_LANE_DEBOUNCE_MS = 100;
+var CONTEXT_REFRESH_THROTTLE_MS = 1000;
+// Caps the dedup Set so long editing sessions don't retain every distinct
+// version of the (potentially hundreds-of-KB) page content for the plugin's
+// lifetime. Eviction is FIFO; a re-ingest of an evicted text is harmless.
+var MAX_INGESTED_CONTEXT_TEXTS = 50;
+// Caps how many times the word-boundary path will retry getContext() while the
+// parent comment is still missing. Combined with the 1s throttle this gives a
+// ~5s window to cover a still-loading comment thread, then stops permanently so
+// non-comment editors (where parentCommentContent never arrives) don't refetch
+// on every word boundary for the plugin's lifetime.
+var MAX_CONTEXT_REFRESH_ATTEMPTS = 5;
 var hasDestroy = function hasDestroy(client) {
   return 'destroy' in client && typeof client.destroy === 'function';
 };
@@ -177,6 +195,12 @@ export var createAutocompletePlugin = function createAutocompletePlugin(options,
   var debounceTimer = null;
   var hasIngestedPage = false;
   var resolvedContext;
+  /**
+   * Kept in sync with the live EditorView so the async getContext() promise
+   * can re-trigger a slow-lane update the moment context arrives, even if the
+   * user has already typed several words before the promise resolved.
+   */
+  var currentView = null;
   /**
    * Set after accepting a suggestion so the next doc-change update
    * skips scheduling a new prediction for the just-inserted text.
@@ -220,12 +244,125 @@ export var createAutocompletePlugin = function createAutocompletePlugin(options,
     });
   };
   var slowLaneClient = options !== null && options !== void 0 && options.useLocalModel ? createLocalSlowLaneClient({
-    debounceMs: 300
+    debounceMs: LOCAL_SLOW_LANE_DEBOUNCE_MS
   }) : createSlowLaneClient({
     baseUrl: '',
-    debounceMs: 300
+    debounceMs: NETWORK_SLOW_LANE_DEBOUNCE_MS
   });
   setDefaultSlowLaneClient(slowLaneClient);
+  var contextRequestInFlight = false;
+  var lastContextRefreshAt = 0;
+  // Bounds the word-boundary retry loop so it terminates even when the editor is
+  // not in a comment thread (parentCommentContent never resolves).
+  var wordBoundaryRefreshAttempts = 0;
+  // Set when the plugin is torn down so in-flight getContext() resolutions don't
+  // mutate the global text-predictor state after destruction.
+  var destroyed = false;
+  var ingestedContextTexts = new Set();
+  var logContextResolved = function logContextResolved(source, context) {
+    var _context$parentCommen, _context$siblingComme4, _context$siblingComme5;
+    if (!isAutocompleteDebugEnabled()) {
+      return;
+    }
+
+    // eslint-disable-next-line no-console
+    console.log('%c[Autocomplete] %cgetContext resolved', 'color: #00b8d9; font-weight: bold;', 'color: inherit;', {
+      source: source,
+      hasParentComment: !!(context !== null && context !== void 0 && context.parentCommentContent),
+      parentCommentPreview: context === null || context === void 0 || (_context$parentCommen = context.parentCommentContent) === null || _context$parentCommen === void 0 ? void 0 : _context$parentCommen.slice(0, 80),
+      siblingCount: (_context$siblingComme4 = context === null || context === void 0 || (_context$siblingComme5 = context.siblingCommentsContents) === null || _context$siblingComme5 === void 0 ? void 0 : _context$siblingComme5.length) !== null && _context$siblingComme4 !== void 0 ? _context$siblingComme4 : 0,
+      hasFullPage: !!(context !== null && context !== void 0 && context.fullPageContent)
+    });
+  };
+  var applyContext = function applyContext(context) {
+    var _context$siblingComme6;
+    // Merge rather than replace: the word-boundary retry may resolve only a
+    // late-arriving field (e.g. parentCommentContent) without re-sending
+    // fullPageContent, so replacing would drop previously resolved context.
+    // Strip undefined values first so a field explicitly set to undefined by
+    // getContext doesn't overwrite a previously resolved value.
+    var definedContext = Object.fromEntries(Object.entries(context).filter(function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+        value = _ref2[1];
+      return value !== undefined;
+    }));
+    resolvedContext = _objectSpread(_objectSpread({}, resolvedContext), definedContext);
+    var ingestContextText = function ingestContextText(text) {
+      if (!text || ingestedContextTexts.has(text)) {
+        return;
+      }
+      ingestedContextTexts.add(text);
+      // Evict oldest entries (Set preserves insertion order) to bound memory.
+      while (ingestedContextTexts.size > MAX_INGESTED_CONTEXT_TEXTS) {
+        var oldest = ingestedContextTexts.values().next().value;
+        if (oldest === undefined) {
+          break;
+        }
+        ingestedContextTexts.delete(oldest);
+      }
+      ingestDocumentPage(text);
+    };
+    ingestContextText(context.fullPageContent);
+    ingestContextText(context.parentCommentContent);
+    var _iterator = _createForOfIteratorHelper((_context$siblingComme6 = context.siblingCommentsContents) !== null && _context$siblingComme6 !== void 0 ? _context$siblingComme6 : []),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var siblingCommentContent = _step.value;
+        ingestContextText(siblingCommentContent);
+      }
+
+      // Context arrived after word boundaries may already have fired. Re-send
+      // slow-lane context immediately so the next inference includes the thread.
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    if (currentView) {
+      slowLaneClient.updateContext(buildSlowLaneText(currentView.state.doc.textContent, resolvedContext));
+    }
+  };
+
+  /**
+   * Returns true when a fetch was actually started, false when it was skipped
+   * (no getContext, a request already in flight, or throttled). Callers that
+   * track a retry budget should only count attempts where this returns true.
+   */
+  var refreshContext = function refreshContext(_ref3) {
+    var source = _ref3.source,
+      _ref3$allowThrottle = _ref3.allowThrottle,
+      allowThrottle = _ref3$allowThrottle === void 0 ? true : _ref3$allowThrottle;
+    if (!(options !== null && options !== void 0 && options.getContext) || contextRequestInFlight) {
+      return false;
+    }
+    var now = Date.now();
+    if (allowThrottle && now - lastContextRefreshAt < CONTEXT_REFRESH_THROTTLE_MS) {
+      return false;
+    }
+    contextRequestInFlight = true;
+    lastContextRefreshAt = now;
+    options.getContext().then(function (context) {
+      // Bail if the plugin was destroyed while the fetch was in flight —
+      // applyContext mutates global text-predictor state we must not touch
+      // after teardown.
+      if (destroyed) {
+        return;
+      }
+      logContextResolved(source, context);
+      if (!context) {
+        return;
+      }
+      applyContext(context);
+    }).catch(function (error) {
+      logException(error, {
+        location: 'editor-plugin-autocomplete/getContext'
+      });
+    }).finally(function () {
+      contextRequestInFlight = false;
+    });
+    return true;
+  };
 
   /**
    * Schedule a prediction after a short debounce.
@@ -397,26 +534,10 @@ export var createAutocompletePlugin = function createAutocompletePlugin(options,
           });
           if (!hasIngestedPage) {
             hasIngestedPage = true;
-            if (options !== null && options !== void 0 && options.getContext) {
-              options.getContext().then(function (context) {
-                var _context$siblingComme4;
-                if (!context) {
-                  return;
-                }
-                resolvedContext = context;
-                if (context.fullPageContent) {
-                  ingestDocumentPage(context.fullPageContent);
-                }
-                if (context.parentCommentContent) {
-                  ingestDocumentPage(context.parentCommentContent);
-                }
-                (_context$siblingComme4 = context.siblingCommentsContents) === null || _context$siblingComme4 === void 0 || _context$siblingComme4.forEach(ingestDocumentPage);
-              }).catch(function (error) {
-                logException(error, {
-                  location: 'editor-plugin-autocomplete/getContext'
-                });
-              });
-            }
+            refreshContext({
+              source: 'focus',
+              allowThrottle: false
+            });
           }
           return false;
         }
@@ -425,6 +546,7 @@ export var createAutocompletePlugin = function createAutocompletePlugin(options,
     view: function view() {
       return {
         update: function update(view, prevState) {
+          currentView = view;
           if (!prevState.doc.eq(view.state.doc)) {
             if (justAccepted) {
               justAccepted = false;
@@ -440,18 +562,36 @@ export var createAutocompletePlugin = function createAutocompletePlugin(options,
             maybeUpdateSessionFrequency(view, prevState);
             var textBefore = getTextBeforeCursor(view.state);
             if (isWordBoundary(textBefore)) {
+              var _resolvedContext;
               slowLaneClient.updateContext(buildSlowLaneText(view.state.doc.textContent, resolvedContext));
+
+              // Context may not have resolved on first focus (e.g. comment
+              // thread still loading). Retry on word boundaries until we have
+              // the parent comment, throttled so we don't refetch constantly
+              // and capped so non-comment editors stop retrying entirely.
+              if (!((_resolvedContext = resolvedContext) !== null && _resolvedContext !== void 0 && _resolvedContext.parentCommentContent) && wordBoundaryRefreshAttempts < MAX_CONTEXT_REFRESH_ATTEMPTS) {
+                // Only count the attempt when a fetch actually started, so an
+                // in-flight or throttled no-op doesn't burn the retry budget.
+                if (refreshContext({
+                  source: 'word-boundary'
+                })) {
+                  wordBoundaryRefreshAttempts++;
+                }
+              }
             }
             schedulePrediction(view);
           }
         },
         destroy: function destroy() {
+          destroyed = true;
+          currentView = null;
           if (debounceTimer) {
             clearTimeout(debounceTimer);
           }
           if (hasDestroy(slowLaneClient)) {
             slowLaneClient.destroy();
           }
+          ingestedContextTexts.clear();
           setDefaultSlowLaneClient(null);
         }
       };

package/dist/esm/pm-plugins/local-slow-lane-client.js

@@ -612,6 +612,14 @@ export var createLocalSlowLaneClient = function createLocalSlowLaneClient() {
   var lastRequestedText = '';
   var requestCounter = 0;
   var latestRequestId = -1;
+  var inferenceInFlight = false;
+  var activeInferenceText = null;
+  // The requestId of the inference currently in flight. Tracked so the
+  // in-flight dedup path can restore `latestRequestId` to it — otherwise an
+  // intermediate keystroke that bumped `latestRequestId` would cause the
+  // in-flight (still-current) result to be discarded as stale.
+  var activeInferenceRequestId = -1;
+  var pendingInference = null;
   var ready = false;
   var destroyed = false;
   var initFailed = false;
@@ -890,7 +898,7 @@ export var createLocalSlowLaneClient = function createLocalSlowLaneClient() {
           case 5:
             _context3.prev = 5;
             _t2 = _context3["catch"](2);
-            if (!(requestId < latestRequestId)) {
+            if (!(requestId < latestRequestId || destroyed)) {
               _context3.next = 6;
               break;
             }
@@ -921,10 +929,48 @@ export var createLocalSlowLaneClient = function createLocalSlowLaneClient() {
 
   // ── Context update (debounced) ─────────────────────────────────────────
 
+  var _startInference = function startInference(text, requestId) {
+    // Self-contained guard: never start a new inference cycle after teardown,
+    // regardless of caller discipline.
+    if (destroyed) {
+      return;
+    }
+    inferenceInFlight = true;
+    activeInferenceText = text;
+    activeInferenceRequestId = requestId;
+    void ensureEngineInitialized().then(function () {
+      return runInference(text, requestId);
+    }).catch(function () {}).finally(function () {
+      inferenceInFlight = false;
+      activeInferenceText = null;
+      activeInferenceRequestId = -1;
+      var next = pendingInference;
+      pendingInference = null;
+      if (next && !destroyed) {
+        _startInference(next.text, next.requestId);
+      }
+    });
+  };
   var doUpdateContext = function doUpdateContext(text) {
+    var _pendingInference;
     if (destroyed || !text || text.trim().length === 0) {
       return;
     }
+    if (inferenceInFlight && text === activeInferenceText) {
+      // The latest desired text already matches the in-flight inference, so
+      // re-running it would be wasted work. But an intermediate keystroke may
+      // have bumped `latestRequestId` past the in-flight request (and then been
+      // coalesced away), which would cause runInference to discard the
+      // still-current result as stale. Pin `latestRequestId` back to the active
+      // request so its result is accepted, and drop any now-superseded pending
+      // request.
+      latestRequestId = activeInferenceRequestId;
+      pendingInference = null;
+      return;
+    }
+    if (inferenceInFlight && ((_pendingInference = pendingInference) === null || _pendingInference === void 0 ? void 0 : _pendingInference.text) === text) {
+      return;
+    }
     var requestId = ++requestCounter;
     latestRequestId = requestId;
     if (isAutocompleteDebugEnabled()) {
@@ -938,14 +984,27 @@ export var createLocalSlowLaneClient = function createLocalSlowLaneClient() {
       // eslint-disable-next-line no-console
       console.groupEnd();
     }
-    void ensureEngineInitialized().then(function () {
-      return runInference(text, requestId);
-    }).catch(function () {});
+    if (inferenceInFlight) {
+      pendingInference = {
+        text: text,
+        requestId: requestId
+      };
+      return;
+    }
+    _startInference(text, requestId);
   };
   var updateContextDebounced = function updateContextDebounced(text) {
     if (debounceTimer) {
       clearTimeout(debounceTimer);
     }
+    if (inferenceInFlight) {
+      pendingInference = null;
+      if (text === activeInferenceText) {
+        latestRequestId = activeInferenceRequestId;
+        lastRequestedText = text;
+        return;
+      }
+    }
     lastRequestedText = text;
     debounceTimer = setTimeout(function () {
       debounceTimer = null;
@@ -984,6 +1043,10 @@ export var createLocalSlowLaneClient = function createLocalSlowLaneClient() {
         unloadEngine(engineToUnload);
       }
       engineInitPromise = null;
+      inferenceInFlight = false;
+      activeInferenceText = null;
+      activeInferenceRequestId = -1;
+      pendingInference = null;
       storedContextVector = null;
       storedLmLogits = null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-autocomplete",
-	"version": "3.3.0",
+	"version": "3.4.0",
 	"description": "Client-side text autocomplete plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,7 +35,7 @@
 		"wink-nlp": "^2.4.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^115.6.0",
+		"@atlaskit/editor-common": "^115.7.0",
 		"@atlaskit/editor-plugin-analytics": "^11.0.0",
 		"react": "^18.2.0"
 	},