@sheetxl/scripting-react 0.8.0-beta.5 → 0.8.0-beta.7

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.5
+* @license @sheetxl/scripting-react - Scripting React - Monaco based script editor and scripting UI for SheetXL. - v0.8.0-beta.7
 *
 * (C) 2026-present SheetXL Inc. & Michael T. Ford
 * License: The license can be found at https://www.sheetxl.com/license.
@@ -8,13 +8,13 @@ import { Suspense as e, forwardRef as t, memo as n, useEffect as r, useMemo as o
 import { createRoot as a } from "react-dom/client";
 import c from "clsx";
 import { mergeRefs as l } from "react-merge-refs";
-import { CommonUtils as u, TimerUtils as d, defineLazyModule as p, messageKey as g } from "@sheetxl/utils";
-import { DocTags as m } from "@sheetxl/scripting";
+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 w, useImperativeElement as k, useLazyRetry as x, useNotifier as v, useTranslator as S } from "@sheetxl/utils-react";
+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 { jsx as C, jsxs as N } from "react/jsx-runtime";
-import { DefaultTaskPaneRegistry as E, useModelListener as L, useTaskPaneArea as M, useWorkbook as D } from "@sheetxl/react";
-var O = {
+import { DefaultTaskPaneRegistry as E, useModelListener as L, useTaskPaneArea as M, useWorkbook as O } from "@sheetxl/react";
+var D = {
 	defaultToken: "invalid",
 	tokenPostfix: ".ts",
 	keywords: [
@@ -355,7 +355,49 @@ var O = {
 			{ include: "common" }
 		]
 	}
-}, T = {
+}, 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) => {
+	const t = [];
+	let n = 0;
+	for (;;) {
+		I.lastIndex = n, I.exec(e), $.lastIndex = I.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;
+		t.push({
+			start: r.index,
+			end: $.lastIndex,
+			text: r[0],
+			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,
+			namesStart: i + s + 1,
+			namesEnd: i + a
+		}), n = $.lastIndex;
+	}
+}, R = (e) => [
+	e.typeOnly,
+	e.binding,
+	e.names?.join(","),
+	e.module
+].join("|"), F = (e) => `${e.typeOnly ? "type " : ""}${e.module}`, P = (e, t, n) => {
+	const r = e.slice(t.namesStart, t.namesEnd), o = r.trimEnd();
+	if ("" === o.trim()) return {
+		offset: t.namesStart,
+		text: ` ${n.join(", ")}${"" === r ? " " : ""}`
+	};
+	const i = t.namesStart + o.length, s = o.endsWith(","), a = o.lastIndexOf("\n");
+	if (a < 0) return {
+		offset: i,
+		text: `${s ? " " : ", "}${n.join(", ")}`
+	};
+	const c = /^[ \t]*/.exec(o.slice(a + 1))[0];
+	return {
+		offset: i,
+		text: `${s ? "" : ","}\n${c}${n.join(`,\n${c}`)}${s ? "," : ""}`
+	};
+}, _ = {
 	lightbulb: { enabled: !1 },
 	tabSize: 2,
 	acceptSuggestionOnCommitCharacter: !0,
@@ -418,11 +460,11 @@ var O = {
 	wordWrapColumn: 80,
 	wordWrapMinified: !0,
 	wrappingIndent: "none"
-}, A = "_script-editor_1kuph_5", R = (e) => {
+}, W = "_script-editor_1kuph_5", V = (e) => {
 	const t = e?.getModules();
 	return t ? (t.getByName(f.DEFAULT_MODULE), f.DEFAULT_MODULE) : f.DEFAULT_MODULE;
-}, I = (e) => e?.getModules()?.getByName(R(e)) ?? null;
-var F, P = p("scripting-react:monaco", async () => (function() {
+}, j = (e) => e?.getModules()?.getByName(V(e)) ?? null;
+var B, U = p("scripting-react:monaco", async () => (function() {
 	if ("undefined" == typeof window) return;
 	const e = window;
 	if (e.__sxlDefineShim) return;
@@ -442,8 +484,8 @@ var F, P = p("scripting-react:monaco", async () => (function() {
 			} catch {}
 		}
 	});
-}(), import("@monaco-editor/react")), { prefetch: !1 }), _ = ({ error: e }) => {
-	const t = x(), n = S();
+}(), import("@monaco-editor/react")), { prefetch: !1 }), H = ({ error: e }) => {
+	const t = k(), n = S();
 	return N("div", {
 		style: {
 			display: "flex",
@@ -459,14 +501,132 @@ var F, P = p("scripting-react:monaco", async () => (function() {
 			children: n("scriptEditor.retry")
 		}) : null]
 	});
-}, $ = h(P.load, { renderError: (e) => C(_, { error: e }) }), W = ["define", "require"], V = !1, B = "@0.8.0-beta.5";
-"@local" !== B && "@0.0.0" !== B || (B = "");
-var U = `https://cdn.jsdelivr.net/npm/@sheetxl/sdk${B}/types/scripting.d.ts`, j = (e) => {
+}, q = h(U.load, { renderError: (e) => C(H, { error: e }) }), K = ["define", "require"], z = !1, G = "@0.8.0-beta.7";
+"@local" !== G && "@0.0.0" !== G || (G = "");
+var Z = `https://cdn.jsdelivr.net/npm/@sheetxl/sdk${G}/types/scripting.d.ts`, J = (e) => {
 	try {
-		e.languages.setMonarchTokensProvider("typescript", O);
+		e.languages.setMonarchTokensProvider("typescript", D);
 	} catch (e) {}
-}, H = !1;
-function K(e, t) {
+}, X = !1, Y = 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();
+	let s = { ...i };
+	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({
+			lineNumber: e,
+			column: 1
+		}), "function");
+		if (!t || ne(t)) {
+			a = !0, s.lineNumber = e + 1;
+			break;
+		}
+		{
+			const n = t.spans[0].start;
+			e = r.getPositionAt(n).lineNumber, s.lineNumber = e;
+		}
+	}
+	const c = ((e, t) => {
+		const n = T(e), r = n.length > 0 ? n[n.length - 1].end : 0, o = T(t);
+		if (0 === o.length) return {
+			body: t,
+			inserts: [],
+			importsEnd: r
+		};
+		let i = "", s = 0;
+		for (const e of o) i += t.slice(s, e.start), s = e.end + (/^[ \t]*\r?\n/.exec(t.slice(e.end))?.[0].length ?? 0);
+		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);
+			l.has(t) || l.set(t, e);
+			let n = c.get(t);
+			n || c.set(t, n = /* @__PURE__ */ new Set());
+			for (const t of e.names) n.add(t);
+		}
+		const u = /* @__PURE__ */ new Map(), d = [], p = /* @__PURE__ */ new Map();
+		for (const e of o) {
+			if (!e.names || e.binding) {
+				const t = R(e);
+				if (a.has(t)) continue;
+				a.add(t), d.push(e.text);
+				continue;
+			}
+			const t = F(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));
+			if (0 === o.length) continue;
+			for (const e of o) n.add(e);
+			const i = l.get(t);
+			if (i) {
+				u.set(i, [...u.get(i) ?? [], ...o]);
+				continue;
+			}
+			const s = p.get(t);
+			if (s) {
+				s.names.push(...o), s.verbatim = !1;
+				continue;
+			}
+			const m = {
+				statement: e,
+				names: o,
+				verbatim: o.length === e.names.length
+			};
+			p.set(t, m), d.push(m);
+		}
+		const m = [];
+		for (const [t, n] of u) m.push(P(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;
+				const { statement: t, names: n, verbatim: r } = e;
+				if (r) return t.text;
+				const { quote: o } = t;
+				return `import ${t.typeOnly ? "type " : ""}{ ${n.join(", ")} } from ${o}${t.module}${o};`;
+			}).join("\n");
+			r > 0 ? m.push({
+				offset: r,
+				text: `\n${t}`
+			}) : m.unshift({
+				offset: 0,
+				text: `${t}\n${/^[ \t]*\r?\n/.test(e) ? "" : "\n"}`
+			});
+		}
+		return {
+			body: i,
+			inserts: m,
+			importsEnd: r
+		};
+	})(r.getValue(), n), l = c.importsEnd > 0 ? r.getPositionAt(c.importsEnd).lineNumber : 0;
+	let u = c.body, d = "";
+	s.lineNumber <= l ? l < r.getLineCount() ? (s.lineNumber = l + 1, d = u.startsWith("\n") ? "" : "\n") : (s.lineNumber = l, s.column = r.getLineMaxColumn(l), d = "\n\n") : !a && !u.startsWith("\n") && s.lineNumber > 1 && (d = "\n");
+	let p = !1;
+	r.getLineCount() > 1 && (u.endsWith("\n\n") || (u += "\n\n", p = !0));
+	const m = r.validatePosition(s), g = new t.Range(m.lineNumber, m.column, m.lineNumber, m.column), f = [];
+	for (const e of c.inserts) {
+		const n = r.getPositionAt(e.offset);
+		n.lineNumber === g.startLineNumber && n.column === g.startColumn ? d = e.text + d : f.push({
+			range: new t.Range(n.lineNumber, n.column, n.lineNumber, n.column),
+			text: e.text
+		});
+	}
+	const y = d.split("\n").length - 1, h = [{
+		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({
+		startLineNumber: b.endLineNumber,
+		startColumn: b.endColumn,
+		endLineNumber: b.startLineNumber,
+		endColumn: b.startColumn
+	});
+};
+function Q(e, t) {
 	let n = null;
 	const r = e.length;
 	for (let o = 0; !n && o < r; o++) {
@@ -475,48 +635,48 @@ function K(e, t) {
 	}
 	return n ? n.getContext() : "formula";
 }
-function q(e, t, n, r, o = []) {
+function ee(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: K(n, r),
+			type: Q(n, r),
 			lineNumber: i.lineNumber
 		});
 	}
-	if (r.childItems) for (const i of r.childItems) q(e, t, n, i, o);
+	if (r.childItems) for (const i of r.childItems) ee(e, t, n, i, o);
 	return o;
 }
-function z(e, t, n = "function", r) {
+function te(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 = z(o, t, n, r);
+				const e = te(o, t, n, r);
 				if (e) return e;
 			}
 		}
 		return null;
 	}
 }
-function G(e) {
+function ne(e) {
 	return "comment" === e.kind;
 }
-var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { current: null }, re = (e, t) => {
-	J = {
+var re = null, oe = null, ie = null, se = null, ae = !1, ce = !1, le = !1, ue = { current: null }, de = (e, t) => {
+	oe = {
 		editor: e,
 		monaco: t
-	}, X && (Y = X(e, t));
-}, oe = (e) => {
-	if (te) return;
-	te = !0, e.languages.typescript.typescriptDefaults.setDiagnosticsOptions({
+	}, ie && (se = ie(e, t));
+}, pe = (e) => {
+	if (le) return;
+	le = !0, e.languages.typescript.typescriptDefaults.setDiagnosticsOptions({
 		noSemanticValidation: !0,
 		noSyntaxValidation: !1,
 		diagnosticCodesToIgnore: [2307]
-	}), e.languages.typescript.typescriptDefaults.setEagerModelSync(!0), e.languages.json.jsonDefaults.setDiagnosticsOptions({ validate: !0 }), j(e), ((e) => {
-		H || (H = !0, e.languages.registerCompletionItemProvider("typescript", {
+	}), e.languages.typescript.typescriptDefaults.setEagerModelSync(!0), e.languages.json.jsonDefaults.setDiagnosticsOptions({ validate: !0 }), J(e), ((e) => {
+		X || (X = !0, e.languages.registerCompletionItemProvider("typescript", {
 			triggerCharacters: ["@"],
 			provideCompletionItems: (t, n) => {
 				const r = t.getValueInRange({
@@ -535,7 +695,7 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 					return n.lastIndexOf("/*") > n.lastIndexOf("*/");
 				})(t, n)) return { suggestions: [] };
 				const i = o[1], s = new e.Range(n.lineNumber, n.column - i.length, n.lineNumber, n.column);
-				return { suggestions: m.map((t) => ({
+				return { suggestions: g.map((t) => ({
 					label: `@${t.name}`,
 					kind: e.languages.CompletionItemKind.Keyword,
 					detail: "sheetxl" === t.group ? "SheetXL" : "JSDoc",
@@ -594,7 +754,7 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 	(async () => {
 		let t = !1;
 		try {
-			const n = await (async () => await (await fetch(U)).text())(), r = e.Uri.parse("inmemory://model/\"sheetxl-models\".d.ts");
+			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) {
@@ -611,10 +771,10 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 							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 g = d[d.length - 1];
-							"`" !== g && "'" !== g && "\"" !== g || (c++, d = d.substring(0, d.length - 1));
+							const m = d[d.length - 1];
+							"`" !== m && "'" !== m && "\"" !== m || (c++, d = d.substring(0, d.length - 1));
 							try {
-								ne.current?.getRanges(d) && r.push({
+								ue.current?.getRanges(d) && r.push({
 									range: {
 										endColumn: l,
 										endLineNumber: n,
@@ -632,7 +792,7 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 			} }), e.editor.registerLinkOpener({ open(e) {
 				if (e?.path?.startsWith("/range/")) {
 					try {
-						ne.current?.getRanges(e.path.substring(7))?.select();
+						ue.current?.getRanges(e.path.substring(7))?.select();
 					} catch (e) {
 						console.warn("invalid range", e);
 					}
@@ -667,14 +827,14 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 			})();
 		}
 	})();
-}, ie = (e) => {
+}, me = (e) => {
 	let t = !1;
 	const n = e ? e.length : 0;
 	for (let r = 0; !t && r < n; r++) 8 === e[r].severity && (t = !0);
-}, se = () => {
-	const [t, n] = s(() => Z.props);
-	return r(() => (Z && (Z.setProps = n), () => {
-		Z && (Z.setProps = null);
+}, ge = () => {
+	const [t, n] = s(() => re.props);
+	return r(() => (re && (re.setProps = n), () => {
+		re && (re.setProps = null);
 	}), []), C("div", {
 		style: {
 			display: "flex",
@@ -682,75 +842,75 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 			width: "100%",
 			height: "100%"
 		},
-		children: C(e, { children: C($, {
+		children: C(e, { children: C(q, {
 			theme: t.theme,
 			options: t.options,
 			language: "typescript",
 			value: t.value,
 			onValidate: t.onValidate,
 			beforeMount: t.beforeMount,
-			onMount: re
+			onMount: de
 		}) })
 	});
-}, ae = n(t((e, t) => {
-	const { className: n, style: p, readOnly: m = !1, darkMode: f, loadingPanel: h, autoFocus: x = !0, frame: E, scripts: M, onStatusChange: O, ...P } = e, _ = S(), $ = i(null), [B, U] = s(!1), H = D(), [K] = w(["insertFunction"]), [te, re] = s({
+}, 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"]), [U, H] = s({
 		message: "Loading",
 		cursor: "",
 		dirty: !1
-	}), [ae, ce] = s({
+	}), [q, G] = s({
 		loading: !1,
 		compiling: !1,
 		errors: [],
 		warnings: []
-	}), le = b((e) => {
-		re((t) => {
+	}), Z = b((e) => {
+		H((t) => {
 			const n = {
 				...t,
 				...e
 			};
-			return u.deepEqual(n, t) ? t : (U(n.dirty ?? !1), n);
+			return u.deepEqual(n, t) ? t : (R(n.dirty ?? !1), n);
 		});
-	}, [O]);
+	}, [D]);
 	r(() => {
-		O?.(te);
-	}, [O, te]);
-	const ue = v(), de = b(async (e) => {
+		D?.(U);
+	}, [D, U]);
+	const X = v(), Q = b(async (e) => {
 		let t = null, n = null;
 		try {
-			e && (n = await ue.showBusy(_("scriptEditor.saving")), t = await M.createModule({ source: e })), M.addModule(R(M), t, { replace: !0 }), n?.();
+			e && (n = await X.showBusy($("scriptEditor.saving")), t = await M.createModule({ source: e })), M.addModule(V(M), t, { replace: !0 }), n?.();
 		} catch (e) {
-			n?.(), console.warn("Unable to compile", e), ue.showError(e);
+			n?.(), console.warn("Unable to compile", e), X.showError(e);
 		}
 		return t;
-	}, [M]), pe = b(async () => {
-		if (!$.current || m) return;
-		const e = $.current.editor;
+	}, [M]), ne = b(async () => {
+		if (!A.current || g) return;
+		const e = A.current.editor;
 		let t;
-		if (te.dirty) {
+		if (U.dirty) {
 			const n = e.getValue();
-			await de(n), t = I(M);
+			await Q(n), t = j(M);
 			const r = t?.getSource(), o = e.getValue(), i = (r?.length ?? 0) !== n.length || r !== o;
-			le({ dirty: i });
-		} else t = I(M);
+			Z({ dirty: i });
+		} else t = j(M);
 		return t;
-	}, [te, M]);
+	}, [U, M]);
 	r(() => {
-		const e = E?.addListener({ onBeforeHide: async () => (await pe(), !0) });
+		const e = E?.addListener({ onBeforeHide: async () => (await ne(), !0) });
 		return () => {
 			e?.();
 		};
 	}, [E]), r(() => {
-		if (M) return M.addListeners({ onBeforeSearch: () => pe() });
-	}, [M]), L(H, {
+		if (M) return M.addListeners({ onBeforeSearch: () => ne() });
+	}, [M]), L(F, {
 		onBeforeSave: async () => {
-			await pe();
+			await ne();
 		},
 		onLoad: () => {
-			const e = $.current?.editor;
-			e && e.setValue(I(M)?.getSource() ?? "");
+			const e = A.current?.editor;
+			e && e.setValue(j(M)?.getSource() ?? "");
 		}
 	});
-	const ge = b(async (e) => {
+	const le = b(async (e) => {
 		if (!M) return;
 		const t = "string" == typeof e ? { functionName: e } : e ?? {};
 		let n = null;
@@ -761,11 +921,11 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 		if (n) try {
 			await M.executeMacro(n);
 		} catch (e) {
-			ue.showError(e);
+			X.showError(e);
 		}
-	}, [M, ue]), [me, fe] = s(!1), ye = b(async () => {
-		if (!$.current) return null;
-		const e = $.current, t = e.editor;
+	}, [M, X]), [de, fe] = s(!1), ye = b(async () => {
+		if (!A.current) return null;
+		const e = A.current, t = e.editor;
 		if (!t) return null;
 		const r = await (async (e, t, n = "export") => {
 			const r = e.getModel();
@@ -775,7 +935,7 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 			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 = z(o, r.getOffsetAt({
+				const t = te(o, r.getOffsetAt({
 					lineNumber: e,
 					column: 1
 				}), "function", n);
@@ -783,14 +943,14 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 			}
 			return i;
 		})(t, e.monaco);
-		return le({ message: (r ?? "").toUpperCase() }), r ? {
+		return Z({ message: (r ?? "").toUpperCase() }), r ? {
 			source: t.getValue(),
 			name: r
 		} : null;
 	}, []);
-	b(d.debounce(pe, 200), []);
+	b(d.debounce(ne, 200), []);
 	const he = b(async (e, t, n) => {
-		ce((e) => ({
+		G((e) => ({
 			...e,
 			compiling: !0
 		}));
@@ -817,9 +977,9 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 			});
 			t.editor.setModelMarkers(e, "sheetxl", r);
 		})(e, t, o), async function(e, t, n, r) {
-			const o = q(e, t, r, await (await (await t.languages.typescript.getTypeScriptWorker())(e.uri)).getNavigationTree(e.uri.toString())).map((e) => {
+			const o = ee(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")), {
+				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),
 					options: {
 						isWholeLine: !1,
@@ -830,32 +990,32 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 				};
 			});
 			Ee.current && Ee.current.clear(), Ee.current = n.createDecorationsCollection(o);
-		}(e, t, n, r ? r.getFunctions().getItems() : u.EmptyArray), ce((e) => ({
+		}(e, t, n, r ? r.getFunctions().getItems() : u.EmptyArray), G((e) => ({
 			...e,
 			compiling: !1,
 			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), []), we = b(async (e) => {
-		if (!$.current) return;
-		const t = $.current.editor.getPosition(), n = { cursor: t ? t.toString() : "" };
-		void 0 !== e && (n.message = e), le(n);
+	}, [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);
 	}, []);
-	r(() => {}, [ae]);
-	const ke = i(null), xe = b(async () => {
-		await pe(), E?.close();
+	r(() => {}, [q]);
+	const we = i(null), ke = b(async () => {
+		await ne(), E?.close();
 	}, [E]), ve = b((e) => {
-		const t = $.current?.editor;
+		const t = A.current?.editor;
 		return !!t && (t.focus(e), !0);
-	}, [te]), Se = b(async () => {
-		const e = $.current?.editor, t = e?.getModel(), n = e?.getSelection();
+	}, [U]), Se = b(async () => {
+		const e = A.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 = $.current, t = e?.editor, n = t?.getModel(), r = t?.getSelection();
+		const e = A.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 {
@@ -869,7 +1029,7 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 			forceMoveMarkers: !0
 		}]), t.pushUndoStop(), t.focus();
 	}, []), Ne = b(async () => {
-		const e = $.current?.editor;
+		const e = A.current?.editor;
 		if (!e) return;
 		let t;
 		try {
@@ -885,15 +1045,15 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 			forceMoveMarkers: !0
 		}]), e.pushUndoStop(), e.focus();
 	}, []), Ee = i(null), Le = b((e, t) => {
-		$.current = {
+		A.current = {
 			monaco: t,
 			editor: e
-		}, ne.current = H ?? null;
+		}, ue.current = F ?? null;
 		const n = e.getModel(), r = [];
 		fe(!0);
-		const o = I(M)?.getSource() ?? "";
-		return e.getValue() !== o && e.setValue(o), Q ? (we(""), be(n, t, e), j(t)) : (Q = !0, we("Loading Types"), import("monaco-editor-auto-typings/custom-editor.js").then(async (n) => {
-			we(""), n.AutoTypings.create(e, {
+		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, {
 				shareCache: !0,
 				dontAdaptEditorOptions: !0,
 				monaco: t,
@@ -910,8 +1070,8 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 					"Not implemented yet" === e && (e = "Compile Errors"), console.warn("Error compiling types", e);
 				}
 			}).then((n) => {
-				ke.current = n, be(e.getModel(), t, e), (() => {
-					if (V) return;
+				we.current = n, be(e.getModel(), t, e), (() => {
+					if (z) return;
 					const e = (e, t) => {
 						try {
 							if (void 0 === t) try {
@@ -923,17 +1083,17 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 							}
 							else globalThis[e] = t;
 						} catch (e) {}
-					}, t = W.length;
+					}, t = K.length;
 					for (let n = 0; n < t; n++) {
-						const t = W[n];
-						e(t, F[t]);
+						const t = K[n];
+						e(t, B[t]);
 					}
-					F = void 0, V = !0;
-				})(), j(t);
+					B = void 0, z = !0;
+				})(), J(t);
 			});
 		}).catch((e) => {
-			Q = !1, we(""), console.warn("Auto typings could not be loaded:", e);
-		})), ee || (ee = !0, function(e, t) {
+			ae = !1, xe(""), console.warn("Auto typings could not be loaded:", e);
+		})), ce || (ce = !0, function(e, t) {
 			t.languages.registerInlayHintsProvider("typescript", { provideInlayHints(e, n, r) {
 				const o = [];
 				for (let n = 1; n < e.getLineCount() + 1; n++) {
@@ -963,74 +1123,74 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 			keybindings: [t.KeyCode.F8],
 			run: async (e) => {
 				const t = await ye();
-				ge(t);
+				le(t);
 			}
 		})), r.push(e.addAction({
 			id: "saveScript",
 			label: "Save Script",
 			keybindings: [t.KeyMod.CtrlCmd | t.KeyCode.KeyS],
 			run: (e) => {
-				pe();
+				ne();
 			}
 		})), 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 pe();
+				const r = e.target.position.lineNumber, o = await (await (await t.languages.typescript.getTypeScriptWorker())(n.uri)).getNavigationTree(n.uri.toString()), i = await ne();
 				if (!i) return;
-				const s = i.getFunctions().getItems(), a = q(n, t, s, o).find((e) => e.lineNumber === r);
+				const s = i.getFunctions().getItems(), a = ee(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) ge({ functionName: a.name });
+						if ("macro" === a.type || "autoRun" === a.type) le({ functionName: a.name });
 						else if ("formula" === a.type) {
 							const e = s?.find((e) => e.getName() === a.name);
-							e && K?.execute(e);
+							e && P?.execute(e);
 						}
 					} else 2 === t && (console.log("Context menu for function:", a.name), e.event.browserEvent.preventDefault());
 				}
 			}
 		})), r.push(e.onDidChangeModelContent(() => {
-			le({ dirty: !0 }), be(n, t, e);
+			Z({ 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 = I(M)?.getSource(), r = e.getValue(), o = (n?.length ?? 0) !== r.length || n !== r;
-			le({ dirty: o });
+			const n = j(M)?.getSource(), r = e.getValue(), o = (n?.length ?? 0) !== r.length || n !== r;
+			Z({ dirty: o });
 		})), r.push(e.onDidChangeCursorPosition((e) => {
-			we();
+			xe();
 		})), () => {
 			for (const e of r) try {
 				e.dispose();
 			} catch {}
 		};
-	}, [M, H]), Me = o(() => me ? null : h || C("div", {
+	}, [M, F]), Me = o(() => de ? null : h || C("div", {
 		style: {
 			position: "absolute",
 			width: "100%",
 			height: "100%"
 		},
-		children: _("scriptEditor.loading")
-	}), [me, h]), De = o(() => ({
-		...T,
+		children: $("scriptEditor.loading")
+	}), [de, h]), Oe = o(() => ({
+		..._,
 		fixedOverflowWidgets: !1,
 		contextmenu: !1,
-		readOnly: m
-	}), [m]), Oe = i(null);
+		readOnly: g
+	}), [g]), De = i(null);
 	r(() => {
 		const e = {
 			theme: f ? "extended-dark" : "extended",
-			options: De,
-			value: I(M)?.getSource() ?? "",
-			beforeMount: oe,
-			onValidate: ie
+			options: Oe,
+			value: j(M)?.getSource() ?? "",
+			beforeMount: pe,
+			onValidate: me
 		}, t = ((e) => {
-			if (Z) return Z;
-			if (!F) {
-				F = {};
-				const e = W.length;
+			if (re) return re;
+			if (!B) {
+				B = {};
+				const e = K.length;
 				for (let t = 0; t < e; t++) {
-					const e = W[t];
-					F[e] = globalThis[e];
+					const e = K[t];
+					B[e] = globalThis[e];
 				}
 			}
 			const t = document.createElement("div");
@@ -1038,33 +1198,33 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 			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 Z = {
+			return re = {
 				root: r,
 				hostEl: n,
 				stashEl: t,
 				props: e,
 				setProps: null
-			}, r.render(C(se, {})), Z;
+			}, r.render(C(ge, {})), re;
 		})(e);
-		return t.props = e, t.setProps?.(e), X = (e, t) => Le(e, t), Oe.current?.appendChild(t.hostEl), J && (Y = Le(J.editor, J.monaco)), () => {
-			Y?.(), Y = null, X = null, $.current = null, Z?.stashEl.appendChild(Z.hostEl);
+		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);
 		};
 	}, []), r(() => {
-		if (!Z) return;
+		if (!re) return;
 		const e = {
-			...Z.props,
+			...re.props,
 			theme: f ? "extended-dark" : "extended",
-			options: De
+			options: Oe
 		};
-		Z.props = e, Z.setProps?.(e);
-	}, [f, De]), r(() => {
-		const e = $.current, t = e?.editor;
+		re.props = e, re.setProps?.(e);
+	}, [f, Oe]), r(() => {
+		const e = A.current, t = e?.editor;
 		if (!t) return;
-		ne.current = H ?? null;
-		const n = I(M)?.getSource() ?? "";
-		t.getValue() !== n && (t.setValue(n), be(t.getModel(), e.monaco, t), le({ dirty: !1 }));
-	}, [M, H]);
-	const Te = N("div", {
+		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", {
 		style: {
 			display: "flex",
 			flex: "1 1 100%",
@@ -1074,7 +1234,7 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 			boxSizing: "border-box"
 		},
 		children: [C("div", {
-			ref: Oe,
+			ref: De,
 			style: {
 				display: "flex",
 				flex: "1 1 100%",
@@ -1082,69 +1242,33 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 				position: "relative"
 			}
 		}), Me]
-	}), Ae = k(t, () => ({
+	}), $e = w(t, () => ({
 		isScriptEditorElement: () => !0,
 		showCommandPalette: () => {
-			$.current?.editor && $.current.editor.trigger("keyboard", "editor.action.quickCommand", null);
+			A.current?.editor && A.current.editor.trigger("keyboard", "editor.action.quickCommand", null);
 		},
 		getScripts: () => M,
 		focus: (e) => {
 			ve(e);
 		},
-		close: () => xe(),
-		insertSnippet: (e) => $.current?.editor ? (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();
-			let s = { ...i };
-			s.lineNumber = 1, s.column = 1;
-			let a = !1;
-			for (let e = i.lineNumber; e >= 1; e--) if ("" === r.getLineContent(e).trim()) {
-				const t = z(o, r.getOffsetAt({
-					lineNumber: e,
-					column: 1
-				}), "function");
-				if (!t || G(t)) {
-					a = !0, s.lineNumber = e + 1;
-					break;
-				}
-				{
-					const n = t.spans[0].start;
-					e = r.getPositionAt(n).lineNumber, s.lineNumber = e;
-				}
-			}
-			let c = n, l = !1;
-			!a && !c.startsWith("\n") && s.lineNumber > 1 && (c = "\n" + c, l = !0);
-			let u = !1;
-			r.getLineCount() > 1 && (c.endsWith("\n\n") || (c += "\n\n", u = !0));
-			const d = [{
-				range: new t.Range(s.lineNumber, s.column, s.lineNumber, s.column),
-				text: `${c}`
-			}];
-			let p = null;
-			r.pushEditOperations([], d, (e) => (p = e[0].range, l && p.startLineNumber++, u && p.endLineNumber--, [new t.Selection(p.startLineNumber, p.startColumn, p.endLineNumber, p.endColumn)])), e.setSelection({
-				startLineNumber: p.endLineNumber,
-				startColumn: p.endColumn,
-				endLineNumber: p.startLineNumber,
-				endColumn: p.startColumn
-			});
-		})($.current.editor, $.current.monaco, e) : Promise.resolve(),
+		close: () => ke(),
+		insertSnippet: (e) => A.current?.editor ? Y(A.current.editor, A.current.monaco, e) : Promise.resolve(),
 		saveSource: async () => {
-			await pe();
+			await ne();
 		},
 		runAction: (e) => {
-			const t = $.current?.editor;
+			const t = A.current?.editor;
 			t && (t.focus(), t.trigger("source", e, null));
 		},
 		copy: () => Se(),
 		cut: () => Ce(),
 		paste: () => Ne()
-	}), [H]), [Re, Ie] = s(null), Fe = b((e) => {
-		null !== e && Ie(e);
-	}, []), Pe = y.useCommandScope();
+	}), [F]), [Ae, Te] = s(null), Re = b((e) => {
+		null !== e && Te(e);
+	}, []), Fe = y.useCommandScope();
 	return r(() => {
-		if (!Pe || !Re) return;
-		const e = Pe.contribution();
+		if (!Fe || !Ae) return;
+		const e = Fe.contribution();
 		return function(e, t) {
 			const n = t.scriptEditor, r = t;
 			e.updateCommand("scriptingHelp", { callback: () => {
@@ -1152,36 +1276,36 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 			} }), e.updateCommand("showScriptingCommands", { callback: () => {
 				n.showCommandPalette();
 			} });
-			const o = r?.readOnly ? [g("reason.scriptsReadOnly")] : [];
+			const o = r?.readOnly ? [m("reason.scriptsReadOnly")] : [];
 			e.updateCommand("insertScript", {
 				disabledReasons: o,
 				callback: (e) => n.insertSnippet(e ?? "")
 			}), e.updateCommand("saveScripts", {
-				disabledReasons: [...o, ...r?.isDirty ? [] : [g("reason.noChangesToSave")]],
+				disabledReasons: [...o, ...r?.isDirty ? [] : [m("reason.noChangesToSave")]],
 				callback: async () => {
 					await n.saveSource();
 				}
 			}), 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: Re,
-			isDirty: B,
-			readOnly: m
+			scriptEditor: Ae,
+			isDirty: T,
+			readOnly: g
 		}), () => {
 			e.remove();
 		};
 	}, [
-		Pe,
-		Re,
-		B,
-		m
-	]), r(() => (x && requestAnimationFrame(() => {
-		Ae.current?.focus();
+		Fe,
+		Ae,
+		T,
+		g
+	]), r(() => (k && requestAnimationFrame(() => {
+		$e.current?.focus();
 	}), () => {
-		$.current?.editor && requestAnimationFrame(() => {
-			Ae.current?.contains(document.activeElement) && Ae.current?.focus();
+		A.current?.editor && requestAnimationFrame(() => {
+			$e.current?.contains(document.activeElement) && $e.current?.focus();
 		});
 	}), []), C("div", {
-		className: c("script-editor", A, n),
+		className: c("script-editor", W, n),
 		style: {
 			display: "flex",
 			flexDirection: "row",
@@ -1189,13 +1313,13 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 			position: "relative",
 			...p
 		},
-		ref: l([Ae, Fe]),
-		...P,
-		children: Te
+		ref: l([$e, Re]),
+		...I,
+		children: Ie
 	});
-})), ce = null, le = (e) => {
-	ce = e;
-}, ue = () => ce, de = n((e) => {
+})), 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) => {
 		if (!o) return;
 		let t = null;
@@ -1211,7 +1335,7 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 			return;
 		}
 	}, [o, i]), l = b(() => {
-		const e = ue();
+		const e = be();
 		e ? o && e({ workbook: o }) : s.getOpen().includes("scriptEditor") ? s.close("scriptEditor") : s.activate("scriptEditor", {});
 	}, [o, s]), u = a.includes("scriptEditor");
 	return r(() => {
@@ -1235,8 +1359,8 @@ var Z = null, J = null, X = null, Y = null, Q = !1, ee = !1, te = !1, ne = { cur
 		o?.getScripts().start();
 	} }), null;
 });
-de.displayName = "WorkbookScriptCommands";
-var pe = {
+xe.displayName = "WorkbookScriptCommands";
+var we = {
 	"reason.noChangesToSave": "No changes to save",
 	"reason.scriptsReadOnly": "Scripts can't be changed while the workbook structure is protected.",
 	"scriptEditor.glyph.autoRun": "Auto Run",
@@ -1245,7 +1369,7 @@ var pe = {
 	"scriptEditor.loading": "Loading...",
 	"scriptEditor.retry": "Retry",
 	"scriptEditor.saving": "Saving Scripts..."
-}, ge = [
+}, ke = [
 	{
 		sourceId: "groups",
 		catalog: {
@@ -1327,30 +1451,30 @@ var pe = {
 			}
 		}
 	}
-], { DefaultCommandCatalogService: me } = y, fe = !1;
-var ye = (e) => {
+], { DefaultCommandCatalogService: ve } = y, Se = !1;
+var Ce = (e) => {
 	const { model: t, entryKey: n, frame: r, ref: o, ...i } = e;
-	return C(ae, {
+	return C(fe, {
 		ref: o,
 		frame: r,
 		scripts: t?.getScripts(),
 		...i
 	});
-}, he = () => {
+}, Ne = () => {
 	E.registerTaskPane({
 		key: "scriptEditor",
 		getTitle: () => "Script (Typescript)",
 		getIcon: () => "ScriptRun",
-		component: ye,
+		component: Ce,
 		keepMounted: !0
 	}, !0), function() {
-		if (fe) return;
-		fe = !0;
-		const e = me;
+		if (Se) return;
+		Se = !0;
+		const e = ve;
 		e.registerFromManifest("@sheetxl/scripting-react", import.meta.url, {
-			messages: pe,
-			catalogs: ge
+			messages: we,
+			catalogs: ke
 		}), e.prefetch();
-	}(), y.DefaultCommandRegistry.registerDynamic("workbook", de);
+	}(), y.DefaultCommandRegistry.registerDynamic("workbook", xe);
 };
-export { ae as ScriptEditor, he as ScriptingReactPlugin, de as WorkbookScriptCommands, ue as getScriptEditorOpener, le as setScriptEditorOpener };
+export { fe as ScriptEditor, Ne as ScriptingReactPlugin, xe as WorkbookScriptCommands, be as getScriptEditorOpener, he as setScriptEditorOpener };