@barefootjs/go-template 0.15.2 → 0.17.0

package/dist/test-render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-render.d.ts","sourceRoot":"","sources":["../src/test-render.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,iBAAiB,CAAA;AAsBnE,qBAAa,mBAAoB,SAAQ,KAAK;IAC5C,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AAgCD,MAAM,WAAW,aAAa;IAC5B,sBAAsB;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,8BAA8B;IAC9B,OAAO,EAAE,eAAe,CAAA;IACxB,iCAAiC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,qDAAqD;IACrD,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzC;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAyVvF"}
+{"version":3,"file":"test-render.d.ts","sourceRoot":"","sources":["../src/test-render.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,iBAAiB,CAAA;AAUnE,qBAAa,mBAAoB,SAAQ,KAAK;IAC5C,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AAgCD,MAAM,WAAW,aAAa;IAC5B,sBAAsB;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,8BAA8B;IAC9B,OAAO,EAAE,eAAe,CAAA;IACxB,iCAAiC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,qDAAqD;IACrD,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzC;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAyVvF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/go-template",
-  "version": "0.15.2",
+  "version": "0.17.0",
   "description": "Go html/template adapter for BarefootJS - generates Go template files from IR",
   "type": "module",
   "main": "./dist/index.js",
@@ -49,7 +49,7 @@
     "directory": "packages/adapter-go-template"
   },
   "dependencies": {
-    "@barefootjs/shared": "0.15.2"
+    "@barefootjs/shared": "0.17.0"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0",
@@ -57,6 +57,6 @@
   },
   "devDependencies": {
     "@barefootjs/adapter-tests": "0.1.0",
-    "@barefootjs/jsx": "0.15.2"
+    "@barefootjs/jsx": "0.17.0"
   }
 }

package/src/__tests__/derived-state-memo.test.ts

@@ -22,10 +22,11 @@ function generate(src: string) {
 describe('Capability A: object-returning searchParams memo → computed map field', () => {
   const SRC = `
 'use client'
-import { createMemo, searchParams } from '@barefootjs/client'
+import { createMemo, createSearchParams } from '@barefootjs/client'
 const SORT_KEYS = ['date', 'title', 'tag']
 const asSortKey = (raw) => (SORT_KEYS.includes(raw) ? raw : 'date')
 export function P() {
+  const [searchParams] = createSearchParams()
   const params = createMemo(() => {
     const sp = searchParams()
     return { sort: asSortKey(sp.get('sort')), tag: sp.get('tag') ?? '' }
@@ -74,8 +75,9 @@ export function P() {
   test('string-valued ternary condition falls back to nil, never invalid Go', () => {
     const src = `
 'use client'
-import { createMemo, searchParams } from '@barefootjs/client'
+import { createMemo, createSearchParams } from '@barefootjs/client'
 export function P() {
+  const [searchParams] = createSearchParams()
   const params = createMemo(() => {
     const sp = searchParams()
     return { label: sp.get('tag') ? 'has' : 'none' }
@@ -95,8 +97,9 @@ export function P() {
   test('block-body memo with control flow falls back to nil', () => {
     const src = `
 'use client'
-import { createMemo, searchParams } from '@barefootjs/client'
+import { createMemo, createSearchParams } from '@barefootjs/client'
 export function P() {
+  const [searchParams] = createSearchParams()
   const params = createMemo(() => {
     const sp = searchParams()
     if (sp.get('x')) return { sort: 'early' }
@@ -115,10 +118,11 @@ describe('Capability B: inline local pure helper calls at attribute call sites',
   test('sortClass(k) inlines to a conditional, not a .SortClass method call', () => {
     const src = `
 'use client'
-import { createMemo, searchParams } from '@barefootjs/client'
+import { createMemo, createSearchParams } from '@barefootjs/client'
 const SORT_KEYS = ['date', 'title', 'tag']
 const asSortKey = (raw) => (SORT_KEYS.includes(raw) ? raw : 'date')
 export function P() {
+  const [searchParams] = createSearchParams()
   const params = createMemo(() => {
     const sp = searchParams()
     return { sort: asSortKey(sp.get('sort')), tag: sp.get('tag') ?? '' }
@@ -139,8 +143,9 @@ export function P() {
   test('tagClass(t) inlines inside a loop, resolving the loop var and root memo', () => {
     const src = `
 'use client'
-import { createMemo, searchParams } from '@barefootjs/client'
+import { createMemo, createSearchParams } from '@barefootjs/client'
 export function P(props: { tags: string[] }) {
+  const [searchParams] = createSearchParams()
   const params = createMemo(() => {
     const sp = searchParams()
     return { tag: sp.get('tag') ?? '' }
@@ -214,51 +219,22 @@ export function P(props: { xs: string[] }) {
   })
 })
 
-describe('Capability C2: URL-builder helpers → bf_query + derived Root field', () => {
-  const SRC = `
+describe('Derived string-const → computed Go struct field (#1945)', () => {
+  // The trailing-slash strip `(props.base ?? '').replace(/\/+$/, '')` lowers in
+  // the `NewXxxProps` constructor to `strings.TrimRight`, and `base || '/'`
+  // becomes a computed `Root` field referenced by the template. (The former
+  // `URLSearchParams` href-builder recognizer that shared this fixture was
+  // retired in #2042 once `queryHref` replaced it.)
+  test('derived `root` const (trailing-slash strip) becomes a computed Root field', () => {
+    const src = `
 'use client'
-import { createMemo, searchParams } from '@barefootjs/client'
 export function P(props: { base: string }) {
-  const params = createMemo(() => {
-    const sp = searchParams()
-    return { sort: sp.get('sort') ?? '', tag: sp.get('tag') ?? '' }
-  })
   const base = (props.base ?? '').replace(/\\/+$/, '')
   const root = base || '/'
-  const hrefFor = (sort: string, tag: string) => {
-    const u = new URLSearchParams()
-    if (sort !== 'date') u.set('sort', sort)
-    if (tag) u.set('tag', tag)
-    const s = u.toString()
-    return s ? \`\${root}?\${s}\` : root
-  }
-  const sortHref = (k) => hrefFor(k, params().tag)
-  const tagHref = (t) => hrefFor(params().sort, t)
-  return (
-    <div>
-      <a href={sortHref('title')}>s</a>
-      {props.base ? <a href={tagHref('go')}>t</a> : null}
-    </div>
-  )
+  return <a href={root}>home</a>
 }
 `
-
-  test('sortHref/tagHref lower to bf_query, not a .SortHref method call', () => {
-    const { template } = generate(SRC)
-    expect(template).not.toContain('.SortHref')
-    expect(template).not.toContain('.TagHref')
-    expect(template).toContain('bf_query .Root')
-  })
-
-  test('guarded set() calls become bool include triples', () => {
-    const { template } = generate(SRC)
-    // sort !== 'date' guard (runtime sort case via tagHref) + tag truthiness.
-    expect(template).toContain('(ne (bf_string .Params.Sort) "date") "sort"')
-    expect(template).toContain('(ne .Params.Tag "") "tag"')
-  })
-
-  test('derived `root` const becomes a computed Root field', () => {
-    const { types } = generate(SRC)
+    const { types } = generate(src)
     expect(types).toContain('Root string `json:"-"`')
     expect(types).toContain(
       'Root: func() string { v := strings.TrimRight(in.Base, "/"); if v != "" { return v }; return "/" }(),',
@@ -266,45 +242,6 @@ export function P(props: { base: string }) {
     expect(types).toContain('"strings"')
   })
 
-  // A `&&` guard is NOT a Go bool (Go's `and` returns an operand); it must be
-  // truthiness-wrapped so `bf_query`'s `include` receives a real bool (#1945 review).
-  test('a && guard is wrapped to a bool, not passed as bare `and`', () => {
-    const src = `
-'use client'
-import { createMemo, searchParams } from '@barefootjs/client'
-export function P(props: { base: string }) {
-  const params = createMemo(() => { const sp = searchParams(); return { tag: sp.get('tag') ?? '' } })
-  const root = (props.base ?? '') || '/'
-  const hrefFor = (sort: string, tag: string) => {
-    const u = new URLSearchParams()
-    if (sort && tag) u.set('both', sort)
-    return u.toString() ? \`\${root}?\${u}\` : root
-  }
-  const h = (k) => hrefFor(k, params().tag)
-  return <a href={h('x')}>x</a>
-}
-`
-    const { template } = generate(src)
-    expect(template).toContain('(ne (and "x" .Params.Tag) "")')
-  })
-
-  // A URL-builder helper whose return isn't the conditional with-query/base
-  // shape must not be lowered to bf_query (#1945 review) — it falls back to the
-  // method-call form.
-  test('a builder returning a non-conditional shape is not lowered to bf_query', () => {
-    const src = `
-'use client'
-import { searchParams } from '@barefootjs/client'
-export function P() {
-  const bad = (sort: string) => { const u = new URLSearchParams(); u.set('s', sort); return u.toString() }
-  return <a href={bad('x')}>x</a>
-}
-`
-    const { template } = generate(src)
-    expect(template).not.toContain('bf_query')
-    expect(template).toContain('.Bad')
-  })
-
   // A non-string derived const referenced by the template must not be emitted
   // as a `string` field with a non-string initializer (#1945 review).
   test('a numeric derived const is not emitted as a string field', () => {
@@ -338,9 +275,10 @@ describe('Capability D: array-memo .length → handler-filled loop slice count',
   test('visible().length lowers to len .<Slice>, not the nil memo field', () => {
     const src = `
 'use client'
-import { createMemo, searchParams } from '@barefootjs/client'
+import { createMemo, createSearchParams } from '@barefootjs/client'
 import { Row } from './Row'
 export function P(props: { items: { id: string }[] }) {
+  const [searchParams] = createSearchParams()
   const params = createMemo(() => {
     const sp = searchParams()
     return { tag: sp.get('tag') ?? '' }
@@ -369,3 +307,136 @@ export function P(props: { items: { id: string }[] }) {
     expect(template).toContain('len .Items')
   })
 })
+
+describe('typed memo bodies parse from the type-stripped computation (#1976 review)', () => {
+  const mk = (body: string) => `
+"use client"
+import { createSignal, createMemo } from '@barefootjs/client'
+export function T() {
+  const [count, setCount] = createSignal(3)
+  const doubled = createMemo(() => ${body})
+  return <div>{doubled()}</div>
+}`
+
+  // `MemoInfo.parsed` is parsed from the type-STRIPPED body (`ctx.getJS`), not
+  // the raw source — otherwise TypeScript-only syntax (`as T`, `!`, satisfies)
+  // would make `parseExpression` bail, `parsed` would be undefined, and the
+  // adapter would lose the arithmetic shape it used to match on the stripped
+  // `computation` (changing the SSR default).
+  test('a TS-annotated memo body yields the same SSR as the untyped form', () => {
+    const typed = generate(mk('(count() as number) * 2'))
+    const untyped = generate(mk('count() * 2'))
+    expect(typed.types).toContain('Doubled: 3 * 2,')
+    expect(typed.types).toBe(untyped.types)
+  })
+})
+
+// #2040 PR-B: guard-and-return-const block memos lower via the analyzer fold
+// (`MemoInfo.parsed`), with a tolerant `parsedBlock` fallback for blocks the
+// fold refuses (so the SSR const bake never regresses vs. the old statement
+// walker).
+describe('Capability C: guard-const block memo via fold (#2040 PR-B)', () => {
+  test('folded guard memo bakes the module-const array (not nil)', () => {
+    const { types } = generate(`
+"use client"
+import { createSignal, createMemo } from "@barefootjs/client"
+const ALL = ['a', 'b', 'c']
+export function Tags() {
+  const [sel, setSel] = createSignal<string | null>(null)
+  const visible = createMemo(() => {
+    const k = sel()
+    if (!k) return ALL
+    return ALL.filter(t => t === k)
+  })
+  return <ul>{visible().map(t => (<li key={t}>{t}</li>))}</ul>
+}
+`)
+    expect(types).toContain(`[]interface{}{"a", "b", "c"}`)
+  })
+
+  test('guard memo with an impure tail binding still bakes the const (fallback path)', () => {
+    // `const n = ext()` is impure (not a reactive getter) and used more than
+    // once in the tail, so `foldBlockToExpr` refuses → `parsed` is unset. The
+    // tolerant `parsedBlock` fallback must still bake `ALL`; otherwise the first
+    // server render is an empty list (regression vs. main). (PR #2053 review #1)
+    const { types } = generate(`
+"use client"
+import { createSignal, createMemo } from "@barefootjs/client"
+const ALL = ['a', 'b', 'c']
+function ext() { return 1 }
+export function Tags() {
+  const [sel, setSel] = createSignal<string | null>(null)
+  const visible = createMemo(() => {
+    const k = sel()
+    const n = ext()
+    if (!k) return ALL
+    return ALL.filter(t => t.length === n).concat(ALL.slice(n))
+  })
+  return <ul>{visible().map(t => (<li key={t}>{t}</li>))}</ul>
+}
+`)
+    expect(types).toContain(`[]interface{}{"a", "b", "c"}`)
+  })
+
+  test('early-return string-const block memo bakes the initial branch (#2040 scope)', () => {
+    // `() => { if (vert()) return A; return B }` folds to `vert() ? A : B`; with
+    // `vert` starting false the SSR value is B. Now lowered via the general
+    // `memoInitialFromParsedBody` conditional path. (PR #2053 review #2)
+    const { types } = generate(`
+"use client"
+import { createSignal, createMemo } from "@barefootjs/client"
+const A = 'flex-col'
+const B = 'flex'
+export function Box() {
+  const [vert, setVert] = createSignal(false)
+  const cls = createMemo(() => {
+    if (vert()) return A
+    return B
+  })
+  return <div className={cls()}>x</div>
+}
+`)
+    expect(types).toContain('"flex"')
+  })
+})
+
+// #2040 PR-C: the object-returning searchParams memo lowers via the general
+// fold (`foldBlockToExpr` with `searchParams` treated as a pure idempotent
+// read), not a bespoke statement walk.
+describe('Capability D: searchParams object memo via fold (#2040 PR-C)', () => {
+  test('object memo using searchParams() directly (no const binding) lowers', () => {
+    // The old statement walk required a `const sp = searchParams()` binding to
+    // populate its env; the fold inlines any binding, so a direct
+    // `searchParams().get('k')` in the returned object now lowers too.
+    const { types } = generate(`
+"use client"
+import { createMemo, createSearchParams } from "@barefootjs/client"
+export function PostList() {
+  const [searchParams] = createSearchParams()
+  const params = createMemo(() => {
+    return { tag: searchParams().get('tag') ?? '' }
+  })
+  return <div>{params().tag}</div>
+}
+`)
+    expect(types).toContain('map[string]interface{}{')
+    expect(types).toContain('"Tag":')
+    expect(types).toContain('in.SearchParams.Get("tag")')
+  })
+
+  test('aliased env-signal getter still lowers (local-name oracle)', () => {
+    const { types } = generate(`
+"use client"
+import { createMemo, createSearchParams } from "@barefootjs/client"
+export function PostList() {
+  const [sp] = createSearchParams()
+  const params = createMemo(() => {
+    const q = sp()
+    return { tag: q.get('tag') ?? '' }
+  })
+  return <div>{params().tag}</div>
+}
+`)
+    expect(types).toContain('in.SearchParams.Get("tag")')
+  })
+})