@brillout/docpress 0.12.1 → 0.12.2

package/components/Algolia/Hit.tsx

@@ -1,16 +1,18 @@
 export { Hit }
 
 import React from 'react'
-import { DocSearch } from '@docsearch/react'
-import type { InternalDocSearchHit } from './types'
+import type { DocSearchHit, InternalDocSearchHit, StoredDocSearchHit } from '@docsearch/react'
 import { Snippet } from './Snippet'
 import { SourceIcon } from './SourceIcon'
 import { SelectIcon } from './SelectIcon'
 
-type HitProps = Parameters<typeof DocSearch>[0]['hitComponent']
-type ContentType = 'lvl0' | 'lvl1' | 'lvl2' | 'lvl3' | 'lvl4' | 'lvl5' | 'lvl6'
+type HitProps = {
+  hit: InternalDocSearchHit | StoredDocSearchHit
+  children: React.ReactNode
+}
+type HierarchyType = Exclude<DocSearchHit['type'], 'content'>
 
-const Hit: HitProps = ({ hit }) => {
+function Hit({ hit }: HitProps) {
   return (
     <a href={hit.type === 'lvl1' ? hit.url.split('#')[0] : hit.url}>
       <div className="DocSearch-Hit-Container">
@@ -29,14 +31,14 @@ const Hit: HitProps = ({ hit }) => {
         <div className="DocSearch-Hit-icon">
           <SourceIcon type={hit.type} />
         </div>
-        {hit.hierarchy[hit.type as ContentType] && hit.type === 'lvl1' && (
+        {hit.hierarchy[hit.type as HierarchyType] && hit.type === 'lvl1' && (
           <div className="DocSearch-Hit-content-wrapper">
             <Snippet className="DocSearch-Hit-title" hit={hit} attribute="hierarchy.lvl1" />
             {hit.content && <Snippet className="DocSearch-Hit-path" hit={hit} attribute="content" />}
           </div>
         )}
 
-        {hit.hierarchy[hit.type as ContentType] &&
+        {hit.hierarchy[hit.type as HierarchyType] &&
           (hit.type === 'lvl2' ||
             hit.type === 'lvl3' ||
             hit.type === 'lvl4' ||

package/components/Algolia/Snippet.tsx

@@ -1,5 +1,5 @@
 import { createElement } from 'react'
-import { StoredDocSearchHit } from './types'
+import { InternalDocSearchHit, StoredDocSearchHit } from '@docsearch/react'
 
 function getPropertyByPath(object: Record<string, any>, path: string): any {
   const parts = path.split('.')
@@ -17,7 +17,7 @@ interface SnippetProps<TItem> {
   [prop: string]: unknown
 }
 
-export function Snippet<TItem extends StoredDocSearchHit>({
+export function Snippet<TItem extends InternalDocSearchHit | StoredDocSearchHit>({
   hit,
   attribute,
   tagName = 'span',
@@ -26,7 +26,7 @@ export function Snippet<TItem extends StoredDocSearchHit>({
   let title = ''
   let lvl2 = ''
 
-  if (!hit.__docsearch_parent && hit.type !== 'lvl1' && attribute !== 'content') {
+  if (!(hit as InternalDocSearchHit).__docsearch_parent && hit.type !== 'lvl1' && attribute !== 'content') {
     if (hit.type === 'content') {
       lvl2 = getPropertyByPath(hit, `_snippetResult.hierarchy.lvl2.value`) || getPropertyByPath(hit, 'hierarchy.lvl2')
       lvl2 = lvl2 ? ` > ${lvl2}` : ''

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@brillout/docpress",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "type": "module",
   "dependencies": {
     "@brillout/picocolors": "^1.0.10",
-    "@docsearch/css": "3.6.1",
-    "@docsearch/react": "3.6.1",
+    "@docsearch/css": "3.9.0",
+    "@docsearch/react": "3.9.0",
     "@mdx-js/mdx": "3.0.1",
     "@mdx-js/react": "3.0.1",
     "@mdx-js/rollup": "3.0.1",

package/components/Algolia/types.ts

@@ -1,86 +0,0 @@
-export type InternalDocSearchHit = DocSearchHit & {
-  __docsearch_parent?: InternalDocSearchHit | null
-}
-
-export type StoredDocSearchHit = Omit<InternalDocSearchHit, '_highlightResult' | '_snippetResult'>
-
-type ContentType = 'content' | 'lvl0' | 'lvl1' | 'lvl2' | 'lvl3' | 'lvl4' | 'lvl5' | 'lvl6'
-
-interface DocSearchHitAttributeHighlightResult {
-  value: string
-  matchLevel: 'full' | 'none' | 'partial'
-  matchedWords: string[]
-  fullyHighlighted?: boolean
-}
-
-interface DocSearchHitHighlightResultHierarchy {
-  lvl0: DocSearchHitAttributeHighlightResult
-  lvl1: DocSearchHitAttributeHighlightResult
-  lvl2: DocSearchHitAttributeHighlightResult
-  lvl3: DocSearchHitAttributeHighlightResult
-  lvl4: DocSearchHitAttributeHighlightResult
-  lvl5: DocSearchHitAttributeHighlightResult
-  lvl6: DocSearchHitAttributeHighlightResult
-}
-
-interface DocSearchHitHighlightResult {
-  content: DocSearchHitAttributeHighlightResult
-  hierarchy: DocSearchHitHighlightResultHierarchy
-  hierarchy_camel: DocSearchHitHighlightResultHierarchy[]
-}
-
-interface DocSearchHitAttributeSnippetResult {
-  value: string
-  matchLevel: 'full' | 'none' | 'partial'
-}
-
-interface DocSearchHitSnippetResult {
-  content: DocSearchHitAttributeSnippetResult
-  hierarchy: DocSearchHitHighlightResultHierarchy
-  hierarchy_camel: DocSearchHitHighlightResultHierarchy[]
-}
-
-export declare type DocSearchHit = {
-  objectID: string
-  content: string | null
-  url: string
-  url_without_anchor: string
-  type: ContentType
-  anchor: string | null
-  hierarchy: {
-    lvl0: string
-    lvl1: string
-    lvl2: string | null
-    lvl3: string | null
-    lvl4: string | null
-    lvl5: string | null
-    lvl6: string | null
-  }
-  _highlightResult: DocSearchHitHighlightResult
-  _snippetResult: DocSearchHitSnippetResult
-  _rankingInfo?: {
-    promoted: boolean
-    nbTypos: number
-    firstMatchedWord: number
-    proximityDistance?: number
-    geoDistance: number
-    geoPrecision?: number
-    nbExactWords: number
-    words: number
-    filters: number
-    userScore: number
-    matchedGeoLocation?: {
-      lat: number
-      lng: number
-      distance: number
-    }
-  }
-  _distinctSeqID?: number
-  __autocomplete_indexName?: string
-  __autocomplete_queryID?: string
-  __autocomplete_algoliaCredentials?: {
-    appId: string
-    apiKey: string
-  }
-  __autocomplete_id?: number
-}