@lvce-editor/quick-pick-worker 4.0.0 → 4.2.0

package/dist/quickPickWorkerMain.js

@@ -1290,6 +1290,18 @@ const toCommandId = key => {
 const create$2 = () => {
   const states = Object.create(null);
   const commandMapRef = {};
+  const updateState = (uid, updater) => {
+    const current = states[uid];
+    const updatedState = updater(current.newState);
+    if (updatedState !== current.newState) {
+      states[uid] = {
+        newState: updatedState,
+        oldState: current.oldState,
+        scheduledState: updatedState
+      };
+    }
+    return Promise.resolve(updatedState);
+  };
   return {
     clear() {
       for (const key of Object.keys(states)) {
@@ -1298,13 +1310,13 @@ const create$2 = () => {
     },
     diff(uid, modules, numbers) {
       const {
-        newState,
-        oldState
+        oldState,
+        scheduledState
       } = states[uid];
       const diffResult = [];
       for (let i = 0; i < modules.length; i++) {
         const fn = modules[i];
-        if (!fn(oldState, newState)) {
+        if (!fn(oldState, scheduledState)) {
           diffResult.push(numbers[i]);
         }
       }
@@ -1322,18 +1334,27 @@ const create$2 = () => {
       return ids;
     },
     getKeys() {
-      return Object.keys(states).map(key => {
-        return Number.parseFloat(key);
-      });
+      return Object.keys(states).map(Number);
     },
     registerCommands(commandMap) {
       Object.assign(commandMapRef, commandMap);
     },
-    set(uid, oldState, newState) {
+    set(uid, oldState, newState, scheduledState) {
       states[uid] = {
         newState,
-        oldState
+        oldState,
+        scheduledState: scheduledState ?? newState
+      };
+    },
+    wrapAsyncCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        const context = {
+          getState: () => states[uid].newState,
+          updateState: updater => updateState(uid, updater)
+        };
+        await fn(context, ...args);
       };
+      return wrapped;
     },
     wrapCommand(fn) {
       const wrapped = async (uid, ...args) => {
@@ -1352,7 +1373,8 @@ const create$2 = () => {
         };
         states[uid] = {
           newState: latestNew,
-          oldState: latestOld.oldState
+          oldState: latestOld.oldState,
+          scheduledState: latestNew
         };
       };
       return wrapped;
@@ -1389,7 +1411,8 @@ const create$2 = () => {
         };
         states[uid] = {
           newState: latestNew,
-          oldState: latestOld.oldState
+          oldState: latestOld.oldState,
+          scheduledState: latestNew
         };
         return {
           error
@@ -1406,6 +1429,7 @@ const {
   getCommandIds,
   registerCommands,
   set: set$1,
+  wrapAsyncCommand,
   wrapCommand
 } = create$2();
 
@@ -1579,7 +1603,7 @@ const handleScrollBarPointerUp = (state, pointerId) => {
   };
 };
 
-const create = (uid, uri, listItemHeight, x, y, width, height, platform, args, workspaceUri, assetDir) => {
+const create = (uid, uri, listItemHeight, x, y, width, height, platform, args, _renderAllItems, workspaceUri, assetDir) => {
   const state = {
     allowEmptyResult: false,
     cursorOffset: 0,
@@ -2710,6 +2734,9 @@ const parseGotoline = value => {
   if (Number.isNaN(wantedLine)) {
     return -1;
   }
+  if (wantedLine < 1) {
+    return -1;
+  }
   return wantedLine;
 };
 
@@ -3093,6 +3120,10 @@ const getQuickPickSubProviderId = (id, prefix) => {
   }
 };
 
+const requestVersions = new Map();
+const requestVersionGenerator = {
+  value: 0
+};
 const isQuickInput = args => {
   const options = args.at(-1);
   return options?.mode === 'quickInput';
@@ -3143,6 +3174,51 @@ const setValue = async (state, newValue) => {
     value: newValue
   };
 };
+const setValueWithContext = async (context, newValue) => {
+  const state = context.getState();
+  if (state.value === newValue) {
+    return;
+  }
+  const requestVersion = ++requestVersionGenerator.value;
+  requestVersions.set(state.uid, requestVersion);
+  const result = await setValue(state, newValue);
+  await context.updateState(latestState => {
+    if (requestVersions.get(latestState.uid) !== requestVersion) {
+      return latestState;
+    }
+    return {
+      ...latestState,
+      fileIconCache: result.fileIconCache,
+      finalDeltaY: result.finalDeltaY,
+      focusedIndex: result.focusedIndex,
+      icons: result.icons,
+      inputSource: result.inputSource,
+      items: result.items,
+      picks: result.picks,
+      value: result.value
+    };
+  });
+  if (requestVersions.get(state.uid) === requestVersion) {
+    requestVersions.delete(state.uid);
+  }
+};
+
+const handleInputWithContext = async (context, newValue, cursorOffset, inputSource = Script) => {
+  const state = context.getState();
+  if (state.value !== newValue) {
+    await setValueWithContext(context, newValue);
+  }
+  await context.updateState(latestState => {
+    if (latestState.value !== newValue) {
+      return latestState;
+    }
+    return {
+      ...latestState,
+      cursorOffset,
+      inputSource
+    };
+  });
+};
 
 // TODO when user types letters -> no need to query provider again -> just filter existing results
 const handleInput = async (state, newValue, cursorOffset, inputSource = Script) => {
@@ -3385,7 +3461,7 @@ const parseArgs = (subId, args) => {
     placeholder: last.placeholder ? String(last.placeholder) : ''
   };
 };
-const loadContent = async state => {
+const getLoadedState = async state => {
   const {
     args,
     assetDir,
@@ -3418,7 +3494,6 @@ const loadContent = async state => {
   const finalDeltaY = getFinalDeltaY(listHeight, itemHeight, items.length);
   const parsedArgs = parseArgs(subId, args);
   const finalValue = parsedArgs.initialValue || value;
-  notifyVisible();
   return {
     ...state,
     args,
@@ -3440,6 +3515,30 @@ const loadContent = async state => {
     value: finalValue
   };
 };
+const loadContentWithContext = async context => {
+  const state = context.getState();
+  const loadedState = await getLoadedState(state);
+  await context.updateState(latestState => ({
+    ...latestState,
+    cursorOffset: loadedState.cursorOffset,
+    fileIconCache: loadedState.fileIconCache,
+    finalDeltaY: loadedState.finalDeltaY,
+    focused: loadedState.focused,
+    focusedIndex: loadedState.focusedIndex,
+    icons: loadedState.icons,
+    initial: loadedState.initial,
+    inputSource: loadedState.inputSource,
+    items: loadedState.items,
+    maxLineY: loadedState.maxLineY,
+    minLineY: loadedState.minLineY,
+    picks: loadedState.picks,
+    placeholder: loadedState.placeholder,
+    providerId: loadedState.providerId,
+    state: loadedState.state,
+    value: loadedState.value
+  }));
+  notifyVisible();
+};
 
 const SetCursorOffset = 'setCursorOffset';
 const SetFocusedIndex = 'setFocusedIndex';
@@ -3910,7 +4009,6 @@ const Viewlet = 'Viewlet';
 
 const HandleWheel = 'handleWheel';
 const HandlePointerDown = 'handlePointerDown';
-const HandleBeforeInput = 'handleBeforeInput';
 const HandleBlur = 'handleBlur';
 const HandleFocus = 'handleFocus';
 const HandleInput = 'handleInput';
@@ -3934,7 +4032,6 @@ const getQuickPickInputVirtualDom = (placeholder = '') => {
     className: InputBox,
     inputType: 'text',
     name: QuickPickInput,
-    onBeforeInput: HandleBeforeInput,
     onBlur: HandleBlur,
     onFocus: HandleFocus,
     onInput: HandleInput,
@@ -4228,9 +4325,6 @@ const renderEventListeners = () => {
   }, {
     name: HandleBlur,
     params: ['handleBlur']
-  }, {
-    name: HandleBeforeInput,
-    params: ['handleBeforeInput']
   }, {
     name: HandleInput,
     params: ['handleInput', 'event.target.value']
@@ -4338,21 +4432,21 @@ const commandMap = {
   'QuickPick.handleBlur': wrapCommand(handleBlur),
   'QuickPick.handleClickAt': wrapCommand(handleClickAt),
   'QuickPick.handleFocus': wrapCommand(handleFocus),
-  'QuickPick.handleInput': wrapCommand(handleInput),
+  'QuickPick.handleInput': wrapAsyncCommand(handleInputWithContext),
   'QuickPick.handleMessagePort': handleMessagePort,
   'QuickPick.handleScrollBarPointerDown': wrapCommand(handleScrollBarPointerDown),
   'QuickPick.handleScrollBarPointerMove': wrapCommand(handleScrollBarPointerMove),
   'QuickPick.handleScrollBarPointerUp': wrapCommand(handleScrollBarPointerUp),
   'QuickPick.handleWheel': wrapCommand(handleWheel),
   'QuickPick.initialize': initialize,
-  'QuickPick.loadContent': wrapCommand(loadContent),
+  'QuickPick.loadContent': wrapAsyncCommand(loadContentWithContext),
   'QuickPick.render2': render2,
   'QuickPick.renderEventListeners': renderEventListeners,
   'QuickPick.selectCurrentIndex': wrapCommand(selectCurrentIndex),
   'QuickPick.selectIndex': wrapCommand(selectIndex),
   'QuickPick.selectItem': wrapCommand(selectItem),
   'QuickPick.setDeltaY': wrapCommand(setDeltaY),
-  'QuickPick.setValue': wrapCommand(setValue),
+  'QuickPick.setValue': wrapAsyncCommand(setValueWithContext),
   'QuickPick.showQuickInput': showQuickInput,
   'QuickPick.showQuickPick': showQuickPick,
   'QuickPick.waitUntilVisible': waitUntilVisible

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/quick-pick-worker",
-  "version": "4.0.0",
+  "version": "4.2.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lvce-editor/quick-pick-worker.git"