@lvce-editor/preview-sandbox-worker 1.5.0 → 1.7.0

package/dist/previewSandBoxWorkerMain.js

@@ -506,6 +506,27 @@ const IpcParentWithMessagePort$1 = {
   wrap: wrap$5
 };
 
+class CommandNotFoundError extends Error {
+  constructor(command) {
+    super(`Command not found ${command}`);
+    this.name = 'CommandNotFoundError';
+  }
+}
+const commands = Object.create(null);
+const register = commandMap => {
+  Object.assign(commands, commandMap);
+};
+const getCommand = key => {
+  return commands[key];
+};
+const execute = (command, ...args) => {
+  const fn = getCommand(command);
+  if (!fn) {
+    throw new CommandNotFoundError(command);
+  }
+  return fn(...args);
+};
+
 const Two$1 = '2.0';
 const callbacks$1 = Object.create(null);
 const get$2 = id => {
@@ -530,12 +551,12 @@ const getErrorConstructor = (message, type) => {
     switch (type) {
       case DomException:
         return DOMException;
-      case TypeError$1:
-        return TypeError;
-      case SyntaxError$1:
-        return SyntaxError;
       case ReferenceError$1:
         return ReferenceError;
+      case SyntaxError$1:
+        return SyntaxError;
+      case TypeError$1:
+        return TypeError;
       default:
         return Error;
     }
@@ -691,56 +712,56 @@ const getErrorProperty = (error, prettyError) => {
   if (error && error.code === E_COMMAND_NOT_FOUND) {
     return {
       code: MethodNotFound,
-      message: error.message,
-      data: error.stack
+      data: error.stack,
+      message: error.message
     };
   }
   return {
     code: Custom,
-    message: prettyError.message,
     data: {
-      stack: getStack(prettyError),
-      codeFrame: prettyError.codeFrame,
-      type: getErrorType(prettyError),
       code: prettyError.code,
-      name: prettyError.name
-    }
+      codeFrame: prettyError.codeFrame,
+      name: prettyError.name,
+      stack: getStack(prettyError),
+      type: getErrorType(prettyError)
+    },
+    message: prettyError.message
   };
 };
-const create$1 = (id, error) => {
+const create$1$1 = (id, error) => {
   return {
-    jsonrpc: Two$1,
+    error,
     id,
-    error
+    jsonrpc: Two$1
   };
 };
 const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
-  return create$1(id, errorProperty);
+  return create$1$1(id, errorProperty);
 };
-const create$3 = (message, result) => {
+const create$6 = (message, result) => {
   return {
-    jsonrpc: Two$1,
     id: message.id,
+    jsonrpc: Two$1,
     result: result ?? null
   };
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$3(message, resultProperty);
+  return create$6(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two$1,
-    id,
     error: {
       code: Custom,
+      data: error,
       // @ts-ignore
-      message: error.message,
-      data: error
-    }
+      message: error.message
+    },
+    id,
+    jsonrpc: Two$1
   };
 };
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
@@ -770,35 +791,35 @@ const normalizeParams = args => {
   if (args.length === 1) {
     const options = args[0];
     return {
+      execute: options.execute,
       ipc: options.ipc,
+      logError: options.logError || defaultLogError,
       message: options.message,
-      execute: options.execute,
-      resolve: options.resolve || defaultResolve,
       preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
-      logError: options.logError || defaultLogError,
-      requiresSocket: options.requiresSocket || defaultRequiresSocket
+      requiresSocket: options.requiresSocket || defaultRequiresSocket,
+      resolve: options.resolve || defaultResolve
     };
   }
   return {
+    execute: args[2],
     ipc: args[0],
+    logError: args[5],
     message: args[1],
-    execute: args[2],
-    resolve: args[3],
     preparePrettyError: args[4],
-    logError: args[5],
-    requiresSocket: args[6]
+    requiresSocket: args[6],
+    resolve: args[3]
   };
 };
 const handleJsonRpcMessage = async (...args) => {
   const options = normalizeParams(args);
   const {
-    message,
-    ipc,
     execute,
-    resolve,
-    preparePrettyError,
+    ipc,
     logError,
-    requiresSocket
+    message,
+    preparePrettyError,
+    requiresSocket,
+    resolve
   } = options;
   if ('id' in message) {
     if ('method' in message) {
@@ -821,36 +842,17 @@ const handleJsonRpcMessage = async (...args) => {
   throw new JsonRpcError('unexpected message');
 };
 
-class CommandNotFoundError extends Error {
-  constructor(command) {
-    super(`Command not found ${command}`);
-    this.name = 'CommandNotFoundError';
-  }
-}
-const commands = Object.create(null);
-const register = commandMap => {
-  Object.assign(commands, commandMap);
-};
-const getCommand = key => {
-  return commands[key];
-};
-const execute = (command, ...args) => {
-  const fn = getCommand(command);
-  if (!fn) {
-    throw new CommandNotFoundError(command);
-  }
-  return fn(...args);
-};
-
 const Two = '2.0';
-const create$t = (method, params) => {
+
+const create$5 = (method, params) => {
   return {
     jsonrpc: Two,
     method,
     params
   };
 };
-const create$s = (id, method, params) => {
+
+const create$4 = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -859,15 +861,14 @@ const create$s = (id, method, params) => {
   };
   return message;
 };
+
 let id$1 = 0;
-const create$r = () => {
+const create$3 = () => {
   return ++id$1;
 };
 
-/* eslint-disable n/no-unsupported-features/es-syntax */
-
 const registerPromise = map => {
-  const id = create$r();
+  const id = create$3();
   const {
     promise,
     resolve
@@ -879,13 +880,12 @@ const registerPromise = map => {
   };
 };
 
-// @ts-ignore
 const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
   const {
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$s(id, method, params);
+  const message = create$4(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -921,12 +921,13 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$t(method, params);
+      const message = create$5(method, params);
       ipc.send(message);
     }
   };
   return rpc;
 };
+
 const requiresSocket = () => {
   return false;
 };
@@ -941,6 +942,7 @@ const handleMessage = event => {
   const actualExecute = event?.target?.execute || execute;
   return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError, actualRequiresSocket);
 };
+
 const handleIpc = ipc => {
   if ('addEventListener' in ipc) {
     ipc.addEventListener('message', handleMessage);
@@ -949,6 +951,7 @@ const handleIpc = ipc => {
     ipc.on('message', handleMessage);
   }
 };
+
 const listen$1 = async (module, options) => {
   const rawIpc = await module.listen(options);
   if (module.signal) {
@@ -957,7 +960,8 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$5 = async ({
+
+const create$2 = async ({
   commandMap,
   isMessagePortOpen = true,
   messagePort
@@ -974,11 +978,8 @@ const create$5 = async ({
   messagePort.start();
   return rpc;
 };
-const PlainMessagePortRpc = {
-  __proto__: null,
-  create: create$5
-};
-const create$2 = async ({
+
+const create$1 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -988,10 +989,9 @@ const create$2 = async ({
   const rpc = createRpc(ipc);
   return rpc;
 };
-const WebWorkerRpcClient = {
-  __proto__: null,
-  create: create$2
-};
+
+const RendererWorker = 1;
+
 const createMockRpc = ({
   commandMap
 }) => {
@@ -1012,63 +1012,6 @@ const createMockRpc = ({
   return mockRpc;
 };
 
-const Button$1 = 1;
-const Div$1 = 4;
-const H1$1 = 5;
-const Input$1 = 6;
-const Span$1 = 8;
-const Table$1 = 9;
-const TBody$1 = 10;
-const Td$1 = 11;
-const Text = 12;
-const Th$1 = 13;
-const THead$1 = 14;
-const Tr$1 = 15;
-const Img$1 = 17;
-const Del$1 = 21;
-const H2$1 = 22;
-const H3$1 = 23;
-const H4$1 = 24;
-const H5$1 = 25;
-const H6$1 = 26;
-const Article$1 = 27;
-const Aside$1 = 28;
-const Footer$1 = 29;
-const Header$1 = 30;
-const Nav$1 = 40;
-const Section$1 = 41;
-const Search$1 = 42;
-const Dd$1 = 43;
-const Dl$1 = 44;
-const Figcaption$1 = 45;
-const Figure$1 = 46;
-const Hr$1 = 47;
-const Li$1 = 48;
-const Ol$1 = 49;
-const P$1 = 50;
-const Pre$1 = 51;
-const A$1 = 53;
-const Abbr$1 = 54;
-const Br$1 = 55;
-const Cite$1 = 56;
-const Data$1 = 57;
-const Time$1 = 58;
-const Tfoot$1 = 59;
-const Ul$1 = 60;
-const TextArea$1 = 62;
-const Select$1 = 63;
-const Option$1 = 64;
-const Code$1 = 65;
-const Label$1 = 66;
-const Dt$1 = 67;
-const Iframe$1 = 68;
-const Style = 72;
-const Html = 73;
-const Canvas$1 = 77;
-const Reference = 100;
-
-const RendererWorker = 1;
-
 const rpcs = Object.create(null);
 const set$4 = (id, rpc) => {
   rpcs[id] = rpc;
@@ -1180,6 +1123,62 @@ const set$1 = (uid, instance) => {
   states$1.set(uid, instance);
 };
 
+const Button$1 = 1;
+const Div$1 = 4;
+const H1$1 = 5;
+const Input$1 = 6;
+const Span$1 = 8;
+const Table$1 = 9;
+const TBody$1 = 10;
+const Td$1 = 11;
+const Th$1 = 13;
+const THead$1 = 14;
+const Tr$1 = 15;
+const Img$1 = 17;
+const Del$1 = 21;
+const H2$1 = 22;
+const H3$1 = 23;
+const H4$1 = 24;
+const H5$1 = 25;
+const H6$1 = 26;
+const Article$1 = 27;
+const Aside$1 = 28;
+const Footer$1 = 29;
+const Header$1 = 30;
+const Nav$1 = 40;
+const Section$1 = 41;
+const Search$1 = 42;
+const Dd$1 = 43;
+const Dl$1 = 44;
+const Figcaption$1 = 45;
+const Figure$1 = 46;
+const Hr$1 = 47;
+const Li$1 = 48;
+const Ol$1 = 49;
+const P$1 = 50;
+const Pre$1 = 51;
+const A$1 = 53;
+const Abbr$1 = 54;
+const Br$1 = 55;
+const Cite$1 = 56;
+const Data$1 = 57;
+const Time$1 = 58;
+const Tfoot$1 = 59;
+const Ul$1 = 60;
+const TextArea$1 = 62;
+const Select$1 = 63;
+const Option$1 = 64;
+const Code$1 = 65;
+const Label$1 = 66;
+const Dt$1 = 67;
+const Iframe$1 = 68;
+const Style = 72;
+const Html = 73;
+const Canvas$1 = 77;
+const Reference = 100;
+
+const Text = 12;
+
 const text = data => {
   return {
     childCount: 0,
@@ -1696,7 +1695,7 @@ const handleKeyup = (uid, hdId, key, code) => {
 };
 
 const handleMessagePort = async port => {
-  const rpc = await PlainMessagePortRpc.create({
+  const rpc = await create$2({
     commandMap: {},
     messagePort: port
   });
@@ -89414,7 +89413,8 @@ const getErrorCodeFrame = (scriptContent, error, contextLines = 2) => {
   const lines = scriptContent.split('\n');
 
   // Line numbers in stack traces are 1-based
-  const errorLineIndex = line - 1;
+  // Offset by -4 to account for the anonymous function wrapper
+  const errorLineIndex = line - 1 - 2;
   if (errorLineIndex < 0 || errorLineIndex >= lines.length) {
     return '';
   }
@@ -89878,7 +89878,7 @@ const commandMap = {
 };
 
 const listen = async () => {
-  const rpc = await WebWorkerRpcClient.create({
+  const rpc = await create$1({
     commandMap: commandMap
   });
   set$2(rpc);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/preview-sandbox-worker",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "description": "Preview SandBox Worker",
   "repository": {
     "type": "git",
@@ -11,7 +11,7 @@
   "type": "module",
   "main": "dist/previewSandBoxWorkerMain.js",
   "dependencies": {
-    "@lvce-editor/virtual-dom-worker": "^8.3.0",
+    "@lvce-editor/virtual-dom-worker": "^8.9.0",
     "happy-dom-without-node": "^14.12.3"
   }
 }