@lapis-notes/search 0.1.3 → 0.1.5

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # Search changelog
 
+## 0.1.5
+
+### Patch Changes
+
+- [#54](https://github.com/lapismd/lapis-plugins/pull/54) [`91d0014`](https://github.com/lapismd/lapis-plugins/commit/91d001499930e7c4ea2c9ea622e3f5ed2d956ab3) Thanks [@lapismd-dependency-bot](https://github.com/apps/lapismd-dependency-bot)! - Refresh first-party Lapis dependencies to the published versions recorded in this pull request.
+
+## 0.1.4
+
+### Patch Changes
+
+- [#28](https://github.com/lapismd/lapis-plugins/pull/28) [`d27467e`](https://github.com/lapismd/lapis-plugins/commit/d27467ee80c273011b7eb6ae792fa8e0330a11c1) Thanks [@stevejuma](https://github.com/stevejuma)! - Align shared presentation dependencies with the Design Core 0.6 public boundary used by current Notes hosts.
+
+- [#28](https://github.com/lapismd/lapis-plugins/pull/28) [`0ed680e`](https://github.com/lapismd/lapis-plugins/commit/0ed680ef409b9bb179312d1b06cee02af56b3e8a) Thanks [@stevejuma](https://github.com/stevejuma)! - Use an explicitly selected native indexing observer for Search configuration,
+  refresh and progress while preserving standalone browser processing. Keep view
+  teardown passive, fence late continuations and recreate the manager when the
+  plugin is enabled again.
+
+- [#28](https://github.com/lapismd/lapis-plugins/pull/28) [`56b5d6c`](https://github.com/lapismd/lapis-plugins/commit/56b5d6c1a016ef9bca43703b5fecf57f8234d1af) Thanks [@stevejuma](https://github.com/stevejuma)! - Consume published Design Core 0.4.0 with prepared browser CSS and bundled font assets through normal npm ranges.
+
+  Restore Bases picker input/list accessibility relationships and name property actions.
+
+- [#28](https://github.com/lapismd/lapis-plugins/pull/28) [`c9febb1`](https://github.com/lapismd/lapis-plugins/commit/c9febb1c8b431db30ecdcf7507cfff8f727bc4ed) Thanks [@stevejuma](https://github.com/stevejuma)! - Consume the published Notes next packages, Mira 0.1.2, and Design Core 0.7.0 through the existing semver floors. Markdown dependents accept ^0.2.0. History keeps its public repository entrypoints, and Bases keeps the file-icon contract on API 0.2.0.
+
+- [#28](https://github.com/lapismd/lapis-plugins/pull/28) [`d463ee8`](https://github.com/lapismd/lapis-plugins/commit/d463ee8c5b48ee0f3a8992c7394f48124fb2cc1c) Thanks [@stevejuma](https://github.com/stevejuma)! - Send every Search command, background-indexing, settings-recovery and
+  copy-feedback notice through the explicitly owned App so a concurrent
+  compatibility host cannot receive delayed errors.
+
+- [#28](https://github.com/lapismd/lapis-plugins/pull/28) [`5bb36e5`](https://github.com/lapismd/lapis-plugins/commit/5bb36e5e01b7e6fb928955edc41426c12c4e5d55) Thanks [@stevejuma](https://github.com/stevejuma)! - Await Search panel teardown before the owning view finishes closing.
+
+- [#28](https://github.com/lapismd/lapis-plugins/pull/28) [`c2d1149`](https://github.com/lapismd/lapis-plugins/commit/c2d11499114ec92a2c168c4ec9a1efd6cbc01eee) Thanks [@stevejuma](https://github.com/stevejuma)! - Refresh Search controls after settings recovery and preserve recovered values
+  when saving another preference. Reconcile recovered native indexing settings
+  through the existing host controls.
+
 ## 0.1.3
 
 ### Patch Changes

package/README.md

@@ -13,7 +13,7 @@ Register the exported plugin class in the application's `PluginProfile`. Import
 registration so the host owns its lifecycle.
 
 The runtime plugin ID is `search`. A matching signed
-`search-0.1.3.lapis-plugin` archive is attached to the
+`search-0.1.5.lapis-plugin` archive is attached to the
 package-scoped GitHub release for manual or registry installation.
 
 See the [repository README](https://github.com/lapismd/lapis-plugins#readme) for

package/dist/native-search.d.ts

@@ -0,0 +1,5 @@
+import type { App, NativeBackgroundIndexingObserver } from "@lapis-notes/api";
+import type { SearchPluginSettings } from "./search-settings";
+export declare function hasNativeSearch(app: App): boolean;
+export declare function nativeSearch(app: App): NativeBackgroundIndexingObserver;
+export declare function configureNativeSearch(app: App, settings: SearchPluginSettings): Promise<NativeBackgroundIndexingObserver>;

package/dist/native-search.js

@@ -0,0 +1,24 @@
+export function hasNativeSearch(app) {
+    return Boolean(app.session?.backgroundIndexing);
+}
+export function nativeSearch(app) {
+    const observer = app.backgroundIndexing;
+    if (!observer)
+        throw new Error("The selected native Search observer is unavailable");
+    return observer;
+}
+export async function configureNativeSearch(app, settings) {
+    const observer = nativeSearch(app);
+    const contribution = await observer.selectSearch({
+        providers: app.searchDocumentProviders.getAll().map((provider) => ({
+            provider_id: provider.id,
+            version: provider.version ?? "1",
+            priority: provider.priority ?? 0,
+        })),
+        chunking: { ...settings.chunking },
+    });
+    if (contribution.placement !== "native") {
+        throw new Error(contribution.message ?? "Native Search cannot execute this provider");
+    }
+    return observer;
+}

package/dist/search-history-versions.svelte

@@ -0,0 +1,197 @@
+<script lang="ts">
+  import * as Collapsible from "@lapismd/design-core/shadcn/collapsible";
+  import * as Sidebar from "@lapismd/design-core/shadcn/sidebar";
+  import { Badge } from "@lapismd/design-core/shadcn/badge";
+  import { Button } from "@lapismd/design-core/shadcn/button";
+  import ChevronUp from "@lucide/svelte/icons/chevron-up";
+  import ChevronDown from "@lucide/svelte/icons/chevron-down";
+  import ChevronRight from "@lucide/svelte/icons/chevron-right";
+  import type {
+    SearchProviderHit,
+    SearchProviderMatch,
+    SearchResultProvider,
+  } from "@lapis-notes/api";
+  import type { ProviderVersion } from "./search-provider-groups";
+  import HighlightedText from "./highlighted-text.svelte";
+  import { onDestroy } from "svelte";
+  const treeId = $props.id();
+  let {
+    versions,
+    report,
+  }: { versions: ProviderVersion[]; report(error: unknown): void } = $props();
+  let expanded = $state<Record<string, boolean>>({});
+  let contexts = $state<Record<string, SearchProviderMatch>>({});
+  let loading = $state<Record<string, boolean>>({});
+  const abort = new AbortController();
+  onDestroy(() => abort.abort());
+  const key = (provider: SearchResultProvider, hit: SearchProviderHit) =>
+    `${provider.id}/${hit.id}`;
+  async function open(
+    provider: SearchResultProvider,
+    hit: SearchProviderHit,
+    match?: SearchProviderMatch,
+  ) {
+    try {
+      await provider.activate(hit, match);
+    } catch (error) {
+      report(error);
+    }
+  }
+  async function context(
+    provider: SearchResultProvider,
+    hit: SearchProviderHit,
+    match: SearchProviderMatch,
+    direction: "before" | "after",
+  ) {
+    if (!provider.expand) return;
+    const id = `${key(provider, hit)}/${match.id}`;
+    loading[id] = true;
+    try {
+      const next = await provider.expand(hit, match, direction, abort.signal);
+      if (!abort.signal.aborted) contexts[id] = next;
+    } catch (error) {
+      if (!abort.signal.aborted) report(error);
+    } finally {
+      if (!abort.signal.aborted) loading[id] = false;
+    }
+  }
+</script>
+
+<Sidebar.MenuSub role="group" class="search-panel__history-list">
+  {#each versions as { provider, hit }, index (`${provider.id}/${hit.id}`)}
+    {@const id = key(provider, hit)}
+    <Sidebar.MenuSubItem
+      role="treeitem"
+      aria-selected="false"
+      aria-level={2}
+      aria-expanded={expanded[id] ?? false}
+    >
+      <Collapsible.Root
+        open={expanded[id] ?? false}
+        onOpenChange={(value) => (expanded[id] = value)}
+      >
+        <Collapsible.Trigger
+          class="search-panel__history-version"
+          id={`${treeId}-${index}-label`}
+          aria-label={`History ${hit.version?.label ?? hit.title}${hit.timestamp ? ` ${new Date(hit.timestamp).toLocaleDateString()}` : ""}`}
+          aria-expanded={expanded[id] ?? false}
+          onkeydown={(event) => {
+            if (event.key === "ArrowRight" || event.key === "ArrowLeft") {
+              event.preventDefault();
+              expanded[id] = event.key === "ArrowRight";
+            }
+          }}
+        >
+          <ChevronRight class="search-panel__disclosure" aria-hidden="true" />
+          <Badge variant="outline">History</Badge>
+          <span class="search-panel__history-label"
+            >{hit.version?.label ?? hit.title}</span
+          >
+          {#if hit.timestamp}<time
+              datetime={new Date(hit.timestamp).toISOString()}
+              >{new Date(hit.timestamp).toLocaleDateString()}</time
+            >{/if}
+        </Collapsible.Trigger>
+        <Collapsible.Content
+          class="search-panel__history-content"
+          role="group"
+          id={`${treeId}-${index}`}
+        >
+          <div class="search-panel__history-details">
+            <Button
+              variant="ghost"
+              size="sm"
+              onclick={() => open(provider, hit)}
+              aria-label={`Open saved version ${hit.version?.label ?? hit.title}: ${hit.version?.author ?? provider.label}${hit.version ? ` · ${hit.version.id.slice(0, 12)}` : ""}`}
+            >
+              {hit.version?.author ?? provider.label}{hit.version
+                ? ` · ${hit.version.id.slice(0, 12)}`
+                : ""}
+            </Button>
+            {#each hit.badges ?? [] as badge}<Badge variant="outline"
+                >{badge}</Badge
+              >{/each}
+            {#if (hit.version?.occurrences ?? 0) > 1}<Badge variant="outline"
+                >{hit.version?.occurrences} checkpoints</Badge
+              >{/if}
+          </div>
+          {#if hit.version?.references && hit.version.references.length > 1}
+            <div
+              class="search-panel__history-details"
+              aria-label="Matching checkpoints"
+            >
+              {#each hit.version.references as reference (reference.id)}
+                <Button
+                  variant="ghost"
+                  size="sm"
+                  onclick={() =>
+                    open(provider, { ...hit, target: reference.target })}
+                  >{reference.id.slice(0, 12)} · {new Date(
+                    reference.timestamp,
+                  ).toLocaleDateString()}</Button
+                >
+              {/each}
+            </div>
+          {/if}
+          <Sidebar.MenuSub role="group" class="search-panel__history-matches">
+            {#each hit.matches as original (original.id)}
+              {@const matchId = `${id}/${original.id}`}
+              {@const match = contexts[matchId] ?? original}
+              <Sidebar.MenuSubItem role="none">
+                <div
+                  class="search-panel__match-shell"
+                  role="treeitem"
+                  aria-selected="false"
+                  aria-level={3}
+                  aria-label={`${match.text} ${match.field}`}
+                  tabindex={0}
+                  onclick={() => open(provider, hit, match)}
+                  onkeydown={(event) => {
+                    if (event.key === "Enter" || event.key === " ") {
+                      event.preventDefault();
+                      void open(provider, hit, match);
+                    }
+                  }}
+                >
+                  {#if match.context && provider.expand}<Button
+                      size="icon-xs"
+                      variant="ghost"
+                      aria-label="Show more context before this saved match"
+                      disabled={loading[matchId]}
+                      onclick={(event) => {
+                        event.stopPropagation();
+                        void context(provider, hit, match, "before");
+                      }}><ChevronUp aria-hidden="true" /></Button
+                    >{/if}
+                  <div class="search-panel__match">
+                    <span class="search-panel__match-text"
+                      ><HighlightedText
+                        text={match.text}
+                        ranges={match.ranges}
+                      /></span
+                    >
+                    <span class="search-panel__match-meta"
+                      ><Badge variant="outline" class="search-panel__match-key"
+                        >{match.field}</Badge
+                      ></span
+                    >
+                  </div>
+                  {#if match.context && provider.expand}<Button
+                      size="icon-xs"
+                      variant="ghost"
+                      aria-label="Show more context after this saved match"
+                      disabled={loading[matchId]}
+                      onclick={(event) => {
+                        event.stopPropagation();
+                        void context(provider, hit, match, "after");
+                      }}><ChevronDown aria-hidden="true" /></Button
+                    >{/if}
+                </div>
+              </Sidebar.MenuSubItem>
+            {/each}
+          </Sidebar.MenuSub>
+        </Collapsible.Content>
+      </Collapsible.Root>
+    </Sidebar.MenuSubItem>
+  {/each}
+</Sidebar.MenuSub>

package/dist/search-history-versions.svelte.d.ts

@@ -0,0 +1,8 @@
+import type { ProviderVersion } from "./search-provider-groups";
+type $$ComponentProps = {
+    versions: ProviderVersion[];
+    report(error: unknown): void;
+};
+declare const SearchHistoryVersions: import("svelte").Component<$$ComponentProps, {}, "">;
+type SearchHistoryVersions = ReturnType<typeof SearchHistoryVersions>;
+export default SearchHistoryVersions;

package/dist/search-manager.d.ts

@@ -44,6 +44,7 @@ export interface SearchQueryResult {
 export declare class SearchManager {
     readonly app: App;
     private readonly getSettings;
+    private observedNativeRefreshActive;
     private refreshPromise;
     private queuedRefreshReason;
     private refreshState;
@@ -71,6 +72,8 @@ export declare class SearchManager {
     private runRefreshQueue;
     trackChanges(): () => void;
     dispose(): Promise<void>;
+    configureIndexing(): Promise<void>;
+    private refreshNative;
     private processFile;
     private projectionSignature;
     private currentReconcileFingerprint;

package/dist/search-manager.js

@@ -1,5 +1,6 @@
 import { debounce, md5, } from "@lapis-notes/api";
 import { DEFAULT_SEARCH_SETTINGS, } from "./search-settings";
+import { configureNativeSearch, hasNativeSearch, nativeSearch, } from "./native-search";
 const REACTIVE_INDEX_DELAY_MS = 75;
 const SEARCH_RECONCILE_CHECKPOINT_KEY = "search.reconcile-checkpoint.v1";
 const SEARCH_RECONCILE_CHECKPOINT_VERSION = 1;
@@ -80,6 +81,7 @@ function sourceMetadata(cache, settings, source, manifest) {
 export class SearchManager {
     app;
     getSettings;
+    observedNativeRefreshActive = false;
     refreshPromise = null;
     queuedRefreshReason = null;
     refreshState = {
@@ -113,6 +115,10 @@ export class SearchManager {
         }
     }
     async processChange(file, content, cache) {
+        if (hasNativeSearch(this.app)) {
+            nativeSearch(this.app);
+            return;
+        }
         const provider = this.app.searchDocumentProviders.resolve(file);
         if (!provider) {
             await this.processDelete(file);
@@ -159,6 +165,10 @@ export class SearchManager {
         });
     }
     async processDelete(file) {
+        if (hasNativeSearch(this.app)) {
+            nativeSearch(this.app);
+            return;
+        }
         await this.app.appDatabase.deleteSearchDocument(typeof file === "string" ? file : file.path);
     }
     async query(params) {
@@ -211,7 +221,9 @@ export class SearchManager {
             span.setAttribute("search.result.count", result.count);
             span.setAttribute("search.path_prefix", Boolean(params.pathPrefix));
             span.setAttribute("search.source_provider.count", params.sourceProviderIds?.length ?? 0);
-            span.setAttribute("search.reconcile.active", this.refreshState.active);
+            span.setAttribute("search.reconcile.active", hasNativeSearch(this.app)
+                ? this.observedNativeRefreshActive
+                : this.refreshState.active);
             return result;
         }, {
             attributes: {
@@ -220,26 +232,42 @@ export class SearchManager {
         });
     }
     async getStatus() {
-        const [provider, runtime, stats] = await Promise.all([
+        const selected = hasNativeSearch(this.app);
+        const [provider, runtime, stats, native] = await Promise.all([
             this.app.appDatabase.getSearchEmbeddingProvider(),
             this.app.appDatabase.getSearchEmbeddingRuntimeStatus(),
             this.app.appDatabase.getSearchIndexStats(),
+            selected ? nativeSearch(this.app).getStatus() : null,
         ]);
+        const nativeRefreshing = Boolean(native && (native.active || native.pending > 0));
+        if (selected)
+            this.observedNativeRefreshActive = nativeRefreshing;
         return {
             backendKind: this.app.appDatabase.kind,
             provider,
             runtime,
             ...stats,
-            isRefreshing: this.refreshState.active,
-            refreshReason: this.refreshState.reason,
+            lastError: native?.error ?? stats.lastError,
+            isRefreshing: selected ? nativeRefreshing : this.refreshState.active,
+            refreshReason: selected
+                ? nativeRefreshing
+                    ? (this.refreshState.reason ?? "native-indexing")
+                    : null
+                : this.refreshState.reason,
             refreshProgress: {
-                processed: this.refreshState.processed,
-                total: this.refreshState.total,
+                processed: selected
+                    ? (native?.processed ?? 0)
+                    : this.refreshState.processed,
+                total: selected ? (native?.total ?? 0) : this.refreshState.total,
             },
-            refreshedAt: this.refreshState.refreshedAt,
+            refreshedAt: selected
+                ? (native?.completed_at ?? null)
+                : this.refreshState.refreshedAt,
         };
     }
     refreshFromVault(reason = "manual-refresh") {
+        if (hasNativeSearch(this.app))
+            return this.refreshNative(reason);
         this.queuedRefreshReason = reason;
         this.refreshPromise ??= this.runRefreshQueue().finally(() => {
             this.refreshPromise = null;
@@ -247,6 +275,8 @@ export class SearchManager {
         return this.refreshPromise;
     }
     async reconcileStartup() {
+        if (hasNativeSearch(this.app))
+            return this.refreshNative("startup");
         const execute = async (setCheckpoint) => {
             const initialGeneration = this.sourceGeneration;
             let status;
@@ -294,6 +324,10 @@ export class SearchManager {
         return status ?? this.getStatus();
     }
     trackChanges() {
+        if (hasNativeSearch(this.app)) {
+            nativeSearch(this.app);
+            return () => { };
+        }
         const changed = this.app.metadataCache.on("changed", (file, content, cache) => {
             if (!this.app.searchDocumentProviders.resolve(file))
                 return;
@@ -378,6 +412,12 @@ export class SearchManager {
         if (this.disposed)
             return;
         this.flushQueuedChanges.cancel();
+        if (hasNativeSearch(this.app)) {
+            this.disposed = true;
+            this.queuedChanges.clear();
+            this.queuedDeletes.clear();
+            return;
+        }
         if (this.queuedChanges.size || this.queuedDeletes.size) {
             await this.drainQueuedChanges();
         }
@@ -391,6 +431,31 @@ export class SearchManager {
         this.queuedChanges.clear();
         this.queuedDeletes.clear();
     }
+    async configureIndexing() {
+        if (this.disposed)
+            return;
+        if (hasNativeSearch(this.app))
+            await configureNativeSearch(this.app, this.getSettings());
+    }
+    async refreshNative(reason) {
+        if (this.disposed)
+            throw new Error("Search manager is disposed");
+        const previous = await this.getStatus();
+        if (this.disposed)
+            return previous;
+        const observer = await configureNativeSearch(this.app, this.getSettings());
+        if (this.disposed || observer.detached)
+            return previous;
+        this.refreshState.reason = reason;
+        await observer.refresh(reason.includes("rebuild"), {
+            title: "Refreshing search index",
+            source: "Search",
+            readyMessage: "Search index ready",
+        });
+        if (this.disposed || observer.detached)
+            return previous;
+        return this.getStatus();
+    }
     async processFile(file) {
         if (!this.app.searchDocumentProviders.resolve(file)) {
             await this.processDelete(file);

package/dist/search-panel.css

@@ -19,6 +19,7 @@
   color: var(--ui-workspace-view-foreground, inherit);
   background: var(--ui-workspace-view-background, transparent);
   font: inherit;
+  container: search-panel / inline-size;
 }
 
 .search-panel__chrome {
@@ -92,6 +93,18 @@
   white-space: nowrap;
 }
 
+@container search-panel (max-width: 24rem) {
+  .search-panel__sort {
+    width: 2rem;
+    flex: 0 0 auto;
+    padding-inline: 0;
+  }
+
+  .search-panel__sort-label {
+    display: none;
+  }
+}
+
 .search-panel__sort-popover {
   display: grid;
   width: 15rem;
@@ -458,3 +471,93 @@
   font-size: 0.8125rem;
   text-align: center;
 }
+
+.search-panel__source {
+  margin-top: 0.5rem;
+}
+.search-panel__history-version {
+  display: grid;
+  grid-template-columns: 0.875rem auto minmax(0, 1fr) auto;
+  align-items: center;
+  gap: 0.375rem;
+  width: 100%;
+  min-width: 0;
+  padding: 0.375rem 0.5rem;
+  color: inherit;
+  font: inherit;
+  font-size: 0.8125rem;
+  line-height: 1.25rem;
+  background: transparent;
+  border: 0;
+  text-align: left;
+  border-radius: 0.25rem;
+}
+.search-panel__history-list,
+.search-panel__history-matches {
+  display: grid;
+  gap: 0.125rem;
+  width: 100%;
+  min-width: 0;
+  margin: 0;
+  padding: 0;
+  border: 0;
+  list-style: none;
+}
+.search-panel__history-version > svg {
+  width: 0.875rem;
+  height: 0.875rem;
+}
+.search-panel__history-version[aria-expanded="true"] .search-panel__disclosure {
+  transform: rotate(90deg);
+}
+.search-panel__history-content {
+  padding: 0.125rem 0.5rem 0.5rem 1.375rem;
+}
+.search-panel__history-version:hover {
+  background: var(
+    --ui-workspace-hover,
+    color-mix(in srgb, currentColor 8%, transparent)
+  );
+}
+.search-panel__history-label {
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.search-panel__history-version time {
+  color: var(--search-panel-muted);
+  font-size: 0.7rem;
+  white-space: nowrap;
+}
+.search-panel__history-details {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 0.25rem;
+  padding-bottom: 0.25rem;
+  color: var(--search-panel-muted);
+  font-size: 0.6875rem;
+}
+.search-panel__history-details button {
+  height: auto;
+  min-height: 1.5rem;
+  padding: 0.125rem 0.375rem;
+  font-size: inherit;
+}
+
+.search-panel__loading {
+  display: grid;
+  gap: 0.5rem;
+  padding: 0.75rem;
+}
+.search-panel__loading-title {
+  height: 0.8rem;
+  width: 55%;
+}
+.search-panel__loading-snippet {
+  height: 0.65rem;
+  width: 85%;
+  margin-bottom: 0.6rem;
+}