@atlaskit/editor-plugin-autocomplete 4.1.1 → 4.1.3

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-autocomplete
 
+## 4.1.3
+
+### Patch Changes
+
+- [`5cd6c10a9394f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5cd6c10a9394f) -
+  Fix autocomplete context extraction when inline formatting inserts leaf nodes before the cursor,
+  preventing misaligned ghost-text suggestions that can surface as stray spaces.
+
+## 4.1.2
+
+### Patch Changes
+
+- [`88a1176b97a25`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/88a1176b97a25) -
+  Internal TypeScript typecheck fixes for ts7 (tsgo) adoption. No functional or API changes.
+- Updated dependencies
+
 ## 4.1.1
 
 ### Patch Changes

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

@@ -38,6 +38,7 @@ var MAX_INGESTED_CONTEXT_TEXTS = 50;
 // 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 INLINE_LEAF_TEXT = ' ';
 
 // eslint-disable-next-line require-unicode-regexp
 var TRAILING_NON_BOUNDARY_TOKEN_REGEX = /([^\s.,;:!?]*)$/;
@@ -63,7 +64,8 @@ var getTextBeforeCursor = function getTextBeforeCursor(state) {
   var maxChars = 200;
   var blockNode = $from.parent;
   var offsetInBlock = $from.parentOffset;
-  var blockText = blockNode.textContent.slice(0, offsetInBlock);
+  // PM offsets count inline leaf nodes; textContent indices do not.
+  var blockText = blockNode.textBetween(0, offsetInBlock, undefined, INLINE_LEAF_TEXT);
   if (blockText.length >= maxChars) {
     return blockText.slice(-maxChars);
   }
@@ -76,7 +78,7 @@ var getTextBeforeCursor = function getTextBeforeCursor(state) {
     var indexInParent = $from.index(depth);
     for (var i = indexInParent - 1; i >= 0 && fullText.length < maxChars; i--) {
       var sibling = parentNode.child(i);
-      var siblingText = sibling.textContent;
+      var siblingText = sibling.textBetween(0, sibling.content.size, '\n', INLINE_LEAF_TEXT);
       fullText = siblingText + '\n' + fullText;
     }
     depth--;

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

@@ -686,7 +686,7 @@ var createLocalSlowLaneClient = exports.createLocalSlowLaneClient = function cre
    */
   var probeWebGpuCapabilities = /*#__PURE__*/function () {
     var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-      var gpu, _adapter$limits, _adapter$limits2, adapter, vendor, architecture, _adapter$info, _adapter$requestAdapt, info, _t, _t2, _t3;
+      var gpu, _adapter$limits, _adapter$limits2, adapter, vendor, architecture, _info, _requestAdapterInfo, _ref9, info, _t, _t2, _t3;
       return _regenerator.default.wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -714,16 +714,16 @@ var createLocalSlowLaneClient = exports.createLocalSlowLaneClient = function cre
             });
           case 3:
             _context2.prev = 3;
-            if (!((_adapter$info = adapter.info) !== null && _adapter$info !== void 0)) {
+            if (!((_info = adapter.info) !== null && _info !== void 0)) {
               _context2.next = 4;
               break;
             }
-            _t = _adapter$info;
+            _t = _info;
             _context2.next = 6;
             break;
           case 4:
             _context2.next = 5;
-            return (_adapter$requestAdapt = adapter.requestAdapterInfo) === null || _adapter$requestAdapt === void 0 ? void 0 : _adapter$requestAdapt.call(adapter);
+            return (_requestAdapterInfo = (_ref9 = adapter).requestAdapterInfo) === null || _requestAdapterInfo === void 0 ? void 0 : _requestAdapterInfo.call(_ref9);
           case 5:
             _t = _context2.sent;
           case 6:
@@ -815,7 +815,7 @@ var createLocalSlowLaneClient = exports.createLocalSlowLaneClient = function cre
     initFailed = true;
   };
   var initEngine = /*#__PURE__*/function () {
-    var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+    var _ref0 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
       var capabilities, startTime, _yield$Promise$all3, _yield$Promise$all4, _yield$Promise$all4$, MLCEngineCtor, prebuiltAppConfig, customModelRecord, appConfig, newEngine, loadDurationMs, errorMsg, _t4;
       return _regenerator.default.wrap(function (_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -933,7 +933,7 @@ var createLocalSlowLaneClient = exports.createLocalSlowLaneClient = function cre
       }, _callee3, null, [[5, 9]]);
     }));
     return function initEngine() {
-      return _ref9.apply(this, arguments);
+      return _ref0.apply(this, arguments);
     };
   }();
   var ensureEngineInitialized = function ensureEngineInitialized() {
@@ -960,7 +960,7 @@ var createLocalSlowLaneClient = exports.createLocalSlowLaneClient = function cre
    *     384-d semantic vector (passage-encoded; see `wrapForArctic`).
    */
   var runInference = /*#__PURE__*/function () {
-    var _ref0 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(text, requestId) {
+    var _ref1 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(text, requestId) {
       var experienceId, lmText, semanticText, arcticInput, captureCompletionTime, _data, tStart, tLmDone, tEmbDone, _yield$Promise$all5, _yield$Promise$all6, embeddingResponse, rawLogits, payload, embedding, sumSq, i, topTokens, errorMsg, _t5;
       return _regenerator.default.wrap(function (_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -1080,17 +1080,17 @@ var createLocalSlowLaneClient = exports.createLocalSlowLaneClient = function cre
               // eslint-disable-next-line no-console
               console.log(storedLmLogits ? "\u2705 lm_logits: ".concat(Object.keys(storedLmLogits).length, " words") : '❌ No lm_logits');
               if (storedLmLogits) {
-                topTokens = Object.entries(storedLmLogits).sort(function (_ref1, _ref10) {
-                  var _ref11 = (0, _slicedToArray2.default)(_ref1, 2),
-                    a = _ref11[1];
+                topTokens = Object.entries(storedLmLogits).sort(function (_ref10, _ref11) {
                   var _ref12 = (0, _slicedToArray2.default)(_ref10, 2),
-                    b = _ref12[1];
+                    a = _ref12[1];
+                  var _ref13 = (0, _slicedToArray2.default)(_ref11, 2),
+                    b = _ref13[1];
                   return b - a;
                 }).slice(0, 10); // eslint-disable-next-line no-console
-                console.log('Top 10 predictions:', topTokens.map(function (_ref13) {
-                  var _ref14 = (0, _slicedToArray2.default)(_ref13, 2),
-                    t = _ref14[0],
-                    p = _ref14[1];
+                console.log('Top 10 predictions:', topTokens.map(function (_ref14) {
+                  var _ref15 = (0, _slicedToArray2.default)(_ref14, 2),
+                    t = _ref15[0],
+                    p = _ref15[1];
                   return "".concat(t, ": ").concat((p * 100).toFixed(1), "%");
                 }).join(', '));
               }
@@ -1151,7 +1151,7 @@ var createLocalSlowLaneClient = exports.createLocalSlowLaneClient = function cre
       }, _callee4, null, [[2, 5]]);
     }));
     return function runInference(_x, _x2) {
-      return _ref0.apply(this, arguments);
+      return _ref1.apply(this, arguments);
     };
   }();
 

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

@@ -24,6 +24,7 @@ const MAX_INGESTED_CONTEXT_TEXTS = 50;
 // non-comment editors (where parentCommentContent never arrives) don't refetch
 // on every word boundary for the plugin's lifetime.
 const MAX_CONTEXT_REFRESH_ATTEMPTS = 5;
+const INLINE_LEAF_TEXT = ' ';
 
 // eslint-disable-next-line require-unicode-regexp
 const TRAILING_NON_BOUNDARY_TOKEN_REGEX = /([^\s.,;:!?]*)$/;
@@ -47,7 +48,8 @@ const getTextBeforeCursor = state => {
   const maxChars = 200;
   const blockNode = $from.parent;
   const offsetInBlock = $from.parentOffset;
-  const blockText = blockNode.textContent.slice(0, offsetInBlock);
+  // PM offsets count inline leaf nodes; textContent indices do not.
+  const blockText = blockNode.textBetween(0, offsetInBlock, undefined, INLINE_LEAF_TEXT);
   if (blockText.length >= maxChars) {
     return blockText.slice(-maxChars);
   }
@@ -60,7 +62,7 @@ const getTextBeforeCursor = state => {
     const indexInParent = $from.index(depth);
     for (let i = indexInParent - 1; i >= 0 && fullText.length < maxChars; i--) {
       const sibling = parentNode.child(i);
-      const siblingText = sibling.textContent;
+      const siblingText = sibling.textBetween(0, sibling.content.size, '\n', INLINE_LEAF_TEXT);
       fullText = siblingText + '\n' + fullText;
     }
     depth--;

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

@@ -560,8 +560,8 @@ export const createLocalSlowLaneClient = (config = {}) => {
       let vendor;
       let architecture;
       try {
-        var _adapter$info, _adapter$requestAdapt;
-        const info = (_adapter$info = adapter.info) !== null && _adapter$info !== void 0 ? _adapter$info : await ((_adapter$requestAdapt = adapter.requestAdapterInfo) === null || _adapter$requestAdapt === void 0 ? void 0 : _adapter$requestAdapt.call(adapter));
+        var _info, _requestAdapterInfo, _ref;
+        const info = (_info = adapter.info) !== null && _info !== void 0 ? _info : await ((_requestAdapterInfo = (_ref = adapter).requestAdapterInfo) === null || _requestAdapterInfo === void 0 ? void 0 : _requestAdapterInfo.call(_ref));
         vendor = (info === null || info === void 0 ? void 0 : info.vendor) || undefined;
         architecture = (info === null || info === void 0 ? void 0 : info.architecture) || undefined;
       } catch {

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

@@ -31,6 +31,7 @@ var MAX_INGESTED_CONTEXT_TEXTS = 50;
 // 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 INLINE_LEAF_TEXT = ' ';
 
 // eslint-disable-next-line require-unicode-regexp
 var TRAILING_NON_BOUNDARY_TOKEN_REGEX = /([^\s.,;:!?]*)$/;
@@ -56,7 +57,8 @@ var getTextBeforeCursor = function getTextBeforeCursor(state) {
   var maxChars = 200;
   var blockNode = $from.parent;
   var offsetInBlock = $from.parentOffset;
-  var blockText = blockNode.textContent.slice(0, offsetInBlock);
+  // PM offsets count inline leaf nodes; textContent indices do not.
+  var blockText = blockNode.textBetween(0, offsetInBlock, undefined, INLINE_LEAF_TEXT);
   if (blockText.length >= maxChars) {
     return blockText.slice(-maxChars);
   }
@@ -69,7 +71,7 @@ var getTextBeforeCursor = function getTextBeforeCursor(state) {
     var indexInParent = $from.index(depth);
     for (var i = indexInParent - 1; i >= 0 && fullText.length < maxChars; i--) {
       var sibling = parentNode.child(i);
-      var siblingText = sibling.textContent;
+      var siblingText = sibling.textBetween(0, sibling.content.size, '\n', INLINE_LEAF_TEXT);
       fullText = siblingText + '\n' + fullText;
     }
     depth--;

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

@@ -676,7 +676,7 @@ export var createLocalSlowLaneClient = function createLocalSlowLaneClient() {
    */
   var probeWebGpuCapabilities = /*#__PURE__*/function () {
     var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      var gpu, _adapter$limits, _adapter$limits2, adapter, vendor, architecture, _adapter$info, _adapter$requestAdapt, info, _t, _t2, _t3;
+      var gpu, _adapter$limits, _adapter$limits2, adapter, vendor, architecture, _info, _requestAdapterInfo, _ref9, info, _t, _t2, _t3;
       return _regeneratorRuntime.wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -704,16 +704,16 @@ export var createLocalSlowLaneClient = function createLocalSlowLaneClient() {
             });
           case 3:
             _context2.prev = 3;
-            if (!((_adapter$info = adapter.info) !== null && _adapter$info !== void 0)) {
+            if (!((_info = adapter.info) !== null && _info !== void 0)) {
               _context2.next = 4;
               break;
             }
-            _t = _adapter$info;
+            _t = _info;
             _context2.next = 6;
             break;
           case 4:
             _context2.next = 5;
-            return (_adapter$requestAdapt = adapter.requestAdapterInfo) === null || _adapter$requestAdapt === void 0 ? void 0 : _adapter$requestAdapt.call(adapter);
+            return (_requestAdapterInfo = (_ref9 = adapter).requestAdapterInfo) === null || _requestAdapterInfo === void 0 ? void 0 : _requestAdapterInfo.call(_ref9);
           case 5:
             _t = _context2.sent;
           case 6:
@@ -805,7 +805,7 @@ export var createLocalSlowLaneClient = function createLocalSlowLaneClient() {
     initFailed = true;
   };
   var initEngine = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+    var _ref0 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
       var capabilities, startTime, _yield$Promise$all3, _yield$Promise$all4, _yield$Promise$all4$, MLCEngineCtor, prebuiltAppConfig, customModelRecord, appConfig, newEngine, loadDurationMs, errorMsg, _t4;
       return _regeneratorRuntime.wrap(function (_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -921,7 +921,7 @@ export var createLocalSlowLaneClient = function createLocalSlowLaneClient() {
       }, _callee3, null, [[5, 9]]);
     }));
     return function initEngine() {
-      return _ref9.apply(this, arguments);
+      return _ref0.apply(this, arguments);
     };
   }();
   var ensureEngineInitialized = function ensureEngineInitialized() {
@@ -948,7 +948,7 @@ export var createLocalSlowLaneClient = function createLocalSlowLaneClient() {
    *     384-d semantic vector (passage-encoded; see `wrapForArctic`).
    */
   var runInference = /*#__PURE__*/function () {
-    var _ref0 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(text, requestId) {
+    var _ref1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(text, requestId) {
       var experienceId, lmText, semanticText, arcticInput, captureCompletionTime, _data, tStart, tLmDone, tEmbDone, _yield$Promise$all5, _yield$Promise$all6, embeddingResponse, rawLogits, payload, embedding, sumSq, i, topTokens, errorMsg, _t5;
       return _regeneratorRuntime.wrap(function (_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -1068,17 +1068,17 @@ export var createLocalSlowLaneClient = function createLocalSlowLaneClient() {
               // eslint-disable-next-line no-console
               console.log(storedLmLogits ? "\u2705 lm_logits: ".concat(Object.keys(storedLmLogits).length, " words") : '❌ No lm_logits');
               if (storedLmLogits) {
-                topTokens = Object.entries(storedLmLogits).sort(function (_ref1, _ref10) {
-                  var _ref11 = _slicedToArray(_ref1, 2),
-                    a = _ref11[1];
+                topTokens = Object.entries(storedLmLogits).sort(function (_ref10, _ref11) {
                   var _ref12 = _slicedToArray(_ref10, 2),
-                    b = _ref12[1];
+                    a = _ref12[1];
+                  var _ref13 = _slicedToArray(_ref11, 2),
+                    b = _ref13[1];
                   return b - a;
                 }).slice(0, 10); // eslint-disable-next-line no-console
-                console.log('Top 10 predictions:', topTokens.map(function (_ref13) {
-                  var _ref14 = _slicedToArray(_ref13, 2),
-                    t = _ref14[0],
-                    p = _ref14[1];
+                console.log('Top 10 predictions:', topTokens.map(function (_ref14) {
+                  var _ref15 = _slicedToArray(_ref14, 2),
+                    t = _ref15[0],
+                    p = _ref15[1];
                   return "".concat(t, ": ").concat((p * 100).toFixed(1), "%");
                 }).join(', '));
               }
@@ -1139,7 +1139,7 @@ export var createLocalSlowLaneClient = function createLocalSlowLaneClient() {
       }, _callee4, null, [[2, 5]]);
     }));
     return function runInference(_x, _x2) {
-      return _ref0.apply(this, arguments);
+      return _ref1.apply(this, arguments);
     };
   }();
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-autocomplete",
-	"version": "4.1.1",
+	"version": "4.1.3",
 	"description": "Client-side text autocomplete plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -30,7 +30,7 @@
 		"wink-nlp": "^2.4.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.24.0",
+		"@atlaskit/editor-common": "^116.30.0",
 		"@atlaskit/editor-plugin-analytics": "^12.0.0",
 		"react": "^18.2.0"
 	},

package/src/pm-plugins/autocomplete-plugin.ts

@@ -47,6 +47,7 @@ const MAX_INGESTED_CONTEXT_TEXTS = 50;
 // non-comment editors (where parentCommentContent never arrives) don't refetch
 // on every word boundary for the plugin's lifetime.
 const MAX_CONTEXT_REFRESH_ATTEMPTS = 5;
+const INLINE_LEAF_TEXT = ' ';
 
 // eslint-disable-next-line require-unicode-regexp
 const TRAILING_NON_BOUNDARY_TOKEN_REGEX = /([^\s.,;:!?]*)$/;
@@ -82,7 +83,8 @@ const getTextBeforeCursor = (state: EditorState): string => {
 
 	const blockNode = $from.parent;
 	const offsetInBlock = $from.parentOffset;
-	const blockText = blockNode.textContent.slice(0, offsetInBlock);
+	// PM offsets count inline leaf nodes; textContent indices do not.
+	const blockText = blockNode.textBetween(0, offsetInBlock, undefined, INLINE_LEAF_TEXT);
 
 	if (blockText.length >= maxChars) {
 		return blockText.slice(-maxChars);
@@ -99,7 +101,7 @@ const getTextBeforeCursor = (state: EditorState): string => {
 
 		for (let i = indexInParent - 1; i >= 0 && fullText.length < maxChars; i--) {
 			const sibling = parentNode.child(i);
-			const siblingText = sibling.textContent;
+			const siblingText = sibling.textBetween(0, sibling.content.size, '\n', INLINE_LEAF_TEXT);
 			fullText = siblingText + '\n' + fullText;
 		}
 		depth--;

package/src/pm-plugins/local-slow-lane-client.ts

@@ -742,7 +742,9 @@ export const createLocalSlowLaneClient = (
 			let vendor: string | undefined;
 			let architecture: string | undefined;
 			try {
-				const info = adapter.info ?? (await adapter.requestAdapterInfo?.());
+				const info =
+					(adapter as MinimalGpuAdapter).info ??
+					(await (adapter as MinimalGpuAdapter).requestAdapterInfo?.());
 				vendor = info?.vendor || undefined;
 				architecture = info?.architecture || undefined;
 			} catch {