@teleporthq/teleport-plugin-next-data-source 0.43.74 → 0.44.0

package/dist/cjs/fetchers/teleport.js

@@ -4,12 +4,15 @@ exports.generateTeleportCountFetcher = exports.generateTeleportFetcher = exports
 var utils_1 = require("../utils");
 var transformations_1 = require("../transformations");
 var product_price_sort_1 = require("../product-price-sort");
+var list_sort_order_1 = require("../list-sort-order");
+var row_order_1 = require("../row-order");
 var product_filter_fields_1 = require("../product-filter-fields");
 var localized_columns_1 = require("../localized-columns");
 var request_locale_1 = require("../request-locale");
 var table_access_guard_1 = require("./utils/table-access-guard");
 var request_sql_guards_1 = require("./utils/request-sql-guards");
 var array_overlap_sql_1 = require("../array-overlap-sql");
+var pg_client_import_1 = require("./pg-client-import");
 var DEFAULT_ENV_KEYS = {
     host: 'TELEPORT_DB_HOST',
     port: 'TELEPORT_DB_PORT',
@@ -56,9 +59,9 @@ var generateTeleportFetcher = function (config, tableName, transformOptions) {
                 ? "key: ".concat(resolveEnvReference(dbConfig.sslConfig.key, 'TELEPORT_DB_SSL_KEY'), ",")
                 : '', "\n      rejectUnauthorized: false\n    }")
             : "(process.env.".concat(DEFAULT_ENV_KEYS.ssl, " === 'false' ? false : process.env.").concat(DEFAULT_ENV_KEYS.ssl, " === 'true' ? { rejectUnauthorized: false } : undefined)");
-    return "import { Client } from 'pg'\n\n".concat((0, table_access_guard_1.generateTableAccessPreamble)(transformOptions.trustedReaderRoles || []), "\nfunction normalizePostgresConnectionString(connectionString) {\n  if (!connectionString || typeof connectionString !== 'string') return connectionString;\n  if (/^postgresql:\\/(?!\\/)/i.test(connectionString)) {\n    return connectionString.replace(/^postgresql:\\//i, 'postgresql://');\n  }\n  return connectionString;\n}\n\nfunction stripSslQueryParamsFromConnectionString(connectionString) {\n  if (!connectionString || typeof connectionString !== 'string') return connectionString;\n  try {\n    var u = new URL(connectionString.replace(/^postgresql:/i, 'postgres:'));\n    u.searchParams.delete('sslmode');\n    u.searchParams.delete('ssl');\n    u.searchParams.delete('sslrootcert');\n    u.searchParams.delete('sslcert');\n    u.searchParams.delete('sslkey');\n    return u.toString().replace(/^postgres:/i, 'postgresql:');\n  } catch (e) {\n    return connectionString;\n  }\n}\n\nconst getClient = () => {\n  var ssl = ").concat(sslCode, ";\n  var connStr = process.env.TELEPORT_DB_CONNECTION_STRING;\n  if (connStr) {\n    connStr = normalizePostgresConnectionString(connStr);\n  }\n  if (ssl === false && connStr) {\n    connStr = stripSslQueryParamsFromConnectionString(connStr);\n  }\n  if (connStr) {\n    return new Client(Object.assign(\n      { connectionString: connStr },\n      ssl !== undefined ? { ssl: ssl } : {}\n    ));\n  }\n  return new Client(Object.assign(\n    {\n      host: ").concat(hostRef, ",\n      port: parseInt(").concat(portRef, " || '5432', 10),\n      user: ").concat(userRef, ",\n      password: ").concat(passwordRef, ",\n      database: ").concat(databaseRef, ",\n    },\n    ssl !== undefined ? { ssl: ssl } : {}\n  ));\n}\n\n").concat((0, utils_1.generateSafeJSONParseCode)(), "\n\n").concat((0, utils_1.generateFilterTreeHelpersCode)(), "\n\n").concat((0, utils_1.generateSearchEscapeHelpersCode)(), "\n").concat((0, array_overlap_sql_1.generateArrayOverlapSqlCode)(), "\n").concat((0, transformations_1.getTransformationCode)(tableName, transformOptions), "\n").concat((0, transformations_1.getTransformWrapperCode)(tableName, transformOptions), "\n").concat((0, request_sql_guards_1.generateRequestSqlGuardsCode)(), "\nconst processFilters = (filters, conditions, queryParams, paramIndex) => {\n  if (!filters) return paramIndex\n  \n  const filterTree = normalizeFilterTree(safeJSONParse(filters))\n  if (!filterTree) return paramIndex\n  \n  const buildCondition = (condition) => {\n    const field = condition.source\n    const normalizedCondition = normalizeInOperand(condition.operand, condition.destination)\n    if (normalizedCondition === null) return null\n    const value = normalizedCondition.value\n    const operand = normalizedCondition.operand\n    \n    // The products table's virtual fields (effective price, rating bucket,\n    // on-sale flag, variant axes) are whole clauses, not columns - so they are\n    // answered before any branch below can interpolate the field name raw.\n    const productClause = productFilterClause(field, operand, value, (param) => {\n      queryParams.push(param)\n      return '$' + paramIndex++\n    })\n    if (productClause !== null) return productClause\n\n    // A translatable column is compared against the value in every language,\n    // so a localized slug resolves under any locale - see localized-columns.ts.\n    const localizedClause = localizedEqualityClause(field, operand, value, (param) => {\n      queryParams.push(param)\n      return '$' + paramIndex++\n    })\n    if (localizedClause !== null) return localizedClause\n    assertRequestColumn(field, 'filter field')\n    \n    if (Array.isArray(value)) {\n      if (value.length === 0) return null\n      if (operand === 'array_overlap') {\n        // The row's list (see array-overlap-sql.ts) shares any value with the set.\n        const clause = arrayOverlapSql((localizedColumnList(field) || [field]), '$' + paramIndex)\n        queryParams.push(value.map((entry) => String(entry)))\n        paramIndex++\n        return clause\n      }\n      const placeholders = value.map(() => `$${paramIndex++}`)\n      queryParams.push(...value)\n      return operand === '!='\n        ? `${field} NOT IN (${placeholders.join(', ')})`\n        : `${field} IN (${placeholders.join(', ')})`\n    }\n    \n    if (operand === 'array_overlap') {\n      if (value === '' || value === null || value === undefined) return null\n      // A single comma-joined string (the multi-select Category Filter's\n      // ?categoryFilter=a,b,c) expands to multiple ids; one id stays one.\n      const overlapValues = String(value).split(',').map((entry) => entry.trim()).filter(Boolean)\n      if (overlapValues.length === 0) return null\n      const clause = arrayOverlapSql((localizedColumnList(field) || [field]), '$' + paramIndex)\n      queryParams.push(overlapValues)\n      paramIndex++\n      return clause\n    }\n    \n    if (value === null) {\n      if (operand === '=') return `${field} IS NULL`\n      if (operand === '!=') return `${field} IS NOT NULL`\n      return null\n    }\n    \n    const validOps = ['=', '!=', '>', '<', '>=', '<=']\n    const sqlOperator = validOps.includes(operand) ? operand : '='\n    const clause = `${field} ${sqlOperator} $${paramIndex}`\n    queryParams.push(value)\n    paramIndex++\n    return clause\n  }\n  \n  const clause = buildFilterTreeClause(filterTree, buildCondition)\n  if (clause) conditions.push(clause)\n  \n  return paramIndex\n}\n\n").concat((0, utils_1.generateDateFormatterCode)(), "\n\n").concat((0, product_price_sort_1.generateSortFieldSqlHelper)(tableName), "\n\n").concat((0, product_price_sort_1.generateSortFallbackFieldHelper)(tableName), "\n\n").concat((0, product_filter_fields_1.generateProductFilterClauseHelper)(tableName), "\n\n").concat((0, localized_columns_1.generateLocalizedColumnsHelper)(localizedColumns), "\n\n// Matches DDL / dangerous statements the raw-query branch should refuse.\n// Keep this list conservative \u2014 anything destructive or schema-changing is\n// out of scope for a client-triggered fetch. SELECT and CTEs (WITH ...) are\n// the only shapes consumers legitimately need.\nconst BLOCKED_RAW_QUERY_PATTERNS = [\n  /\\bcreate\\s+(?:temporary\\s+|temp\\s+|unlogged\\s+|global\\s+|local\\s+)?table\\b/i,\n  /\\bcreate\\s+(?:unique\\s+)?index\\b/i,\n  /\\bcreate\\s+(?:or\\s+replace\\s+)?(?:materialized\\s+)?view\\b/i,\n  /\\bcreate\\s+(?:or\\s+replace\\s+)?trigger\\b/i,\n  /\\bcreate\\s+(?:or\\s+replace\\s+)?(?:aggregate\\s+)?function\\b/i,\n  /\\bcreate\\s+(?:or\\s+replace\\s+)?procedure\\b/i,\n  /\\bcreate\\s+(?:database|schema|sequence|extension|type|role|user)\\b/i,\n  /\\bdrop\\s+(?:table|view|index|schema|database|sequence|trigger|function|procedure|role|user|extension|type|materialized)\\b/i,\n  /\\balter\\s+(?:table|view|index|schema|database|sequence|role|user|system)\\b/i,\n  /\\btruncate\\b/i,\n  /\\bgrant\\b/i,\n  /\\brevoke\\b/i,\n  /\\binsert\\b/i,\n  /\\bupdate\\b/i,\n  /\\bdelete\\b/i,\n  /\\bcopy\\b/i,\n  /\\bvacuum\\b/i,\n  /\\breindex\\b/i,\n  /\\bcluster\\b/i,\n]\n\nfunction assertRawQuerySafe(rawQuery) {\n  if (typeof rawQuery !== 'string' || rawQuery.length === 0) {\n    throw new Error('rawQuery must be a non-empty string')\n  }\n  // Reject multi-statement payloads \u2014 only single SELECT / WITH statements.\n  // A trailing semicolon is tolerated but any content after it fails.\n  var trimmed = rawQuery.trim().replace(/;\\s*$/, '')\n  if (trimmed.indexOf(';') !== -1) {\n    throw new Error('rawQuery must contain exactly one statement')\n  }\n  for (var i = 0; i < BLOCKED_RAW_QUERY_PATTERNS.length; i++) {\n    if (BLOCKED_RAW_QUERY_PATTERNS[i].test(trimmed)) {\n      throw new Error('rawQuery contains a blocked statement')\n    }\n  }\n}\n\nexport default async function handler(req, res) {\n").concat((0, table_access_guard_1.generateReadGuardCall)(tableName, 'req.query && req.query.rawQuery'), "\n  const client = getClient()\n\n  try {\n    await client.connect()\n    ").concat(schema ? "await client.query('SET search_path TO ".concat(schema, "')") : '', "\n\n    // If the caller supplied a rawQuery, run it verbatim (after a safety\n    // guard). The schema-driven branch below builds `SELECT * FROM ").concat(tableName, "`\n    // with optional filters \u2014 it's the default read path and ignores\n    // rawQuery. Page-load workflows and other consumers that need a JOIN\n    // or a user-scoped filter pass their fully-rendered SQL here via\n    // `fetchData({ rawQuery })` and expect it to execute verbatim.\n    if (req.query && typeof req.query.rawQuery === 'string' && req.query.rawQuery.length > 0) {\n      assertRawQuerySafe(req.query.rawQuery)\n      const rawResult = await client.query(req.query.rawQuery)\n      const rawRows = Array.isArray(rawResult?.rows) ? rawResult.rows : []\n      const rawPlain = rawRows.map((row) =>\n        row && typeof row.toJSON === 'function' ? row.toJSON() : row\n      )\n      const rawSafe = JSON.parse(JSON.stringify(rawPlain, dateReplacer))\n      return res.status(200).json({\n        success: true,\n        // Every row here ends up in a browser (a page's props or a client\n        // refetch), so no credential column survives, whatever joined it.\n        data: __taWithoutCredentials(rawSafe, null),\n        timestamp: Date.now()\n      })\n    }\n\n    const { query, queryColumns, limit, page, perPage, sortBy, sortOrder, filters, sorts, offset } = req.query\n    // A visitor never filters, sorts or searches by a column it is not served.\n    if (__rowPolicy) __brpAssertVisibleFields(__rowPolicy, req.query)\n    // The language the page is in - what a translatable sort orders by.\n    const requestLocale = typeof req.query.").concat(request_locale_1.REQUEST_LOCALE_PARAM, " === 'string' ? req.query.").concat(request_locale_1.REQUEST_LOCALE_PARAM, " : null\n    \n    const conditions = []\n    const queryParams = []\n    let paramIndex = 1\n    \n    if (query) {\n      let columns = []\n      \n      if (queryColumns) {\n        const parsed = safeJSONParse(queryColumns)\n        columns = Array.isArray(parsed) ? parsed : (parsed ? [parsed] : [])\n      } else {\n        try {\n          const schemaQuery = `\n            SELECT column_name \n            FROM information_schema.columns \n            WHERE table_name = $1\n            ").concat(schema ? "AND table_schema = $2" : '', "\n            ORDER BY ordinal_position\n          `\n          const schemaParams = ").concat(schema
+    return "".concat(pg_client_import_1.PG_CLIENT_IMPORT, "\n\n").concat((0, table_access_guard_1.generateTableAccessPreamble)(transformOptions.trustedReaderRoles || []), "\nfunction normalizePostgresConnectionString(connectionString) {\n  if (!connectionString || typeof connectionString !== 'string') return connectionString;\n  if (/^postgresql:\\/(?!\\/)/i.test(connectionString)) {\n    return connectionString.replace(/^postgresql:\\//i, 'postgresql://');\n  }\n  return connectionString;\n}\n\nfunction stripSslQueryParamsFromConnectionString(connectionString) {\n  if (!connectionString || typeof connectionString !== 'string') return connectionString;\n  try {\n    var u = new URL(connectionString.replace(/^postgresql:/i, 'postgres:'));\n    u.searchParams.delete('sslmode');\n    u.searchParams.delete('ssl');\n    u.searchParams.delete('sslrootcert');\n    u.searchParams.delete('sslcert');\n    u.searchParams.delete('sslkey');\n    return u.toString().replace(/^postgres:/i, 'postgresql:');\n  } catch (e) {\n    return connectionString;\n  }\n}\n\nconst getClient = () => {\n  var ssl = ").concat(sslCode, ";\n  var connStr = process.env.TELEPORT_DB_CONNECTION_STRING;\n  if (connStr) {\n    connStr = normalizePostgresConnectionString(connStr);\n  }\n  if (ssl === false && connStr) {\n    connStr = stripSslQueryParamsFromConnectionString(connStr);\n  }\n  if (connStr) {\n    return new Client(Object.assign(\n      { connectionString: connStr },\n      ssl !== undefined ? { ssl: ssl } : {}\n    ));\n  }\n  return new Client(Object.assign(\n    {\n      host: ").concat(hostRef, ",\n      port: parseInt(").concat(portRef, " || '5432', 10),\n      user: ").concat(userRef, ",\n      password: ").concat(passwordRef, ",\n      database: ").concat(databaseRef, ",\n    },\n    ssl !== undefined ? { ssl: ssl } : {}\n  ));\n}\n\n").concat((0, utils_1.generateSafeJSONParseCode)(), "\n\n").concat((0, utils_1.generateFilterTreeHelpersCode)(), "\n\n").concat((0, utils_1.generateSearchEscapeHelpersCode)(), "\n").concat((0, array_overlap_sql_1.generateArrayOverlapSqlCode)(), "\n").concat((0, transformations_1.getTransformationCode)(tableName, transformOptions), "\n").concat((0, transformations_1.getTransformWrapperCode)(tableName, transformOptions), "\n").concat((0, request_sql_guards_1.generateRequestSqlGuardsCode)(), "\nconst processFilters = (filters, conditions, queryParams, paramIndex) => {\n  if (!filters) return paramIndex\n  \n  const filterTree = normalizeFilterTree(safeJSONParse(filters))\n  if (!filterTree) return paramIndex\n  \n  const buildCondition = (condition) => {\n    const field = condition.source\n    const normalizedCondition = normalizeInOperand(condition.operand, condition.destination)\n    if (normalizedCondition === null) return null\n    const value = normalizedCondition.value\n    const operand = normalizedCondition.operand\n    \n    // The products table's virtual fields (effective price, rating bucket,\n    // on-sale flag, variant axes) are whole clauses, not columns - so they are\n    // answered before any branch below can interpolate the field name raw.\n    const productClause = productFilterClause(field, operand, value, (param) => {\n      queryParams.push(param)\n      return '$' + paramIndex++\n    })\n    if (productClause !== null) return productClause\n\n    // A translatable column is compared against the value in every language,\n    // so a localized slug resolves under any locale - see localized-columns.ts.\n    const localizedClause = localizedEqualityClause(field, operand, value, (param) => {\n      queryParams.push(param)\n      return '$' + paramIndex++\n    })\n    if (localizedClause !== null) return localizedClause\n    assertRequestColumn(field, 'filter field')\n    \n    if (Array.isArray(value)) {\n      if (value.length === 0) return null\n      if (operand === 'array_overlap') {\n        // The row's list (see array-overlap-sql.ts) shares any value with the set.\n        const clause = arrayOverlapSql((localizedColumnList(field) || [field]), '$' + paramIndex)\n        queryParams.push(value.map((entry) => String(entry)))\n        paramIndex++\n        return clause\n      }\n      const placeholders = value.map(() => `$${paramIndex++}`)\n      queryParams.push(...value)\n      return operand === '!='\n        ? `${field} NOT IN (${placeholders.join(', ')})`\n        : `${field} IN (${placeholders.join(', ')})`\n    }\n    \n    if (operand === 'array_overlap') {\n      if (value === '' || value === null || value === undefined) return null\n      // A single comma-joined string (the multi-select Category Filter's\n      // ?categoryFilter=a,b,c) expands to multiple ids; one id stays one.\n      const overlapValues = String(value).split(',').map((entry) => entry.trim()).filter(Boolean)\n      if (overlapValues.length === 0) return null\n      const clause = arrayOverlapSql((localizedColumnList(field) || [field]), '$' + paramIndex)\n      queryParams.push(overlapValues)\n      paramIndex++\n      return clause\n    }\n    \n    if (value === null) {\n      if (operand === '=') return `${field} IS NULL`\n      if (operand === '!=') return `${field} IS NOT NULL`\n      return null\n    }\n    \n    const validOps = ['=', '!=', '>', '<', '>=', '<=']\n    const sqlOperator = validOps.includes(operand) ? operand : '='\n    const clause = `${field} ${sqlOperator} $${paramIndex}`\n    queryParams.push(value)\n    paramIndex++\n    return clause\n  }\n  \n  const clause = buildFilterTreeClause(filterTree, buildCondition)\n  if (clause) conditions.push(clause)\n  \n  return paramIndex\n}\n\n").concat((0, utils_1.generateDateFormatterCode)(), "\n\n").concat((0, product_price_sort_1.generateSortFieldSqlHelper)(tableName), "\n\n").concat((0, product_price_sort_1.generateSortFallbackFieldHelper)(tableName), "\n\n").concat((0, row_order_1.generateRowOrderTiebreakHelper)((0, row_order_1.rowIdentityColumn)(config, tableName)), "\n\n").concat((0, product_filter_fields_1.generateProductFilterClauseHelper)(tableName), "\n\n").concat((0, localized_columns_1.generateLocalizedColumnsHelper)(localizedColumns), "\n\n// Matches DDL / dangerous statements the raw-query branch should refuse.\n// Keep this list conservative \u2014 anything destructive or schema-changing is\n// out of scope for a client-triggered fetch. SELECT and CTEs (WITH ...) are\n// the only shapes consumers legitimately need.\nconst BLOCKED_RAW_QUERY_PATTERNS = [\n  /\\bcreate\\s+(?:temporary\\s+|temp\\s+|unlogged\\s+|global\\s+|local\\s+)?table\\b/i,\n  /\\bcreate\\s+(?:unique\\s+)?index\\b/i,\n  /\\bcreate\\s+(?:or\\s+replace\\s+)?(?:materialized\\s+)?view\\b/i,\n  /\\bcreate\\s+(?:or\\s+replace\\s+)?trigger\\b/i,\n  /\\bcreate\\s+(?:or\\s+replace\\s+)?(?:aggregate\\s+)?function\\b/i,\n  /\\bcreate\\s+(?:or\\s+replace\\s+)?procedure\\b/i,\n  /\\bcreate\\s+(?:database|schema|sequence|extension|type|role|user)\\b/i,\n  /\\bdrop\\s+(?:table|view|index|schema|database|sequence|trigger|function|procedure|role|user|extension|type|materialized)\\b/i,\n  /\\balter\\s+(?:table|view|index|schema|database|sequence|role|user|system)\\b/i,\n  /\\btruncate\\b/i,\n  /\\bgrant\\b/i,\n  /\\brevoke\\b/i,\n  /\\binsert\\b/i,\n  /\\bupdate\\b/i,\n  /\\bdelete\\b/i,\n  /\\bcopy\\b/i,\n  /\\bvacuum\\b/i,\n  /\\breindex\\b/i,\n  /\\bcluster\\b/i,\n]\n\nfunction assertRawQuerySafe(rawQuery) {\n  if (typeof rawQuery !== 'string' || rawQuery.length === 0) {\n    throw new Error('rawQuery must be a non-empty string')\n  }\n  // Reject multi-statement payloads \u2014 only single SELECT / WITH statements.\n  // A trailing semicolon is tolerated but any content after it fails.\n  var trimmed = rawQuery.trim().replace(/;\\s*$/, '')\n  if (trimmed.indexOf(';') !== -1) {\n    throw new Error('rawQuery must contain exactly one statement')\n  }\n  for (var i = 0; i < BLOCKED_RAW_QUERY_PATTERNS.length; i++) {\n    if (BLOCKED_RAW_QUERY_PATTERNS[i].test(trimmed)) {\n      throw new Error('rawQuery contains a blocked statement')\n    }\n  }\n}\n\nexport default async function handler(req, res) {\n").concat((0, table_access_guard_1.generateReadGuardCall)(tableName, 'req.query && req.query.rawQuery'), "\n  const client = getClient()\n\n  try {\n    await client.connect()\n    ").concat(schema ? "await client.query('SET search_path TO ".concat(schema, "')") : '', "\n\n    // If the caller supplied a rawQuery, run it verbatim (after a safety\n    // guard). The schema-driven branch below builds `SELECT * FROM ").concat(tableName, "`\n    // with optional filters \u2014 it's the default read path and ignores\n    // rawQuery. Page-load workflows and other consumers that need a JOIN\n    // or a user-scoped filter pass their fully-rendered SQL here via\n    // `fetchData({ rawQuery })` and expect it to execute verbatim.\n    if (req.query && typeof req.query.rawQuery === 'string' && req.query.rawQuery.length > 0) {\n      assertRawQuerySafe(req.query.rawQuery)\n      const rawResult = await client.query(req.query.rawQuery)\n      const rawRows = Array.isArray(rawResult?.rows) ? rawResult.rows : []\n      const rawPlain = rawRows.map((row) =>\n        row && typeof row.toJSON === 'function' ? row.toJSON() : row\n      )\n      const rawSafe = JSON.parse(JSON.stringify(rawPlain, dateReplacer))\n      return res.status(200).json({\n        success: true,\n        // Every row here ends up in a browser (a page's props or a client\n        // refetch), so no credential column survives, whatever joined it.\n        data: __taWithoutCredentials(rawSafe, null),\n        timestamp: Date.now()\n      })\n    }\n\n    const { query, queryColumns, limit, page, perPage, sortBy, sortOrder, filters, sorts, offset } = req.query\n    // A visitor never filters, sorts or searches by a column it is not served.\n    if (__rowPolicy) __brpAssertVisibleFields(__rowPolicy, req.query)\n    // The language the page is in - what a translatable sort orders by.\n    const requestLocale = typeof req.query.").concat(request_locale_1.REQUEST_LOCALE_PARAM, " === 'string' ? req.query.").concat(request_locale_1.REQUEST_LOCALE_PARAM, " : null\n    \n    const conditions = []\n    const queryParams = []\n    let paramIndex = 1\n    \n    if (query) {\n      let columns = []\n      \n      if (queryColumns) {\n        const parsed = safeJSONParse(queryColumns)\n        columns = Array.isArray(parsed) ? parsed : (parsed ? [parsed] : [])\n      } else {\n        try {\n          const schemaQuery = `\n            SELECT column_name \n            FROM information_schema.columns \n            WHERE table_name = $1\n            ").concat(schema ? "AND table_schema = $2" : '', "\n            ORDER BY ordinal_position\n          `\n          const schemaParams = ").concat(schema
         ? "[".concat(JSON.stringify(tableName), ", ").concat(JSON.stringify(schema), "]")
-        : "[".concat(JSON.stringify(tableName), "]"), "\n          \n          const schemaResult = await client.query(schemaQuery, schemaParams)\n          columns = schemaResult.rows.map(row => row.column_name)\n        } catch (schemaError) {\n          console.warn('Failed to fetch column names from information_schema:', schemaError.message)\n        }\n      }\n      if (__rowPolicy) columns = __brpVisibleColumns(__rowPolicy, columns)\n      \n      if (columns.length > 0) {\n        const pattern = '%' + escapeLikePattern(query) + '%'\n        const placeholder = '$' + paramIndex\n        paramIndex++\n        queryParams.push(pattern)\n        const searchConditions = columns.map(\n          (col) => '\"' + sanitizeSearchIdentifier(col) + '\"::text ILIKE ' + placeholder + \" ESCAPE '|'\"\n        )\n        conditions.push('(' + searchConditions.join(' OR ') + ')')\n      }\n    }\n    \n    paramIndex = processFilters(filters, conditions, queryParams, paramIndex)\n    if (__rowPolicy) conditions.push('(' + __rowPolicy.predicate + ')')\n    \n    let sql = `SELECT * FROM ").concat(tableName, "`\n    \n    if (conditions.length > 0) {\n      sql += ` WHERE ${conditions.join(' AND ')}`\n    }\n    \n    // Handle sorts - new array format. Two ORDER BY clauses are built: the one\n    // actually used (a translatable column in the request's language, the\n    // products table's price rewrites), and a plain-column twin kept only as\n    // the fallback below.\n    let orderBySql = ''\n    let plainOrderBySql = ''\n    if (sorts) {\n      const parsedSorts = safeJSONParse(sorts)\n      if (Array.isArray(parsedSorts) && parsedSorts.length > 0) {\n        const valid = parsedSorts.filter((sort) => sort && sort.field)\n        valid.forEach((sort) => assertRequestColumn(sort.field, 'sort field'))\n        const orderOf = (sort) => (sort.order || '').toUpperCase().startsWith('DESC') ? 'DESC' : 'ASC'\n        const orderClauses = valid.map((sort) => `${localizedSortFieldSql(sort.field, requestLocale) || sortFieldSql(sort.field)} ${orderOf(sort)}`)\n        const plainClauses = valid.map((sort) => `${sortFallbackField(sort.field)} ${orderOf(sort)}`)\n\n        if (orderClauses.length > 0) {\n          // A deterministic tiebreaker keeps pagination stable: \"sort by\n          // discount\" ties every undiscounted product at zero, and equal rows\n          // with no defined order can repeat across pages or vanish between them.\n          orderBySql = ` ORDER BY ${orderClauses.join(', ')}").concat((0, product_price_sort_1.generateSortTiebreakSql)(tableName), "`\n          plainOrderBySql = ` ORDER BY ${plainClauses.join(', ')}").concat((0, product_price_sort_1.generateSortTiebreakSql)(tableName), "`\n        }\n      }\n    } else if (sortBy) {\n      assertRequestColumn(sortBy, 'sort field')\n      const sortByDirection = (sortOrder || '').toUpperCase().startsWith('DESC') ? 'DESC' : 'ASC'\n      orderBySql = ` ORDER BY ${localizedSortFieldSql(sortBy, requestLocale) || sortBy} ${sortByDirection}`\n      plainOrderBySql = ` ORDER BY ${sortBy} ${sortByDirection}`\n    }\n    const usedDiscountAwareSort = orderBySql !== plainOrderBySql\n\n    const limitValue = requestRowCount(limit || perPage)\n    const offsetValue = offset !== undefined ? parseInt(offset) : (page && perPage ? (parseInt(page) - 1) * parseInt(perPage) : undefined)\n\n    let sqlTail = ''\n    if (limitValue !== undefined) {\n      sqlTail += ` LIMIT ${limitValue}`\n    }\n    \n    if (offsetValue !== undefined) {\n      sqlTail += ` OFFSET ${offsetValue}`\n    }\n\n    const baseSql = sql\n    sql = baseSql + orderBySql + sqlTail\n\n    // The discount-aware price ordering is an inline sub-select over a JSON\n    // column. It is written to be unraisable, but it runs inside ORDER BY for\n    // the whole table - so if a database ever rejects it, fall back to ordering\n    // by the stored list price rather than serving an empty products page. The\n    // translatable-column ordering takes the same exit: a per-language column\n    // the schema had at generation time may have been dropped since.\n    let result\n    try {\n      result = await client.query(sql, queryParams)\n    } catch (sortError) {\n      if (!usedDiscountAwareSort) throw sortError\n      console.warn(\n        'Rewritten sort failed; falling back to the plain column:',\n        sortError && sortError.message\n      )\n      result = await client.query(baseSql + plainOrderBySql + sqlTail, queryParams)\n    }\n    const rows = Array.isArray(result?.rows) ? result.rows : []\n    const plainRows = rows.map((row) =>\n      row && typeof row.toJSON === 'function' ? row.toJSON() : row\n    )\n    const safeData = JSON.parse(JSON.stringify(plainRows, dateReplacer))\n    ").concat((0, transformations_1.getTransformExpression)(tableName)
+        : "[".concat(JSON.stringify(tableName), "]"), "\n          \n          const schemaResult = await client.query(schemaQuery, schemaParams)\n          columns = schemaResult.rows.map(row => row.column_name)\n        } catch (schemaError) {\n          console.warn('Failed to fetch column names from information_schema:', schemaError.message)\n        }\n      }\n      if (__rowPolicy) columns = __brpVisibleColumns(__rowPolicy, columns)\n      \n      if (columns.length > 0) {\n        const pattern = '%' + escapeLikePattern(query) + '%'\n        const placeholder = '$' + paramIndex\n        paramIndex++\n        queryParams.push(pattern)\n        const searchConditions = columns.map(\n          (col) => '\"' + sanitizeSearchIdentifier(col) + '\"::text ILIKE ' + placeholder + \" ESCAPE '|'\"\n        )\n        conditions.push('(' + searchConditions.join(' OR ') + ')')\n      }\n    }\n    \n    paramIndex = processFilters(filters, conditions, queryParams, paramIndex)\n    if (__rowPolicy) conditions.push('(' + __rowPolicy.predicate + ')')\n    \n    let sql = `SELECT * FROM ").concat(tableName, "`\n    \n    if (conditions.length > 0) {\n      sql += ` WHERE ${conditions.join(' AND ')}`\n    }\n    \n    // Handle sorts - new array format. Two ORDER BY clauses are built: the one\n    // actually used (a translatable column in the request's language, the\n    // products table's price rewrites, rows without a value last), and a\n    // plain-column twin kept only as the fallback below.\n    let orderBySql = ''\n    let plainOrderBySql = ''\n    if (sorts) {\n      const parsedSorts = safeJSONParse(sorts)\n      if (Array.isArray(parsedSorts) && parsedSorts.length > 0) {\n        const valid = parsedSorts.filter((sort) => sort && sort.field)\n        valid.forEach((sort) => assertRequestColumn(sort.field, 'sort field'))\n        const orderOf = (sort) => (sort.order || '').toUpperCase().startsWith('DESC') ? 'DESC' : 'ASC'\n        const orderClauses = valid.map((sort) => `${localizedSortFieldSql(sort.field, requestLocale) || sortFieldSql(sort.field)} ${orderOf(sort)}").concat(list_sort_order_1.SORT_NULLS_LAST_SQL, "`)\n        const plainClauses = valid.map((sort) => `${sortFallbackField(sort.field)} ${orderOf(sort)}`)\n\n        if (orderClauses.length > 0) {\n          // The row's own key last, so equal rows can't repeat across pages\n          // or vanish between them.\n          const tiebreak = rowOrderTiebreak(valid.map((sort) => sort.field), orderOf(valid[valid.length - 1]))\n          orderBySql = ` ORDER BY ${orderClauses.join(', ')}${tiebreak}`\n          plainOrderBySql = ` ORDER BY ${plainClauses.join(', ')}${tiebreak}`\n        }\n      }\n    } else if (sortBy) {\n      assertRequestColumn(sortBy, 'sort field')\n      const sortByDirection = (sortOrder || '').toUpperCase().startsWith('DESC') ? 'DESC' : 'ASC'\n      const tiebreak = rowOrderTiebreak([sortBy], sortByDirection)\n      orderBySql = ` ORDER BY ${localizedSortFieldSql(sortBy, requestLocale) || sortBy} ${sortByDirection}").concat(list_sort_order_1.SORT_NULLS_LAST_SQL, "${tiebreak}`\n      plainOrderBySql = ` ORDER BY ${sortBy} ${sortByDirection}${tiebreak}`\n    }\n    const usedRewrittenSort = orderBySql !== plainOrderBySql\n\n    const limitValue = requestRowCount(limit || perPage)\n    const offsetValue = offset !== undefined ? parseInt(offset) : (page && perPage ? (parseInt(page) - 1) * parseInt(perPage) : undefined)\n\n    let sqlTail = ''\n    if (limitValue !== undefined) {\n      sqlTail += ` LIMIT ${limitValue}`\n    }\n    \n    if (offsetValue !== undefined) {\n      sqlTail += ` OFFSET ${offsetValue}`\n    }\n\n    const baseSql = sql\n    sql = baseSql + orderBySql + sqlTail\n\n    // The discount-aware price ordering is an inline sub-select over a JSON\n    // column. It is written to be unraisable, but it runs inside ORDER BY for\n    // the whole table - so if a database ever rejects it, fall back to ordering\n    // by the stored list price rather than serving an empty products page. The\n    // translatable-column ordering takes the same exit: a per-language column\n    // the schema had at generation time may have been dropped since. So does\n    // the empty-values-last ordering.\n    let result\n    try {\n      result = await client.query(sql, queryParams)\n    } catch (sortError) {\n      if (!usedRewrittenSort) throw sortError\n      console.warn(\n        'Rewritten sort failed; falling back to the plain column:',\n        sortError && sortError.message\n      )\n      result = await client.query(baseSql + plainOrderBySql + sqlTail, queryParams)\n    }\n    const rows = Array.isArray(result?.rows) ? result.rows : []\n    const plainRows = rows.map((row) =>\n      row && typeof row.toJSON === 'function' ? row.toJSON() : row\n    )\n    const safeData = JSON.parse(JSON.stringify(plainRows, dateReplacer))\n    ").concat((0, transformations_1.getTransformExpression)(tableName)
         ? "const transformedData = ".concat((0, transformations_1.getTransformExpression)(tableName))
         : '', "\n\n    // Stamp each row with a globally-correct 1-based `__rowNumber` (the page\n    // offset is applied server-side above), so list index columns keep counting\n    // across pages instead of restarting at 1. Renderer-internal field \u2014 it is\n    // filtered from ordinary field bindings and only read by the index column.\n    const __finalData = ").concat((0, transformations_1.getTransformExpression)(tableName) ? 'transformedData' : 'safeData', "\n    const __rowNumberStart = (typeof offsetValue === 'number' && !isNaN(offsetValue)) ? offsetValue : 0\n    const __numberedData = Array.isArray(__finalData)\n      ? __finalData.map((__row, __i) =>\n          __row && typeof __row === 'object' && !Array.isArray(__row)\n            ? Object.assign({}, __row, { __rowNumber: __rowNumberStart + __i + 1 })\n            : __row)\n      : __finalData\n\n    return res.status(200).json({\n      success: true,\n      data: __taWithoutCredentials(\n        __rowPolicy ? __brpStripHidden(__rowPolicy, __numberedData) : __numberedData,\n        ").concat(JSON.stringify(tableName), "\n      ),\n      timestamp: Date.now()\n    })\n  } catch (error) {\n    console.error('Teleport DB fetch error:', error)\n    // A database error names tables, columns and values: it stays in the server\n    // log. Only an error this route raised for the caller (it carries a status)\n    // is repeated to it.\n    return res.status(error.status || 500).json({\n      success: false,\n      error: error.status ? error.message : 'Failed to fetch data',\n      timestamp: Date.now()\n    })\n  } finally {\n    if (client) {\n      try {\n        await client.end()\n      } catch (error) {\n        console.error('Error closing database client:', error)\n      }\n    }\n  }\n}\n");
 };

package/dist/cjs/fetchers/teleport.js.map

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

package/dist/cjs/fetchers/utils/browser-row-policy.d.ts

@@ -1,3 +1,4 @@
+import { ContentTables } from '@teleporthq/teleport-shared';
 /**
  * What a per-table read route (`/api/teleport-<table>-<source>` and its count
  * twin) serves a BROWSER of the tables whose unpublished rows sit beside the
@@ -17,12 +18,12 @@
  * bindings name every text column of the table — the blog list asks to search
  * `author_email` — and refusing them emptied the blog for every visitor.
  */
-export interface BrowserRowPolicy {
-    /** SQL every browser read of the table is narrowed with. */
-    predicate: string;
-    /** Keys never served to a browser, wherever they sit in a row (raw and transformed names). */
-    hiddenColumns: ReadonlyArray<string>;
-}
+export type BrowserRowPolicy = ContentTables.VisitorRowPolicy;
+/**
+ * One map for both route families: the content presets' posts tables (ONLY
+ * `published` rows, never the author's email — see
+ * `CONTENT_POSTS_VISITOR_ROW_POLICY`) and the catalogue's products.
+ */
 export declare const BROWSER_ROW_POLICIES: Readonly<Record<string, BrowserRowPolicy>>;
 /**
  * ES5 source inlined after the table-access preamble (it uses `__ta*` and

package/dist/cjs/fetchers/utils/browser-row-policy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browser-row-policy.d.ts","sourceRoot":"","sources":["../../../../src/fetchers/utils/browser-row-policy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,MAAM,WAAW,gBAAgB;IAC/B,4DAA4D;IAC5D,SAAS,EAAE,MAAM,CAAA;IACjB,8FAA8F;IAC9F,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;CACrC;AAED,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAa3E,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,4BAA4B,QACnC,MA+HL,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,oBAAoB,cACpB,MAAM,mBACA,cAAc,MAAM,CAAC,KACrC,OAUF,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,4BAA4B,cAC5B,MAAM,gBACH,MAAM,GAAG,IAAI,KAC1B,MASF,CAAA"}
+{"version":3,"file":"browser-row-policy.d.ts","sourceRoot":"","sources":["../../../../src/fetchers/utils/browser-row-policy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAE3D;;;;;;;;;;;;;;;;;;GAkBG;AAEH,MAAM,MAAM,gBAAgB,GAAG,aAAa,CAAC,gBAAgB,CAAA;AAE7D;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CACxC,CAAA;AAEpC;;;;;;;GAOG;AACH,eAAO,MAAM,4BAA4B,QACnC,MA+HL,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,oBAAoB,cACpB,MAAM,mBACA,cAAc,MAAM,CAAC,KACrC,OAUF,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,4BAA4B,cAC5B,MAAM,gBACH,MAAM,GAAG,IAAI,KAC1B,MASF,CAAA"}

package/dist/cjs/fetchers/utils/browser-row-policy.js

@@ -1,39 +1,13 @@
 "use strict";
-/**
- * What a per-table read route (`/api/teleport-<table>-<source>` and its count
- * twin) serves a BROWSER of the tables whose unpublished rows sit beside the
- * public ones. (The tables it serves a browser not at all — the AI assistant's
- * among them — are `TableAccess.PROTECTED_TABLES`, guarded by `__taGuardRead`.)
- *
- * The route answers whoever asks, with the whole table. For the blog that was
- * every draft, scheduled and archived post — and each author's email address;
- * for the catalogue, every draft and inactive product. The storefront's own
- * bindings ask for the public rows, but the route is a URL anyone can call
- * without them. So a caller that is not the store itself (its server code, or a
- * signed-in administrator — the generated admin edits drafts through these
- * routes) is served only the rows the storefront publishes, never a hidden
- * column, and may neither filter nor sort by a hidden column: a filter is an
- * oracle for a column it never returns. A hidden SEARCH column is dropped from
- * the search instead (`__brpVisibleColumns`), because the storefront's own list
- * bindings name every text column of the table — the blog list asks to search
- * `author_email` — and refusing them emptied the blog for every visitor.
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateBrowserRowAccessCall = exports.isViewDependentTable = exports.generateBrowserRowPolicyCode = exports.BROWSER_ROW_POLICIES = void 0;
-exports.BROWSER_ROW_POLICIES = {
-    // ONLY `published` is public — the blog's own rule (see the GUI's
-    // `blog-post-status.ts`): drafts, scheduled and archived posts are not.
-    teleport_blog_posts: {
-        predicate: "status = 'published'",
-        hiddenColumns: ['author_email', 'authorEmail'],
-    },
-    // The storefront sells `active` products; a draft or inactive one is the
-    // merchant's, spelled in any case the admin form stored it in.
-    teleport_products: {
-        predicate: "LOWER(TRIM(status)) = 'active'",
-        hiddenColumns: [],
-    },
-};
+var teleport_shared_1 = require("@teleporthq/teleport-shared");
+/**
+ * One map for both route families: the content presets' posts tables (ONLY
+ * `published` rows, never the author's email — see
+ * `CONTENT_POSTS_VISITOR_ROW_POLICY`) and the catalogue's products.
+ */
+exports.BROWSER_ROW_POLICIES = teleport_shared_1.ContentTables.VISITOR_ROW_POLICIES;
 /**
  * ES5 source inlined after the table-access preamble (it uses `__ta*` and
  * `__tqSessionToken`). Declares `__brpAccess(req, tableName, rawQuery)`, which

package/dist/cjs/fetchers/utils/browser-row-policy.js.map

@@ -1 +1 @@
-{"version":3,"file":"browser-row-policy.js","sourceRoot":"","sources":["../../../../src/fetchers/utils/browser-row-policy.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;GAkBG;;;AASU,QAAA,oBAAoB,GAA+C;IAC9E,kEAAkE;IAClE,wEAAwE;IACxE,mBAAmB,EAAE;QACnB,SAAS,EAAE,sBAAsB;QACjC,aAAa,EAAE,CAAC,cAAc,EAAE,aAAa,CAAC;KAC/C;IACD,yEAAyE;IACzE,+DAA+D;IAC/D,iBAAiB,EAAE;QACjB,SAAS,EAAE,gCAAgC;QAC3C,aAAa,EAAE,EAAE;KAClB;CACF,CAAA;AAED;;;;;;;GAOG;AACI,IAAM,4BAA4B,GACvC,cAAc,OAAA,mHACO,IAAI,CAAC,SAAS,CAAC,4BAAoB,CAAC,q8JA8H1D,EA/He,CA+Hf,CAAA;AAhIY,QAAA,4BAA4B,gCAgIxC;AAED;;;GAGG;AACI,IAAM,oBAAoB,GAAG,UAClC,SAAiB,EACjB,eAAsC;IAEtC,IAAM,KAAK,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;SAClC,IAAI,EAAE;SACN,WAAW,EAAE;SACb,KAAK,CAAC,GAAG,CAAC,CAAA;IACb,IAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IACtD,OAAO,CACL,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,4BAAoB,EAAE,IAAI,CAAC;QAChE,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CACrC,CAAA;AACH,CAAC,CAAA;AAbY,QAAA,oBAAoB,wBAahC;AAED;;;GAGG;AACI,IAAM,4BAA4B,GAAG,UAC1C,SAAiB,EACjB,YAA2B;IAE3B,OAAO,uDAAgD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,eAC9E,YAAY,IAAI,MAAM,yNAMzB,CAAA;AACD,CAAC,CAAA;AAZY,QAAA,4BAA4B,gCAYxC"}
+{"version":3,"file":"browser-row-policy.js","sourceRoot":"","sources":["../../../../src/fetchers/utils/browser-row-policy.ts"],"names":[],"mappings":";;;AAAA,+DAA2D;AAwB3D;;;;GAIG;AACU,QAAA,oBAAoB,GAC/B,+BAAa,CAAC,oBAAoB,CAAA;AAEpC;;;;;;;GAOG;AACI,IAAM,4BAA4B,GACvC,cAAc,OAAA,mHACO,IAAI,CAAC,SAAS,CAAC,4BAAoB,CAAC,q8JA8H1D,EA/He,CA+Hf,CAAA;AAhIY,QAAA,4BAA4B,gCAgIxC;AAED;;;GAGG;AACI,IAAM,oBAAoB,GAAG,UAClC,SAAiB,EACjB,eAAsC;IAEtC,IAAM,KAAK,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;SAClC,IAAI,EAAE;SACN,WAAW,EAAE;SACb,KAAK,CAAC,GAAG,CAAC,CAAA;IACb,IAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IACtD,OAAO,CACL,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,4BAAoB,EAAE,IAAI,CAAC;QAChE,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CACrC,CAAA;AACH,CAAC,CAAA;AAbY,QAAA,oBAAoB,wBAahC;AAED;;;GAGG;AACI,IAAM,4BAA4B,GAAG,UAC1C,SAAiB,EACjB,YAA2B;IAE3B,OAAO,uDAAgD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,eAC9E,YAAY,IAAI,MAAM,yNAMzB,CAAA;AACD,CAAC,CAAA;AAZY,QAAA,4BAA4B,gCAYxC"}

package/dist/cjs/filter-utils.d.ts

@@ -1,14 +1,26 @@
 import * as types from '@babel/types';
-export declare const buildFiltersStringifyCall: (filters: Array<{
+/**
+ * One entry of the filter TREE the inspector authors: a condition leaf, or a
+ * group of further entries joined with `and` / `or`. The generated fetchers
+ * read this same tree (`normalizeFilterTree` in utils.ts), so the group
+ * operator must reach them intact — flattening an `or` group into its leaves
+ * turns "any of" into "all of" on the published site.
+ */
+export type FilterCondition = {
     source?: string;
     operand?: string;
     destination: unknown;
-}>, buildDestinationExpression: (destination: unknown) => types.Expression) => types.CallExpression;
-export declare const appendFiltersParam: (paramsProps: types.ObjectProperty[], filters: Array<{
-    source?: string;
-    operand?: string;
-    destination: unknown;
-}> | undefined, buildDestinationExpression: (destination: unknown) => types.Expression) => void;
+};
+export type FilterGroup = {
+    type: 'group';
+    operator?: string;
+    children: FilterEntry[];
+};
+export type FilterEntry = FilterCondition | FilterGroup;
+export declare const isFilterGroup: (entry: unknown) => entry is FilterGroup;
+export declare const buildFiltersStringifyCall: (filters: FilterEntry[], buildDestinationExpression: (destination: unknown) => types.Expression) => types.CallExpression;
+export declare const buildStaticFiltersStringifyCall: (filters: FilterEntry[]) => types.CallExpression;
+export declare const appendFiltersParam: (paramsProps: types.ObjectProperty[], filters: FilterEntry[] | undefined, buildDestinationExpression: (destination: unknown) => types.Expression) => void;
 export declare const pushStateIdsAsDeps: (deps: types.Expression[], seen: Set<string>, stateIds: string[]) => void;
 export declare const pushPropIdsAsDeps: (deps: types.Expression[], seen: Set<string>, propIds: string[]) => void;
 //# sourceMappingURL=filter-utils.d.ts.map

package/dist/cjs/filter-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter-utils.d.ts","sourceRoot":"","sources":["../../src/filter-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AA6ErC,eAAO,MAAM,yBAAyB,YAC3B,MAAM;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,CAAC,4CACjC,OAAO,KAAK,MAAM,UAAU,KACrE,MAAM,cAkBR,CAAA;AAGD,eAAO,MAAM,kBAAkB,gBAChB,MAAM,cAAc,EAAE,WAC1B,MAAM;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,CAAC,GAAG,SAAS,4CAC7C,OAAO,KAAK,MAAM,UAAU,KACrE,IAUF,CAAA;AAUD,eAAO,MAAM,kBAAkB,SACvB,MAAM,UAAU,EAAE,QAClB,IAAI,MAAM,CAAC,YACP,MAAM,EAAE,KACjB,IAQF,CAAA;AAaD,eAAO,MAAM,iBAAiB,SACtB,MAAM,UAAU,EAAE,QAClB,IAAI,MAAM,CAAC,WACR,MAAM,EAAE,KAChB,IASF,CAAA"}
+{"version":3,"file":"filter-utils.d.ts","sourceRoot":"","sources":["../../src/filter-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,CAAA;AACzF,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,WAAW,EAAE,CAAA;CAAE,CAAA;AACvF,MAAM,MAAM,WAAW,GAAG,eAAe,GAAG,WAAW,CAAA;AAEvD,eAAO,MAAM,aAAa,UAAW,OAAO,yBAIe,CAAA;AA+H3D,eAAO,MAAM,yBAAyB,YAC3B,WAAW,EAAE,4CACoB,OAAO,KAAK,MAAM,UAAU,KACrE,MAAM,cAIN,CAAA;AAiBH,eAAO,MAAM,+BAA+B,YAAa,WAAW,EAAE,KAAG,MAAM,cAI5E,CAAA;AAGH,eAAO,MAAM,kBAAkB,gBAChB,MAAM,cAAc,EAAE,WAC1B,WAAW,EAAE,GAAG,SAAS,4CACQ,OAAO,KAAK,MAAM,UAAU,KACrE,IAUF,CAAA;AAUD,eAAO,MAAM,kBAAkB,SACvB,MAAM,UAAU,EAAE,QAClB,IAAI,MAAM,CAAC,YACP,MAAM,EAAE,KACjB,IAQF,CAAA;AAaD,eAAO,MAAM,iBAAiB,SACtB,MAAM,UAAU,EAAE,QAClB,IAAI,MAAM,CAAC,WACR,MAAM,EAAE,KAChB,IASF,CAAA"}

package/dist/cjs/filter-utils.js

@@ -23,8 +23,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pushPropIdsAsDeps = exports.pushStateIdsAsDeps = exports.appendFiltersParam = exports.buildFiltersStringifyCall = void 0;
+exports.pushPropIdsAsDeps = exports.pushStateIdsAsDeps = exports.appendFiltersParam = exports.buildStaticFiltersStringifyCall = exports.buildFiltersStringifyCall = exports.isFilterGroup = void 0;
 var types = __importStar(require("@babel/types"));
+var isFilterGroup = function (entry) {
+    return !!entry &&
+        typeof entry === 'object' &&
+        entry.type === 'group' &&
+        Array.isArray(entry.children);
+};
+exports.isFilterGroup = isFilterGroup;
 // Build a single filter entry: { source: '<src>', destination: <destExpr>, operand: '<op>' }
 var buildFilterEntry = function (source, destinationExpr, operand) {
     return types.objectExpression([
@@ -33,10 +40,19 @@ var buildFilterEntry = function (source, destinationExpr, operand) {
         types.objectProperty(types.identifier('operand'), types.stringLiteral(operand)),
     ]);
 };
+// { type: 'group', operator: 'and' | 'or', children: <childrenExpr> }
+var buildFilterGroup = function (operator, childrenExpr) {
+    return types.objectExpression([
+        types.objectProperty(types.identifier('type'), types.stringLiteral('group')),
+        types.objectProperty(types.identifier('operator'), types.stringLiteral(operator === 'or' ? 'or' : 'and')),
+        types.objectProperty(types.identifier('children'), childrenExpr),
+    ]);
+};
 // Predicate:
-//   (__f) => __f.destination !== '' && __f.destination !== null &&
-//            __f.destination !== undefined &&
-//            !(Array.isArray(__f.destination) && __f.destination.filter(Boolean).length === 0)
+//   (__f) => __f.type === 'group' ||
+//            (__f.destination !== '' && __f.destination !== null &&
+//             __f.destination !== undefined &&
+//             !(Array.isArray(__f.destination) && __f.destination.filter(Boolean).length === 0))
 // Used at runtime to drop filter conditions whose destination resolves to an
 // empty value. Keeps the page generic: state-bound filters (e.g.
 // `selectedCategory === ''` after picking "All Categories") and url-bound
@@ -46,19 +62,31 @@ var buildFilterEntry = function (source, destinationExpr, operand) {
 // string and returns zero rows. The array clause covers array-overlap filters
 // (e.g. category `CATEGORY_DESCENDANTS[selectedCategory] || []`) whose "All"
 // reset resolves to `[]` — an empty overlap set must mean "no filter", not
-// "match nothing".
+// "match nothing". A group has no destination of its own and is kept; its
+// children carry the same `.filter(...)`, and a group emptied that way is
+// dropped by the fetcher's `normalizeFilterTree`.
 var buildNonEmptyDestinationPredicate = function () {
     var f = types.identifier('__f');
     var dest = types.memberExpression(f, types.identifier('destination'));
     var isEmptyArray = types.logicalExpression('&&', types.callExpression(types.memberExpression(types.identifier('Array'), types.identifier('isArray')), [dest]), types.binaryExpression('===', types.memberExpression(types.callExpression(types.memberExpression(dest, types.identifier('filter')), [
         types.identifier('Boolean'),
     ]), types.identifier('length')), types.numericLiteral(0)));
-    return types.arrowFunctionExpression([f], types.logicalExpression('&&', types.logicalExpression('&&', types.logicalExpression('&&', types.binaryExpression('!==', dest, types.stringLiteral('')), types.binaryExpression('!==', dest, types.nullLiteral())), types.binaryExpression('!==', dest, types.identifier('undefined'))), types.unaryExpression('!', isEmptyArray)));
+    return types.arrowFunctionExpression([f], types.logicalExpression('||', types.binaryExpression('===', types.memberExpression(f, types.identifier('type')), types.stringLiteral('group')), types.logicalExpression('&&', types.logicalExpression('&&', types.logicalExpression('&&', types.binaryExpression('!==', dest, types.stringLiteral('')), types.binaryExpression('!==', dest, types.nullLiteral())), types.binaryExpression('!==', dest, types.identifier('undefined'))), types.unaryExpression('!', isEmptyArray))));
+};
+// `[ entry, ... ].filter(<non-empty destination>)`, recursing into groups so
+// every level of the tree drops its empty conditions at runtime.
+var buildFilteredEntriesArray = function (filters, buildDestinationExpression) {
+    var entries = filters.map(function (filter) {
+        return (0, exports.isFilterGroup)(filter)
+            ? buildFilterGroup(filter.operator, buildFilteredEntriesArray(filter.children, buildDestinationExpression))
+            : buildFilterEntry(filter.source || '', buildDestinationExpression(filter.destination), filter.operand || '');
+    });
+    return types.callExpression(types.memberExpression(types.arrayExpression(entries), types.identifier('filter')), [buildNonEmptyDestinationPredicate()]);
 };
 // Build the AST for:
 //   JSON.stringify(
-//     [ {source, destination, operand}, ... ]
-//       .filter(__f => __f.destination !== '' && __f.destination !== null && __f.destination !== undefined)
+//     [ {source, destination, operand}, { type: 'group', operator, children: [...].filter(...) }, ... ]
+//       .filter(__f => __f.type === 'group' || (__f.destination !== '' && __f.destination !== null && __f.destination !== undefined))
 //   )
 //
 // The `.filter(...)` step is unconditional even when every entry is a static
@@ -67,13 +95,21 @@ var buildNonEmptyDestinationPredicate = function () {
 // type is added but its empty-value behavior is forgotten don't silently
 // re-introduce empty-string filters.
 var buildFiltersStringifyCall = function (filters, buildDestinationExpression) {
-    var entries = filters.map(function (filter) {
-        return buildFilterEntry(filter.source || '', buildDestinationExpression(filter.destination), filter.operand || '');
-    });
-    var filteredArray = types.callExpression(types.memberExpression(types.arrayExpression(entries), types.identifier('filter')), [buildNonEmptyDestinationPredicate()]);
-    return types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [filteredArray]);
+    return types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [buildFilteredEntriesArray(filters, buildDestinationExpression)]);
 };
 exports.buildFiltersStringifyCall = buildFiltersStringifyCall;
+// The build-time counterpart for `getStaticProps`: every destination is a
+// literal (the dynamic ones were pruned — see `pruneFilterTree`), so the tree
+// is written out as plain string literals with no runtime `.filter(...)`.
+var buildStaticFilterEntryAST = function (filter) {
+    return (0, exports.isFilterGroup)(filter)
+        ? buildFilterGroup(filter.operator, types.arrayExpression(filter.children.map(buildStaticFilterEntryAST)))
+        : buildFilterEntry(filter.source || '', types.stringLiteral(typeof filter.destination === 'string' ? filter.destination : ''), filter.operand || '');
+};
+var buildStaticFiltersStringifyCall = function (filters) {
+    return types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [types.arrayExpression(filters.map(buildStaticFilterEntryAST))]);
+};
+exports.buildStaticFiltersStringifyCall = buildStaticFiltersStringifyCall;
 // Convenience: push `filters: <call>` onto a paramsProps array.
 var appendFiltersParam = function (paramsProps, filters, buildDestinationExpression) {
     if (!filters || filters.length === 0) {

package/dist/cjs/filter-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter-utils.js","sourceRoot":"","sources":["../../src/filter-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"filter-utils.js","sourceRoot":"","sources":["../../src/filter-utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAqC;AAa9B,IAAM,aAAa,GAAG,UAAC,KAAc;IAC1C,OAAA,CAAC,CAAC,KAAK;QACP,OAAO,KAAK,KAAK,QAAQ;QACxB,KAA2B,CAAC,IAAI,KAAK,OAAO;QAC7C,KAAK,CAAC,OAAO,CAAE,KAAgC,CAAC,QAAQ,CAAC;AAHzD,CAGyD,CAAA;AAJ9C,QAAA,aAAa,iBAIiC;AAE3D,6FAA6F;AAC7F,IAAM,gBAAgB,GAAG,UACvB,MAAc,EACd,eAAiC,EACjC,OAAe;IAEf,OAAA,KAAK,CAAC,gBAAgB,CAAC;QACrB,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC7E,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,eAAe,CAAC;QACtE,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;KAChF,CAAC;AAJF,CAIE,CAAA;AAEJ,sEAAsE;AACtE,IAAM,gBAAgB,GAAG,UACvB,QAA4B,EAC5B,YAA8B;IAE9B,OAAA,KAAK,CAAC,gBAAgB,CAAC;QACrB,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAC5E,KAAK,CAAC,cAAc,CAClB,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,EAC5B,KAAK,CAAC,aAAa,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CACtD;QACD,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,YAAY,CAAC;KACjE,CAAC;AAPF,CAOE,CAAA;AAEJ,aAAa;AACb,qCAAqC;AACrC,oEAAoE;AACpE,+CAA+C;AAC/C,iGAAiG;AACjG,6EAA6E;AAC7E,iEAAiE;AACjE,0EAA0E;AAC1E,+EAA+E;AAC/E,6EAA6E;AAC7E,yEAAyE;AACzE,8EAA8E;AAC9E,6EAA6E;AAC7E,2EAA2E;AAC3E,0EAA0E;AAC1E,0EAA0E;AAC1E,kDAAkD;AAClD,IAAM,iCAAiC,GAAG;IACxC,IAAM,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;IACjC,IAAM,IAAI,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAA;IACvE,IAAM,YAAY,GAAG,KAAK,CAAC,iBAAiB,CAC1C,IAAI,EACJ,KAAK,CAAC,cAAc,CAClB,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAC9E,CAAC,IAAI,CAAC,CACP,EACD,KAAK,CAAC,gBAAgB,CACpB,KAAK,EACL,KAAK,CAAC,gBAAgB,CACpB,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE;QAC7E,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC;KAC5B,CAAC,EACF,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAC3B,EACD,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CACxB,CACF,CAAA;IACD,OAAO,KAAK,CAAC,uBAAuB,CAClC,CAAC,CAAC,CAAC,EACH,KAAK,CAAC,iBAAiB,CACrB,IAAI,EACJ,KAAK,CAAC,gBAAgB,CACpB,KAAK,EACL,KAAK,CAAC,gBAAgB,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EACnD,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAC7B,EACD,KAAK,CAAC,iBAAiB,CACrB,IAAI,EACJ,KAAK,CAAC,iBAAiB,CACrB,IAAI,EACJ,KAAK,CAAC,iBAAiB,CACrB,IAAI,EACJ,KAAK,CAAC,gBAAgB,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,EAC5D,KAAK,CAAC,gBAAgB,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CACzD,EACD,KAAK,CAAC,gBAAgB,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CACnE,EACD,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE,YAAY,CAAC,CACzC,CACF,CACF,CAAA;AACH,CAAC,CAAA;AAED,6EAA6E;AAC7E,iEAAiE;AACjE,IAAM,yBAAyB,GAAG,UAChC,OAAsB,EACtB,0BAAsE;IAEtE,IAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,UAAC,MAAM;QACjC,OAAA,IAAA,qBAAa,EAAC,MAAM,CAAC;YACnB,CAAC,CAAC,gBAAgB,CACd,MAAM,CAAC,QAAQ,EACf,yBAAyB,CAAC,MAAM,CAAC,QAAQ,EAAE,0BAA0B,CAAC,CACvE;YACH,CAAC,CAAC,gBAAgB,CACd,MAAM,CAAC,MAAM,IAAI,EAAE,EACnB,0BAA0B,CAAC,MAAM,CAAC,WAAW,CAAC,EAC9C,MAAM,CAAC,OAAO,IAAI,EAAE,CACrB;IATL,CASK,CACN,CAAA;IAED,OAAO,KAAK,CAAC,cAAc,CACzB,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,EAClF,CAAC,iCAAiC,EAAE,CAAC,CACtC,CAAA;AACH,CAAC,CAAA;AAED,qBAAqB;AACrB,oBAAoB;AACpB,wGAAwG;AACxG,sIAAsI;AACtI,MAAM;AACN,EAAE;AACF,6EAA6E;AAC7E,yEAAyE;AACzE,6EAA6E;AAC7E,yEAAyE;AACzE,qCAAqC;AAC9B,IAAM,yBAAyB,GAAG,UACvC,OAAsB,EACtB,0BAAsE;IAEtE,OAAA,KAAK,CAAC,cAAc,CAClB,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,EAC/E,CAAC,yBAAyB,CAAC,OAAO,EAAE,0BAA0B,CAAC,CAAC,CACjE;AAHD,CAGC,CAAA;AAPU,QAAA,yBAAyB,6BAOnC;AAEH,0EAA0E;AAC1E,8EAA8E;AAC9E,0EAA0E;AAC1E,IAAM,yBAAyB,GAAG,UAAC,MAAmB;IACpD,OAAA,IAAA,qBAAa,EAAC,MAAM,CAAC;QACnB,CAAC,CAAC,gBAAgB,CACd,MAAM,CAAC,QAAQ,EACf,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,CACtE;QACH,CAAC,CAAC,gBAAgB,CACd,MAAM,CAAC,MAAM,IAAI,EAAE,EACnB,KAAK,CAAC,aAAa,CAAC,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,EACrF,MAAM,CAAC,OAAO,IAAI,EAAE,CACrB;AATL,CASK,CAAA;AAEA,IAAM,+BAA+B,GAAG,UAAC,OAAsB;IACpE,OAAA,KAAK,CAAC,cAAc,CAClB,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,EAC/E,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAChE;AAHD,CAGC,CAAA;AAJU,QAAA,+BAA+B,mCAIzC;AAEH,gEAAgE;AACzD,IAAM,kBAAkB,GAAG,UAChC,WAAmC,EACnC,OAAkC,EAClC,0BAAsE;IAEtE,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACpC,OAAM;KACP;IACD,WAAW,CAAC,IAAI,CACd,KAAK,CAAC,cAAc,CAClB,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,EAC3B,IAAA,iCAAyB,EAAC,OAAO,EAAE,0BAA0B,CAAC,CAC/D,CACF,CAAA;AACH,CAAC,CAAA;AAdY,QAAA,kBAAkB,sBAc9B;AAED,6EAA6E;AAC7E,oEAAoE;AACpE,EAAE;AACF,2EAA2E;AAC3E,0EAA0E;AAC1E,yEAAyE;AACzE,2EAA2E;AAC3E,yBAAyB;AAClB,IAAM,kBAAkB,GAAG,UAChC,IAAwB,EACxB,IAAiB,EACjB,QAAkB;IAElB,KAAiB,UAAQ,EAAR,qBAAQ,EAAR,sBAAQ,EAAR,IAAQ,EAAE;QAAtB,IAAM,EAAE,iBAAA;QACX,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAChB,SAAQ;SACT;QACD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACZ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAA;KAChC;AACH,CAAC,CAAA;AAZY,QAAA,kBAAkB,sBAY9B;AAED,+EAA+E;AAC/E,gFAAgF;AAChF,uEAAuE;AACvE,EAAE;AACF,gFAAgF;AAChF,4EAA4E;AAC5E,0EAA0E;AAC1E,8EAA8E;AAC9E,6EAA6E;AAC7E,qDAAqD;AACrD,yCAAyC;AAClC,IAAM,iBAAiB,GAAG,UAC/B,IAAwB,EACxB,IAAiB,EACjB,OAAiB;IAEjB,KAAiB,UAAO,EAAP,mBAAO,EAAP,qBAAO,EAAP,IAAO,EAAE;QAArB,IAAM,EAAE,gBAAA;QACX,IAAM,GAAG,GAAG,gBAAS,EAAE,CAAE,CAAA;QACzB,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACjB,SAAQ;SACT;QACD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACb,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;KACnF;AACH,CAAC,CAAA;AAbY,QAAA,iBAAiB,qBAa7B"}

package/dist/cjs/infinite-scroll.d.ts

@@ -14,6 +14,15 @@ import * as types from '@babel/types';
  * and re-enter it. The ref is keyed by a SIGNATURE of every fetch param except
  * the page, so a filter, sort or search change starts a fresh list instead of
  * interleaving rows from two different queries.
+ *
+ * `fetchData` records the query and the page the list stands on BEFORE it
+ * requests them (`latest`), and only the answer to that request changes the
+ * list. A filter, sort or search change made past page 1 fires the old page
+ * under the new query first, then page 1 once the page is reset: kept, the
+ * stray page sat in the list, the page counter said 1, and the next "Load
+ * more" fetched a page already on show. `DataProvider` also renders whichever
+ * answer arrives LAST, so a late answer to an earlier query must not replace
+ * the list either.
  */
 export interface InfiniteScrollVars {
     accumRefVar: string;
@@ -37,11 +46,20 @@ export declare const getInfiniteScrollVars: (index: number) => InfiniteScrollVar
  * being made at all; it is `0` while unknown, hence the explicit escape.
  */
 export declare const buildInfiniteScrollDeclarations: (vars: InfiniteScrollVars, maxPagesVar: string, currentPageExpr: types.Expression, includeSentinel: boolean) => types.Statement[];
+/**
+ * What `fetchData` runs before its request: the query and the page the list
+ * now stands on.
+ *
+ *   ds_0_accumRef.current.latest = { sig: JSON.stringify({ ...params, page: 0 }), page: Number(params.page) || 1 }
+ */
+export declare const buildAccumulatingRequestMark: (vars: InfiniteScrollVars) => types.Statement;
 /**
  * The `.then(...)` tail that accumulates a page and reports whether more exist.
  *
  * Returned as the resolved value of `fetchData`, so `DataProvider` stores the
- * whole accumulated list as its data.
+ * whole accumulated list as its data: the pages of the query on show, first
+ * to the page it stands on. An answer to anything but the latest request
+ * (`buildAccumulatingRequestMark`) is not kept, and gets the list as it is.
  *
  * `itemsPath` is where the rows sit inside a payload that wraps them
  * (`{ items: [...], total }`): the rows are read there and the accumulated list
@@ -66,6 +84,11 @@ export declare const buildSentinelObserverEffect: (vars: InfiniteScrollVars, max
  * An invisible one-pixel row after the list. It is generated rather than
  * authored because it is not a control — there is nothing to style or click,
  * only a position in the document for the observer to watch.
+ *
+ * It takes the element its parent may hold: a table section holds rows, a
+ * list holds items, a paragraph holds phrasing. A `<div>` among a table's
+ * rows is moved out of the table by the parser, so the server's markup and
+ * the client's tree differ and React's hydration fails on every such list.
  */
-export declare const buildSentinelElement: (vars: InfiniteScrollVars) => types.JSXElement;
+export declare const buildSentinelElement: (vars: InfiniteScrollVars, parentTag?: string | null) => types.JSXElement;
 //# sourceMappingURL=infinite-scroll.d.ts.map

package/dist/cjs/infinite-scroll.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"infinite-scroll.d.ts","sourceRoot":"","sources":["../../src/infinite-scroll.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC;;;;;;;;;;;;;;;GAeG;AAIH,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,EAAE,MAAM,CAAA;IACtB,iBAAiB,EAAE,MAAM,CAAA;IACzB,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,EAAE,MAAM,CAAA;CACvB;AAED,eAAO,MAAM,qBAAqB,UAAW,MAAM,KAAG,kBAMpD,CAAA;AAEF;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,+BAA+B,SACpC,kBAAkB,eACX,MAAM,mBACF,MAAM,UAAU,mBAChB,OAAO,KACvB,MAAM,SAAS,EAsDjB,CAAA;AAsDD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,gCAAgC,SACrC,kBAAkB,WACf,MAAM,cACH,MAAM,EAAE,KACnB,MAAM,uBAyIR,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,2BAA2B,SAChC,kBAAkB,eACX,MAAM,6BACQ,MAAM,MAAM,SAAS,KAC/C,MAAM,mBAoGN,CAAA;AAEH;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,SAAU,kBAAkB,KAAG,MAAM,UAwBnE,CAAA"}
+{"version":3,"file":"infinite-scroll.d.ts","sourceRoot":"","sources":["../../src/infinite-scroll.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAIH,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,EAAE,MAAM,CAAA;IACtB,iBAAiB,EAAE,MAAM,CAAA;IACzB,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,EAAE,MAAM,CAAA;CACvB;AAED,eAAO,MAAM,qBAAqB,UAAW,MAAM,KAAG,kBAMpD,CAAA;AAEF;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,+BAA+B,SACpC,kBAAkB,eACX,MAAM,mBACF,MAAM,UAAU,mBAChB,OAAO,KACvB,MAAM,SAAS,EAuDjB,CAAA;AA+ED;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,SAAU,kBAAkB,KAAG,MAAM,SAU3E,CAAA;AAEH;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,gCAAgC,SACrC,kBAAkB,WACf,MAAM,cACH,MAAM,EAAE,KACnB,MAAM,uBA+KR,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,2BAA2B,SAChC,kBAAkB,eACX,MAAM,6BACQ,MAAM,MAAM,SAAS,KAC/C,MAAM,mBAoGN,CAAA;AAmDH;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,oBAAoB,SACzB,kBAAkB,cACb,MAAM,GAAG,IAAI,KACvB,MAAM,UAmCR,CAAA"}