ooxml-core 1.2.1 → 1.3.0

package/dist/xlsx/ui/index.cjs

@@ -2202,14 +2202,13 @@ function splitSheets(text2) {
   if (book !== void 0) out.book = book;
   return out;
 }
-var PREFIX_AT = /(\[\d+\])?([A-Za-z0-9_.\u00A1-\uFFFF]+)(?::([A-Za-z0-9_.\u00A1-\uFFFF]+))?!/y;
 function readPrefix(source, at) {
   const ch = source[at];
   if (ch === "'") {
     const quoted = readQuoted(source, at);
     if (source[at + quoted.length] !== "!") return void 0;
-    const length = quoted.length + 1;
-    return { prefix: { text: source.slice(at, at + length), ...splitSheets(quoted.name) }, length };
+    const length2 = quoted.length + 1;
+    return { prefix: { text: source.slice(at, at + length2), ...splitSheets(quoted.name) }, length: length2 };
   }
   let i2 = at;
   if (ch === "[") {
@@ -2218,13 +2217,23 @@ function readPrefix(source, at) {
     if (i2 === at + 1 || source[i2] !== "]") return void 0;
     i2++;
   }
+  const sheetFrom = i2;
   while (i2 < source.length && isSheetCharCode(source.charCodeAt(i2))) i2++;
-  if (source[i2] !== "!" && source[i2] !== ":") return void 0;
-  const m = matchAt(PREFIX_AT, source, at);
-  if (!m) return void 0;
-  if (!m[1] && /^\d/.test(m[2] ?? "") && !m[3]) return void 0;
-  const raw = m[0].slice(0, -1);
-  return { prefix: { text: m[0], ...splitSheets(raw) }, length: m[0].length };
+  if (i2 === sheetFrom) return void 0;
+  let lastFrom = -1;
+  if (source[i2] === ":") {
+    lastFrom = i2 + 1;
+    i2 = lastFrom;
+    while (i2 < source.length && isSheetCharCode(source.charCodeAt(i2))) i2++;
+    if (i2 === lastFrom) return void 0;
+  }
+  if (source[i2] !== "!") return void 0;
+  if (ch !== "[" && lastFrom < 0 && isDigitCode(source.charCodeAt(sheetFrom))) return void 0;
+  const length = i2 + 1 - at;
+  return {
+    prefix: { text: source.slice(at, at + length), ...splitSheets(source.slice(at, i2)) },
+    length
+  };
 }
 function numberLiteral(text2) {
   if (text2.length <= 15) return Number(text2);

package/dist/xlsx/ui/index.mjs

@@ -2200,14 +2200,13 @@ function splitSheets(text2) {
   if (book !== void 0) out.book = book;
   return out;
 }
-var PREFIX_AT = /(\[\d+\])?([A-Za-z0-9_.\u00A1-\uFFFF]+)(?::([A-Za-z0-9_.\u00A1-\uFFFF]+))?!/y;
 function readPrefix(source, at) {
   const ch = source[at];
   if (ch === "'") {
     const quoted = readQuoted(source, at);
     if (source[at + quoted.length] !== "!") return void 0;
-    const length = quoted.length + 1;
-    return { prefix: { text: source.slice(at, at + length), ...splitSheets(quoted.name) }, length };
+    const length2 = quoted.length + 1;
+    return { prefix: { text: source.slice(at, at + length2), ...splitSheets(quoted.name) }, length: length2 };
   }
   let i2 = at;
   if (ch === "[") {
@@ -2216,13 +2215,23 @@ function readPrefix(source, at) {
     if (i2 === at + 1 || source[i2] !== "]") return void 0;
     i2++;
   }
+  const sheetFrom = i2;
   while (i2 < source.length && isSheetCharCode(source.charCodeAt(i2))) i2++;
-  if (source[i2] !== "!" && source[i2] !== ":") return void 0;
-  const m = matchAt(PREFIX_AT, source, at);
-  if (!m) return void 0;
-  if (!m[1] && /^\d/.test(m[2] ?? "") && !m[3]) return void 0;
-  const raw = m[0].slice(0, -1);
-  return { prefix: { text: m[0], ...splitSheets(raw) }, length: m[0].length };
+  if (i2 === sheetFrom) return void 0;
+  let lastFrom = -1;
+  if (source[i2] === ":") {
+    lastFrom = i2 + 1;
+    i2 = lastFrom;
+    while (i2 < source.length && isSheetCharCode(source.charCodeAt(i2))) i2++;
+    if (i2 === lastFrom) return void 0;
+  }
+  if (source[i2] !== "!") return void 0;
+  if (ch !== "[" && lastFrom < 0 && isDigitCode(source.charCodeAt(sheetFrom))) return void 0;
+  const length = i2 + 1 - at;
+  return {
+    prefix: { text: source.slice(at, at + length), ...splitSheets(source.slice(at, i2)) },
+    length
+  };
 }
 function numberLiteral(text2) {
   if (text2.length <= 15) return Number(text2);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ooxml-core",
-	"version": "1.2.1",
+	"version": "1.3.0",
 	"description": "Shared OOXML logic for the Word, PowerPoint and Excel viewers: everything except the UI",
 	"keywords": [
 		"charts",