@teleporthq/teleport-plugin-next-data-source 0.43.57 → 0.43.60

package/__tests__/page-url-sync.test.ts

@@ -0,0 +1,208 @@
+import * as types from '@babel/types'
+import generator from '@babel/generator'
+import {
+  ChunkType,
+  FileType,
+  ComponentStructure,
+  ChunkDefinition,
+} from '@teleporthq/teleport-types'
+import { createNextArrayMapperPaginationPlugin } from '../src/pagination-plugin'
+
+const makeComponentChunk = (): ChunkDefinition => {
+  const body = types.blockStatement([
+    types.returnStatement(
+      types.jsxElement(
+        types.jsxOpeningElement(types.jsxIdentifier('div'), [], true),
+        null,
+        [],
+        true
+      )
+    ),
+  ])
+  const arrow = types.arrowFunctionExpression([types.identifier('props')], body)
+  return {
+    name: 'jsx-component',
+    type: ChunkType.AST,
+    fileType: FileType.JS,
+    linkAfter: [],
+    content: types.variableDeclaration('const', [
+      types.variableDeclarator(types.identifier('TestComponent'), arrow),
+    ]),
+    meta: {},
+  }
+}
+
+interface ListOptions {
+  pageUrlParamKey?: string
+  searchEnabled?: boolean
+  stateFilter?: string
+  infiniteScroll?: boolean
+}
+
+// tslint:disable-next-line:no-any
+const makeUidlNode = (options: ListOptions): any => ({
+  type: 'data-source-list',
+  content: {
+    renderPropIdentifier: 'items',
+    resourceDefinition: {
+      dataSourceId: 'ds1',
+      tableName: 'products',
+      dataSourceType: 'postgresql',
+    },
+    resource: {
+      params: {
+        queryColumns: { content: ['name'] },
+        ...(options.stateFilter
+          ? {
+              filters: {
+                content: [
+                  {
+                    source: 'category_filter_ids',
+                    operand: 'array_overlap',
+                    destination: {
+                      type: 'dynamic',
+                      content: { referenceType: 'state', id: options.stateFilter },
+                    },
+                  },
+                ],
+              },
+            }
+          : {}),
+      },
+    },
+    nodes: {
+      success: {
+        type: 'cms-list-repeater',
+        content: {
+          renderPropIdentifier: 'product',
+          paginated: true,
+          perPage: 20,
+          searchEnabled: options.searchEnabled !== false,
+          searchDebounce: 300,
+          ...(options.pageUrlParamKey ? { pageUrlParamKey: options.pageUrlParamKey } : {}),
+          ...(options.infiniteScroll ? { infiniteScroll: true } : {}),
+          nodes: { list: { type: 'element', content: { elementType: 'div' } } },
+        },
+      },
+    },
+  },
+})
+
+const runPlugin = async (options: ListOptions): Promise<string> => {
+  const chunk = makeComponentChunk()
+  const structure: ComponentStructure = {
+    uidl: { name: 'TestComponent', node: makeUidlNode(options) },
+    chunks: [chunk],
+    dependencies: {},
+    options: { dataSources: {}, extractedResources: {} },
+  } as never
+  await createNextArrayMapperPaginationPlugin()(structure)
+  return generator(chunk.content as types.Node).code
+}
+
+const collapse = (code: string): string => code.replace(/\s+/g, ' ')
+
+describe('pagination plugin — current page ⇄ URL (pageUrlParamKey)', () => {
+  it('adopts the URL page in an effect rather than seeding the state', async () => {
+    const code = await runPlugin({ pageUrlParamKey: 'page' })
+    const flat = collapse(code)
+
+    // ⛔ NOT seeded in the useState initializer, unlike the search query.
+    // A statically generated page renders page 1 on the server, and React does
+    // not repair mismatched ATTRIBUTES when it hydrates — a client that started
+    // on page 3 would keep the server's disabled "Previous" for good. Moving
+    // the page in an effect makes it a real state transition React will paint.
+    expect(code).not.toContain('window.location.search')
+    expect(flat).toContain('const [ds_0_state, setDs_0_state] = useState({ page: 1,')
+
+    expect(code).toContain('const router = useRouter()')
+    expect(code).toContain('const ds_0_pageUrlRef = useRef(null)')
+    expect(code).toContain('const __urlPage = Math.max(1, parseInt(__raw, 10) || 1)')
+    expect(code).toContain('const __statePage = ds_0_state.page')
+    expect(code).toContain('const __seenUrlPage = ds_0_pageUrlRef.current')
+  })
+
+  it('decides which side moved, so the two directions cannot race', async () => {
+    const code = await runPlugin({ pageUrlParamKey: 'page' })
+    const flat = collapse(code)
+
+    // The URL moved (deep link, <Link>, back/forward) ⇒ adopt it — but ONLY
+    // once every replace this component issued has landed. Mid-flight,
+    // `router.query` still holds the page the visitor is on their way out of.
+    expect(flat).toContain(
+      'if (__tqQuerySyncRef.current.inFlight === 0 && __seenUrlPage !== __urlPage && __urlPage !== __statePage)'
+    )
+    expect(flat).toContain(
+      'setDs_0_state(state => state.page === __urlPage ? state : { ...state, page: __urlPage })'
+    )
+    // The page moved (a click, or the filter reset) ⇒ write it. Page 1 is the
+    // ABSENCE of the key, so an unpaginated visit keeps a clean URL.
+    expect(flat).toContain('if (__urlPage === __statePage) return')
+    expect(flat).toContain(
+      '__tqWriteQueryParam("page", __statePage <= 1 ? undefined : __statePage)'
+    )
+    expect(code).toContain('}, [router.query.page, router.isReady, ds_0_state.page])')
+  })
+
+  it('applies to the standalone page state for a paginated-only list', async () => {
+    const code = await runPlugin({ pageUrlParamKey: 'page', searchEnabled: false })
+    const flat = collapse(code)
+
+    expect(code).toContain('const __statePage = ds_0_page')
+    expect(flat).toContain('setDs_0_page(page => page === __urlPage ? page : __urlPage)')
+  })
+
+  it('runs the URL sync AFTER the filter reset so a deep link wins', async () => {
+    const code = await runPlugin({ pageUrlParamKey: 'page', stateFilter: 'selectedCategory' })
+
+    // Both effects can fire in one flush on a navigation that changes filter and
+    // page together. Effects run in emission order, so the URL sync must be last
+    // or `?page=3&categoryFilter=X` would land on page 1.
+    const resetAt = code.indexOf('ds_0_filterResetRef.current = __sig')
+    const syncAt = code.indexOf('const __seenUrlPage = ds_0_pageUrlRef.current')
+    expect(resetAt).toBeGreaterThan(-1)
+    expect(syncAt).toBeGreaterThan(resetAt)
+  })
+
+  it('writes through the shared writer, so two controls cannot erase each other', async () => {
+    const code = await runPlugin({ pageUrlParamKey: 'page', stateFilter: 'selectedCategory' })
+    const flat = collapse(code)
+
+    // ⛔ THE DEFECT THIS GUARDS, seen live: picking a category while on page 3
+    // resets the page, so the category write-back and the page write-back fire
+    // in the SAME flush. Each used to build its next query from `router.query`,
+    // which Next updates asynchronously and does NOT refresh on a component's
+    // own setState — so the second `replace` wrote a query that predated the
+    // first, and `?categoryFilter=…` vanished even though the list was filtered.
+    // The read-back then cleared the category state, the write-back re-asserted
+    // it, and the pair swapped values forever: an endless refetch loop.
+    //
+    // The fix is that neither effect composes a query any more. Both hand one
+    // key to `__tqWriteQueryParam`, which merges into the last query the
+    // component ASKED for, so the second write builds on the first's payload.
+    expect(code).not.toContain('__nextQuery')
+    expect(flat).toContain('const base = __tqQuerySyncRef.current.pending || router.query')
+    expect(flat).toContain('__tqQuerySyncRef.current.pending = next')
+
+    // Exactly ONE writer is declared however many controls are bound to the URL.
+    expect((code.match(/const __tqWriteQueryParam = /g) || []).length).toBe(1)
+    // ...and exactly one `router.replace`, inside it.
+    expect((code.match(/router\.replace\(/g) || []).length).toBe(1)
+  })
+
+  it('emits nothing page-URL related without the key (unchanged behaviour)', async () => {
+    const code = await runPlugin({})
+
+    expect(code).toContain('page: 1')
+    expect(code).not.toContain('pageUrlRef')
+    expect(code).not.toContain('router.query.page')
+    expect(code).not.toContain('useRouter')
+  })
+
+  it('ignores the key on an infinite-scroll list, which has no pages to name', async () => {
+    const code = await runPlugin({ pageUrlParamKey: 'page', infiniteScroll: true })
+
+    expect(code).not.toContain('router.query.page')
+    expect(code).not.toContain('pageUrlRef')
+  })
+})

package/__tests__/product-price-sort.ts

@@ -0,0 +1,313 @@
+import { parse } from '@babel/parser'
+import {
+  PRODUCT_DISCOUNT_SORT_FIELD,
+  buildProductDiscountPercentageSql,
+  buildProductEffectivePriceSql,
+  generateSortFallbackFieldHelper,
+  generateSortFieldSqlHelper,
+  generateSortTiebreakSql,
+  supportsProductPriceSort,
+} from '../src/product-price-sort'
+import { generatePostgreSQLFetcher } from '../src/fetchers/postgresql'
+import { generateTeleportFetcher } from '../src/fetchers/teleport'
+import { generateDataSourceFetcher } from '../src/data-source-fetchers'
+
+/**
+ * Ordering a products list by what customers actually pay.
+ *
+ * The sort happens in SQL, before any row reaches JavaScript, and the list is
+ * paginated — so re-sorting the fetched page would only reorder 20 of N
+ * products. The database therefore has to compute the discounted price itself.
+ *
+ * These tests cannot execute the SQL (no Postgres here), so they pin the two
+ * things that are checkable: the emitted route still parses, and the expression
+ * says what the discount rule says.
+ */
+
+const PG_CONFIG = { connectionString: 'postgres://user:pw@host:5432/db' }
+
+describe('generateSortFieldSqlHelper', () => {
+  it('rewrites price only for the products table', () => {
+    expect(supportsProductPriceSort('teleport_products')).toBe(true)
+    expect(supportsProductPriceSort('teleport_orders')).toBe(false)
+
+    expect(generateSortFieldSqlHelper('teleport_products')).toContain('if (field === "price")')
+    // Every other table gets the identity, so a fetcher can embed it
+    // unconditionally and no unrelated sort can change.
+    const other = generateSortFieldSqlHelper('teleport_orders')
+    expect(other).not.toContain('if (field ===')
+    expect(other).toContain('return field')
+  })
+
+  it('emits the SQL as a double-quoted literal, carrying no template syntax', () => {
+    // The helper is interpolated into a fetcher's template literal. A backtick
+    // or a `${` inside it would close or interpolate that template — which is
+    // exactly how this first went wrong.
+    const helper = generateSortFieldSqlHelper('teleport_products')
+    expect(helper).not.toContain('`')
+    expect(helper).not.toContain('${')
+  })
+
+  it('is a syntactically valid JS function', () => {
+    expect(() =>
+      parse(generateSortFieldSqlHelper('teleport_products'), { sourceType: 'script' })
+    ).not.toThrow()
+  })
+})
+
+describe('the effective-price expression', () => {
+  const sql = buildProductEffectivePriceSql()
+
+  it('falls back to the list price when nothing is live', () => {
+    expect(sql.startsWith('COALESCE((')).toBe(true)
+    expect(sql.trimEnd().endsWith('), "price"::numeric)')).toBe(true)
+  })
+
+  it('applies the same rule as the discount module', () => {
+    // Percentage off the list price, capped at 100; fixed subtracted; floored
+    // at zero and rounded to the cent — `computeDiscountedPrice`'s contract.
+    expect(sql).toContain(`"price"::numeric * (1 - LEAST(entry.amount, 100) / 100)`)
+    expect(sql).toContain(`"price"::numeric - entry.amount`)
+    expect(sql).toContain('ROUND(GREATEST(0,')
+    expect(sql).toContain(', 2)')
+  })
+
+  it('takes the FIRST live entry in array order, like resolveActiveDiscount', () => {
+    expect(sql).toContain('WITH ORDINALITY')
+    expect(sql).toContain('ORDER BY entry.ord')
+    expect(sql).toContain('LIMIT 1')
+  })
+
+  it('honours the half-open window', () => {
+    // `[startsAt, endsAt)` — inclusive start, exclusive end, so back-to-back
+    // discounts hand over with no overlap.
+    expect(sql).toContain('entry.starts_at <=')
+    expect(sql).toContain('entry.ends_at >')
+  })
+
+  it('ignores entries the parser would drop', () => {
+    expect(sql).toContain('entry.amount > 0')
+    expect(sql).toContain(`entry.kind IN ('percentage', 'fixed')`)
+  })
+
+  it('never casts anything that could raise', () => {
+    // It runs inside ORDER BY for the whole table: one unparseable row would
+    // empty the products page.
+    // JSON is cast only when the text already looks like an array…
+    expect(sql).toContain(`btrim("discounts") NOT LIKE '[%'`)
+    expect(sql).toContain(`'[]'::jsonb`)
+    // …the value only when it is a bare decimal…
+    expect(sql).toContain(`~ '^[0-9]+(\\.[0-9]+)?$'`)
+    // …and the window bounds are compared as TEXT, never cast to a timestamp.
+    // `toISOString()` is fixed-width UTC, so it sorts lexicographically in the
+    // same order it sorts chronologically.
+    expect(sql).not.toContain('::timestamp')
+    expect(sql).toContain(`to_char(now() AT TIME ZONE 'UTC'`)
+  })
+})
+
+describe('the generated Postgres route', () => {
+  const productsRoute = generatePostgreSQLFetcher(PG_CONFIG, 'teleport_products')
+
+  it('parses as valid JavaScript', () => {
+    expect(() => parse(productsRoute, { sourceType: 'module', plugins: ['jsx'] })).not.toThrow()
+  })
+
+  it('orders through the mapper rather than the raw field', () => {
+    expect(productsRoute).toContain('sortFieldSql(sort.field)')
+    expect(productsRoute).toContain('if (field === "price")')
+  })
+
+  it('keeps a plain-column ORDER BY to fall back to', () => {
+    // If a database ever rejects the sub-select, the page must degrade to the
+    // previous ordering rather than serve nothing.
+    expect(productsRoute).toContain('const usedDiscountAwareSort = orderBySql !== plainOrderBySql')
+    expect(productsRoute).toContain('if (!usedDiscountAwareSort) throw sortError')
+    expect(productsRoute).toContain('baseSql + plainOrderBySql + sqlTail')
+  })
+
+  it('leaves every other table ordering exactly as it was', () => {
+    const ordersRoute = generatePostgreSQLFetcher(PG_CONFIG, 'teleport_orders')
+    expect(ordersRoute).toContain('sortFieldSql(sort.field)')
+    expect(ordersRoute).not.toContain('if (field ===')
+    expect(ordersRoute).not.toContain('jsonb_array_elements')
+  })
+
+  it('still parses for a non-products table', () => {
+    expect(() =>
+      parse(generatePostgreSQLFetcher(PG_CONFIG, 'teleport_orders'), { sourceType: 'module' })
+    ).not.toThrow()
+  })
+})
+
+describe('the discount ordering', () => {
+  const sql = buildProductDiscountPercentageSql()
+
+  it('sorts on the real `discounts` column, never a virtual field name', () => {
+    // The same field reaches sixteen other fetchers and the editor's data API,
+    // none of which know about the rewrite. A name that is not a column becomes
+    // `ORDER BY discount` and fails the entire query; the real column can only
+    // ever be ordered by uselessly.
+    expect(PRODUCT_DISCOUNT_SORT_FIELD).toBe('discounts')
+    expect(generateSortFieldSqlHelper('teleport_products')).toContain('if (field === "discounts")')
+  })
+
+  it('measures the markdown as a percentage of the list price', () => {
+    // Comparable across a mixed catalogue: $20 off a $2000 sofa is a worse deal
+    // than $5 off a $10 mug, and an absolute saving would rank them backwards.
+    expect(sql).toContain('* 100')
+    expect(sql).toContain('/ "price"::numeric')
+    expect(sql).toContain(buildProductEffectivePriceSql())
+  })
+
+  it('cannot divide by zero, and treats a priceless row as undiscounted', () => {
+    // `NULL > 0` is NULL, which is not true — so a NULL price takes the ELSE.
+    expect(sql).toContain('WHEN "price"::numeric > 0')
+    expect(sql).toContain('ELSE 0')
+  })
+
+  it('rounds, so ties are stable rather than floating-point noise', () => {
+    expect(sql).toContain('ROUND(')
+    expect(sql).toContain(', 4)')
+  })
+})
+
+describe('degrading safely', () => {
+  it('falls back to a column that is certain to exist', () => {
+    const helper = generateSortFallbackFieldHelper('teleport_products')
+    // Never back to `discounts` itself: it is the JSON column, and a store
+    // provisioned before discounts shipped does not have it at all — retrying
+    // with it would fail exactly like the expression did.
+    expect(helper).toContain('if (field === "price" || field === "discounts")')
+    expect(helper).toContain('return "price"')
+  })
+
+  it('leaves other tables and other fields alone', () => {
+    const helper = generateSortFallbackFieldHelper('teleport_orders')
+    expect(helper).not.toContain('if (field ===')
+    expect(helper).toContain('return field')
+  })
+
+  it('is valid JS for both tables', () => {
+    expect(() =>
+      parse(generateSortFallbackFieldHelper('teleport_products'), { sourceType: 'script' })
+    ).not.toThrow()
+    expect(() =>
+      parse(generateSortFallbackFieldHelper('teleport_orders'), { sourceType: 'script' })
+    ).not.toThrow()
+  })
+})
+
+describe('stable pagination', () => {
+  it('breaks ties on the products table so pages cannot repeat or skip rows', () => {
+    // "Sort by discount" ties every undiscounted product at zero. Equal rows
+    // with no defined order can appear on two pages, or on none.
+    expect(generateSortTiebreakSql('teleport_products')).toBe(', "id" ASC')
+  })
+
+  it('adds nothing to a table it does not own', () => {
+    expect(generateSortTiebreakSql('teleport_orders')).toBe('')
+  })
+
+  it('is applied to both the real and the fallback ORDER BY', () => {
+    const route = generatePostgreSQLFetcher(PG_CONFIG, 'teleport_products')
+    const orderByLines = route
+      .split('\n')
+      .filter((line) => line.includes('ORDER BY') && line.includes('join'))
+    expect(orderByLines).toHaveLength(2)
+    orderByLines.forEach((line) => expect(line).toContain('"id" ASC'))
+  })
+})
+
+/**
+ * The half of this that was missed the first time.
+ *
+ * A generated storefront's products table is TELEPORT-hosted, so its route is
+ * built by `generateTeleportFetcher` — not by `generatePostgreSQLFetcher`,
+ * which every test above exercises. The rewrite went into the Postgres fetcher
+ * alone, so a real store still ordered by the undiscounted list price while the
+ * whole suite passed.
+ *
+ * These tests go through `generateFetcher`, the function the project generator
+ * actually calls, so what is asserted is the route a store really ships.
+ */
+describe('the fetcher a generated storefront actually gets', () => {
+  const teleportProducts = generateDataSourceFetcher(
+    { type: 'teleport', config: { host: 'db', database: 'store' } },
+    'teleport_products'
+  )
+
+  it('is discount-aware for a teleport-hosted products table', () => {
+    expect(teleportProducts).toContain('sortFieldSql(sort.field)')
+    expect(teleportProducts).toContain('if (field === "price")')
+    expect(teleportProducts).toContain('if (field === "discounts")')
+    expect(teleportProducts).toContain('jsonb_array_elements')
+  })
+
+  it('keeps the plain-column fallback and the tiebreaker', () => {
+    expect(teleportProducts).toContain(
+      'const usedDiscountAwareSort = orderBySql !== plainOrderBySql'
+    )
+    expect(teleportProducts).toContain('if (!usedDiscountAwareSort) throw sortError')
+    expect(teleportProducts).toContain('baseSql + plainOrderBySql + sqlTail')
+    expect(teleportProducts).toContain('"id" ASC')
+  })
+
+  it('parses as valid JavaScript', () => {
+    expect(() => parse(teleportProducts, { sourceType: 'module', plugins: ['jsx'] })).not.toThrow()
+  })
+
+  it('leaves a teleport-hosted table that is not products alone', () => {
+    const orders = generateDataSourceFetcher(
+      { type: 'teleport', config: { host: 'db', database: 'store' } },
+      'teleport_orders'
+    )
+    expect(orders).not.toContain('if (field ===')
+    expect(orders).not.toContain('jsonb_array_elements')
+    expect(() => parse(orders, { sourceType: 'module', plugins: ['jsx'] })).not.toThrow()
+  })
+
+  it('is discount-aware for a self-hosted Postgres products table too', () => {
+    const pg = generateDataSourceFetcher(
+      { type: 'postgresql', config: PG_CONFIG },
+      'teleport_products'
+    )
+    expect(pg).toContain('if (field === "price")')
+  })
+
+  /**
+   * The guard that makes the miss above impossible to repeat: every SQL data
+   * source that can serve a products table must route its sorts through
+   * `sortFieldSql`. A new Postgres-compatible fetcher, or a rewrite of an
+   * existing one, fails here rather than silently shipping the list price.
+   */
+  it.each([
+    ['teleport', { host: 'db', database: 'store' }],
+    ['postgresql', PG_CONFIG],
+    ['cockroachdb', PG_CONFIG],
+  ])('routes %s sorts through the mapper', (type, config) => {
+    const route = generateDataSourceFetcher(
+      { type, config } as unknown as Parameters<typeof generateDataSourceFetcher>[0],
+      'teleport_products'
+    )
+    expect(route).toContain('sortFieldSql(sort.field)')
+    expect(route).not.toMatch(/return `\$\{sort\.field\} \$\{order\}`/)
+  })
+})
+
+describe('the teleport fetcher, directly', () => {
+  it('emits the helpers exactly once, so the route has no duplicate declaration', () => {
+    const route = generateTeleportFetcher({ host: 'db' }, 'teleport_products')
+    expect(route.split('function sortFieldSql(')).toHaveLength(2)
+    expect(route.split('function sortFallbackField(')).toHaveLength(2)
+  })
+
+  it('does not add an ORDER BY to the count query', () => {
+    // The count route shares this file; a tiebreaker or a sub-select there
+    // would be wasted work at best and a syntax error at worst.
+    const route = generateTeleportFetcher({ host: 'db' }, 'teleport_products')
+    const countBody = route.slice(route.indexOf('async function getCount'))
+    expect(countBody).not.toContain('ORDER BY ${')
+    expect(countBody).not.toContain('sortFieldSql(')
+  })
+})

package/__tests__/search-url-sync.test.ts

@@ -96,9 +96,12 @@ describe('pagination plugin — search input URL two-way sync (searchUrlParamKey
     // useRouter is injected for the effects.
     expect(code).toContain('const router = useRouter()')
 
-    // Write-back (debounced query → URL), keyed on the DEBOUNCED value.
-    expect(code).toContain('__nextQuery.searchKeyword = String(ds_0_state.debouncedQuery)')
-    expect(code).toContain('if (__nextQuery.searchKeyword === router.query.searchKeyword) return')
+    // Write-back (debounced query → URL), keyed on the DEBOUNCED value and
+    // routed through the shared writer so it cannot race the page's own write.
+    expect(code).toContain('const __tqQuerySyncRef = useRef(')
+    expect(code).toContain(
+      '__tqWriteQueryParam("searchKeyword", ds_0_state.debouncedQuery === "" || ds_0_state.debouncedQuery == null ? undefined : ds_0_state.debouncedQuery)'
+    )
     expect(code).toContain('}, [ds_0_state.debouncedQuery, router.isReady])')
 
     // Read-back (URL → input), functional setState bail-out (loop-free).
@@ -115,6 +118,7 @@ describe('pagination plugin — search input URL two-way sync (searchUrlParamKey
     expect(code).not.toContain('searchKeyword')
     expect(code).not.toContain('window.location.search')
     expect(code).not.toContain('router.replace')
+    expect(code).not.toContain('__tqWriteQueryParam')
     expect(code).not.toContain('useRouter')
   })
 })

package/dist/cjs/array-mapper-pagination.d.ts

@@ -1,4 +1,13 @@
 import { UIDLElementNode, UIDLNode } from '@teleporthq/teleport-types';
+/**
+ * @deprecated Not part of the generation pipeline.
+ *
+ * Array-mapper pagination is generated by `pagination-plugin.ts` (with
+ * `numbered-pagination.ts`, `infinite-scroll.ts` and `pagination-controls.ts`).
+ * This module models an older client-side slicing design and is kept only
+ * because it is re-exported from the package index; nothing in the pipeline
+ * calls it. Add nothing here — the two would drift apart in silence.
+ */
 export interface ArrayMapperPaginationInfo {
     paginationNodeId: string;
     dataSourceIdentifier: string;

package/dist/cjs/array-mapper-pagination.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"array-mapper-pagination.d.ts","sourceRoot":"","sources":["../../src/array-mapper-pagination.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAGtE,MAAM,WAAW,yBAAyB;IACxC,gBAAgB,EAAE,MAAM,CAAA;IACxB,oBAAoB,EAAE,MAAM,CAAA;IAC5B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAChC,YAAY,EAAE,MAAM,CAAA;IACpB,eAAe,EAAE,MAAM,CAAA;IACvB,cAAc,EAAE,MAAM,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,gBAAgB,EAAE,MAAM,CAAA;IACxB,aAAa,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,uBAAuB,CAAC,EAAE,MAAM,CAAA;IAChC,0BAA0B,CAAC,EAAE,MAAM,CAAA;IACnC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;CACxB;AAED,MAAM,WAAW,kBAAkB;IACjC,cAAc,EAAE,eAAe,CAAA;IAC/B,oBAAoB,EAAE,MAAM,CAAA;IAC5B,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,eAAe,GAAG,IAAI,CAAA;IAClC,UAAU,EAAE,eAAe,GAAG,IAAI,CAAA;CACnC;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,QAAQ,GAAG,kBAAkB,EAAE,CA2CxE;AAED,wBAAgB,uBAAuB,CACrC,gBAAgB,EAAE,MAAM,EACxB,oBAAoB,EAAE,MAAM,EAC5B,OAAO,GAAE,MAAW,EACpB,YAAY,CAAC,EAAE;IAAE,aAAa,EAAE,OAAO,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,EACjE,YAAY,CAAC,EAAE,MAAM,EAAE,GACtB,yBAAyB,CA+B3B"}
+{"version":3,"file":"array-mapper-pagination.d.ts","sourceRoot":"","sources":["../../src/array-mapper-pagination.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAGtE;;;;;;;;GAQG;AAEH,MAAM,WAAW,yBAAyB;IACxC,gBAAgB,EAAE,MAAM,CAAA;IACxB,oBAAoB,EAAE,MAAM,CAAA;IAC5B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAChC,YAAY,EAAE,MAAM,CAAA;IACpB,eAAe,EAAE,MAAM,CAAA;IACvB,cAAc,EAAE,MAAM,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,gBAAgB,EAAE,MAAM,CAAA;IACxB,aAAa,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,uBAAuB,CAAC,EAAE,MAAM,CAAA;IAChC,0BAA0B,CAAC,EAAE,MAAM,CAAA;IACnC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;CACxB;AAED,MAAM,WAAW,kBAAkB;IACjC,cAAc,EAAE,eAAe,CAAA;IAC/B,oBAAoB,EAAE,MAAM,CAAA;IAC5B,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,eAAe,GAAG,IAAI,CAAA;IAClC,UAAU,EAAE,eAAe,GAAG,IAAI,CAAA;CACnC;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,QAAQ,GAAG,kBAAkB,EAAE,CA2CxE;AAED,wBAAgB,uBAAuB,CACrC,gBAAgB,EAAE,MAAM,EACxB,oBAAoB,EAAE,MAAM,EAC5B,OAAO,GAAE,MAAW,EACpB,YAAY,CAAC,EAAE;IAAE,aAAa,EAAE,OAAO,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,EACjE,YAAY,CAAC,EAAE,MAAM,EAAE,GACtB,yBAAyB,CA+B3B"}

package/dist/cjs/array-mapper-pagination.js.map

@@ -1 +1 @@
-{"version":3,"file":"array-mapper-pagination.js","sourceRoot":"","sources":["../../src/array-mapper-pagination.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"array-mapper-pagination.js","sourceRoot":"","sources":["../../src/array-mapper-pagination.ts"],"names":[],"mappings":"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"}

package/dist/cjs/count-effect.d.ts

@@ -0,0 +1,42 @@
+import * as types from '@babel/types';
+/**
+ * The client-side "how many rows match?" fetch that drives `ds_N_maxPages`.
+ *
+ * One builder for every caller, because the two hand-written copies had already
+ * drifted: the search-enabled list sent the query, the columns and the filters,
+ * while the paginated-only list fetched a bare `/api/<file>-count` with NO
+ * params at all — so a filtered list counted the WHOLE table and "Next" stayed
+ * enabled long past the end of the filtered results.
+ *
+ * The endpoint deliberately receives no `sorts` and no `limit`: ordering cannot
+ * change how many rows match, and a limit would count the page rather than the
+ * result set.
+ */
+interface CountEffectOptions {
+    /** `<fileName>-count` is the generated API route. */
+    fileName: string;
+    /** Divisor for the page count; the mapper's resolved `perPage`. */
+    perPage: number;
+    /** Name of the `setDs_N_maxPages` setter. */
+    setMaxPagesVar: string;
+    /**
+     * Params sent to the count endpoint: the search query (when the list has
+     * one), `queryColumns`, and the filter array. Built by the caller because
+     * only it knows how this usage's filter destinations resolve to expressions.
+     */
+    urlParams: types.ObjectProperty[];
+    /** Dependencies that should re-run the count. */
+    deps: types.Expression[];
+}
+export declare const buildCountFetchStatement: (options: Pick<CountEffectOptions, 'fileName' | 'perPage' | 'setMaxPagesVar' | 'urlParams'>) => types.Statement;
+/**
+ * The whole `useEffect(...)` wrapper.
+ *
+ * ⛔ No skip-on-mount guard, on purpose: a page seeds `maxPages` from the
+ * build-time `getStaticProps` count, and that snapshot goes stale the moment
+ * rows are added after the build — leaving "Next" disabled on a list that has
+ * grown. Re-counting on mount is what corrects it.
+ */
+export declare const buildCountFetchEffect: (options: CountEffectOptions) => types.ExpressionStatement;
+export {};
+//# sourceMappingURL=count-effect.d.ts.map

package/dist/cjs/count-effect.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"count-effect.d.ts","sourceRoot":"","sources":["../../src/count-effect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC;;;;;;;;;;;;GAYG;AAEH,UAAU,kBAAkB;IAC1B,qDAAqD;IACrD,QAAQ,EAAE,MAAM,CAAA;IAChB,mEAAmE;IACnE,OAAO,EAAE,MAAM,CAAA;IACf,6CAA6C;IAC7C,cAAc,EAAE,MAAM,CAAA;IACtB;;;;OAIG;IACH,SAAS,EAAE,KAAK,CAAC,cAAc,EAAE,CAAA;IACjC,iDAAiD;IACjD,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE,CAAA;CACzB;AA6BD,eAAO,MAAM,wBAAwB,YAC1B,KAAK,kBAAkB,EAAE,UAAU,GAAG,SAAS,GAAG,gBAAgB,GAAG,WAAW,CAAC,KACzF,MAAM,SA0DN,CAAA;AAEH;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,YAAa,kBAAkB,KAAG,MAAM,mBAMvE,CAAA"}