@sheetxl/scripting-react 0.8.0-beta.11 → 0.8.0-beta.13

package/node/esm/index.mjs

@@ -1,5 +1,5 @@
 /**
-* @license @sheetxl/scripting-react - Scripting React - Monaco based script editor and scripting UI for SheetXL. - v0.8.0-beta.11
+* @license @sheetxl/scripting-react - Scripting React - Monaco based script editor and scripting UI for SheetXL. - v0.8.0-beta.13
 *
 * (C) 2026-present SheetXL Inc. & Michael T. Ford
 * License: The license can be found at https://www.sheetxl.com/license.
@@ -11,10 +11,10 @@ import { useMergeRefs as l } from "react-merge-refs";
 import { CommonUtils as u, TimerUtils as d, defineLazyModule as p, messageKey as m } from "@sheetxl/utils";
 import { DocTags as g } from "@sheetxl/scripting";
 import { IScript as f } from "@sheetxl/sdk";
-import { Command as y, lazyComponent as h, useCallbackRef as b, useCommands as x, useImperativeElement as w, useLazyRetry as k, useNotifier as v, useTranslator as S } from "@sheetxl/utils-react";
+import { Command as h, lazyComponent as y, useCallbackRef as b, useCommands as x, useImperativeElement as w, useLazyRetry as v, useNotifier as k, useTranslator as S } from "@sheetxl/utils-react";
 import { jsx as C, jsxs as N } from "react/jsx-runtime";
 import { DefaultTaskPaneRegistry as E, useModelListener as L, useTaskPaneArea as M, useWorkbook as O } from "@sheetxl/react";
-var D = {
+var I = {
 	defaultToken: "invalid",
 	tokenPostfix: ".ts",
 	keywords: [
@@ -355,11 +355,11 @@ var D = {
 			{ include: "common" }
 		]
 	}
-}, I = /(?:\s|\/\/[^\n]*|\/\*[\s\S]*?\*\/)*/y, $ = /(import\b\s*(?:type\s+(?!from\b))?)(?:([^'";]*?)\s*\bfrom\s*)?(['"])([^'"\n]+)\3[ \t]*;?/y, A = (e) => e.replace(/\s+/g, " ").trim(), T = (e) => {
+}, D = /(?:\s|\/\/[^\n]*|\/\*[\s\S]*?\*\/)*/y, $ = /(import\b\s*(?:type\s+(?!from\b))?)(?:([^'";]*?)\s*\bfrom\s*)?(['"])([^'"\n]+)\3[ \t]*;?/y, R = (e) => e.replace(/\s+/g, " ").trim(), T = (e) => {
 	const t = [];
 	let n = 0;
 	for (;;) {
-		I.lastIndex = n, I.exec(e), $.lastIndex = I.lastIndex;
+		D.lastIndex = n, D.exec(e), $.lastIndex = D.lastIndex;
 		const r = $.exec(e);
 		if (!r) return t;
 		const o = r[2] ?? "", i = r.index + r[1].length, s = o.indexOf("{"), a = o.lastIndexOf("}"), c = s >= 0 && a > s, l = c ? o.slice(0, s) + o.slice(a + 1) : o;
@@ -370,18 +370,18 @@ var D = {
 			module: r[4],
 			quote: r[3],
 			typeOnly: /\btype\s+$/.test(r[1]),
-			binding: A(l).replace(/\s*,$/, ""),
-			names: c ? o.slice(s + 1, a).split(",").map(A).filter(Boolean) : null,
+			binding: R(l).replace(/\s*,$/, ""),
+			names: c ? o.slice(s + 1, a).split(",").map(R).filter(Boolean) : null,
 			namesStart: i + s + 1,
 			namesEnd: i + a
 		}), n = $.lastIndex;
 	}
-}, R = (e) => [
+}, A = (e) => [
 	e.typeOnly,
 	e.binding,
 	e.names?.join(","),
 	e.module
-].join("|"), F = (e) => `${e.typeOnly ? "type " : ""}${e.module}`, P = (e, t, n) => {
+].join("|"), P = (e) => `${e.typeOnly ? "type " : ""}${e.module}`, F = (e, t, n) => {
 	const r = e.slice(t.namesStart, t.namesEnd), o = r.trimEnd();
 	if ("" === o.trim()) return {
 		offset: t.namesStart,
@@ -460,32 +460,38 @@ var D = {
 	wordWrapColumn: 80,
 	wordWrapMinified: !0,
 	wrappingIndent: "none"
-}, W = "_script-editor_1kuph_5", V = (e) => {
+}, W = "_script-editor_1kuph_5", j = (e) => {
 	const t = e?.getModules();
 	return t ? (t.getByName(f.DEFAULT_MODULE), f.DEFAULT_MODULE) : f.DEFAULT_MODULE;
-}, j = (e) => e?.getModules()?.getByName(V(e)) ?? null;
-var B, H = p("scripting-react:monaco", async () => (function() {
-	if ("undefined" == typeof window) return;
-	const e = window;
-	if (e.__sxlDefineShim) return;
-	e.__sxlDefineShim = !0;
-	const t = [];
-	let n = null;
-	const r = (...e) => {
-		"function" == typeof n ? n(...e) : t.push(e);
-	};
-	Object.defineProperty(e, "define", {
-		configurable: !1,
-		enumerable: !0,
-		get: () => "function" == typeof n ? n : r,
-		set(e) {
-			if ("function" == typeof e) for (n = e; t.length;) try {
-				e(...t.shift());
-			} catch {}
-		}
-	});
-}(), import("@monaco-editor/react")), { prefetch: !1 }), U = ({ error: e }) => {
-	const t = k(), n = S();
+}, V = (e) => e?.getModules()?.getByName(j(e)) ?? null;
+var B, H = p("scripting-react:monaco", async () => {
+	(function() {
+		if ("undefined" == typeof window) return;
+		const e = window;
+		if (e.__sxlDefineShim) return;
+		e.__sxlDefineShim = !0;
+		const t = [];
+		let n = null;
+		const r = (...e) => {
+			"function" == typeof n ? n(...e) : t.push(e);
+		};
+		Object.defineProperty(e, "define", {
+			configurable: !1,
+			enumerable: !0,
+			get: () => "function" == typeof n ? n : r,
+			set(e) {
+				if ("function" == typeof e) for (n = e; t.length;) try {
+					e(...t.shift());
+				} catch {}
+			}
+		});
+	})();
+	const [e] = await Promise.all([import("@monaco-editor/react"), Y().catch((e) => {
+		console.warn("cant load types", e);
+	})]);
+	return e;
+}, { prefetch: !1 }), U = ({ error: e }) => {
+	const t = v(), n = S();
 	return N("div", {
 		style: {
 			display: "flex",
@@ -501,13 +507,15 @@ var B, H = p("scripting-react:monaco", async () => (function() {
 			children: n("scriptEditor.retry")
 		}) : null]
 	});
-}, q = h(H.load, { renderError: (e) => C(U, { error: e }) }), K = ["define", "require"], z = !1, G = "@0.8.0-beta.11";
+}, q = y(H.load, { renderError: ({ error: e }) => C(U, { error: e }) }), K = ["define", "require"], z = !1, G = "@0.8.0-beta.13";
 "@local" !== G && "@0.0.0" !== G || (G = "");
-var Z = `https://cdn.jsdelivr.net/npm/@sheetxl/sdk${G}/types/scripting.d.ts`, J = (e) => {
+var J = `https://cdn.jsdelivr.net/npm/@sheetxl/sdk${G}/types/scripting.d.ts`, X = null, Z = null, Y = () => (Z || (Z = (async () => await (await fetch(J)).text())().then((e) => (X = e, e))).catch(() => {
+	Z = null;
+}), Z), Q = (e) => {
 	try {
-		e.languages.setMonarchTokensProvider("typescript", D);
+		e.languages.setMonarchTokensProvider("typescript", I);
 	} catch (e) {}
-}, X = !1, Y = async (e, t, n) => {
+}, ee = !1, te = async (e, t, n) => {
 	const r = e.getModel();
 	if (!r) return;
 	const o = await (await (await t.languages.typescript.getTypeScriptWorker())(r.uri)).getNavigationTree(r.uri.toString()), i = e.getPosition();
@@ -515,11 +523,11 @@ var Z = `https://cdn.jsdelivr.net/npm/@sheetxl/sdk${G}/types/scripting.d.ts`, J
 	s.lineNumber = 1, s.column = 1;
 	let a = !1;
 	for (let e = i.lineNumber; e >= 1; e--) if ("" === r.getLineContent(e).trim()) {
-		const t = te(o, r.getOffsetAt({
+		const t = oe(o, r.getOffsetAt({
 			lineNumber: e,
 			column: 1
 		}), "function");
-		if (!t || ne(t)) {
+		if (!t || ie(t)) {
 			a = !0, s.lineNumber = e + 1;
 			break;
 		}
@@ -540,8 +548,8 @@ var Z = `https://cdn.jsdelivr.net/npm/@sheetxl/sdk${G}/types/scripting.d.ts`, J
 		i = (i + t.slice(s)).replace(/^(?:[ \t]*\r?\n)+/, "");
 		const a = /* @__PURE__ */ new Set(), c = /* @__PURE__ */ new Map(), l = /* @__PURE__ */ new Map();
 		for (const e of n) {
-			if (a.add(R(e)), !e.names) continue;
-			const t = F(e);
+			if (a.add(A(e)), !e.names) continue;
+			const t = P(e);
 			l.has(t) || l.set(t, e);
 			let n = c.get(t);
 			n || c.set(t, n = /* @__PURE__ */ new Set());
@@ -550,12 +558,12 @@ var Z = `https://cdn.jsdelivr.net/npm/@sheetxl/sdk${G}/types/scripting.d.ts`, J
 		const u = /* @__PURE__ */ new Map(), d = [], p = /* @__PURE__ */ new Map();
 		for (const e of o) {
 			if (!e.names || e.binding) {
-				const t = R(e);
+				const t = A(e);
 				if (a.has(t)) continue;
 				a.add(t), d.push(e.text);
 				continue;
 			}
-			const t = F(e);
+			const t = P(e);
 			let n = c.get(t);
 			n || c.set(t, n = /* @__PURE__ */ new Set());
 			const r = e.typeOnly ? c.get(e.module) : void 0, o = e.names.filter((e) => !n.has(e) && !r?.has(e));
@@ -579,7 +587,7 @@ var Z = `https://cdn.jsdelivr.net/npm/@sheetxl/sdk${G}/types/scripting.d.ts`, J
 			p.set(t, m), d.push(m);
 		}
 		const m = [];
-		for (const [t, n] of u) m.push(P(e, t, n));
+		for (const [t, n] of u) m.push(F(e, t, n));
 		if (m.sort((e, t) => e.offset - t.offset), d.length > 0) {
 			const t = d.map((e) => {
 				if ("string" == typeof e) return e;
@@ -614,19 +622,19 @@ var Z = `https://cdn.jsdelivr.net/npm/@sheetxl/sdk${G}/types/scripting.d.ts`, J
 			text: e.text
 		});
 	}
-	const y = d.split("\n").length - 1, h = [{
+	const h = d.split("\n").length - 1, y = [{
 		range: g,
 		text: `${d}${u}`
 	}, ...f];
 	let b = null;
-	r.pushEditOperations([], h, (e) => (b = e[0].range, y > 0 && (b.startLineNumber += y, b.startColumn = 1), p && b.endLineNumber--, [new t.Selection(b.startLineNumber, b.startColumn, b.endLineNumber, b.endColumn)])), e.setSelection({
+	r.pushEditOperations([], y, (e) => (b = e[0].range, h > 0 && (b.startLineNumber += h, b.startColumn = 1), p && b.endLineNumber--, [new t.Selection(b.startLineNumber, b.startColumn, b.endLineNumber, b.endColumn)])), e.setSelection({
 		startLineNumber: b.endLineNumber,
 		startColumn: b.endColumn,
 		endLineNumber: b.startLineNumber,
 		endColumn: b.startColumn
 	});
 };
-function Q(e, t) {
+function ne(e, t) {
 	let n = null;
 	const r = e.length;
 	for (let o = 0; !n && o < r; o++) {
@@ -635,48 +643,64 @@ function Q(e, t) {
 	}
 	return n ? n.getContext() : "formula";
 }
-function ee(e, t, n, r, o = []) {
+function re(e, t, n, r, o = []) {
 	if ("function" === r.kind && "export" === r.kindModifiers) {
 		const t = r.spans[0].start, i = e.getPositionAt(t);
 		o.push({
 			name: r.text,
-			type: Q(n, r),
+			type: ne(n, r),
 			lineNumber: i.lineNumber
 		});
 	}
-	if (r.childItems) for (const i of r.childItems) ee(e, t, n, i, o);
+	if (r.childItems) for (const i of r.childItems) re(e, t, n, i, o);
 	return o;
 }
-function te(e, t, n = "function", r) {
+function oe(e, t, n = "function", r) {
 	const o = e.spans, i = o.length;
 	for (let s = 0; s < i; s++) {
 		const i = o[s];
 		if (i.start <= t && t < i.start + i.length) {
 			if (e.kind === n && (!r || e.kindModifiers === r)) return e;
 			for (const o of e.childItems || []) {
-				const e = te(o, t, n, r);
+				const e = oe(o, t, n, r);
 				if (e) return e;
 			}
 		}
 		return null;
 	}
 }
-function ne(e) {
+function ie(e) {
 	return "comment" === e.kind;
 }
-var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue = { current: null }, de = (e, t) => {
-	oe = {
+var se = null, ae = null, ce = null, le = null, ue = !1, de = !1, pe = !1, me = { current: null }, ge = (e, t) => {
+	ae = {
 		editor: e,
 		monaco: t
-	}, ie && (se = ie(e, t));
-}, pe = (e) => {
-	if (le) return;
-	le = !0, e.languages.typescript.typescriptDefaults.setDiagnosticsOptions({
-		noSemanticValidation: !0,
+	}, ce && (le = ce(e, t));
+}, fe = (e) => {
+	if (pe) return;
+	pe = !0;
+	const t = e.languages.typescript;
+	t.typescriptDefaults.setCompilerOptions({
+		...t.typescriptDefaults.getCompilerOptions(),
+		target: t.ScriptTarget.ES2020,
+		lib: [
+			"webworker",
+			"es2020",
+			"esnext.asynciterable"
+		],
+		strict: !0,
+		downlevelIteration: !0,
+		moduleResolution: t.ModuleResolutionKind.NodeJs,
+		allowSyntheticDefaultImports: !0,
+		baseUrl: "inmemory://model/",
+		allowNonTsExtensions: !0
+	}), t.typescriptDefaults.setDiagnosticsOptions({
+		noSemanticValidation: !1,
 		noSyntaxValidation: !1,
 		diagnosticCodesToIgnore: [2307]
-	}), e.languages.typescript.typescriptDefaults.setEagerModelSync(!0), e.languages.json.jsonDefaults.setDiagnosticsOptions({ validate: !0 }), J(e), ((e) => {
-		X || (X = !0, e.languages.registerCompletionItemProvider("typescript", {
+	}), t.typescriptDefaults.setEagerModelSync(!0), null !== X && (t.typescriptDefaults.addExtraLib(X, "inmemory://model/sheetxl.d.ts"), t.typescriptDefaults.addExtraLib("declare module '@sheetxl/primitives' { export = SheetXL; }\n", "inmemory://model/sheetxl-module-shims.d.ts")), e.languages.json.jsonDefaults.setDiagnosticsOptions({ validate: !0 }), Q(e), ((e) => {
+		ee || (ee = !0, e.languages.registerCompletionItemProvider("typescript", {
 			triggerCharacters: ["@"],
 			provideCompletionItems: (t, n) => {
 				const r = t.getValueInRange({
@@ -750,91 +774,53 @@ var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue =
 			}
 		],
 		colors: {}
-	});
-	(async () => {
-		let t = !1;
-		try {
-			const n = await (async () => await (await fetch(Z)).text())(), r = e.Uri.parse("inmemory://model/\"sheetxl-models\".d.ts");
-			let o = e.editor.getModel(r);
-			o ? t = !0 : o = e.editor.createModel(n, "typescript", r), e.editor.setModelMarkers(o, "default", []);
-		} catch (e) {
-			console.warn("cant load types", e);
-		}
-		try {
-			if (e.languages.registerLinkProvider("*", { provideLinks: (t, n) => {
-				const r = [], o = { links: r }, i = t.getLinesContent(), s = i.length;
-				for (let n = 1; n <= s; n++) {
-					const o = i[n - 1], s = e.editor.tokenize(o, "typescript"), a = s[0].length;
-					for (let i = 0; i < a; i++) {
-						const a = s[0]?.[i];
-						if (a && a.type.startsWith("string")) {
-							let c = a.offset, l = s[0]?.[i + 1]?.offset ?? o.length, u = new e.Range(n, c + 1, n, l + 1), d = t.getValueInRange(u);
-							const p = d[0];
-							"`" !== p && "'" !== p && "\"" !== p || (c++, d = d.substring(1));
-							const m = d[d.length - 1];
-							"`" !== m && "'" !== m && "\"" !== m || (c++, d = d.substring(0, d.length - 1));
-							try {
-								ue.current?.getRanges(d) && r.push({
-									range: {
-										endColumn: l,
-										endLineNumber: n,
-										startColumn: c,
-										startLineNumber: n
-									},
-									tooltip: `Goto range '${d}'`,
-									url: `/range/${d}`
-								});
-							} catch (e) {}
-						}
-					}
-				}
-				return o;
-			} }), e.editor.registerLinkOpener({ open(e) {
-				if (e?.path?.startsWith("/range/")) {
+	}), e.languages.registerLinkProvider("*", { provideLinks: (t, n) => {
+		const r = [], o = { links: r }, i = t.getLinesContent(), s = i.length;
+		for (let n = 1; n <= s; n++) {
+			const o = i[n - 1], s = e.editor.tokenize(o, "typescript"), a = s[0].length;
+			for (let i = 0; i < a; i++) {
+				const a = s[0]?.[i];
+				if (a && a.type.startsWith("string")) {
+					let c = a.offset, l = s[0]?.[i + 1]?.offset ?? o.length, u = new e.Range(n, c + 1, n, l + 1), d = t.getValueInRange(u);
+					const p = d[0];
+					"`" !== p && "'" !== p && "\"" !== p || (c++, d = d.substring(1));
+					const m = d[d.length - 1];
+					"`" !== m && "'" !== m && "\"" !== m || (c++, d = d.substring(0, d.length - 1));
 					try {
-						ue.current?.getRanges(e.path.substring(7))?.select();
-					} catch (e) {
-						console.warn("invalid range", e);
-					}
-					return !0;
+						me.current?.getRanges(d) && r.push({
+							range: {
+								endColumn: l,
+								endLineNumber: n,
+								startColumn: c,
+								startLineNumber: n
+							},
+							tooltip: `Goto range '${d}'`,
+							url: `/range/${d}`
+						});
+					} catch (e) {}
 				}
-				return !1;
-			} }), !t) {
-				const t = e.languages.typescript.typescriptDefaults.getCompilerOptions();
-				e.languages.typescript.typescriptDefaults.setCompilerOptions({
-					...t,
-					target: e.languages.typescript.ScriptTarget.ES2020,
-					lib: [
-						"webworker",
-						"es2020",
-						"esnext.asynciterable"
-					],
-					strict: !0,
-					downlevelIteration: !0,
-					moduleResolution: e.languages.typescript.ModuleResolutionKind.NodeJs,
-					allowSyntheticDefaultImports: !0,
-					baseUrl: "inmemory://model/",
-					allowNonTsExtensions: !0
-				});
 			}
-		} finally {
-			(() => {
-				const t = e.languages.typescript.typescriptDefaults.getDiagnosticsOptions();
-				e.languages.typescript.typescriptDefaults.setDiagnosticsOptions({
-					...t,
-					noSemanticValidation: !1
-				});
-			})();
 		}
-	})();
-}, me = (e) => {
+		return o;
+	} }), e.editor.registerLinkOpener({ open(e) {
+		if (e?.path?.startsWith("/range/")) {
+			try {
+				me.current?.getRanges(e.path.substring(7))?.select();
+			} catch (e) {
+				console.warn("invalid range", e);
+			}
+			return !0;
+		}
+		return !1;
+	} });
+}, he = (e) => {
 	let t = !1;
 	const n = e ? e.length : 0;
 	for (let r = 0; !t && r < n; r++) 8 === e[r].severity && (t = !0);
-}, ge = () => {
-	const [t, n] = s(() => re.props);
-	return r(() => (re && (re.setProps = n), () => {
-		re && (re.setProps = null);
+}, ye = () => {
+	const [t, n] = s(() => se.props);
+	return r(() => (se && (se.setProps = n), () => {
+		se && (se.setProps = null);
 	}), []), C("div", {
 		style: {
 			display: "flex",
@@ -849,11 +835,11 @@ var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue =
 			value: t.value,
 			onValidate: t.onValidate,
 			beforeMount: t.beforeMount,
-			onMount: de
+			onMount: ge
 		}) })
 	});
-}, fe = n(t((e, t) => {
-	const { className: n, style: p, readOnly: g = !1, darkMode: f, loadingPanel: h, autoFocus: k = !0, frame: E, scripts: M, onStatusChange: D, ...I } = e, $ = S(), A = i(null), [T, R] = s(!1), F = O(), [P] = x(["insertFunction"]), [H, U] = s({
+}, be = n(t((e, t) => {
+	const { className: n, style: p, readOnly: g = !1, darkMode: f, loadingPanel: y, autoFocus: v = !0, frame: E, scripts: M, onStatusChange: I, ...D } = e, $ = S(), R = i(null), [T, A] = s(!1), P = O(), [F] = x(["insertFunction"]), [H, U] = s({
 		message: "Loading",
 		cursor: "",
 		dirty: !1
@@ -862,55 +848,55 @@ var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue =
 		compiling: !1,
 		errors: [],
 		warnings: []
-	}), Z = b((e) => {
+	}), J = b((e) => {
 		U((t) => {
 			const n = {
 				...t,
 				...e
 			};
-			return u.deepEqual(n, t) ? t : (R(n.dirty ?? !1), n);
+			return u.deepEqual(n, t) ? t : (A(n.dirty ?? !1), n);
 		});
-	}, [D]);
+	}, [I]);
 	r(() => {
-		D?.(H);
-	}, [D, H]);
-	const X = v(), Q = b(async (e) => {
+		I?.(H);
+	}, [I, H]);
+	const X = k(), Z = b(async (e) => {
 		let t = null, n = null;
 		try {
-			e && (n = await X.showBusy($("scriptEditor.saving")), t = await M.createModule({ source: e })), M.addModule(V(M), t, { replace: !0 }), n?.();
+			e && (n = await X.showBusy($("scriptEditor.saving")), t = await M.createModule({ source: e })), M.addModule(j(M), t, { replace: !0 }), n?.();
 		} catch (e) {
 			n?.(), console.warn("Unable to compile", e), X.showError(e);
 		}
 		return t;
-	}, [M]), ne = b(async () => {
-		if (!A.current || g) return;
-		const e = A.current.editor;
+	}, [M]), Y = b(async () => {
+		if (!R.current || g) return;
+		const e = R.current.editor;
 		let t;
 		if (H.dirty) {
 			const n = e.getValue();
-			await Q(n), t = j(M);
+			await Z(n), t = V(M);
 			const r = t?.getSource(), o = e.getValue(), i = (r?.length ?? 0) !== n.length || r !== o;
-			Z({ dirty: i });
-		} else t = j(M);
+			J({ dirty: i });
+		} else t = V(M);
 		return t;
 	}, [H, M]);
 	r(() => {
-		const e = E?.addListener({ onBeforeHide: async () => (await ne(), !0) });
+		const e = E?.addListener({ onBeforeHide: async () => (await Y(), !0) });
 		return () => {
 			e?.();
 		};
 	}, [E]), r(() => {
-		if (M) return M.addListeners({ onBeforeSearch: () => ne() });
-	}, [M]), L(F, {
+		if (M) return M.addListeners({ onBeforeSearch: () => Y() });
+	}, [M]), L(P, {
 		onBeforeSave: async () => {
-			await ne();
+			await Y();
 		},
 		onLoad: () => {
-			const e = A.current?.editor;
-			e && e.setValue(j(M)?.getSource() ?? "");
+			const e = R.current?.editor;
+			e && e.setValue(V(M)?.getSource() ?? "");
 		}
 	});
-	const le = b(async (e) => {
+	const ee = b(async (e) => {
 		if (!M) return;
 		const t = "string" == typeof e ? { functionName: e } : e ?? {};
 		let n = null;
@@ -926,9 +912,9 @@ var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue =
 		} catch (e) {
 			X.showError(e);
 		}
-	}, [M, X]), [de, fe] = s(!1), ye = b(async () => {
-		if (!A.current) return null;
-		const e = A.current, t = e.editor;
+	}, [M, X]), [ne, ie] = s(!1), pe = b(async () => {
+		if (!R.current) return null;
+		const e = R.current, t = e.editor;
 		if (!t) return null;
 		const r = await (async (e, t, n = "export") => {
 			const r = e.getModel();
@@ -938,7 +924,7 @@ var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue =
 			if (!s) return null;
 			const a = s.startLineNumber === s.endLineNumber && s.startColumn === s.endColumn ? r.getLineCount() : Math.min(s.endLineNumber, r.getLineCount());
 			for (let e = s.startLineNumber; !i && e <= a; e++) {
-				const t = te(o, r.getOffsetAt({
+				const t = oe(o, r.getOffsetAt({
 					lineNumber: e,
 					column: 1
 				}), "function", n);
@@ -946,13 +932,13 @@ var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue =
 			}
 			return i;
 		})(t, e.monaco);
-		return Z({ message: (r ?? "").toUpperCase() }), r ? {
+		return J({ message: (r ?? "").toUpperCase() }), r ? {
 			source: t.getValue(),
 			name: r
 		} : null;
 	}, []);
-	b(d.debounce(ne, 200), []);
-	const he = b(async (e, t, n) => {
+	b(d.debounce(Y, 200), []);
+	const ge = b(async (e, t, n) => {
 		G((e) => ({
 			...e,
 			compiling: !0
@@ -980,7 +966,7 @@ var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue =
 			});
 			t.editor.setModelMarkers(e, "sheetxl", r);
 		})(e, t, o), async function(e, t, n, r) {
-			const o = ee(e, t, r, await (await (await t.languages.typescript.getTypeScriptWorker())(e.uri)).getNavigationTree(e.uri.toString())).map((e) => {
+			const o = re(e, t, r, await (await (await t.languages.typescript.getTypeScriptWorker())(e.uri)).getNavigationTree(e.uri.toString())).map((e) => {
 				let n = null, r = null;
 				return "formula" === e.type ? (n = "formula.margin-icon", r = $("scriptEditor.glyph.formula")) : "macro" === e.type ? (n = "macro.margin-icon", r = $("scriptEditor.glyph.macro")) : "autoRun" === e.type && (n = "autorun.margin-icon", r = $("scriptEditor.glyph.autoRun")), {
 					range: new t.Range(e.lineNumber, 1, e.lineNumber, 1),
@@ -999,26 +985,26 @@ var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue =
 			errors: o.filter((e) => "error" === e.severity).map((e) => `${e.code}: ${e.message}`),
 			warnings: o.filter((e) => "warning" === e.severity).map((e) => `${e.code}: ${e.message}`)
 		}));
-	}, [M]), be = b(d.debounce(he, 580), []), xe = b(async (e) => {
-		if (!A.current) return;
-		const t = A.current.editor.getPosition(), n = { cursor: t ? t.toString() : "" };
-		void 0 !== e && (n.message = e), Z(n);
+	}, [M]), be = b(d.debounce(ge, 580), []), xe = b(async (e) => {
+		if (!R.current) return;
+		const t = R.current.editor.getPosition(), n = { cursor: t ? t.toString() : "" };
+		void 0 !== e && (n.message = e), J(n);
 	}, []);
 	r(() => {}, [q]);
-	const we = i(null), ke = b(async () => {
-		await ne(), E?.close();
-	}, [E]), ve = b((e) => {
-		const t = A.current?.editor;
+	const we = i(null), ve = b(async () => {
+		await Y(), E?.close();
+	}, [E]), ke = b((e) => {
+		const t = R.current?.editor;
 		return !!t && (t.focus(e), !0);
 	}, [H]), Se = b(async () => {
-		const e = A.current?.editor, t = e?.getModel(), n = e?.getSelection();
+		const e = R.current?.editor, t = e?.getModel(), n = e?.getSelection();
 		if (!t || !n) return;
 		const r = n.isEmpty() ? t.getLineContent(n.positionLineNumber) + "\n" : t.getValueInRange(n);
 		try {
 			await navigator.clipboard?.writeText(r);
 		} catch {}
 	}, []), Ce = b(async () => {
-		const e = A.current, t = e?.editor, n = t?.getModel(), r = t?.getSelection();
+		const e = R.current, t = e?.editor, n = t?.getModel(), r = t?.getSelection();
 		if (!n || !r) return;
 		const o = r.isEmpty() ? new e.monaco.Range(r.positionLineNumber, 1, r.positionLineNumber + 1, 1) : r, i = n.getValueInRange(o);
 		try {
@@ -1032,7 +1018,7 @@ var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue =
 			forceMoveMarkers: !0
 		}]), t.pushUndoStop(), t.focus();
 	}, []), Ne = b(async () => {
-		const e = A.current?.editor;
+		const e = R.current?.editor;
 		if (!e) return;
 		let t;
 		try {
@@ -1048,22 +1034,28 @@ var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue =
 			forceMoveMarkers: !0
 		}]), e.pushUndoStop(), e.focus();
 	}, []), Ee = i(null), Le = b((e, t) => {
-		A.current = {
+		R.current = {
 			monaco: t,
 			editor: e
-		}, ue.current = F ?? null;
+		}, me.current = P ?? null;
 		const n = e.getModel(), r = [];
-		fe(!0);
-		const o = j(M)?.getSource() ?? "";
-		return e.getValue() !== o && e.setValue(o), ae ? (xe(""), be(n, t, e), J(t)) : (ae = !0, xe("Loading Types"), import("monaco-editor-auto-typings/custom-editor.js").then(async (n) => {
-			xe(""), n.AutoTypings.create(e, {
+		ie(!0);
+		const o = V(M)?.getSource() ?? "";
+		return e.getValue() !== o && e.setValue(o), ue ? (xe(""), be(n, t, e), Q(t)) : (ue = !0, xe("Loading Types"), import("monaco-editor-auto-typings/custom-editor.js").then(async (n) => {
+			xe("");
+			const r = n.AutoTypings, o = new n.JsDelivrSourceResolver(), i = (e) => e.startsWith("@sheetxl/") || e.startsWith("@types/sheetxl__");
+			r.create(e, {
+				sourceResolver: {
+					resolvePackageJson: (e, t, n) => i(e) ? Promise.resolve(void 0) : o.resolvePackageJson(e, t, n),
+					resolveSourceFile: (e, t, n) => i(e) ? Promise.resolve(void 0) : o.resolveSourceFile(e, t, n)
+				},
 				shareCache: !0,
 				dontAdaptEditorOptions: !0,
 				monaco: t,
 				onUpdate: (e, n) => {
-					if ("LookedUpPackage" === e.type && void 0 !== e.success) {
+					if ("LookedUpPackage" === e.type && !0 === e.success) {
 						const e = t.languages.typescript.typescriptDefaults.getDiagnosticsOptions();
-						t.languages.typescript.typescriptDefaults.setDiagnosticsOptions({
+						e.diagnosticCodesToIgnore?.length && t.languages.typescript.typescriptDefaults.setDiagnosticsOptions({
 							...e,
 							diagnosticCodesToIgnore: []
 						});
@@ -1092,11 +1084,11 @@ var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue =
 						e(t, B[t]);
 					}
 					B = void 0, z = !0;
-				})(), J(t);
+				})(), Q(t);
 			});
 		}).catch((e) => {
-			ae = !1, xe(""), console.warn("Auto typings could not be loaded:", e);
-		})), ce || (ce = !0, function(e, t) {
+			ue = !1, xe(""), console.warn("Auto typings could not be loaded:", e);
+		})), de || (de = !0, function(e, t) {
 			t.languages.registerInlayHintsProvider("typescript", { provideInlayHints(e, n, r) {
 				const o = [];
 				for (let n = 1; n < e.getLineCount() + 1; n++) {
@@ -1125,40 +1117,40 @@ var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue =
 			label: "Execute",
 			keybindings: [t.KeyCode.F8],
 			run: async (e) => {
-				const t = await ye();
-				le(t);
+				const t = await pe();
+				ee(t);
 			}
 		})), r.push(e.addAction({
 			id: "saveScript",
 			label: "Save Script",
 			keybindings: [t.KeyMod.CtrlCmd | t.KeyCode.KeyS],
 			run: (e) => {
-				ne();
+				Y();
 			}
 		})), r.push(e.onMouseDown(async (e) => {
 			if (e.target.type === t.editor.MouseTargetType.GUTTER_GLYPH_MARGIN) {
 				e.event.browserEvent.preventDefault();
-				const r = e.target.position.lineNumber, o = await (await (await t.languages.typescript.getTypeScriptWorker())(n.uri)).getNavigationTree(n.uri.toString()), i = await ne();
+				const r = e.target.position.lineNumber, o = await (await (await t.languages.typescript.getTypeScriptWorker())(n.uri)).getNavigationTree(n.uri.toString()), i = await Y();
 				if (!i) return;
-				const s = i.getFunctions().getItems({ includeHidden: !0 }), a = ee(n, t, s, o).find((e) => e.lineNumber === r);
+				const s = i.getFunctions().getItems({ includeHidden: !0 }), a = re(n, t, s, o).find((e) => e.lineNumber === r);
 				if (a) {
 					const t = e.event.browserEvent.button;
 					if (0 === t) {
-						if ("macro" === a.type || "autoRun" === a.type) le({ functionName: a.name });
+						if ("macro" === a.type || "autoRun" === a.type) ee({ functionName: a.name });
 						else if ("formula" === a.type) {
 							const e = s?.find((e) => e.getName() === a.name);
-							e && P?.execute(e);
+							e && F?.execute(e);
 						}
 					} else 2 === t && (console.log("Context menu for function:", a.name), e.event.browserEvent.preventDefault());
 				}
 			}
 		})), r.push(e.onDidChangeModelContent(() => {
-			Z({ dirty: !0 }), be(n, t, e);
+			J({ dirty: !0 }), be(n, t, e);
 		})), r.push(t.editor.onDidChangeMarkers((e) => {
 			e.some((e) => e.toString() === n.uri.toString());
 		})), r.push(n.onDidChangeContent((t) => {
-			const n = j(M)?.getSource(), r = e.getValue(), o = (n?.length ?? 0) !== r.length || n !== r;
-			Z({ dirty: o });
+			const n = V(M)?.getSource(), r = e.getValue(), o = (n?.length ?? 0) !== r.length || n !== r;
+			J({ dirty: o });
 		})), r.push(e.onDidChangeCursorPosition((e) => {
 			xe();
 		})), () => {
@@ -1166,28 +1158,28 @@ var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue =
 				e.dispose();
 			} catch {}
 		};
-	}, [M, F]), Me = o(() => de ? null : h || C("div", {
+	}, [M, P]), Me = o(() => ne ? null : y || C("div", {
 		style: {
 			position: "absolute",
 			width: "100%",
 			height: "100%"
 		},
 		children: $("scriptEditor.loading")
-	}), [de, h]), Oe = o(() => ({
+	}), [ne, y]), Oe = o(() => ({
 		..._,
 		fixedOverflowWidgets: !1,
 		contextmenu: !1,
 		readOnly: g
-	}), [g]), De = i(null);
+	}), [g]), Ie = i(null);
 	r(() => {
 		const e = {
 			theme: f ? "extended-dark" : "extended",
 			options: Oe,
-			value: j(M)?.getSource() ?? "",
-			beforeMount: pe,
-			onValidate: me
+			value: V(M)?.getSource() ?? "",
+			beforeMount: fe,
+			onValidate: he
 		}, t = ((e) => {
-			if (re) return re;
+			if (se) return se;
 			if (!B) {
 				B = {};
 				const e = K.length;
@@ -1201,33 +1193,33 @@ var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue =
 			const n = document.createElement("div");
 			n.style.width = "100%", n.style.height = "100%", n.style.display = "flex", n.style.flex = "1 1 100%", t.appendChild(n), document.body.appendChild(t);
 			const r = a(n);
-			return re = {
+			return se = {
 				root: r,
 				hostEl: n,
 				stashEl: t,
 				props: e,
 				setProps: null
-			}, r.render(C(ge, {})), re;
+			}, r.render(C(ye, {})), se;
 		})(e);
-		return t.props = e, t.setProps?.(e), ie = (e, t) => Le(e, t), De.current?.appendChild(t.hostEl), oe && (se = Le(oe.editor, oe.monaco)), () => {
-			se?.(), se = null, ie = null, A.current = null, re?.stashEl.appendChild(re.hostEl);
+		return t.props = e, t.setProps?.(e), ce = (e, t) => Le(e, t), Ie.current?.appendChild(t.hostEl), ae && (le = Le(ae.editor, ae.monaco)), () => {
+			le?.(), le = null, ce = null, R.current = null, se?.stashEl.appendChild(se.hostEl);
 		};
 	}, []), r(() => {
-		if (!re) return;
+		if (!se) return;
 		const e = {
-			...re.props,
+			...se.props,
 			theme: f ? "extended-dark" : "extended",
 			options: Oe
 		};
-		re.props = e, re.setProps?.(e);
+		se.props = e, se.setProps?.(e);
 	}, [f, Oe]), r(() => {
-		const e = A.current, t = e?.editor;
+		const e = R.current, t = e?.editor;
 		if (!t) return;
-		ue.current = F ?? null;
-		const n = j(M)?.getSource() ?? "";
-		t.getValue() !== n && (t.setValue(n), be(t.getModel(), e.monaco, t), Z({ dirty: !1 }));
-	}, [M, F]);
-	const Ie = N("div", {
+		me.current = P ?? null;
+		const n = V(M)?.getSource() ?? "";
+		t.getValue() !== n && (t.setValue(n), be(t.getModel(), e.monaco, t), J({ dirty: !1 }));
+	}, [M, P]);
+	const De = N("div", {
 		style: {
 			display: "flex",
 			flex: "1 1 100%",
@@ -1237,7 +1229,7 @@ var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue =
 			boxSizing: "border-box"
 		},
 		children: [C("div", {
-			ref: De,
+			ref: Ie,
 			style: {
 				display: "flex",
 				flex: "1 1 100%",
@@ -1248,30 +1240,30 @@ var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue =
 	}), $e = w(t, () => ({
 		isScriptEditorElement: () => !0,
 		showCommandPalette: () => {
-			A.current?.editor && A.current.editor.trigger("keyboard", "editor.action.quickCommand", null);
+			R.current?.editor && R.current.editor.trigger("keyboard", "editor.action.quickCommand", null);
 		},
 		getScripts: () => M,
 		focus: (e) => {
-			ve(e);
+			ke(e);
 		},
-		close: () => ke(),
-		insertSnippet: (e) => A.current?.editor ? Y(A.current.editor, A.current.monaco, e) : Promise.resolve(),
+		close: () => ve(),
+		insertSnippet: (e) => R.current?.editor ? te(R.current.editor, R.current.monaco, e) : Promise.resolve(),
 		saveSource: async () => {
-			await ne();
+			await Y();
 		},
 		runAction: (e) => {
-			const t = A.current?.editor;
+			const t = R.current?.editor;
 			t && (t.focus(), t.trigger("source", e, null));
 		},
 		copy: () => Se(),
 		cut: () => Ce(),
 		paste: () => Ne()
-	}), [F]), [Ae, Te] = s(null), Re = b((e) => {
+	}), [P]), [Re, Te] = s(null), Ae = b((e) => {
 		null !== e && Te(e);
-	}, []), Fe = y.useCommandScope();
+	}, []), Pe = h.useCommandScope();
 	r(() => {
-		if (!Fe || !Ae) return;
-		const e = Fe.contribution();
+		if (!Pe || !Re) return;
+		const e = Pe.contribution();
 		return function(e, t) {
 			const n = t.scriptEditor, r = t;
 			e.updateCommand("scriptingHelp", { callback: () => {
@@ -1290,25 +1282,25 @@ var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue =
 				}
 			}), e.updateCommand("copy", { callback: () => n.copy() }), e.updateCommand("cut", { callback: () => n.cut() }), e.updateCommand("paste", { callback: () => n.paste() }), e.updateCommand("selectAll", { callback: () => n.runAction("editor.action.selectAll") }), e.updateCommand("find", { callback: () => n.runAction("actions.find") }), e.updateCommand("findReplace", { callback: () => n.runAction("editor.action.startFindReplaceAction") }), e.updateCommand("goto", { callback: () => n.runAction("editor.action.gotoLine") });
 		}(e, {
-			scriptEditor: Ae,
+			scriptEditor: Re,
 			isDirty: T,
 			readOnly: g
 		}), () => {
 			e.remove();
 		};
 	}, [
-		Fe,
-		Ae,
+		Pe,
+		Re,
 		T,
 		g
-	]), r(() => (k && requestAnimationFrame(() => {
+	]), r(() => (v && requestAnimationFrame(() => {
 		$e.current?.focus();
 	}), () => {
-		A.current?.editor && requestAnimationFrame(() => {
+		R.current?.editor && requestAnimationFrame(() => {
 			$e.current?.contains(document.activeElement) && $e.current?.focus();
 		});
 	}), []);
-	const Pe = l([$e, Re]);
+	const Fe = l([$e, Ae]);
 	return C("div", {
 		className: c("script-editor", W, n),
 		style: {
@@ -1318,14 +1310,14 @@ var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue =
 			position: "relative",
 			...p
 		},
-		ref: Pe,
-		...I,
-		children: Ie
+		ref: Fe,
+		...D,
+		children: De
 	});
-})), ye = null, he = (e) => {
-	ye = e;
-}, be = () => ye, xe = n((e) => {
-	const { scope: t, data: n } = e, { workbook: o } = n, i = v(), s = M(), a = s.getOpen(), c = b(async (e) => {
+})), xe = null, we = (e) => {
+	xe = e;
+}, ve = () => xe, ke = n((e) => {
+	const { scope: t, data: n } = e, { workbook: o } = n, i = k(), s = M(), a = s.getOpen(), c = b(async (e) => {
 		if (!o) return;
 		let t = null;
 		const n = o.getScripts();
@@ -1343,7 +1335,7 @@ var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue =
 			return;
 		}
 	}, [o, i]), l = b(() => {
-		const e = be();
+		const e = ve();
 		e ? o && e({ workbook: o }) : s.getOpen().includes("scriptEditor") ? s.close("scriptEditor") : s.activate("scriptEditor", {});
 	}, [o, s]), u = a.includes("scriptEditor");
 	return r(() => {
@@ -1367,8 +1359,8 @@ var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue =
 		o?.getScripts().start();
 	} }), null;
 });
-xe.displayName = "WorkbookScriptCommands";
-var we = {
+ke.displayName = "WorkbookScriptCommands";
+var Se = {
 	"reason.noChangesToSave": "No changes to save",
 	"reason.scriptsReadOnly": "Scripts can't be changed while the workbook structure is protected.",
 	"scriptEditor.glyph.autoRun": "Auto Run",
@@ -1377,7 +1369,7 @@ var we = {
 	"scriptEditor.loading": "Loading...",
 	"scriptEditor.retry": "Retry",
 	"scriptEditor.saving": "Saving Scripts..."
-}, ke = [
+}, Ce = [
 	{
 		sourceId: "groups",
 		catalog: {
@@ -1459,30 +1451,30 @@ var we = {
 			}
 		}
 	}
-], { DefaultCommandCatalogService: ve } = y, Se = !1;
-var Ce = (e) => {
+], { DefaultCommandCatalogService: Ne } = h, Ee = !1;
+var Le = (e) => {
 	const { model: t, entryKey: n, frame: r, ref: o, ...i } = e;
-	return C(fe, {
+	return C(be, {
 		ref: o,
 		frame: r,
 		scripts: t?.getScripts(),
 		...i
 	});
-}, Ne = () => {
+}, Me = () => {
 	E.registerTaskPane({
 		key: "scriptEditor",
 		getTitle: () => "Script (Typescript)",
 		getIcon: () => "ScriptRun",
-		component: Ce,
+		component: Le,
 		keepMounted: !0
 	}, !0), function() {
-		if (Se) return;
-		Se = !0;
-		const e = ve;
+		if (Ee) return;
+		Ee = !0;
+		const e = Ne;
 		e.registerFromManifest("@sheetxl/scripting-react", import.meta.url, {
-			messages: we,
-			catalogs: ke
+			messages: Se,
+			catalogs: Ce
 		}), e.prefetch();
-	}(), y.DefaultCommandRegistry.registerDynamic("workbook", xe);
+	}(), h.DefaultCommandRegistry.registerDynamic("workbook", ke);
 };
-export { fe as ScriptEditor, Ne as ScriptingReactPlugin, xe as WorkbookScriptCommands, be as getScriptEditorOpener, he as setScriptEditorOpener };
+export { be as ScriptEditor, Me as ScriptingReactPlugin, ke as WorkbookScriptCommands, ve as getScriptEditorOpener, we as setScriptEditorOpener };