@lvce-editor/editor-worker 19.57.0 → 19.58.1

package/dist/editorWorkerMain.js

@@ -1748,7 +1748,7 @@ const codeGeneratorAccept = state => {
 
 const editorStates = create$9();
 const {
-  dispose: dispose$3,
+  dispose: dispose$4,
   getCommandIds,
   registerCommands,
   wrapGetter
@@ -2309,7 +2309,7 @@ const getInitialLineState = initialLineState => {
   return deepCopy(initialLineState);
 };
 
-const state$d = {
+const state$e = {
   warned: []
 };
 const flattenTokensArray = tokens => {
@@ -2321,10 +2321,10 @@ const flattenTokensArray = tokens => {
   return flattened;
 };
 const warnDeprecatedArrayReturn = (languageId, fn) => {
-  if (state$d.warned.includes(fn)) {
+  if (state$e.warned.includes(fn)) {
     return;
   }
-  state$d.warned.push(fn);
+  state$e.warned.push(fn);
   console.warn(`tokenizers without hasArrayReturn=false are deprecated (language ${languageId})`);
 };
 const safeTokenizeLine = (languageId, tokenizeLine, line, lineStateAtStart, hasArrayReturn) => {
@@ -2385,14 +2385,14 @@ const TokenizePlainText = {
   tokenizeLine
 };
 
-const state$c = {
+const state$d = {
   enabled: false
 };
 const setEnabled$1 = value => {
-  state$c.enabled = value;
+  state$d.enabled = value;
 };
 const getEnabled$1 = () => {
-  return state$c.enabled;
+  return state$d.enabled;
 };
 
 const {
@@ -2400,25 +2400,25 @@ const {
   set: set$6
 } = SyntaxHighlightingWorker;
 
-const state$b = {
+const state$c = {
   pending: Object.create(null),
   tokenizePaths: Object.create(null),
   tokenizers: Object.create(null)
 };
 const has = languageId => {
-  return Object.hasOwn(state$b.tokenizers, languageId);
+  return Object.hasOwn(state$c.tokenizers, languageId);
 };
 const set$5 = (languageId, tokenizer) => {
-  state$b.tokenizers[languageId] = tokenizer;
+  state$c.tokenizers[languageId] = tokenizer;
 };
 const get$6 = languageId => {
-  return state$b.tokenizers[languageId];
+  return state$c.tokenizers[languageId];
 };
 const setTokenizePath = (languageId, tokenizePath) => {
-  state$b.tokenizePaths[languageId] = tokenizePath;
+  state$c.tokenizePaths[languageId] = tokenizePath;
 };
 const getTokenizePath$1 = languageId => {
-  return state$b.tokenizePaths[languageId] || '';
+  return state$c.tokenizePaths[languageId] || '';
 };
 const setTokenizePaths = languages => {
   for (const language of languages) {
@@ -2428,7 +2428,7 @@ const setTokenizePaths = languages => {
   }
 };
 const isPending = languageId => {
-  return Object.hasOwn(state$b.pending, languageId);
+  return Object.hasOwn(state$c.pending, languageId);
 };
 
 const tokenMaps = Object.create(null);
@@ -3256,14 +3256,14 @@ const getVisible$1 = async (editor, syncIncremental) => {
   };
 };
 
-const state$a = {
+const state$b = {
   enabled: false
 };
 const setEnabled = value => {
-  state$a.enabled = value;
+  state$b.enabled = value;
 };
 const getEnabled = () => {
-  return state$a.enabled;
+  return state$b.enabled;
 };
 
 // TODO this should be in a separate scrolling module
@@ -3490,7 +3490,94 @@ const getUrlAtOffset = (editor, offset) => {
 const EditorChange = 1;
 const EditorSelection$1 = 2;
 
-const state$9 = Object.create(null);
+const deliveries = new Map();
+const getDelta = (previous, next) => {
+  return Object.fromEntries(Object.entries(next).filter(([key, value]) => previous[key] !== value));
+};
+const flush = async delivery => {
+  while (delivery.pending && !delivery.disposed) {
+    const status = delivery.pendingStatus;
+    delivery.pending = false;
+    if (delivery.supportsDeltas === undefined) {
+      try {
+        delivery.supportsDeltas = (await delivery.rpc.invoke('StatusBar.supportsEditorStatusDeltas')) === true;
+      } catch {
+        delivery.supportsDeltas = false;
+      }
+    }
+    if (delivery.disposed) {
+      return;
+    }
+    let update = status;
+    if (delivery.hasBaseline) {
+      if (!delivery.baseline && !status) {
+        continue;
+      }
+      if (delivery.baseline && status) {
+        const delta = getDelta(delivery.baseline, status);
+        if (Object.keys(delta).length === 0) {
+          continue;
+        }
+        if (delivery.supportsDeltas) {
+          update = delta;
+        }
+      }
+    }
+    try {
+      await delivery.rpc.invoke('StatusBar.handleEditorStatusChanged', update);
+      delivery.baseline = status;
+      delivery.hasBaseline = true;
+    } catch (error) {
+      delivery.baseline = undefined;
+      delivery.hasBaseline = false;
+      console.warn('Failed to deliver editor status:', error);
+    }
+  }
+};
+const run$1 = async delivery => {
+  try {
+    await flush(delivery);
+  } finally {
+    delivery.running = undefined;
+  }
+  // An update can arrive after flush returns but before this continuation runs.
+  if (delivery.pending && !delivery.disposed) {
+    await start(delivery);
+  }
+};
+const start = delivery => {
+  delivery.running = run$1(delivery);
+  return delivery.running;
+};
+const dispose$3 = rpcId => {
+  const delivery = deliveries.get(rpcId);
+  if (delivery) {
+    delivery.disposed = true;
+    deliveries.delete(rpcId);
+  }
+};
+const send$2 = (rpcId, rpc, status) => {
+  let delivery = deliveries.get(rpcId);
+  if (!delivery || delivery.rpc !== rpc) {
+    dispose$3(rpcId);
+    delivery = {
+      baseline: undefined,
+      disposed: false,
+      hasBaseline: false,
+      pending: false,
+      pendingStatus: undefined,
+      rpc,
+      running: undefined,
+      supportsDeltas: undefined
+    };
+    deliveries.set(rpcId, delivery);
+  }
+  delivery.pendingStatus = status;
+  delivery.pending = true;
+  return delivery.running || start(delivery);
+};
+
+const state$a = Object.create(null);
 
 /**
  * Register a listener for a specific event type
@@ -3500,13 +3587,13 @@ const state$9 = Object.create(null);
 const registerListener$1 = (listenerType, rpcId) => {
   number(listenerType);
   number(rpcId);
-  if (!Object.hasOwn(state$9, listenerType)) {
-    state$9[listenerType] = [];
+  if (!Object.hasOwn(state$a, listenerType)) {
+    state$a[listenerType] = [];
   }
 
   // Avoid duplicate registrations
-  if (!state$9[listenerType].includes(rpcId)) {
-    state$9[listenerType].push(rpcId);
+  if (!state$a[listenerType].includes(rpcId)) {
+    state$a[listenerType].push(rpcId);
   }
 };
 
@@ -3518,10 +3605,13 @@ const registerListener$1 = (listenerType, rpcId) => {
 const unregisterListener$1 = (listenerType, rpcId) => {
   number(listenerType);
   number(rpcId);
-  if (Object.hasOwn(state$9, listenerType)) {
-    const index = state$9[listenerType].indexOf(rpcId);
+  if (listenerType === EditorSelection$1) {
+    dispose$3(rpcId);
+  }
+  if (Object.hasOwn(state$a, listenerType)) {
+    const index = state$a[listenerType].indexOf(rpcId);
     if (index !== -1) {
-      state$9[listenerType].splice(index, 1);
+      state$a[listenerType].splice(index, 1);
     }
   }
 };
@@ -3533,7 +3623,7 @@ const unregisterListener$1 = (listenerType, rpcId) => {
  */
 const getListeners = listenerType => {
   number(listenerType);
-  return state$9[listenerType] || [];
+  return state$a[listenerType] || [];
 };
 
 /**
@@ -4962,12 +5052,12 @@ const launchColorPickerWorker = async () => {
   return launchWorker(name, url, undefined, getColorPickerWorkerCommandMap());
 };
 
-const state$8 = {};
+const state$9 = {};
 const getOrCreate$3 = () => {
-  if (!state$8.workerPromise) {
-    state$8.workerPromise = launchColorPickerWorker();
+  if (!state$9.workerPromise) {
+    state$9.workerPromise = launchColorPickerWorker();
   }
-  return state$8.workerPromise;
+  return state$9.workerPromise;
 };
 const invoke$6 = async (method, ...params) => {
   const worker = await getOrCreate$3();
@@ -5614,7 +5704,7 @@ const diff2 = uid => {
 
 const autoSaveDelay = 1000;
 const pendingSaves = new Map();
-const state$7 = {
+const state$8 = {
   nextToken: 0
 };
 const run = async (uid, token, save) => {
@@ -5625,7 +5715,7 @@ const run = async (uid, token, save) => {
 };
 const schedule = (uid, save) => {
   dispose$2(uid);
-  const token = ++state$7.nextToken;
+  const token = ++state$8.nextToken;
   const timeout = setTimeout(run, autoSaveDelay, uid, token, save);
   pendingSaves.set(uid, {
     timeout,
@@ -5665,21 +5755,34 @@ const getEditorStatus = editor => {
   };
 };
 
-const equals = (oldStatus, newStatus) => {
-  return oldStatus.column === newStatus.column && oldStatus.endOfLine === newStatus.endOfLine && oldStatus.encoding === newStatus.encoding && oldStatus.insertSpaces === newStatus.insertSpaces && oldStatus.languageId === newStatus.languageId && oldStatus.line === newStatus.line && oldStatus.tabSize === newStatus.tabSize;
+const sendToListener = async (rpcId, status) => {
+  const rpc = get$9(rpcId);
+  if (rpc) {
+    await send$2(rpcId, rpc, status);
+  }
 };
-const notifyEditorStatusChange = async (oldEditor, newEditor) => {
-  if (newEditor.initial || !newEditor.focused) {
+const initializeListener = async rpcId => {
+  if (!getListeners(EditorSelection$1).includes(rpcId)) {
     return;
   }
-  const newStatus = getEditorStatus(newEditor);
-  if (!oldEditor.initial && oldEditor.focused && equals(getEditorStatus(oldEditor), newStatus)) {
+  const editor = getKeys$2().map(uid => get$8(Number(uid))?.newState).find(state => {
+    const {
+      focused,
+      initial
+    } = state || {};
+    return focused && !initial;
+  });
+  await sendToListener(rpcId, editor ? getEditorStatus(editor) : undefined);
+};
+const notifyEditorStatusChange = async (_oldEditor, newEditor) => {
+  if (newEditor.initial || !newEditor.focused) {
     return;
   }
-  await notifyListeners(EditorSelection$1, 'StatusBar.handleEditorStatusChanged', newStatus);
+  const status = getEditorStatus(newEditor);
+  await Promise.all(getListeners(EditorSelection$1).map(rpcId => sendToListener(rpcId, status)));
 };
 const notifyEditorStatusCleared = async () => {
-  await notifyListeners(EditorSelection$1, 'StatusBar.handleEditorStatusChanged', undefined);
+  await Promise.all(getListeners(EditorSelection$1).map(rpcId => sendToListener(rpcId, undefined)));
 };
 
 const addWidget$1 = widget => {
@@ -5774,7 +5877,7 @@ const disposeEditor = async editorUid => {
   });
   dispose$1(editorUid);
   dispose$2(editorUid);
-  dispose$3(editorUid);
+  dispose$4(editorUid);
   if (getKeys$2().length === 0) {
     await notifyEditorStatusCleared();
   }
@@ -6048,8 +6151,39 @@ const isFormattingError = error => {
   return error && error instanceof Error && error.message.startsWith(expectedErrorMessage$1);
 };
 
+const state$7 = {
+  configured: false,
+  lastId: -1,
+  nextId: 0
+};
+const configure = (start, end) => {
+  const {
+    configured
+  } = state$7;
+  if (configured) {
+    throw new Error('Component id range is already configured');
+  }
+  if (!Number.isSafeInteger(start) || !Number.isSafeInteger(end) || start <= 0 || end < start) {
+    throw new Error('Invalid component id range');
+  }
+  state$7.nextId = start;
+  state$7.lastId = end;
+  state$7.configured = true;
+};
 const create$8 = () => {
-  return Math.random();
+  const {
+    configured,
+    lastId,
+    nextId
+  } = state$7;
+  if (!configured) {
+    // Compatibility with renderer versions that do not assign worker id ranges.
+    return Math.random();
+  }
+  if (nextId > lastId) {
+    throw new Error('Component id range exhausted');
+  }
+  return state$7.nextId++;
 };
 
 const Message = 9;
@@ -14013,6 +14147,7 @@ const handleMessagePort = async (port, rpcId) => {
   });
   if (rpcId) {
     set$h(rpcId, rpc);
+    await initializeListener(rpcId);
   }
 };
 
@@ -14696,10 +14831,11 @@ const refreshGutterDecorationsAll = async () => {
  * @param listenerType - The type of event to listen for (from ListenerType enum)
  * @param rpcId - The RPC ID of the listener that will be notified
  */
-const registerListener = (listenerType, rpcId) => {
+const registerListener = async (listenerType, rpcId) => {
   number(listenerType);
   number(rpcId);
   registerListener$1(listenerType, rpcId);
+  await initializeListener(rpcId);
 };
 
 const renderAdditionalFocusContext$1 = (oldState, newState) => {
@@ -16511,9 +16647,10 @@ const commandMap = {
   'Hover.handleSashPointerUp': handleSashPointerUp,
   'Hover.loadContent': loadContent$1,
   'Hover.render': renderHover,
+  'Id.configure': configure,
   'Initialize.initialize': intialize,
   'Listener.register': registerListener,
-  'Listener.registerListener': registerListener$1,
+  'Listener.registerListener': registerListener,
   'Listener.unregister': unregisterListener,
   'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker': sendDeprecatedExtensionHostPortToExtensionManagementWorker,
   'SendMessagePortToExtensionManagementWorker.sendMessagePortToExtensionManagementWorker': sendMessagePortToExtensionManagementWorker

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "19.57.0",
+  "version": "19.58.1",
   "repository": {
     "type": "git",
     "url": "git@github.com:lvce-editor/editor-worker.git"