@lvce-editor/editor-worker 19.78.0 → 19.78.2

package/dist/editorWorkerMain.js

@@ -4174,6 +4174,34 @@ const getTokensViewport = (editor, startLineIndex, endLineIndex) => {
   };
 };
 
+const state$c = {};
+const create$a = () => create$g({
+  commandMap: {},
+  send: port => invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSystemWorker', port, 'FileSystem.connect')
+});
+const invoke$b = async (method, ...args) => {
+  state$c.rpcPromise ||= create$a();
+  let rpc;
+  try {
+    const {
+      rpcPromise
+    } = state$c;
+    rpc = await rpcPromise;
+  } catch (error) {
+    delete state$c.rpcPromise;
+    throw error;
+  }
+  return rpc.invoke(method, ...args);
+};
+
+const invoke$a = async (applicationId, method, ...args) => {
+  return applicationId === undefined ? invoke$e(method, ...args) : invoke$e('Application.execute', applicationId, method, ...args);
+};
+const readFile$1 = async (applicationId, uri, encoding) => {
+  const args = encoding === undefined ? [uri] : [uri, encoding];
+  return applicationId === undefined ? invoke$b('FileSystem.readFile', ...args) : invoke$b('ApplicationFileSystem.execute', applicationId, 'readFile', ...args);
+};
+
 const magic = 0x53_48_43_31;
 const maxBytes = 8 * 1024 * 1024;
 const checksum = buffer => {
@@ -4321,7 +4349,7 @@ const decode = (buffer, lineLengths, now) => {
       if (total !== lineLengths[i]) {
         return undefined;
       }
-      if (line.embeddedResultIndex !== undefined && (!embeddedResults[line.embeddedResultIndex] || line.embeddedLanguageStart === undefined || line.embeddedLanguageEnd === undefined || line.embeddedLanguageStart > line.embeddedLanguageEnd || line.embeddedLanguageEnd > lineLengths[i])) {
+      if (line.embeddedResultIndex !== undefined && (!embeddedResults[line.embeddedResultIndex] || line.embeddedLanguageStart === undefined || line.embeddedLanguageEnd === undefined || line.embeddedLanguageStart > lineLengths[i] || line.embeddedLanguageStart > line.embeddedLanguageEnd && (embeddedResults[line.embeddedResultIndex].isFull || embeddedResults[line.embeddedResultIndex].result.tokens.length > 0) || line.embeddedLanguageEnd > lineLengths[i])) {
         return undefined;
       }
     }
@@ -11048,7 +11076,7 @@ function h() {
 
 // Hash the entire static module graph, including re-exports and literal dynamic
 // imports. Unknown import targets cannot produce a trustworthy persistent key.
-const getFingerprint = async paths => {
+const getFingerprint = async (paths, readApplicationSource) => {
   await init();
   const sources = new Map();
   const signal = AbortSignal.timeout(5000);
@@ -11057,20 +11085,30 @@ const getFingerprint = async paths => {
     if (sources.has(url)) {
       return;
     }
-    if (!/^https?:/.test(url)) {
+    if (!/^(?:https?|lvce-oss):/.test(url)) {
       throw new Error('Unsupported tokenizer URL');
     }
     if (sources.size >= 256) {
       throw new Error('Tokenizer module graph is too large');
     }
-    const response = await fetch(url, {
-      cache: 'no-cache',
-      signal
-    });
-    if (!response.ok) {
-      throw new Error('Cannot read tokenizer source');
+    signal.throwIfAborted();
+    let source;
+    if (url.startsWith('lvce-oss:')) {
+      if (!readApplicationSource) {
+        throw new Error('No application source reader');
+      }
+      source = await readApplicationSource(url);
+    } else {
+      const response = await fetch(url, {
+        cache: 'no-cache',
+        signal
+      });
+      if (!response.ok) {
+        throw new Error('Cannot read tokenizer source');
+      }
+      source = await response.text();
     }
-    const source = await response.text();
+    signal.throwIfAborted();
     totalBytes += source.length * 2;
     if (totalBytes > 8 * 1024 * 1024) {
       throw new Error('Tokenizer module is too large');
@@ -11082,7 +11120,7 @@ const getFingerprint = async paths => {
         // import.meta can expose resources outside the parsed module graph.
         throw new Error('Tokenizer uses import.meta');
       }
-      if (!entry.specifier || !entry.specifier.startsWith('.') && !entry.specifier.startsWith('/') && !/^https?:/.test(entry.specifier)) {
+      if (!entry.specifier || !entry.specifier.startsWith('.') && !entry.specifier.startsWith('/') && !/^(?:https?|lvce-oss):/.test(entry.specifier)) {
         throw new Error('Tokenizer has an unresolved dependency');
       }
       await visit(new URL(entry.specifier, url).href);
@@ -11113,12 +11151,16 @@ const getKey$2 = async (editor, start, end) => {
   }
   try {
     const paths = getTokenizePaths();
-    const catalog = JSON.stringify(paths);
+    const catalog = JSON.stringify([editor.applicationId, paths]);
     let fingerprint = fingerprints.get(catalog);
     if (!fingerprint) {
       fingerprint = (async () => {
         try {
-          return await getFingerprint(paths);
+          return await getFingerprint(paths, url => invoke$a(editor.applicationId, 'Ajax.getText', url, {
+            cache: 'no-cache',
+            retry: 0,
+            timeout: 5000
+          }));
         } catch {
           return '';
         }
@@ -11987,14 +12029,14 @@ const getVisible$1 = async (editor, syncIncremental) => {
   };
 };
 
-const state$c = {
+const state$b = {
   enabled: false
 };
 const setEnabled = value => {
-  state$c.enabled = value;
+  state$b.enabled = value;
 };
 const getEnabled = () => {
-  return state$c.enabled;
+  return state$b.enabled;
 };
 
 // TODO this should be in a separate scrolling module
@@ -12325,7 +12367,7 @@ const send$2 = (rpcId, rpc, status) => {
   return delivery.running || start(delivery);
 };
 
-const state$b = Object.create(null);
+const state$a = Object.create(null);
 
 /**
  * Register a listener for a specific event type
@@ -12335,13 +12377,13 @@ const state$b = Object.create(null);
 const registerListener$1 = (listenerType, rpcId) => {
   number(listenerType);
   number(rpcId);
-  if (!Object.hasOwn(state$b, listenerType)) {
-    state$b[listenerType] = [];
+  if (!Object.hasOwn(state$a, listenerType)) {
+    state$a[listenerType] = [];
   }
 
   // Avoid duplicate registrations
-  if (!state$b[listenerType].includes(rpcId)) {
-    state$b[listenerType].push(rpcId);
+  if (!state$a[listenerType].includes(rpcId)) {
+    state$a[listenerType].push(rpcId);
   }
 };
 
@@ -12356,10 +12398,10 @@ const unregisterListener$1 = (listenerType, rpcId) => {
   if (listenerType === EditorSelection$1) {
     dispose$5(rpcId);
   }
-  if (Object.hasOwn(state$b, listenerType)) {
-    const index = state$b[listenerType].indexOf(rpcId);
+  if (Object.hasOwn(state$a, listenerType)) {
+    const index = state$a[listenerType].indexOf(rpcId);
     if (index !== -1) {
-      state$b[listenerType].splice(index, 1);
+      state$a[listenerType].splice(index, 1);
     }
   }
 };
@@ -12371,7 +12413,7 @@ const unregisterListener$1 = (listenerType, rpcId) => {
  */
 const getListeners = listenerType => {
   number(listenerType);
-  return state$b[listenerType] || [];
+  return state$a[listenerType] || [];
 };
 
 /**
@@ -12470,34 +12512,6 @@ const splitLines = lines => {
   return lines.split('\n');
 };
 
-const state$a = {};
-const create$a = () => create$g({
-  commandMap: {},
-  send: port => invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSystemWorker', port, 'FileSystem.connect')
-});
-const invoke$b = async (method, ...args) => {
-  state$a.rpcPromise ||= create$a();
-  let rpc;
-  try {
-    const {
-      rpcPromise
-    } = state$a;
-    rpc = await rpcPromise;
-  } catch (error) {
-    delete state$a.rpcPromise;
-    throw error;
-  }
-  return rpc.invoke(method, ...args);
-};
-
-const invoke$a = async (applicationId, method, ...args) => {
-  return applicationId === undefined ? invoke$e(method, ...args) : invoke$e('Application.execute', applicationId, method, ...args);
-};
-const readFile$1 = async (applicationId, uri, encoding) => {
-  const args = encoding === undefined ? [uri] : [uri, encoding];
-  return applicationId === undefined ? invoke$b('FileSystem.readFile', ...args) : invoke$b('ApplicationFileSystem.execute', applicationId, 'readFile', ...args);
-};
-
 const notifyTabModifiedStatusChange = async (uri, modified, applicationId) => {
   try {
     await invoke$a(applicationId, 'Main.handleModifiedStatusChange', uri, modified);

package/package.json

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