Merge pull request #50 from getlang-dev/infer-xpath

mattfysh · web-flow · commit e00f5d164d31 · 2025-09-09T15:29:54.000+10:00
infer xpath
diff --git a/packages/lib/src/values/html.ts b/packages/lib/src/values/html.ts
@@ -58,8 +58,8 @@ const selectCss = (el: AnyHtmlNode, selector: string, expand: boolean) => {
 }
 
 export const select = (el: AnyHtmlNode, selector: string, expand: boolean) => {
-  return selector.startsWith('xpath:')
-    ? selectXpath(el, selector.slice(6), expand)
+  return /^(\/|\.\/)/.test(selector)
+    ? selectXpath(el, selector, expand)
     : selectCss(el, selector, expand)
 }
 
diff --git a/test/calls.spec.ts b/test/calls.spec.ts
@@ -260,8 +260,8 @@ describe('calls', () => {
       Data: `
         inputs { text }
 
-        extract xpath://div[p[contains(text(), '$text')]]
-          -> xpath:@data-json
+        extract //div[p[contains(text(), '$text')]]
+          -> ./@data-json
           -> @json
       `,
     }
@@ -291,13 +291,13 @@ describe('calls', () => {
         GET http://stub
 
         extract @Data({text: |'first'|})
-          -> xpath:@data-json
+          -> ./@data-json
           -> @json
       `,
       Data: `
         inputs { text }
 
-        extract xpath://div[p[contains(text(), '$text')]]
+        extract //div[p[contains(text(), '$text')]]
       `,
     }
 
diff --git a/test/request.spec.ts b/test/request.spec.ts
@@ -396,7 +396,7 @@ describe('request', () => {
         extract {
           link1: link -> @link
           link2: anchor -> @html -> a -> @link
-          link3: attr -> @html -> i -> xpath:@data-url -> @link
+          link3: attr -> @html -> i -> ./@data-url -> @link
           link4: img -> @html -> img -> @link
         }
       `,
diff --git a/test/slice.spec.ts b/test/slice.spec.ts
@@ -85,7 +85,7 @@ describe('slice', () => {
   it('converts context to value prior to run', async () => {
     const result = await execute(`
       set html = |'<ul><li>one</li><li>two</li></ul>'|
-      extract $html -> @html -> xpath://li -> |$|
+      extract $html -> @html -> //li -> |$|
     `)
     expect(result).toEqual('one')
   })
diff --git a/test/values.spec.ts b/test/values.spec.ts
@@ -196,18 +196,18 @@ describe('values', () => {
     test('xpath selector', async () => {
       const result = await execute(`
         set html = |"<html><h1>unweb</h1><p class='intro'>welcome</p><html>"|
-        extract $html -> @html -> xpath://p/@class
+        extract $html -> @html -> //p/@class
       `)
       expect(result).toEqual('intro')
     })
 
     test.if(SELSYN)('xpath parsing error', async () => {
       const result = execute(`
         set html = |'<div>test</div>'|
-        extract $html -> @html -> xpath:p/*&@#^
+        extract $html -> @html -> ./p/*&@#^
       `)
       return expect(result).rejects.toThrow(
-        new SelectorSyntaxError('XPath', 'p/*&@#^'),
+        new SelectorSyntaxError('XPath', './p/*&@#^'),
       )
     })
 
@@ -354,7 +354,7 @@ describe('values', () => {
         -> @json -> docHtml
         -> @html -> pre
         -> @js -> Literal
-        -> @html -> xpath://p/@cooked
+        -> @html -> //p/@cooked
         -> @cookies -> patientZero
     `
 

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,8 @@ const selectCss = (el: AnyHtmlNode, selector: string, expand: boolean) => {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`export const select = (el: AnyHtmlNode, selector: string, expand: boolean) => {`
`61`		`- return selector.startsWith('xpath:')`
`62`		`- ? selectXpath(el, selector.slice(6), expand)`
	`61`	`+ return /^(\/\|\.\/)/.test(selector)`
	`62`	`+ ? selectXpath(el, selector, expand)`
`63`	`63`	`: selectCss(el, selector, expand)`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -396,7 +396,7 @@ describe('request', () => {`
`396`	`396`	`extract {`
`397`	`397`	`link1: link -> @link`
`398`	`398`	`link2: anchor -> @html -> a -> @link`
`399`		`- link3: attr -> @html -> i -> xpath:@data-url -> @link`
	`399`	`+ link3: attr -> @html -> i -> ./@data-url -> @link`
`400`	`400`	`link4: img -> @html -> img -> @link`
`401`	`401`	`}`
`402`	`402`	`,