@lvce-editor/renderer-process 29.4.0 → 30.0.0

package/dist/rendererProcessMain.js

@@ -146,7 +146,7 @@ const getSelectionText = () => {
 const warn$1 = (...args) => {
   console.warn(...args);
 };
-const error = (...args) => {
+const error$1 = (...args) => {
   console.error(...args);
 };
 const info = (...args) => {
@@ -3370,16 +3370,36 @@ const has = name => {
 
 const commandMapRef = {};
 
+const success = value => {
+  return {
+    ok: true,
+    value
+  };
+};
+const error = error => {
+  return {
+    error,
+    ok: false
+  };
+};
+const isError = result => {
+  return !result.ok;
+};
+
 const launchWorker = async ({
   name,
   url
 }) => {
-  const rpc = await create$B({
-    commandMap: commandMapRef,
-    name,
-    url
-  });
-  return rpc;
+  try {
+    const rpc = await create$B({
+      commandMap: commandMapRef,
+      name,
+      url
+    });
+    return success(rpc);
+  } catch (error$1) {
+    return error(error$1);
+  }
 };
 
 const getAssetDir = () => {
@@ -3439,15 +3459,18 @@ const state$7 = {
   rpc: undefined
 };
 const hydrate$3 = async () => {
-  const rpc = await launchRendererWorker();
-  // @ts-expect-error
-  state$7.rpc = rpc;
+  const result = await launchRendererWorker();
+  if (isError(result)) {
+    state$7.rpc = undefined;
+    return result;
+  }
+  state$7.rpc = result.value;
+  return success(undefined);
 };
 
 // TODO needed?
 const dispose$j = () => {
   if (state$7.rpc) {
-    // @ts-expect-error
     state$7.rpc.dispose();
   }
 };
@@ -8797,6 +8820,7 @@ const appendViewlet = (parentId, childId, focus) => {
   if (focus && childInstance.factory.focus) {
     childInstance.factory.focus(childInstance.state);
   }
+  applyLateFocusMaybe();
 };
 const ariaAnnounce = async message => {
   const AriaAlert$1 = await Promise.resolve().then(function () { return AriaAlert; });
@@ -9269,154 +9293,6 @@ const commandMap = {
   'WindowTitle.set': set$1
 };
 
-const getConfiguredEditorWorkerUrl = () => {
-  return getConfiguredWorkerUrl('editorWorkerUrl');
-};
-
-const editorWorkerUrl = getConfiguredEditorWorkerUrl() || `${assetDir}/packages/renderer-worker/node_modules/@lvce-editor/editor-worker/dist/editorWorkerMain.js`;
-
-const launchEditorWorker = async port => {
-  const ipc = await create$w({
-    method: ModuleWorkerWithMessagePort,
-    name: 'Editor Worker',
-    port,
-    url: editorWorkerUrl
-  });
-  return ipc;
-};
-
-const hydrate$2 = async () => {
-  const {
-    port1,
-    port2
-  } = new MessageChannel();
-  // TODO only launch port and send to renderer worker
-  const promise = launchEditorWorker(port1);
-  set$7('Editor Worker', port2);
-  await promise;
-};
-
-const getConfiguredExtensionHostWorkerUrl = () => {
-  return getConfiguredWorkerUrl('extensionHostWorkerUrl');
-};
-
-const extensionHostWorkerUrl = getConfiguredExtensionHostWorkerUrl() || `${assetDir}/packages/renderer-worker/node_modules/@lvce-editor/extension-host-worker/dist/extensionHostWorkerMain.js`;
-
-const launchExtensionHostWorker = async port => {
-  const name = isElectron ? 'Extension Host (Electron)' : 'Extension Host';
-  const ipc = await create$w({
-    method: ModuleWorkerWithMessagePort,
-    name,
-    port,
-    url: extensionHostWorkerUrl
-  });
-  return ipc;
-};
-
-const hydrate$1 = async () => {
-  const {
-    port1,
-    port2
-  } = new MessageChannel();
-  // TODO only launch port and send to renderer worker
-  const promise = launchExtensionHostWorker(port1);
-  const name = isElectron ? 'Extension Host (Electron)' : 'Extension Host';
-  set$7(name, port2);
-  await promise;
-};
-
-const getConfiguredSyntaxHighlightingWorkerUrl = () => {
-  return getConfiguredWorkerUrl('syntaxHighlightingWorkerUrl');
-};
-
-const syntaxHighlightingWorkerUrl = getConfiguredSyntaxHighlightingWorkerUrl() || `${assetDir}/packages/renderer-worker/node_modules/@lvce-editor/syntax-highlighting-worker/dist/syntaxHighlightingWorkerMain.js`;
-
-const launchSyntaxHighlightingWorker = async port => {
-  const ipc = await create$w({
-    method: ModuleWorkerWithMessagePort,
-    name: 'Syntax Highlighting Worker',
-    port,
-    url: syntaxHighlightingWorkerUrl
-  });
-  return ipc;
-};
-
-const hydrate = async () => {
-  const {
-    port1,
-    port2
-  } = new MessageChannel();
-  // TODO only launch port and send to renderer worker
-  const promise = launchSyntaxHighlightingWorker(port1);
-  set$7('Syntax Highlighting Worker', port2);
-  await promise;
-};
-
-const workerFns = [hydrate$3, hydrate$2, hydrate, hydrate$1];
-const call = fn => {
-  return fn();
-};
-const launchWorkers = () => {
-  {
-    return Promise.all(workerFns.map(call));
-  }
-};
-
-const handleFocusIn = event => {
-  preventDefault(event);
-  const uid = fromEvent(event);
-  handleFocusIn$4(uid);
-};
-const handleBlur$1 = event => {
-  const uid = fromEvent(event);
-  executeViewletCommand(uid, 'EditorRename.handleBlur');
-};
-const handleInput = event => {
-  const {
-    target
-  } = event;
-  const {
-    value
-  } = target;
-  const uid = fromEvent(event);
-  executeViewletCommand(uid, 'EditorRename.handleInput', value);
-};
-
-const ViewletEditorRenameEvents = {
-  __proto__: null,
-  handleBlur: handleBlur$1,
-  handleFocusIn,
-  handleInput
-};
-
-const setBounds = (state, x, y, width, height) => {
-  const {
-    $Viewlet
-  } = state;
-  setBounds$a($Viewlet, x, y, width, height);
-  applyUidWorkaround($Viewlet);
-};
-const appendWidget = state => {
-  const {
-    $Viewlet
-  } = state;
-  append$1($Viewlet);
-};
-const dispose$2 = state => {
-  remove$1(state.$Viewlet);
-};
-
-const ViewletEditorRename = {
-  __proto__: null,
-  Events: ViewletEditorRenameEvents,
-  appendWidget,
-  dispose: dispose$2,
-  setBounds
-};
-
-const handleContentSecurityPolicyViolation = event => {
-};
-
 const RE_AT = /^\s+at/;
 const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/;
 const RE_OBJECT_AS = /^\s*at Object\.\w+ \[as ([\w.]+)]/;
@@ -9629,37 +9505,37 @@ const prepare = async error => {
   }
   return error;
 };
-const print = (error$1, prefix = '') => {
+const print = (error, prefix = '') => {
   if (getIsFirefox()) {
     // Firefox does not support printing codeframe with error stack
-    if (error$1 && error$1._error) {
-      error(`${prefix}${error$1._error}`);
+    if (error && error._error) {
+      error$1(`${prefix}${error._error}`);
       return;
     }
-    error(`${prefix}${error$1}`);
+    error$1(`${prefix}${error}`);
     return;
   }
-  if (error$1 && error$1.type && error$1.message && error$1.codeFrame) {
-    error(`${prefix}${error$1.type}: ${error$1.message}\n\n${error$1.codeFrame}\n\n${error$1.stack}`);
+  if (error && error.type && error.message && error.codeFrame) {
+    error$1(`${prefix}${error.type}: ${error.message}\n\n${error.codeFrame}\n\n${error.stack}`);
     return;
   }
-  if (error$1 && error$1.message && error$1.codeFrame) {
-    error(`${prefix}${error$1.message}\n\n${error$1.codeFrame}\n\n${error$1.stack}`);
+  if (error && error.message && error.codeFrame) {
+    error$1(`${prefix}${error.message}\n\n${error.codeFrame}\n\n${error.stack}`);
     return;
   }
-  if (error$1 && error$1.type && error$1.message) {
-    error(`${prefix}${error$1.type}: ${error$1.message}\n${error$1.stack}`);
+  if (error && error.type && error.message) {
+    error$1(`${prefix}${error.type}: ${error.message}\n${error.stack}`);
     return;
   }
-  if (error$1 && error$1.stack) {
-    error(`${prefix}${error$1.stack}`);
+  if (error && error.stack) {
+    error$1(`${prefix}${error.stack}`);
     return;
   }
-  if (error$1 === null) {
-    error(`${prefix}null`);
+  if (error === null) {
+    error$1(`${prefix}null`);
     return;
   }
-  error(`${prefix}${error$1}`);
+  error$1(`${prefix}${error}`);
 };
 const getMessage = error => {
   if (error && error.type && error.message) {
@@ -9689,6 +9565,186 @@ const handleError = async (error, notify = true, prefix = '') => {
   }
 };
 
+const getConfiguredEditorWorkerUrl = () => {
+  return getConfiguredWorkerUrl('editorWorkerUrl');
+};
+
+const editorWorkerUrl = getConfiguredEditorWorkerUrl() || `${assetDir}/packages/renderer-worker/node_modules/@lvce-editor/editor-worker/dist/editorWorkerMain.js`;
+
+const launchEditorWorker = async port => {
+  try {
+    await create$w({
+      method: ModuleWorkerWithMessagePort,
+      name: 'Editor Worker',
+      port,
+      url: editorWorkerUrl
+    });
+    return success(undefined);
+  } catch (error$1) {
+    return error(error$1);
+  }
+};
+
+const hydrate$2 = async () => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  // TODO only launch port and send to renderer worker
+  const promise = launchEditorWorker(port1);
+  set$7('Editor Worker', port2);
+  const result = await promise;
+  if (isError(result)) {
+    remove$2('Editor Worker');
+    return result;
+  }
+  return success(undefined);
+};
+
+const getConfiguredExtensionHostWorkerUrl = () => {
+  return getConfiguredWorkerUrl('extensionHostWorkerUrl');
+};
+
+const extensionHostWorkerUrl = getConfiguredExtensionHostWorkerUrl() || `${assetDir}/packages/renderer-worker/node_modules/@lvce-editor/extension-host-worker/dist/extensionHostWorkerMain.js`;
+
+const launchExtensionHostWorker = async port => {
+  const name = isElectron ? 'Extension Host (Electron)' : 'Extension Host';
+  try {
+    await create$w({
+      method: ModuleWorkerWithMessagePort,
+      name,
+      port,
+      url: extensionHostWorkerUrl
+    });
+    return success(undefined);
+  } catch (error$1) {
+    return error(error$1);
+  }
+};
+
+const hydrate$1 = async () => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  // TODO only launch port and send to renderer worker
+  const promise = launchExtensionHostWorker(port1);
+  const name = isElectron ? 'Extension Host (Electron)' : 'Extension Host';
+  set$7(name, port2);
+  const result = await promise;
+  if (isError(result)) {
+    remove$2(name);
+    return result;
+  }
+  return success(undefined);
+};
+
+const getConfiguredSyntaxHighlightingWorkerUrl = () => {
+  return getConfiguredWorkerUrl('syntaxHighlightingWorkerUrl');
+};
+
+const syntaxHighlightingWorkerUrl = getConfiguredSyntaxHighlightingWorkerUrl() || `${assetDir}/packages/renderer-worker/node_modules/@lvce-editor/syntax-highlighting-worker/dist/syntaxHighlightingWorkerMain.js`;
+
+const launchSyntaxHighlightingWorker = async port => {
+  try {
+    await create$w({
+      method: ModuleWorkerWithMessagePort,
+      name: 'Syntax Highlighting Worker',
+      port,
+      url: syntaxHighlightingWorkerUrl
+    });
+    return success(undefined);
+  } catch (error$1) {
+    return error(error$1);
+  }
+};
+
+const hydrate = async () => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  // TODO only launch port and send to renderer worker
+  const promise = launchSyntaxHighlightingWorker(port1);
+  set$7('Syntax Highlighting Worker', port2);
+  const result = await promise;
+  if (isError(result)) {
+    remove$2('Syntax Highlighting Worker');
+    return result;
+  }
+  return success(undefined);
+};
+
+const workerFns = [hydrate$3, hydrate$2, hydrate, hydrate$1];
+const call = fn => {
+  return fn();
+};
+const launchWorkers = async () => {
+  {
+    const results = await Promise.all(workerFns.map(call));
+    const firstError = results.find(isError);
+    if (firstError) {
+      return firstError;
+    }
+    return success(undefined);
+  }
+};
+
+const handleFocusIn = event => {
+  preventDefault(event);
+  const uid = fromEvent(event);
+  handleFocusIn$4(uid);
+};
+const handleBlur$1 = event => {
+  const uid = fromEvent(event);
+  executeViewletCommand(uid, 'EditorRename.handleBlur');
+};
+const handleInput = event => {
+  const {
+    target
+  } = event;
+  const {
+    value
+  } = target;
+  const uid = fromEvent(event);
+  executeViewletCommand(uid, 'EditorRename.handleInput', value);
+};
+
+const ViewletEditorRenameEvents = {
+  __proto__: null,
+  handleBlur: handleBlur$1,
+  handleFocusIn,
+  handleInput
+};
+
+const setBounds = (state, x, y, width, height) => {
+  const {
+    $Viewlet
+  } = state;
+  setBounds$a($Viewlet, x, y, width, height);
+  applyUidWorkaround($Viewlet);
+};
+const appendWidget = state => {
+  const {
+    $Viewlet
+  } = state;
+  append$1($Viewlet);
+};
+const dispose$2 = state => {
+  remove$1(state.$Viewlet);
+};
+
+const ViewletEditorRename = {
+  __proto__: null,
+  Events: ViewletEditorRenameEvents,
+  appendWidget,
+  dispose: dispose$2,
+  setBounds
+};
+
+const handleContentSecurityPolicyViolation = event => {
+};
+
 const isChromeExtensionError = error => {
   return String(error) === 'Script error.';
 };
@@ -9735,7 +9791,11 @@ const main = async () => {
   state$1.modules[FindWidget] = ViewletFindWidget;
   state$1.modules[TitleBar] = ViewletTitleBar;
   // TODO this is discovered very late
-  await launchWorkers();
+  const launchWorkersResult = await launchWorkers();
+  if (isError(launchWorkersResult)) {
+    await handleError(launchWorkersResult.error, true);
+    return;
+  }
   setIpc(RendererWorker);
 };
 

package/package.json

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