@lvce-editor/renderer-process 30.34.1 → 30.35.0

package/dist/rendererProcessMain.js

@@ -211,6 +211,42 @@ const showState = async () => {
   info(state);
 };
 
+const rpcs = new Map();
+const viewRpcIds = new Map();
+const get$9 = uid => {
+  const rpcId = viewRpcIds.get(uid);
+  return rpcId === undefined ? undefined : rpcs.get(rpcId);
+};
+const getViewUid = rpcId => {
+  let matchingUid;
+  for (const [uid, registeredRpcId] of viewRpcIds) {
+    if (registeredRpcId === rpcId) {
+      matchingUid = uid;
+    }
+  }
+  if (matchingUid === undefined) {
+    throw new Error(`direct view not found: ${rpcId}`);
+  }
+  return matchingUid;
+};
+const registerRpc = (rpcId, rpc) => {
+  const previous = rpcs.get(rpcId);
+  if (previous && previous !== rpc) {
+    previous.dispose();
+  }
+  rpcs.set(rpcId, rpc);
+};
+const registerView = (uid, rpcId) => {
+  if (rpcId === undefined) {
+    viewRpcIds.delete(uid);
+    return;
+  }
+  viewRpcIds.set(uid, rpcId);
+};
+const unregisterView = uid => {
+  viewRpcIds.delete(uid);
+};
+
 const downloadFile = (fileName, url) => {
   const a = document.createElement('a');
   a.href = url;
@@ -1277,7 +1313,7 @@ const {
 } = ElementTagMap;
 
 const instances = Object.create(null);
-const get$9 = viewletId => {
+const get$8 = viewletId => {
   return instances[viewletId];
 };
 const set$a = (viewletId, instance) => {
@@ -1312,7 +1348,7 @@ const has$1 = listener => {
 const set$9 = (listener, value) => {
   cache.set(listener, value);
 };
-const get$8 = listener => {
+const get$7 = listener => {
   return cache.get(listener);
 };
 
@@ -1334,7 +1370,7 @@ const getWrappedListener = (listener, returnValue) => {
     nameAnonymousFunction$1(wrapped, listener.name);
     set$9(listener, wrapped);
   }
-  return get$8(listener);
+  return get$7(listener);
 };
 
 const attachedListeners = new WeakMap();
@@ -1568,7 +1604,7 @@ const renderDomElement = (element, eventMap, newEventMap) => {
   return $Element;
 };
 const renderReferenceNode = (element, eventMap, newEventMap) => {
-  const instance = get$9(element.uid);
+  const instance = get$8(element.uid);
   if (!instance || !instance.state) {
     return document.createTextNode('Reference node not found');
   }
@@ -1714,7 +1750,7 @@ const handleNavigateSibling = (state, patch, $Element, patchIndex) => {
   return true;
 };
 const handleSetReferenceNodeUid = (state, patch) => {
-  const instance = get$9(patch.uid);
+  const instance = get$8(patch.uid);
   if (!instance || !instance.state) {
     console.error('Cannot set reference node uid: instance not found', {
       uid: patch.uid
@@ -1930,7 +1966,7 @@ const rememberFocus$1 = ($Viewlet, dom, eventMap, uid = 0) => {
   }
 };
 
-const get$7 = ids => {
+const get$6 = ids => {
   return getFileHandles$1(ids);
 };
 
@@ -2857,7 +2893,7 @@ const execute = (command, ...args) => {
 
 const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const get$6 = id => {
+const get$5 = id => {
   return callbacks[id];
 };
 const remove$4 = id => {
@@ -3047,7 +3083,7 @@ const warn = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$6(id);
+  const fn = get$5(id);
   if (!fn) {
     console.log(response);
     warn(`callback ${id} may already be disposed`);
@@ -3523,7 +3559,7 @@ const ipcs = Object.create(null);
 const set$7 = (name, ipc) => {
   ipcs[name] = ipc;
 };
-const get$5 = name => {
+const get$4 = name => {
   return ipcs[name];
 };
 const remove$2 = name => {
@@ -3757,7 +3793,7 @@ const create$u = async ({
     }
     // TODO rename method
     // TODO avoid cyclic dependency
-    const port = get$5(options.name);
+    const port = get$4(options.name);
     remove$2(options.name);
     await invokeAndTransfer('Transferrable.transfer', options.id, port);
     return;
@@ -4021,7 +4057,7 @@ const create$BackDrop = () => {
 };
 
 const set$5 = setComponentUid;
-const get$4 = getComponentUid;
+const get$3 = getComponentUid;
 const fromEvent = getComponentUidFromEvent;
 
 const AriaOwns = 'aria-owns';
@@ -4400,7 +4436,7 @@ const showControlled = ({
   showMenu(x, y, width, height, items, level);
   const $Menu = state$5.$$Menus.at(-1);
   if ($Parent && $Menu) {
-    const uid = get$4($Parent);
+    const uid = get$3($Parent);
     set$5($Menu, uid);
   }
   // TODO menu should not necessarily know about parent (titleBarMenuBar)
@@ -4487,7 +4523,7 @@ const prompt = (message, defaultValue) => {
 };
 
 const screenCaptures = Object.create(null);
-const get$3 = id => {
+const get$2 = id => {
   return screenCaptures[id];
 };
 const set$4 = (id, captureStream) => {
@@ -4553,9 +4589,9 @@ class VError extends Error {
   }
 }
 
-const get$2 = id => {
+const get$1 = id => {
   number(id);
-  return get$3(id);
+  return get$2(id);
 };
 const start = async (id, options) => {
   try {
@@ -5212,7 +5248,7 @@ const webViews = Object.create(null);
 const set$3 = (id, webView) => {
   webViews[id] = webView;
 };
-const get$1 = id => {
+const get = id => {
   return webViews[id];
 };
 const remove = id => {
@@ -5232,7 +5268,7 @@ const acquire = objectId => {
 // TODO transfer port directly instead of storing
 // it for a short time in state
 const transferToWebView = objectId => {
-  const $Iframe = get$1(1);
+  const $Iframe = get(1);
   if (!$Iframe) {
     throw new Error(`webview not found`);
   }
@@ -5261,30 +5297,6 @@ const attachEvents$7 = ($Node, eventMap) => {
   }
 };
 
-const rpcs = new Map();
-const viewRpcIds = new Map();
-const get = uid => {
-  const rpcId = viewRpcIds.get(uid);
-  return rpcId === undefined ? undefined : rpcs.get(rpcId);
-};
-const registerRpc = (rpcId, rpc) => {
-  const previous = rpcs.get(rpcId);
-  if (previous && previous !== rpc) {
-    previous.dispose();
-  }
-  rpcs.set(rpcId, rpc);
-};
-const registerView = (uid, rpcId) => {
-  if (rpcId === undefined) {
-    viewRpcIds.delete(uid);
-    return;
-  }
-  viewRpcIds.set(uid, rpcId);
-};
-const unregisterView = uid => {
-  viewRpcIds.delete(uid);
-};
-
 const state$4 = {
   currentDragInfo: undefined
 };
@@ -5483,7 +5495,7 @@ const ViewletActivityBar = {
 const executeViewletCommand$1 = 'Viewlet.executeViewletCommand';
 const send = (method, uid, ...args) => {
   if (method === executeViewletCommand$1) {
-    const rpc = get(uid);
+    const rpc = get$9(uid);
     if (rpc) {
       rpc.send(method, uid, ...args);
       return;
@@ -5678,7 +5690,7 @@ const applyUidWorkaround = element => {
   if (!editor) {
     throw new Error('no editor found');
   }
-  const editorUid = get$4(editor);
+  const editorUid = get$3(editor);
   set$5(element, editorUid);
 };
 
@@ -7652,7 +7664,7 @@ const handleClickAction$1 = target => {
     console.info('[panel] action command not found');
     return;
   }
-  const childUid = get$4(target);
+  const childUid = get$3(target);
   handleClickAction$2(childUid, index, command);
 };
 const handleHeaderClick$1 = event => {
@@ -7778,7 +7790,7 @@ const setActionsDom$1 = (state, actions, childUid) => {
   const {
     $PanelActions
   } = state;
-  const instance = get$9(childUid);
+  const instance = get$8(childUid);
   if (!instance) {
     throw new Error(`child instance not found`);
   }
@@ -7831,7 +7843,7 @@ const setScreenCapture = (state, id) => {
     $Viewlet
   } = state;
   const $Video = document.createElement('video');
-  const screenCapture = get$2(id);
+  const screenCapture = get$1(id);
   $Video.srcObject = screenCapture;
   $Video.onloadedmetadata = handleLoadedMetadata;
   $Viewlet.append($Video);
@@ -8210,7 +8222,7 @@ const handleMouseDown$1 = event => {
   if (!terminal) {
     return;
   }
-  const terminalUid = get$4(terminal);
+  const terminalUid = get$3(terminal);
   if (!terminalUid) {
     return;
   }
@@ -8774,7 +8786,7 @@ const setPort$1 = (state, portId, origin) => {
   });
 };
 const setPosition = (state, id, x, y, width, height) => {
-  const $Iframe = get$1(id);
+  const $Iframe = get(id);
   if (!$Iframe) {
     return;
   }
@@ -8859,7 +8871,7 @@ const create$2 = (id, uid = id) => {
   if (!module) {
     throw new Error(`module not found: ${id}`);
   }
-  const existing = get$9(id);
+  const existing = get$8(id);
   if (existing?.state.$Viewlet.isConnected) {
     existing.state.$Viewlet.remove();
   }
@@ -8881,7 +8893,7 @@ const createFunctionalRoot = (id, uid = id, hasFunctionalEvents, directEventRpcI
   if (!module) {
     throw new Error(`module not found: ${id}`);
   }
-  const existing = get$9(id);
+  const existing = get$8(id);
   if (existing?.state.$Viewlet.isConnected) {
     existing.state.$Viewlet.remove();
   }
@@ -8913,7 +8925,7 @@ const loadModule = async id => {
 };
 const invoke = (viewletId, method, ...args) => {
   string(method);
-  const instance = get$9(viewletId);
+  const instance = get$8(viewletId);
   if (!instance?.factory) {
     if (viewletId && method !== 'setActionsDom') {
       warn$1(`cannot execute ${method} viewlet instance ${viewletId} not found`);
@@ -8931,7 +8943,7 @@ const focus$1 = viewletId => {
     // eslint-disable-next-line no-console
     console.trace(`focus ${viewletId}`);
   }
-  const instance = get$9(viewletId);
+  const instance = get$8(viewletId);
   if (instance.factory?.setFocused) {
     instance.factory.setFocused(instance.state, true);
   } else if (instance?.factory?.focus) {
@@ -8947,7 +8959,7 @@ const focusElementByName = (viewletId, name) => {
     // eslint-disable-next-line no-console
     console.trace(`focusByName ${viewletId} ${name}`);
   }
-  const instance = get$9(viewletId);
+  const instance = get$8(viewletId);
   if (!instance) {
     return;
   }
@@ -8962,7 +8974,7 @@ const focusElementByName = (viewletId, name) => {
 };
 const setElementProperty = (viewletId, name, key, value) => {
   const selector = `[name="${name}"]`;
-  const instance = get$9(viewletId);
+  const instance = get$8(viewletId);
   if (!instance) {
     return;
   }
@@ -8991,7 +9003,7 @@ const setCheckboxValue = (viewletId, name, value) => {
 };
 const setSelectionByName = (viewletId, name, start, end) => {
   const selector = `[name="${name}"]`;
-  const instance = get$9(viewletId);
+  const instance = get$8(viewletId);
   if (!instance) {
     return;
   }
@@ -9006,7 +9018,7 @@ const setSelectionByName = (viewletId, name, start, end) => {
   $Element.selectionEnd = end;
 };
 const setUid = (viewletId, uid) => {
-  const instance = get$9(viewletId);
+  const instance = get$8(viewletId);
   if (!instance) {
     return;
   }
@@ -9024,7 +9036,7 @@ const resetFocusCallback = () => {
   focusCallback.selector = '';
 };
 const focusSelector = (viewletId, selector) => {
-  const instance = get$9(viewletId);
+  const instance = get$8(viewletId);
   if (!instance) {
     return;
   }
@@ -9056,7 +9068,7 @@ const focusSelectorAfterRender = (viewletId, selector) => {
  * @deprecated
  */
 const refresh = (viewletId, viewletContext) => {
-  const instance = get$9(viewletId);
+  const instance = get$8(viewletId);
   if (instance) {
     instance.factory.refresh(instance.state, viewletContext);
   } else {
@@ -9075,7 +9087,7 @@ const createPlaceholder = (viewletId, parentId, top, left, width, height) => {
   if (isSpecial(viewletId)) {
     $Placeholder.id = viewletId;
   }
-  const parentInstance = get$9(parentId);
+  const parentInstance = get$8(parentId);
   const $Parent = parentInstance.state.$Viewlet;
   $Parent.append($Placeholder);
   set$a(viewletId, {
@@ -9091,7 +9103,7 @@ const getDragData = () => {
   return getCurrent();
 };
 const setDom = (viewletId, dom) => {
-  const instance = get$9(viewletId);
+  const instance = get$8(viewletId);
   if (!instance) {
     return;
   }
@@ -9104,7 +9116,7 @@ const setDom = (viewletId, dom) => {
   renderInto($Viewlet, dom, Events);
 };
 const setDom2 = (viewletId, dom) => {
-  const instance = get$9(viewletId);
+  const instance = get$8(viewletId);
   if (!instance) {
     return;
   }
@@ -9117,7 +9129,7 @@ const setDom2 = (viewletId, dom) => {
   let uid;
   if ($Viewlet) {
     try {
-      uid = get$4($Viewlet);
+      uid = get$3($Viewlet);
     } catch {}
   }
   // TODO optimize rendering with virtual DOM diffing
@@ -9135,7 +9147,7 @@ const setDom2 = (viewletId, dom) => {
   });
 };
 const setPatches = (uid, patches) => {
-  const instance = get$9(uid);
+  const instance = get$8(uid);
   if (!instance) {
     return;
   }
@@ -9207,7 +9219,7 @@ const dispose$3 = id => {
   try {
     number(id);
     unregisterView(id);
-    const instance = get$9(id);
+    const instance = get$8(id);
     if (!instance) {
       warn$1(`viewlet instance ${id} not found and cannot be disposed`);
       return;
@@ -9226,7 +9238,7 @@ const dispose$3 = id => {
 };
 const handleError$1 = (id, parentId, message) => {
   info(`[viewlet-error] ${id}: ${message}`);
-  const instance = get$9(id);
+  const instance = get$8(id);
   if (instance?.state.$Viewlet.isConnected) {
     instance.state.$Viewlet.remove();
   }
@@ -9238,7 +9250,7 @@ const handleError$1 = (id, parentId, message) => {
     instance.state.$Viewlet.textContent = String(message);
   }
   // TODO error should bubble up to until highest possible component
-  const parentInstance = get$9(parentId);
+  const parentInstance = get$8(parentId);
   if (parentInstance?.factory?.handleError) {
     parentInstance.factory.handleError(instance.state, message);
   }
@@ -9252,9 +9264,9 @@ const appendViewlet = (parentId, childId, focus) => {
     // TODO
     return;
   }
-  const parentInstanceState = get$9(parentId); // TODO must ensure that parent is already created
+  const parentInstanceState = get$8(parentId); // TODO must ensure that parent is already created
   const parentModule = parentInstanceState.factory;
-  const childInstance = get$9(childId);
+  const childInstance = get$8(childId);
   if (!childInstance) {
     throw new Error(`child instance ${childId} must be defined to be appended to parent ${parentId}`);
   }
@@ -9278,7 +9290,7 @@ const prependChild = ($Parent, $Child) => {
 const appendAfterPreviousReference = (referenceNodes, childIndex, $Child) => {
   for (let i = childIndex - 1; i >= 0; i--) {
     const beforeId = referenceNodes[i];
-    const beforeInstance = get$9(beforeId);
+    const beforeInstance = get$8(beforeId);
     if (beforeInstance) {
       const $ReferenceNode = beforeInstance.state.$Viewlet;
       $ReferenceNode.after($Child);
@@ -9290,7 +9302,7 @@ const appendAfterPreviousReference = (referenceNodes, childIndex, $Child) => {
 const appendBeforeNextReference = (referenceNodes, childIndex, $Child) => {
   for (let i = childIndex + 1; i < referenceNodes.length; i++) {
     const afterId = referenceNodes[i];
-    const afterInstance = get$9(afterId);
+    const afterInstance = get$8(afterId);
     if (afterInstance) {
       const $ReferenceNode = afterInstance.state.$Viewlet;
       $ReferenceNode.before($Child);
@@ -9320,12 +9332,12 @@ const appendWithReferenceNodes = ($Parent, $Child, childId, referenceNodes) => {
 const append = (parentId, childId, referenceNodes) => {
   number(parentId);
   number(childId);
-  const parentInstance = get$9(parentId);
+  const parentInstance = get$8(parentId);
   if (!parentInstance) {
     throw new Error(`cannot append child: instance ${parentId} not found`);
   }
   const $Parent = parentInstance.state.$Viewlet;
-  const childInstance = get$9(childId);
+  const childInstance = get$8(childId);
   if (!childInstance) {
     throw new Error(`cannot append child: child instance not found ${childId}`);
   }
@@ -9344,11 +9356,11 @@ const append = (parentId, childId, referenceNodes) => {
   applyLateFocusMaybe();
 };
 const replaceChildren = (parentId, childIds) => {
-  const parentInstance = get$9(parentId);
+  const parentInstance = get$8(parentId);
   const $Parent = parentInstance.state.$Viewlet;
   const $Fragment = document.createDocumentFragment();
   for (const childId of childIds) {
-    const childInstance = get$9(childId);
+    const childInstance = get$8(childId);
     const $Child = childInstance.state.$Viewlet;
     $Fragment.append($Child);
   }
@@ -9363,7 +9375,7 @@ const applyLateFocusMaybe = () => {
     selector
   } = focusCallback;
   resetFocusCallback();
-  const instance = get$9(id);
+  const instance = get$8(id);
   if (instance) {
     const {
       $Viewlet
@@ -9376,7 +9388,7 @@ const applyLateFocusMaybe = () => {
 };
 const appendToBody = childId => {
   const $Parent = document.body;
-  const childInstance = get$9(childId);
+  const childInstance = get$8(childId);
   const $Child = childInstance.state.$Viewlet;
   $Parent.append($Child);
   applyLateFocusMaybe();
@@ -9389,7 +9401,7 @@ const executeCommands = commands => {
   }
 };
 const show = id => {
-  const instance = get$9(id);
+  const instance = get$8(id);
   const $Viewlet = instance.state.$Viewlet;
   const $Workbench = document.getElementById('Workbench');
   // @ts-expect-error
@@ -9399,7 +9411,7 @@ const show = id => {
   }
 };
 const setBounds$1 = (id, left, top, width, height) => {
-  const instance = get$9(id);
+  const instance = get$8(id);
   if (!instance) {
     return;
   }
@@ -9407,7 +9419,7 @@ const setBounds$1 = (id, left, top, width, height) => {
   setBounds$a($Viewlet, left, top, width, height);
 };
 const setProperty = (id, selector, property, value) => {
-  const instance = get$9(id);
+  const instance = get$8(id);
   if (!instance) {
     return;
   }
@@ -9572,9 +9584,13 @@ const getFilePathElectron = async file => {
   return filePath;
 };
 
+const forwardRendererWorkerCommand = (method, ...params) => {
+  send$1(method, ...params);
+};
 const handleMessagePort = async (port, rpcId) => {
   const rpc = await create$x({
     commandMap: {
+      'Viewlet.forwardRendererWorkerCommand': forwardRendererWorkerCommand,
       'Viewlet.queueCommands': queueCommands
     },
     messagePort: port
@@ -9619,12 +9635,12 @@ const create$1 = async (uid, src, sandbox, csp, credentialless, permissionPolicy
   // TODO make make waitForFrameToLoad a separate command
 };
 const loadOnly = async uid => {
-  const $Iframe = get$1(uid);
+  const $Iframe = get(uid);
   const promise = waitForFrameToLoad($Iframe);
   await promise;
 };
 const appendOnly = async uid => {
-  const $Iframe = get$1(uid);
+  const $Iframe = get(uid);
   const parent = document.getElementById('Workbench');
   parent.append($Iframe);
 };
@@ -9633,7 +9649,7 @@ const appendOnly = async uid => {
  * @deprecated use loadOnly and appendOnly instead
  */
 const load = async uid => {
-  const $Iframe = get$1(uid);
+  const $Iframe = get(uid);
   const promise = waitForFrameToLoad($Iframe);
   const parent = document.getElementById('Workbench');
   parent.append($Iframe);
@@ -9642,7 +9658,7 @@ const load = async uid => {
 
 // TODO rename to sendMessage
 const setPort = (uid, port, origin, portType) => {
-  const $Iframe = get$1(uid);
+  const $Iframe = get(uid);
   // TODO use jsonrpc invoke
   const {
     contentWindow
@@ -9657,7 +9673,7 @@ const setPort = (uid, port, origin, portType) => {
   }, origin, [port]);
 };
 const dispose$2 = uid => {
-  const $Iframe = get$1(uid);
+  const $Iframe = get(uid);
   $Iframe.remove();
   remove(uid);
 };
@@ -9675,7 +9691,7 @@ const queryAudio = (uid, elementLocator) => {
     // @ts-ignore
     return remoteAudio;
   }
-  const $Viewlet = get$9(uid);
+  const $Viewlet = get$8(uid);
   const remoteAudio = $Viewlet.querySelector(elementLocator);
   if (!remoteAudio) {
     console.error('[webrtc] audio element not found');
@@ -9849,8 +9865,9 @@ const commandMap = {
   'Css.addCssStyleSheet': addCssStyleSheet,
   'Css.getSelectionText': getSelectionText,
   'Developer.showState': showState,
+  'DirectView.getUid': getViewUid,
   'Download.downloadFile': downloadFile,
-  'FileHandles.get': get$7,
+  'FileHandles.get': get$6,
   'FilePicker.showDirectoryPicker': showDirectoryPicker,
   'FilePicker.showFilePicker': showFilePicker,
   'FilePicker.showSaveFilePicker': showSaveFilePicker,
@@ -10482,6 +10499,10 @@ const mountTerminal = async (state, uid) => {
   state.disposables = [inputDisposable, resizeDisposable];
   fitAddon.fit();
   flushPendingData(state);
+  if (state.pendingFocus) {
+    state.pendingFocus = false;
+    terminal.focus();
+  }
 };
 const create = () => {
   const $Viewlet = document.createElement('div');
@@ -10494,6 +10515,7 @@ const create = () => {
     mountPromise: undefined,
     mouseDownListener: undefined,
     pendingData: [],
+    pendingFocus: false,
     resizeObserver: undefined,
     terminal: undefined
   };
@@ -10525,8 +10547,10 @@ const focus = state => {
     terminal
   } = state;
   if (!terminal) {
+    state.pendingFocus = true;
     return;
   }
+  state.pendingFocus = false;
   terminal.focus();
 };
 const handleMouseDown = state => {
@@ -10552,6 +10576,7 @@ const dispose = state => {
   }
   state.disposables = [];
   state.pendingData.length = 0;
+  state.pendingFocus = false;
   state.resizeObserver?.disconnect();
   state.resizeObserver = undefined;
   state.terminal?.dispose();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/renderer-process",
-  "version": "30.34.1",
+  "version": "30.35.0",
   "keywords": [
     "lvce-editor",
     "renderer-process"