refactor(oc-path): share JSONL line selection · openclaw/openclaw@bdf7547

Recent Commits to openclaw:main

vincentkoc · 2026-06-22 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import { isMap, isScalar, isSeq, type Node, type Pair } from "yaml";`
`11`	`11`	`import type { MdAst } from "./ast.js";`
`12`	`12`	`import type { JsoncValue } from "./jsonc/ast.js";`
`13`	`13`	`import type { JsonlAst, JsonlLine } from "./jsonl/ast.js";`
	`14`	`+import { pickJsonlLine } from "./jsonl/line.js";`
`14`	`15`	`import type { OcPath } from "./oc-path.js";`
`15`	`16`	`import {`
`16`	`17`	`MAX_TRAVERSAL_DEPTH,`
`@@ -364,7 +365,7 @@ const jsonlOps: WalkOps<JsonlAst> = {`
`364`	`365`	`}`
`365`	`366`	`},`
`366`	`367`	`lookup(ast, key) {`
`367`		`-const line = pickLine(ast, key);`
	`368`	`+const line = pickJsonlLine(ast, key);`
`368`	`369`	`if (line === null) {`
`369`	`370`	`return null;`
`370`	`371`	`}`
`@@ -440,37 +441,6 @@ function topLevelLeafText(value: JsoncValue, key: string): string \| null {`
`440`	`441`	`return null;`
`441`	`442`	`}`
`442`	`443`
`443`		`-function pickLine(ast: JsonlAst, addr: string): JsonlLine \| null {`
`444`		`-if (addr === "$first") {`
`445`		`-for (const l of ast.lines) {`
`446`		`-if (l.kind === "value") {`
`447`		`-return l;`
`448`		`-}`
`449`		`-}`
`450`		`-return null;`
`451`		`-}`
`452`		`-if (addr === "$last") {`
`453`		`-for (let i = ast.lines.length - 1; i >= 0; i--) {`
`454`		`-const l = ast.lines[i];`
`455`		`-if (l !== undefined && l.kind === "value") {`
`456`		`-return l;`
`457`		`-}`
`458`		`-}`
`459`		`-return null;`
`460`		`-}`
`461`		`-const m = /^L(\d+)$/.exec(addr);`
`462`		`-if (m === null \|\| m[1] === undefined) {`
`463`		`-return null;`
`464`		`-}`
`465`		`-const target = Number(m[1]);`
`466`		`-for (const l of ast.lines) {`
`467`		`-if (l.line === target) {`
`468`		`-return l;`
`469`		`-}`
`470`		`-}`
`471`		`-return null;`
`472`		`-}`
`473`		`-`
`474`	`444`	`// ---------- YAML walker ----------------------------------------------------`
`475`	`445`
`476`	`446`	`function walkYaml(`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,33 @@`
	`1`	`+import { POS_FIRST, POS_LAST } from "../oc-path.js";`
	`2`	`+import type { JsonlAst, JsonlLine } from "./ast.js";`
	`3`	`+`
	`4`	`+export function pickJsonlLine(ast: JsonlAst, addr: string): JsonlLine \| null {`
	`5`	`+if (addr === POS_FIRST) {`
	`6`	`+for (const line of ast.lines) {`
	`7`	`+if (line.kind === "value") {`
	`8`	`+return line;`
	`9`	`+}`
	`10`	`+}`
	`11`	`+return null;`
	`12`	`+}`
	`13`	`+if (addr === POS_LAST) {`
	`14`	`+for (let index = ast.lines.length - 1; index >= 0; index -= 1) {`
	`15`	`+const line = ast.lines[index];`
	`16`	`+if (line !== undefined && line.kind === "value") {`
	`17`	`+return line;`
	`18`	`+}`
	`19`	`+}`
	`20`	`+return null;`
	`21`	`+}`
	`22`	`+const match = /^L(\d+)$/.exec(addr);`
	`23`	`+if (match === null \|\| match[1] === undefined) {`
	`24`	`+return null;`
	`25`	`+}`
	`26`	`+const target = Number(match[1]);`
	`27`	`+for (const line of ast.lines) {`
	`28`	`+if (line.line === target) {`
	`29`	`+return line;`
	`30`	`+}`
	`31`	`+}`
	`32`	`+return null;`
	`33`	`+}`

Original file line number	Diff line number	Diff line change
`@@ -18,14 +18,9 @@`
`18`	`18`	`import type { JsoncEntry, JsoncValue } from "../jsonc/ast.js";`
`19`	`19`	`import { resolveJsoncValueOcPath } from "../jsonc/resolve-value.js";`
`20`	`20`	`import type { OcPath } from "../oc-path.js";`
`21`		`-import {`
`22`		`-POS_FIRST,`
`23`		`-POS_LAST,`
`24`		`-isQuotedSeg,`
`25`		`-splitRespectingBrackets,`
`26`		`-unquoteSeg,`
`27`		`-} from "../oc-path.js";`
	`21`	`+import { isQuotedSeg, splitRespectingBrackets, unquoteSeg } from "../oc-path.js";`
`28`	`22`	`import type { JsonlAst, JsonlLine } from "./ast.js";`
	`23`	`+import { pickJsonlLine } from "./line.js";`
`29`	`24`
`30`	`25`	`export type JsonlOcPathMatch =`
`31`	`26`	`\| { readonly kind: "root"; readonly node: JsonlAst }`
`@@ -50,7 +45,7 @@ export function resolveJsonlOcPath(ast: JsonlAst, path: OcPath): JsonlOcPathMatc`
`50`	`45`	`return { kind: "root", node: ast };`
`51`	`46`	`}`
`52`	`47`
`53`		`-const lineEntry = pickLine(ast, head);`
	`48`	`+const lineEntry = pickJsonlLine(ast, head);`
`54`	`49`	`if (lineEntry === null) {`
`55`	`50`	`return null;`
`56`	`51`	`}`
`@@ -90,34 +85,3 @@ export function resolveJsonlOcPath(ast: JsonlAst, path: OcPath): JsonlOcPathMatc`
`90`	`85`	`}`
`91`	`86`	`return { kind: "value", node: match.node, line: lineEntry.line, path: match.path };`
`92`	`87`	`}`
`93`		`-`
`94`		`-function pickLine(ast: JsonlAst, addr: string): JsonlLine \| null {`
`95`		`-if (addr === POS_FIRST) {`
`96`		`-for (const l of ast.lines) {`
`97`		`-if (l.kind === "value") {`
`98`		`-return l;`
`99`		`-}`
`100`		`-}`
`101`		`-return null;`
`102`		`-}`
`103`		`-if (addr === POS_LAST) {`
`104`		`-for (let i = ast.lines.length - 1; i >= 0; i--) {`
`105`		`-const l = ast.lines[i];`
`106`		`-if (l !== undefined && l.kind === "value") {`
`107`		`-return l;`
`108`		`-}`
`109`		`-}`
`110`		`-return null;`
`111`		`-}`
`112`		`-const m = /^L(\d+)$/.exec(addr);`
`113`		`-if (m === null \|\| m[1] === undefined) {`
`114`		`-return null;`
`115`		`-}`
`116`		`-const target = Number(m[1]);`
`117`		`-for (const l of ast.lines) {`
`118`		`-if (l.line === target) {`
`119`		`-return l;`
`120`		`-}`
`121`		`-}`
`122`		`-return null;`
`123`		`-}`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main