@atproto/api 0.6.17 → 0.6.18

package/dist/rich-text/rich-text.d.ts

@@ -4,6 +4,7 @@ import { UnicodeString } from './unicode';
 export declare type Facet = AppBskyRichtextFacet.Main;
 export declare type FacetLink = AppBskyRichtextFacet.Link;
 export declare type FacetMention = AppBskyRichtextFacet.Mention;
+export declare type FacetTag = AppBskyRichtextFacet.Tag;
 export declare type Entity = AppBskyFeedPost.Entity;
 export interface RichTextProps {
     text: string;
@@ -21,6 +22,8 @@ export declare class RichTextSegment {
     isLink(): boolean;
     get mention(): FacetMention | undefined;
     isMention(): boolean;
+    get tag(): FacetTag | undefined;
+    isTag(): boolean;
 }
 export declare class RichText {
     unicodeText: UnicodeString;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.6.17",
+  "version": "0.6.18",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
@@ -27,7 +27,7 @@
   "devDependencies": {
     "common-tags": "^1.8.2",
     "@atproto/lex-cli": "^0.2.1",
-    "@atproto/pds": "^0.1.17"
+    "@atproto/pds": "^0.1.18"
   },
   "scripts": {
     "codegen": "pnpm docgen && node ./scripts/generate-code.mjs && lex gen-api ./src/client ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/*",

package/src/rich-text/detection.ts

@@ -69,6 +69,33 @@ export function detectFacets(text: UnicodeString): Facet[] | undefined {
       })
     }
   }
+  {
+    const re = /(?:^|\s)(#[^\d\s]\S*)(?=\s)?/g
+    while ((match = re.exec(text.utf16))) {
+      let [tag] = match
+      const hasLeadingSpace = /^\s/.test(tag)
+
+      tag = tag.trim().replace(/\p{P}+$/gu, '') // strip ending punctuation
+
+      // inclusive of #, max of 64 chars
+      if (tag.length > 66) continue
+
+      const index = match.index + (hasLeadingSpace ? 1 : 0)
+
+      facets.push({
+        index: {
+          byteStart: text.utf16IndexToUtf8Index(index),
+          byteEnd: text.utf16IndexToUtf8Index(index + tag.length), // inclusive of last char
+        },
+        features: [
+          {
+            $type: 'app.bsky.richtext.facet#tag',
+            tag,
+          },
+        ],
+      })
+    }
+  }
   return facets.length > 0 ? facets : undefined
 }
 

package/src/rich-text/rich-text.ts

@@ -100,6 +100,7 @@ import { detectFacets } from './detection'
 export type Facet = AppBskyRichtextFacet.Main
 export type FacetLink = AppBskyRichtextFacet.Link
 export type FacetMention = AppBskyRichtextFacet.Mention
+export type FacetTag = AppBskyRichtextFacet.Tag
 export type Entity = AppBskyFeedPost.Entity
 
 export interface RichTextProps {
@@ -141,6 +142,18 @@ export class RichTextSegment {
   isMention() {
     return !!this.mention
   }
+
+  get tag(): FacetTag | undefined {
+    const tag = this.facet?.features.find(AppBskyRichtextFacet.isTag)
+    if (AppBskyRichtextFacet.isTag(tag)) {
+      return tag
+    }
+    return undefined
+  }
+
+  isTag() {
+    return !!this.tag
+  }
 }
 
 export class RichText {

package/tests/rich-text-detection.test.ts

@@ -1,4 +1,5 @@
 import { AtpAgent, RichText, RichTextSegment } from '../src'
+import { isTag } from '../src/client/types/app/bsky/richtext/facet'
 
 describe('detectFacets', () => {
   const agent = new AtpAgent({ service: 'http://localhost' })
@@ -208,6 +209,109 @@ describe('detectFacets', () => {
       expect(Array.from(rt.segments(), segmentToOutput)).toEqual(outputs[i])
     }
   })
+
+  it('correctly detects tags inline', async () => {
+    const inputs: [
+      string,
+      string[],
+      { byteStart: number; byteEnd: number }[],
+    ][] = [
+      ['#a', ['#a'], [{ byteStart: 0, byteEnd: 2 }]],
+      [
+        '#a #b',
+        ['#a', '#b'],
+        [
+          { byteStart: 0, byteEnd: 2 },
+          { byteStart: 3, byteEnd: 5 },
+        ],
+      ],
+      ['#1', [], []],
+      ['#tag', ['#tag'], [{ byteStart: 0, byteEnd: 4 }]],
+      ['body #tag', ['#tag'], [{ byteStart: 5, byteEnd: 9 }]],
+      ['#tag body', ['#tag'], [{ byteStart: 0, byteEnd: 4 }]],
+      ['body #tag body', ['#tag'], [{ byteStart: 5, byteEnd: 9 }]],
+      ['body #1', [], []],
+      ['body #a1', ['#a1'], [{ byteStart: 5, byteEnd: 8 }]],
+      ['#', [], []],
+      ['text #', [], []],
+      ['text # text', [], []],
+      [
+        'body #thisisa64characterstring_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+        ['#thisisa64characterstring_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'],
+        [{ byteStart: 5, byteEnd: 71 }],
+      ],
+      [
+        'body #thisisa65characterstring_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab',
+        [],
+        [],
+      ],
+      [
+        'its a #double#rainbow',
+        ['#double#rainbow'],
+        [{ byteStart: 6, byteEnd: 21 }],
+      ],
+      ['##hashash', ['##hashash'], [{ byteStart: 0, byteEnd: 9 }]],
+      ['some #n0n3s@n5e!', ['#n0n3s@n5e'], [{ byteStart: 5, byteEnd: 15 }]],
+      [
+        'works #with,punctuation',
+        ['#with,punctuation'],
+        [{ byteStart: 6, byteEnd: 23 }],
+      ],
+      [
+        'strips trailing #punctuation, #like. #this!',
+        ['#punctuation', '#like', '#this'],
+        [
+          { byteStart: 16, byteEnd: 28 },
+          { byteStart: 30, byteEnd: 35 },
+          { byteStart: 37, byteEnd: 42 },
+        ],
+      ],
+      [
+        'strips #multi_trailing___...',
+        ['#multi_trailing'],
+        [{ byteStart: 7, byteEnd: 22 }],
+      ],
+      [
+        'works with #🦋 emoji, and #butter🦋fly',
+        ['#🦋', '#butter🦋fly'],
+        [
+          { byteStart: 11, byteEnd: 16 },
+          { byteStart: 28, byteEnd: 42 },
+        ],
+      ],
+      [
+        '#same #same #but #diff',
+        ['#same', '#same', '#but', '#diff'],
+        [
+          { byteStart: 0, byteEnd: 5 },
+          { byteStart: 6, byteEnd: 11 },
+          { byteStart: 12, byteEnd: 16 },
+          { byteStart: 17, byteEnd: 22 },
+        ],
+      ],
+    ]
+
+    for (const [input, tags, indices] of inputs) {
+      const rt = new RichText({ text: input })
+      await rt.detectFacets(agent)
+
+      let detectedTags: string[] = []
+      let detectedIndices: { byteStart: number; byteEnd: number }[] = []
+
+      for (const { facet } of rt.segments()) {
+        if (!facet) continue
+        for (const feature of facet.features) {
+          if (isTag(feature)) {
+            detectedTags.push(feature.tag)
+          }
+        }
+        detectedIndices.push(facet.index)
+      }
+
+      expect(detectedTags).toEqual(tags)
+      expect(detectedIndices).toEqual(indices)
+    }
+  })
 })
 
 function segmentToOutput(segment: RichTextSegment): string[] {