Commit eab1c7c

committed

fix(websocket): Add linesCount and charsCount to metadata extraction

1 parent bc575d9 commit eab1c7cCopy full SHA for eab1c7c

File tree

+28

-2

lines changed

+28

-2

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ export type Change =`
`11`	`11`	`\| HelpFeelsChange`
`12`	`12`	`\| infoboxDefinitionChange`
`13`	`13`	`\| TitleChange`
	`14`	`+ \| LinesCountChange`
	`15`	`+ \| charsCountChange`
`14`	`16`	`\| PinChange;`
`15`	`17`	`export interface InsertChange {`
`16`	`18`	`_insert: string;`
`@@ -72,6 +74,13 @@ export interface infoboxDefinitionChange {`
`72`	`74`	`*/`
`73`	`75`	`infoboxDefinition: string[];`
`74`	`76`	`}`
	`77`	`+export interface LinesCountChange {`
	`78`	`+ linesCount: number;`
	`79`	`+}`
	`80`	`+export interface charsCountChange {`
	`81`	`+ charsCount: number;`
	`82`	`+}`
	`83`	`+`
`75`	`84`	`export interface PinChange {`
`76`	`85`	`pin: number;`
`77`	`86`	`}`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`		`-import { getHelpfeels, getPageMetadataFromLines } from "./getPageMetadataFromLines.ts";`
	`1`	`+import {`
	`2`	`+ getHelpfeels,`
	`3`	`+ getPageMetadataFromLines,`
	`4`	`+} from "./getPageMetadataFromLines.ts";`
`2`	`5`	`import { assertEquals } from "@std/assert/equals";`
`3`	`6`
`4`	`7`	`// Test data for metadata extraction from a Scrapbox page`
`@@ -74,6 +77,8 @@ Deno.test("getPageMetadataFromLines()", () => {`
`74`	`77`	`"Phone\tAdding # won't create a link",`
`75`	`78`	`"Strengths\tList about 3 items",`
`76`	`79`	`],`
	`80`	`+ 26,`
	`81`	`+ 659,`
`77`	`82`	`]);`
`78`	`83`	`});`
`79`	`84`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ export const getPageMetadataFromLines = (`
`30`	`30`	`files: string[],`
`31`	`31`	`helpfeels: string[],`
`32`	`32`	`infoboxDefinition: string[],`
	`33`	`+ linesCount: number,`
	`34`	`+ charsCount: number,`
`33`	`35`	`] => {`
`34`	`36`	`const blocks = parse(text, { hasTitle: true });`
`35`	`37`
`@@ -190,6 +192,7 @@ export const getPageMetadataFromLines = (`
`190`	`192`	`}`
`191`	`193`	`}`
`192`	`194`
	`195`	`+ const lines = text.split("\n");`
`193`	`196`	`return [`
`194`	`197`	`title,`
`195`	`198`	`links,`
`@@ -200,6 +203,8 @@ export const getPageMetadataFromLines = (`
`200`	`203`	`[...files],`
`201`	`204`	`[...helpfeels],`
`202`	`205`	`infoboxDefinition,`
	`206`	`+ lines.length,`
	`207`	`+ lines.reduce((acc, line) => acc + [...line].length, 0),`
`203`	`208`	`];`
`204`	`209`	`};`
`205`	`210`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,10 @@`
`1`	`1`	`import { diffToChanges } from "./diffToChanges.ts";`
`2`	`2`	`import type { Page } from "@cosense/types/rest";`
`3`	`3`	`import type { Change } from "./change.ts";`
`4`		`-import { getHelpfeels, getPageMetadataFromLines } from "./getPageMetadataFromLines.ts";`
	`4`	`+import {`
	`5`	`+ getHelpfeels,`
	`6`	`+ getPageMetadataFromLines,`
	`7`	`+} from "./getPageMetadataFromLines.ts";`
`5`	`8`	`import { isSameArray } from "./isSameArray.ts";`
`6`	`9`	`import { isString } from "@core/unknownutil/is/string";`
`7`	`10`
`@@ -41,6 +44,8 @@ export function* makeChanges(`
`41`	`44`	`files,`
`42`	`45`	`helpfeels,`
`43`	`46`	`infoboxDefinition,`
	`47`	`+ linesCount,`
	`48`	`+ charsCount,`
`44`	`49`	`] = getPageMetadataFromLines(after_.join("\n"));`
`45`	`50`	`// Handle title changes`
`46`	`51`	// Note: We always include title change commits for new pages (`persistent === false`)
`@@ -56,4 +61,6 @@ export function* makeChanges(`
`56`	`61`	`if (!isSameArray(before.infoboxDefinition, infoboxDefinition)) {`
`57`	`62`	`yield { infoboxDefinition };`
`58`	`63`	`}`
	`64`	`+ yield { linesCount };`
	`65`	`+ yield { charsCount };`
`59`	`66`	`}`

Comments

(0)