@aicayzer/inkkit 0.6.0 → 0.6.1

package/dist/chunks/{core-C37056dR.js → core-CbHV2KPY.js}

@@ -48733,6 +48733,11 @@ function formattedQuery(text) {
 			const from = state.doc.resolve(match.from);
 			const to = state.doc.resolve(match.to);
 			if (from.parent !== to.parent || !from.parent.inlineContent) return false;
+			if ([
+				"comment_inline",
+				"comment_block",
+				"reference_definition"
+			].includes(from.parent.type.name)) return false;
 			const content = state.doc.slice(match.from, match.to).content;
 			let textOnly = true;
 			content.forEach((node) => {
@@ -48742,6 +48747,22 @@ function formattedQuery(text) {
 		}
 	});
 }
+function formattedMatches(state, text) {
+	if (!text) return [];
+	const query = formattedQuery(text);
+	const matches = [];
+	if (!query.valid) return matches;
+	for (let position = 0;;) {
+		const match = query.findNext(state, position);
+		if (!match) break;
+		matches.push({
+			from: match.from,
+			to: match.to
+		});
+		position = match.to;
+	}
+	return matches;
+}
 function findFormatted(view, text) {
 	const query = formattedQuery(text);
 	const previous = getSearchState(view.state)?.query.search;
@@ -48847,6 +48868,33 @@ var EditorSearch = class {
 	restore(match) {
 		this.literalMatch = match;
 	}
+	matches(text, snapshotId, projection) {
+		const raw = this.runtime.literal() ? this.runtime.currentText() : void 0;
+		const matches = raw === void 0 ? formattedMatches(this.runtime.view().state, text) : literalMatches(raw, text);
+		let rawPosition = 0, normalizedPosition = 0, spanIndex = 0;
+		const offset = (position) => {
+			if (raw !== void 0) {
+				while (rawPosition < position) {
+					if (raw[rawPosition] !== "\n" || raw[rawPosition - 1] !== "\r") normalizedPosition++;
+					rawPosition++;
+				}
+				return normalizedPosition;
+			}
+			while (spanIndex < projection.spans.length && projection.spans[spanIndex].end < position) spanIndex++;
+			const span = projection.spans[spanIndex];
+			if (!span) return projection.text.length;
+			if (position < span.start) return span.from;
+			return span.kind === "text" ? span.from + Math.max(0, position - span.start) : position === span.start ? span.from : span.to;
+		};
+		return Object.freeze(matches.map((match) => {
+			const start = raw !== void 0 && raw[match.from] === "\n" && raw[match.from - 1] === "\r" ? match.from - 1 : match.from;
+			return Object.freeze({
+				snapshotId,
+				from: offset(start),
+				to: offset(match.to)
+			});
+		}));
+	}
 	find(text) {
 		if (this.runtime.literal()) {
 			const from = this.plainSearch === text ? this.runtime.element().selectionEnd : this.runtime.element().selectionStart;
@@ -57233,7 +57281,7 @@ async function createMilkdownEditor(root, options, runtime) {
 				return true;
 			}
 		}));
-	}).use(labelsCtx).use(linkSchemesCtx).use(formatInputCtx).use(richTextGuard).use(runtime.plugins.paste).use(visibleClipboard).use(runtime.plugins.suggestions).use(runtime.plugins.keymap).use(createDialect(Boolean(options.images || options.files), Boolean(options.wikiLinks), Boolean(options.files))).use(codeControlCtx).use(codeControlsPlugin(() => runtime.visibleRect())).use(tablePlugins).use(tableBlock).use(runtime.plugins.change).use(runtime.plugins.historyInput).use(history).use(clipboard).use(cursor).use(taskListPlugin((operation) => runtime.mutate(operation))).use(undoTypedRule).use(quoteBackspace).use(calloutEnter).use(literalEnter).use(literalReread).use(listItemBackspace).use(nestedItemEnter).use(rejoinLists).use(movedListItems).use(textInputPolicy).use(runtime.copy ? codeCopyPlugin((text) => runtime.copy?.(text)) : []).use(placeholderPlugin).use(options.rendering?.codeHighlighting === false ? [] : (await import("./highlight-ByA5v5o7.js")).highlightPlugin).use(options.rendering?.diagramPreview === false || !diagramsAvailable() ? [] : mermaidPreview(runtime.diagrams, (error) => runtime.report(error))).use(selectionPlugin).use($prose(() => search())).use(runtime.plugins.policy).use(options.wikiLinks ? wikiLinkView(options.wikiLinks, {
+	}).use(labelsCtx).use(linkSchemesCtx).use(formatInputCtx).use(richTextGuard).use(runtime.plugins.paste).use(visibleClipboard).use(runtime.plugins.suggestions).use(runtime.plugins.keymap).use(createDialect(Boolean(options.images || options.files), Boolean(options.wikiLinks), Boolean(options.files))).use(codeControlCtx).use(codeControlsPlugin(() => runtime.visibleRect())).use(tablePlugins).use(tableBlock).use(runtime.plugins.change).use(runtime.plugins.historyInput).use(history).use(clipboard).use(cursor).use(taskListPlugin((operation) => runtime.mutate(operation))).use(undoTypedRule).use(quoteBackspace).use(calloutEnter).use(literalEnter).use(literalReread).use(listItemBackspace).use(nestedItemEnter).use(rejoinLists).use(movedListItems).use(textInputPolicy).use(runtime.copy ? codeCopyPlugin((text) => runtime.copy?.(text)) : []).use(placeholderPlugin).use(options.rendering?.codeHighlighting === false ? [] : (await import("./highlight-C-9lbVMU.js")).highlightPlugin).use(options.rendering?.diagramPreview === false || !diagramsAvailable() ? [] : mermaidPreview(runtime.diagrams, (error) => runtime.report(error))).use(selectionPlugin).use($prose(() => search())).use(runtime.plugins.policy).use(options.wikiLinks ? wikiLinkView(options.wikiLinks, {
 		capture: () => runtime.capture(),
 		active: () => runtime.active(),
 		labels: {
@@ -60970,6 +61018,14 @@ var InkKitEditor = class InkKitEditor {
 		this.lastMarkdown = markdown;
 		view.dispatch(initialDocumentSelection(view.state));
 	}
+	/** Returns every non-overlapping match without changing selection, focus or highlights. */
+	searchMatches(text, expectedGeneration) {
+		this.assertAlive();
+		expectString(text, "text");
+		this.assertCurrent(expectedGeneration);
+		const scope = this.text.scope();
+		return this.search.matches(text, scope.id, scope.projection);
+	}
 	/** Selects the next match and returns whether there was one. */
 	find(text, expectedGeneration) {
 		this.assertAlive();
@@ -61306,6 +61362,7 @@ var InkKitEditor = class InkKitEditor {
 			"undo",
 			"redo",
 			"find",
+			"searchMatches",
 			"replace",
 			"replaceAll",
 			"format",

package/dist/chunks/{highlight-ByA5v5o7.js → highlight-C-9lbVMU.js}

@@ -1,4 +1,4 @@
-import { a as Decoration, c as PluginKey, d as __toESM, i as $prose, o as DecorationSet, s as Plugin, u as __commonJSMin } from "./core-C37056dR.js";
+import { a as Decoration, c as PluginKey, d as __toESM, i as $prose, o as DecorationSet, s as Plugin, u as __commonJSMin } from "./core-CbHV2KPY.js";
 //#region node_modules/.pnpm/highlight.js@11.11.2/node_modules/highlight.js/es/languages/arduino.js
 /** @type LanguageFn */
 function cPlusPlus(hljs) {

package/dist/core.js

@@ -1,2 +1,2 @@
-import { r as InkKitError, t as InkKitEditor } from "./chunks/core-C37056dR.js";
+import { r as InkKitError, t as InkKitEditor } from "./chunks/core-CbHV2KPY.js";
 export { InkKitEditor, InkKitError };

package/dist/editor.d.ts

@@ -371,6 +371,8 @@ export declare class InkKitEditor<F extends DocumentFormat = TextDocumentFormat>
     private revealCurrentSelection;
     private revealLiteralSelection;
     private load;
+    /** Returns every non-overlapping match without changing selection, focus or highlights. */
+    searchMatches(text: string, expectedGeneration?: number): readonly TextRange[];
     /** Selects the next match and returns whether there was one. */
     find(text: string, expectedGeneration?: number): boolean;
     /** Replaces the selected match, or the next one, and returns whether text changed. */

package/dist/index.js

@@ -1,4 +1,4 @@
-import { n as registerDiagram, r as InkKitError, t as InkKitEditor } from "./chunks/core-C37056dR.js";
+import { n as registerDiagram, r as InkKitError, t as InkKitEditor } from "./chunks/core-CbHV2KPY.js";
 //#region node_modules/.pnpm/dompurify@3.4.17/node_modules/dompurify/dist/purify.es.mjs
 /*! @license DOMPurify 3.4.17 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.4.17/LICENSE */
 function _OverloadYield(e, d) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aicayzer/inkkit",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "A preserving Markdown editor for offline web views and the web",
   "license": "MIT",
   "type": "module",