@teleporthq/teleport-plugin-next-data-source 0.43.66 → 0.43.67

package/__tests__/product-filter-fields.ts

@@ -0,0 +1,230 @@
+import { parse } from '@babel/parser'
+import { readFileSync } from 'fs'
+import { join } from 'path'
+import {
+  PRODUCT_ON_SALE_FILTER_FIELD,
+  PRODUCT_RATING_FILTER_FIELD,
+  PRODUCT_VARIANT_AXIS_FILTER_PREFIX,
+  PRODUCT_VARIANT_AXIS_KEY_PATTERN,
+  buildProductOnSaleSql,
+  buildProductRatingBucketSql,
+  buildProductVariantAxisExistsSql,
+  generateProductFilterClauseHelper,
+} from '../src/product-filter-fields'
+import { buildProductEffectivePriceSql } from '../src/product-price-sort'
+import { generateTeleportFetcher } from '../src/fetchers/teleport'
+import { generatePostgreSQLFetcher } from '../src/fetchers/postgresql'
+import { generateMySQLFetcher } from '../src/fetchers/mysql'
+import { generateDataSourceFetcher } from '../src/data-source-fetchers'
+import { generateFilterTreeHelpersCode } from '../src/utils'
+
+/**
+ * The storefront's product filters on things that are not a column: the price
+ * paid today, the star bucket, the on-sale flag and a variant axis. They are
+ * answered in SQL — the list is paginated — so the emitted helper is pinned
+ * here the same way the discount-aware sort is.
+ */
+
+const PG_CONFIG = { connectionString: 'postgres://user:pw@host:5432/db' }
+
+/** Runs the emitted helper as real JS and returns the clause + bound params. */
+function runHelper(
+  tableName: string,
+  field: string,
+  operand: string,
+  value: unknown
+): { clause: string | null; params: unknown[] } {
+  const params: unknown[] = []
+  let index = 1
+  const pushParam = (param: unknown) => {
+    params.push(param)
+    return '$' + index++
+  }
+  // tslint:disable-next-line:function-constructor
+  const factory = new Function(
+    `${generateProductFilterClauseHelper(tableName)}\nreturn productFilterClause`
+  )
+  const clause = factory()(field, operand, value, pushParam)
+  return { clause, params }
+}
+
+/** Runs the emitted `normalizeInOperand` as real JS. */
+function runNormalize(operand: string, value: unknown): unknown {
+  // tslint:disable-next-line:function-constructor
+  const factory = new Function(`${generateFilterTreeHelpersCode()}\nreturn normalizeInOperand`)
+  return factory()(operand, value)
+}
+
+describe('generateProductFilterClauseHelper', () => {
+  it('is the identity for every table but the products table', () => {
+    const helper = generateProductFilterClauseHelper('teleport_orders')
+    expect(helper).toContain('return null')
+    expect(helper).not.toContain('jsonb_array_elements')
+    expect(runHelper('teleport_orders', 'rating', '=', '4').clause).toBeNull()
+  })
+
+  it('emits the SQL as double-quoted literals, carrying no template syntax', () => {
+    const helper = generateProductFilterClauseHelper('teleport_products')
+    expect(helper).not.toContain('`')
+    expect(helper).not.toContain('${')
+    expect(() => parse(helper, { sourceType: 'script' })).not.toThrow()
+  })
+
+  it('leaves a plain column to the ordinary branches', () => {
+    expect(runHelper('teleport_products', 'brand', '=', 'Acme').clause).toBeNull()
+    expect(runHelper('teleport_products', 'brand', '=', ['Acme', 'Globex']).clause).toBeNull()
+  })
+
+  it('filters price on what customers pay today, like the price sort', () => {
+    const { clause, params } = runHelper('teleport_products', 'price', '<=', '50')
+    expect(clause).toBe(`(${buildProductEffectivePriceSql()}) <= $1`)
+    expect(params).toEqual(['50'])
+  })
+
+  it('answers a star bucket over approved reviews only', () => {
+    const sql = buildProductRatingBucketSql()
+    expect(sql).toContain("r.status = 'approved'")
+    expect(sql).toContain('ROUND(AVG(r.rating))')
+    expect(sql).toContain('r.product_id = teleport_products.id')
+
+    const { clause, params } = runHelper('teleport_products', PRODUCT_RATING_FILTER_FIELD, '=', [
+      '4',
+      '5',
+    ])
+    expect(clause).toBe(`${sql}::text = ANY($1::text[])`)
+    expect(params).toEqual([['4', '5']])
+  })
+
+  it('reads the on-sale flag off the effective price', () => {
+    const sql = buildProductOnSaleSql()
+    expect(sql).toContain(`< "price"::numeric THEN 'true' ELSE 'false'`)
+    const { clause, params } = runHelper(
+      'teleport_products',
+      PRODUCT_ON_SALE_FILTER_FIELD,
+      '=',
+      'true'
+    )
+    expect(clause).toBe(`${sql} = $1`)
+    expect(params).toEqual(['true'])
+  })
+
+  it('binds the axis key and the values, never interpolating them', () => {
+    const { clause, params } = runHelper(
+      'teleport_products',
+      `${PRODUCT_VARIANT_AXIS_FILTER_PREFIX}size`,
+      '=',
+      ['xl', 'l']
+    )
+    expect(clause).toBe(buildProductVariantAxisExistsSql('$1', '$2'))
+    expect(clause).toContain("ax->>'key' = $1")
+    expect(clause).toContain("v->>'value' = ANY($2::text[])")
+    expect(params).toEqual(['size', ['xl', 'l']])
+  })
+
+  it('casts the JSON column only when it already looks like an array', () => {
+    const sql = buildProductVariantAxisExistsSql('$1', '$2')
+    expect(sql).toContain(`btrim("variant_options") NOT LIKE '[%'`)
+    expect(sql).toContain(`jsonb_typeof(ax->'values') = 'array'`)
+  })
+
+  it('refuses an axis key the editor could never have written', () => {
+    expect(new RegExp(PRODUCT_VARIANT_AXIS_KEY_PATTERN).test('size')).toBe(true)
+    expect(new RegExp(PRODUCT_VARIANT_AXIS_KEY_PATTERN).test('shoe-size_2')).toBe(true)
+    expect(new RegExp(PRODUCT_VARIANT_AXIS_KEY_PATTERN).test(`x' OR 1=1 --`)).toBe(false)
+    const { clause, params } = runHelper(
+      'teleport_products',
+      `${PRODUCT_VARIANT_AXIS_FILTER_PREFIX}x' OR 1=1 --`,
+      '=',
+      ['a']
+    )
+    expect(clause).toBe('FALSE')
+    expect(params).toEqual([])
+  })
+
+  it('never lets a virtual field fall into a column branch', () => {
+    // A `>` on the on-sale flag has no meaning; the fallthrough would emit
+    // `on_sale > $1` and fail the whole query.
+    expect(runHelper('teleport_products', PRODUCT_ON_SALE_FILTER_FIELD, '>', 'x').clause).toBe(
+      'FALSE'
+    )
+    expect(
+      runHelper('teleport_products', `${PRODUCT_VARIANT_AXIS_FILTER_PREFIX}size`, '>', ['xl'])
+        .clause
+    ).toBe('FALSE')
+  })
+})
+
+describe('normalizeInOperand', () => {
+  it('turns "in" into "=" over an array, so every fetcher answers IN (...)', () => {
+    expect(runNormalize('in', 'a, b,,c')).toEqual({ operand: '=', value: ['a', 'b', 'c'] })
+    expect(runNormalize('in', ['a', 'b,c', 4])).toEqual({ operand: '=', value: ['a', 'b', 'c', 4] })
+  })
+
+  it('reads an empty set as "no filter"', () => {
+    expect(runNormalize('in', '')).toBeNull()
+    expect(runNormalize('in', [])).toBeNull()
+    expect(runNormalize('in', ' , ')).toBeNull()
+  })
+
+  it('passes every other operand through untouched', () => {
+    expect(runNormalize('=', 'a,b')).toEqual({ operand: '=', value: 'a,b' })
+    expect(runNormalize('array_overlap', 'a,b')).toEqual({ operand: 'array_overlap', value: 'a,b' })
+  })
+})
+
+describe('the generated routes', () => {
+  it('answer the virtual fields before any raw-field branch, in the fetcher a store uses', () => {
+    // Through the type dispatch, not one fetcher's export: `teleport_products`
+    // is a Teleport-hosted table, and the discount sort once shipped into the
+    // wrong fetcher with every test green.
+    const route = generateDataSourceFetcher({ type: 'teleport', config: {} }, 'teleport_products')
+    expect(route).toContain('function productFilterClause(field, operand, value, pushParam)')
+    const conditionAt = route.indexOf('const buildCondition = (condition) =>')
+    const hookAt = route.indexOf('const productClause = productFilterClause(', conditionAt)
+    const arrayBranchAt = route.indexOf('if (Array.isArray(value))', conditionAt)
+    expect(conditionAt).toBeGreaterThan(-1)
+    expect(hookAt).toBeGreaterThan(conditionAt)
+    expect(arrayBranchAt).toBeGreaterThan(hookAt)
+    expect(route).toContain('normalizeInOperand(condition.operand, condition.destination)')
+    expect(() => parse(route, { sourceType: 'module', plugins: ['jsx'] })).not.toThrow()
+  })
+
+  it('embed the helper in the Postgres route too, and parse', () => {
+    const route = generatePostgreSQLFetcher(PG_CONFIG, 'teleport_products')
+    expect(route).toContain('const productClause = productFilterClause(')
+    expect(() => parse(route, { sourceType: 'module', plugins: ['jsx'] })).not.toThrow()
+  })
+
+  it('give every other SQL fetcher the "in" normalisation, and nothing else', () => {
+    const route = generateMySQLFetcher({ host: 'h' }, 'orders')
+    expect(route).toContain('normalizeInOperand(condition.operand, condition.destination)')
+    expect(route).not.toContain('productFilterClause')
+    expect(() => parse(route, { sourceType: 'module', plugins: ['jsx'] })).not.toThrow()
+  })
+
+  it('keep a non-products Teleport table on the ordinary branches', () => {
+    const route = generateTeleportFetcher({}, 'teleport_orders')
+    expect(route).toContain('function productFilterClause() {')
+    expect(route).not.toContain('jsonb_array_elements(CASE')
+    expect(() => parse(route, { sourceType: 'module', plugins: ['jsx'] })).not.toThrow()
+  })
+})
+
+describe('the SQL mirrored into database-provider-worker', () => {
+  // `database-provider-worker/src/lib/__tests__/product-filter-sql.fixture.json`
+  // is a copy of this file. Both repos pin their builders to it, so the canvas
+  // and the generated store can never disagree about what a filter means.
+  const fixture = JSON.parse(
+    readFileSync(join(__dirname, 'product-filter-sql.fixture.json'), 'utf8')
+  ) as Record<string, string>
+
+  it('matches the shared fixture byte for byte', () => {
+    expect(buildProductEffectivePriceSql()).toBe(fixture.effectivePrice)
+    expect(buildProductRatingBucketSql()).toBe(fixture.ratingBucket)
+    expect(buildProductOnSaleSql()).toBe(fixture.onSale)
+    expect(buildProductVariantAxisExistsSql('__KEY__', '__VALUES__')).toBe(
+      fixture.variantAxisExists
+    )
+    expect(PRODUCT_VARIANT_AXIS_KEY_PATTERN).toBe(fixture.axisKeyPattern)
+  })
+})

package/__tests__/product-filter-sql.fixture.json

@@ -0,0 +1,7 @@
+{
+  "effectivePrice": "COALESCE((\n    SELECT ROUND(GREATEST(0,\n      CASE\n        WHEN entry.kind = 'percentage'\n          THEN \"price\"::numeric * (1 - LEAST(entry.amount, 100) / 100)\n        ELSE \"price\"::numeric - entry.amount\n      END\n    ), 2)\n    FROM (\n      SELECT\n        d.value->>'type' AS kind,\n        CASE\n          WHEN d.value->>'value' ~ '^[0-9]+(\\.[0-9]+)?$' THEN (d.value->>'value')::numeric\n          ELSE 0\n        END AS amount,\n        d.value->>'startsAt' AS starts_at,\n        d.value->>'endsAt' AS ends_at,\n        d.ord AS ord\n      FROM jsonb_array_elements(CASE\n        WHEN \"discounts\" IS NULL OR btrim(\"discounts\") NOT LIKE '[%' THEN '[]'::jsonb\n        ELSE \"discounts\"::jsonb\n      END) WITH ORDINALITY AS d(value, ord)\n    ) AS entry\n    WHERE entry.amount > 0\n      AND entry.kind IN ('percentage', 'fixed')\n      AND (entry.starts_at IS NULL OR entry.starts_at <= to_char(now() AT TIME ZONE 'UTC', 'YYYY-MM-DD\"T\"HH24:MI:SS.MS\"Z\"'))\n      AND (entry.ends_at IS NULL OR entry.ends_at > to_char(now() AT TIME ZONE 'UTC', 'YYYY-MM-DD\"T\"HH24:MI:SS.MS\"Z\"'))\n    ORDER BY entry.ord\n    LIMIT 1\n  ), \"price\"::numeric)",
+  "ratingBucket": "(SELECT ROUND(AVG(r.rating)) FROM teleport_product_reviews r WHERE r.product_id = teleport_products.id AND r.status = 'approved' AND r.rating IS NOT NULL)",
+  "onSale": "(CASE WHEN COALESCE((\n    SELECT ROUND(GREATEST(0,\n      CASE\n        WHEN entry.kind = 'percentage'\n          THEN \"price\"::numeric * (1 - LEAST(entry.amount, 100) / 100)\n        ELSE \"price\"::numeric - entry.amount\n      END\n    ), 2)\n    FROM (\n      SELECT\n        d.value->>'type' AS kind,\n        CASE\n          WHEN d.value->>'value' ~ '^[0-9]+(\\.[0-9]+)?$' THEN (d.value->>'value')::numeric\n          ELSE 0\n        END AS amount,\n        d.value->>'startsAt' AS starts_at,\n        d.value->>'endsAt' AS ends_at,\n        d.ord AS ord\n      FROM jsonb_array_elements(CASE\n        WHEN \"discounts\" IS NULL OR btrim(\"discounts\") NOT LIKE '[%' THEN '[]'::jsonb\n        ELSE \"discounts\"::jsonb\n      END) WITH ORDINALITY AS d(value, ord)\n    ) AS entry\n    WHERE entry.amount > 0\n      AND entry.kind IN ('percentage', 'fixed')\n      AND (entry.starts_at IS NULL OR entry.starts_at <= to_char(now() AT TIME ZONE 'UTC', 'YYYY-MM-DD\"T\"HH24:MI:SS.MS\"Z\"'))\n      AND (entry.ends_at IS NULL OR entry.ends_at > to_char(now() AT TIME ZONE 'UTC', 'YYYY-MM-DD\"T\"HH24:MI:SS.MS\"Z\"'))\n    ORDER BY entry.ord\n    LIMIT 1\n  ), \"price\"::numeric) < \"price\"::numeric THEN 'true' ELSE 'false' END)",
+  "variantAxisExists": "EXISTS (SELECT 1 FROM jsonb_array_elements(CASE\n        WHEN \"variant_options\" IS NULL OR btrim(\"variant_options\") NOT LIKE '[%' THEN '[]'::jsonb\n        ELSE \"variant_options\"::jsonb\n      END) AS ax, jsonb_array_elements(CASE WHEN jsonb_typeof(ax->'values') = 'array' THEN ax->'values' ELSE '[]'::jsonb END) AS v WHERE ax->>'key' = __KEY__ AND v->>'value' = ANY(__VALUES__::text[]))",
+  "axisKeyPattern": "^[a-z0-9][a-z0-9_-]{0,63}$"
+}

package/__tests__/refetch-loading-state.test.ts

@@ -178,6 +178,28 @@ describe('pagination plugin — refetch loading state', () => {
     expect(code).toContain('ds_0_fetchesInFlight.current = 0')
   })
 
+  it('hands an overtaken response the newest rows, so a slow older request never paints over a newer one', async () => {
+    const code = await runPlugin({})
+
+    expect(code).toContain('const ds_0_fetchSeq = useRef(0)')
+    expect(code).toContain('const ds_0_latestData = useRef(undefined)')
+    // Numbered when it STARTS, before the flag goes up.
+    expect(code).toMatch(
+      /const __tqSeq = \+\+ds_0_fetchSeq\.current;?\s*ds_0_fetchesInFlight\.current \+= 1/
+    )
+    // Checked when it settles: overtaken → the newest settled rows (or its own
+    // while the successor is still in flight); newest → recorded and returned.
+    expect(code).toContain('if (__tqSeq !== ds_0_fetchSeq.current)')
+    expect(code).toContain(
+      'return ds_0_latestData.current !== undefined ? ds_0_latestData.current : __tqRows'
+    )
+    expect(code).toContain('ds_0_latestData.current = __tqRows')
+    // The guard sits on the chain BEFORE the settle handler.
+    expect(code.indexOf('__tqSeq !== ds_0_fetchSeq.current')).toBeLessThan(
+      code.indexOf('.finally(() => {')
+    )
+  })
+
   it('keeps fetchData referentially stable so the provider does not refetch in a loop', async () => {
     const code = await runPlugin({})
 
@@ -249,6 +271,7 @@ describe('pagination plugin — refetch loading state', () => {
     const code = generator(chunk.content as types.Node).code
     expect(code).not.toContain('ds_0_isFetching')
     expect(code).not.toContain('ds_0_fetchesInFlight')
+    expect(code).not.toContain('ds_0_fetchSeq')
   })
 
   it('leaves a provider without a designed loading state untouched', async () => {

package/__tests__/search-clear-button.test.ts

@@ -0,0 +1,122 @@
+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'
+import { SEARCH_CLEAR_ATTR } from '../src/search-clear'
+
+// tslint:disable:no-any
+
+const element = (
+  tag: string,
+  attrs: Array<[string, string]>,
+  children: types.JSXElement['children'] = []
+): types.JSXElement =>
+  types.jsxElement(
+    types.jsxOpeningElement(
+      types.jsxIdentifier(tag),
+      attrs.map(([name, value]) =>
+        types.jsxAttribute(types.jsxIdentifier(name), types.stringLiteral(value))
+      ),
+      false
+    ),
+    types.jsxClosingElement(types.jsxIdentifier(tag)),
+    children,
+    false
+  )
+
+const searchInput = (): types.JSXElement => element('input', [['className', 'search-input']])
+const clearButton = (): types.JSXElement =>
+  element('button', [
+    ['type', 'button'],
+    [SEARCH_CLEAR_ATTR, 'true'],
+  ])
+
+/**
+ * A component whose JSX is the field the editor builds — `<div><input
+ * class=search-input/><button data-tq-search-clear/></div>` — plus, when
+ * asked, a stray marked button somewhere else on the page.
+ */
+const makeComponentChunk = (withStrayButton: boolean): ChunkDefinition => {
+  const field = element('div', [['data-tq-search-field', 'true']], [searchInput(), clearButton()])
+  const root = element(
+    'div',
+    [],
+    withStrayButton ? [field, element('div', [], [clearButton()])] : [field]
+  )
+  const body = types.blockStatement([types.returnStatement(root)])
+  const arrow = types.arrowFunctionExpression([types.identifier('props')], body)
+  const declaration = types.variableDeclaration('const', [
+    types.variableDeclarator(types.identifier('TestComponent'), arrow),
+  ])
+  return {
+    name: 'jsx-component',
+    type: ChunkType.AST,
+    fileType: FileType.JS,
+    linkAfter: [],
+    content: declaration,
+    meta: {},
+  }
+}
+
+const makeUidlNode = (): any => ({
+  type: 'data-source-list',
+  content: {
+    renderPropIdentifier: 'items',
+    resourceDefinition: {
+      dataSourceId: 'ds1',
+      tableName: 'products',
+      dataSourceType: 'postgresql',
+    },
+    resource: { params: { queryColumns: { content: ['name'] } } },
+    nodes: {
+      success: {
+        type: 'cms-list-repeater',
+        content: {
+          renderPropIdentifier: 'product',
+          paginated: true,
+          perPage: 20,
+          searchEnabled: true,
+          searchDebounce: 300,
+          nodes: { list: { type: 'element', content: { elementType: 'div' } } },
+        },
+      },
+    },
+  },
+})
+
+const runPlugin = async (withStrayButton = false): Promise<string> => {
+  const chunk = makeComponentChunk(withStrayButton)
+  const structure: ComponentStructure = {
+    uidl: { name: 'TestComponent', node: makeUidlNode() },
+    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 — search clear button', () => {
+  it('empties the query on click and renders only while something is typed', async () => {
+    const flat = collapse(await runPlugin())
+    expect(flat).toContain('onClick={() => setDs_0_searchQuery("")}')
+    expect(flat).toContain('{ds_0_searchQuery ? <button type="button" data-tq-search-clear="true"')
+    expect(flat).toContain(': null}')
+    // The input beside it is the one the button clears.
+    expect(flat).toContain('value={ds_0_searchQuery}')
+  })
+
+  it('leaves a marked button that shares no parent with a search input alone', async () => {
+    const flat = collapse(await runPlugin(true))
+    expect(flat.match(/setDs_0_searchQuery\(""\)/g)).toHaveLength(1)
+    // The stray one keeps its markup, unwired and unconditional.
+    expect(flat).toContain('<div><button type="button" data-tq-search-clear="true"></button></div>')
+  })
+})

package/dist/cjs/content-localization.d.ts

@@ -0,0 +1,37 @@
+import type { GeneratorOptions } from '@teleporthq/teleport-types';
+/**
+ * The languages a project's DATABASE content is stored in.
+ *
+ * Translatable columns of the platform tables (`teleport_products.name`,
+ * `teleport_blog_posts.title`, …) hold the MAIN language, and every other
+ * language of the project owns a `<locale>_<column>` copy (`es_name`) — the
+ * editor creates those columns when a language is added. The generated
+ * fetcher resolves a row against the locale the visitor is reading in, so it
+ * needs to know which locale is the main one (never prefixed) and which
+ * locales may have a prefixed copy.
+ */
+export interface ContentLocalization {
+    /** The locale whose values live in the base columns, never in a prefixed copy. */
+    mainLocale: string;
+    /** Every other locale of the project — each may own a `<locale>_<column>` copy. */
+    secondaryLocales: string[];
+}
+/**
+ * The options both a generator pass (`GeneratorOptions`) and a project plugin
+ * (the `ProjectUIDL` itself) can hand over — the two carry the same
+ * `internationalization` shape.
+ */
+export type LocalizedProjectOptions = Pick<GeneratorOptions, 'internationalization'>;
+/**
+ * Derives the content localization from the project's i18n settings, or
+ * `undefined` for a single-language project — in which case nothing about a
+ * generated fetch mentions a locale, exactly as before languages existed.
+ */
+export declare const resolveContentLocalization: (options: LocalizedProjectOptions) => ContentLocalization | undefined;
+/**
+ * True when the project has a language setup at all — the same condition under
+ * which the Next generator emits its i18n routing (`skipI18n`), and therefore
+ * the condition under which a fetch has to say which language it is for.
+ */
+export declare const isLocalizedProject: (options: LocalizedProjectOptions) => boolean;
+//# sourceMappingURL=content-localization.d.ts.map

package/dist/cjs/content-localization.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"content-localization.d.ts","sourceRoot":"","sources":["../../src/content-localization.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAElE;;;;;;;;;;GAUG;AACH,MAAM,WAAW,mBAAmB;IAClC,kFAAkF;IAClF,UAAU,EAAE,MAAM,CAAA;IAClB,mFAAmF;IACnF,gBAAgB,EAAE,MAAM,EAAE,CAAA;CAC3B;AAED;;;;GAIG;AACH,MAAM,MAAM,uBAAuB,GAAG,IAAI,CAAC,gBAAgB,EAAE,sBAAsB,CAAC,CAAA;AAEpF;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,YAC5B,uBAAuB,KAC/B,mBAAmB,GAAG,SAUxB,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,YAAa,uBAAuB,KAAG,OACnB,CAAA"}

package/dist/cjs/content-localization.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isLocalizedProject = exports.resolveContentLocalization = void 0;
+/**
+ * Derives the content localization from the project's i18n settings, or
+ * `undefined` for a single-language project — in which case nothing about a
+ * generated fetch mentions a locale, exactly as before languages existed.
+ */
+var resolveContentLocalization = function (options) {
+    var _a;
+    var internationalization = options.internationalization;
+    var mainLocale = (_a = internationalization === null || internationalization === void 0 ? void 0 : internationalization.main) === null || _a === void 0 ? void 0 : _a.locale;
+    if (!mainLocale) {
+        return undefined;
+    }
+    var secondaryLocales = Object.keys(internationalization.languages || {}).filter(function (locale) { return locale !== mainLocale; });
+    return { mainLocale: mainLocale, secondaryLocales: secondaryLocales };
+};
+exports.resolveContentLocalization = resolveContentLocalization;
+/**
+ * True when the project has a language setup at all — the same condition under
+ * which the Next generator emits its i18n routing (`skipI18n`), and therefore
+ * the condition under which a fetch has to say which language it is for.
+ */
+var isLocalizedProject = function (options) {
+    return (0, exports.resolveContentLocalization)(options) !== undefined;
+};
+exports.isLocalizedProject = isLocalizedProject;
+//# sourceMappingURL=content-localization.js.map

package/dist/cjs/content-localization.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"content-localization.js","sourceRoot":"","sources":["../../src/content-localization.ts"],"names":[],"mappings":";;;AA2BA;;;;GAIG;AACI,IAAM,0BAA0B,GAAG,UACxC,OAAgC;;IAEhC,IAAM,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAA;IACzD,IAAM,UAAU,GAAG,MAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,IAAI,0CAAE,MAAM,CAAA;IACrD,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,SAAS,CAAA;KACjB;IACD,IAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,CAC/E,UAAC,MAAM,IAAK,OAAA,MAAM,KAAK,UAAU,EAArB,CAAqB,CAClC,CAAA;IACD,OAAO,EAAE,UAAU,YAAA,EAAE,gBAAgB,kBAAA,EAAE,CAAA;AACzC,CAAC,CAAA;AAZY,QAAA,0BAA0B,8BAYtC;AAED;;;;GAIG;AACI,IAAM,kBAAkB,GAAG,UAAC,OAAgC;IACjE,OAAA,IAAA,kCAA0B,EAAC,OAAO,CAAC,KAAK,SAAS;AAAjD,CAAiD,CAAA;AADtC,QAAA,kBAAkB,sBACoB"}

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

@@ -27,8 +27,18 @@ interface CountEffectOptions {
     urlParams: types.ObjectProperty[];
     /** Dependencies that should re-run the count. */
     deps: types.Expression[];
+    /**
+     * Name of the `useRef(0)` counting the count requests STARTED. Each request
+     * notes its sequence number and a response overtaken by a newer request is
+     * dropped: two filter changes in quick succession start two counts, and the
+     * older, slower one landing last painted a page strip for a result set the
+     * list no longer shows.
+     */
+    countSeqRefVar: string;
 }
-export declare const buildCountFetchStatement: (options: Pick<CountEffectOptions, 'fileName' | 'perPage' | 'setMaxPagesVar' | 'urlParams'>) => types.Statement;
+/** `const ds_N_countSeq = useRef(0)` */
+export declare const buildCountSeqDeclaration: (countSeqRefVar: string) => types.Statement;
+export declare const buildCountFetchStatement: (options: Pick<CountEffectOptions, 'fileName' | 'perPage' | 'setMaxPagesVar' | 'urlParams' | 'countSeqRefVar'>) => types.Statement;
 /**
  * The whole `useEffect(...)` wrapper.
  *

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

@@ -1 +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"}
+{"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;IACxB;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAA;CACvB;AAED,wCAAwC;AACxC,eAAO,MAAM,wBAAwB,mBAAoB,MAAM,KAAG,MAAM,SAMpE,CAAA;AAqDJ,eAAO,MAAM,wBAAwB,YAC1B,KACP,kBAAkB,EAClB,UAAU,GAAG,SAAS,GAAG,gBAAgB,GAAG,WAAW,GAAG,gBAAgB,CAC3E,KACA,MAAM,SA2DN,CAAA;AAEH;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,YAAa,kBAAkB,KAAG,MAAM,mBAYvE,CAAA"}

package/dist/cjs/count-effect.js

@@ -23,8 +23,19 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildCountFetchEffect = exports.buildCountFetchStatement = void 0;
+exports.buildCountFetchEffect = exports.buildCountFetchStatement = exports.buildCountSeqDeclaration = void 0;
 var types = __importStar(require("@babel/types"));
+/** `const ds_N_countSeq = useRef(0)` */
+var buildCountSeqDeclaration = function (countSeqRefVar) {
+    return types.variableDeclaration('const', [
+        types.variableDeclarator(types.identifier(countSeqRefVar), types.callExpression(types.identifier('useRef'), [types.numericLiteral(0)])),
+    ]);
+};
+exports.buildCountSeqDeclaration = buildCountSeqDeclaration;
+var COUNT_SEQ_LOCAL = '__tqCountSeq';
+var refCurrent = function (refVar) {
+    return types.memberExpression(types.identifier(refVar), types.identifier('current'));
+};
 /**
  * `data.count === 0 ? 0 : Math.ceil(data.count / perPage)`
  *
@@ -37,6 +48,19 @@ var buildMaxPagesExpression = function (perPage) {
         types.binaryExpression('/', types.memberExpression(types.identifier('data'), types.identifier('count')), types.numericLiteral(perPage)),
     ]));
 };
+/**
+ * `const __tqCountSeq = ++ds_N_countSeq.current` — the request's sequence
+ * number, taken before the fetch starts.
+ */
+var buildCountSeqCapture = function (countSeqRefVar) {
+    return types.variableDeclaration('const', [
+        types.variableDeclarator(types.identifier(COUNT_SEQ_LOCAL), types.updateExpression('++', refCurrent(countSeqRefVar), true)),
+    ]);
+};
+/** `if (__tqCountSeq !== ds_N_countSeq.current) return` — a newer count is in flight. */
+var buildStaleCountGuard = function (countSeqRefVar) {
+    return types.ifStatement(types.binaryExpression('!==', types.identifier(COUNT_SEQ_LOCAL), refCurrent(countSeqRefVar)), types.returnStatement());
+};
 var buildCountFetchStatement = function (options) {
     return types.expressionStatement(types.callExpression(types.memberExpression(types.callExpression(types.memberExpression(types.callExpression(types.identifier('fetch'), [
         types.templateLiteral([
@@ -54,6 +78,7 @@ var buildCountFetchStatement = function (options) {
         types.arrowFunctionExpression([types.identifier('res')], types.callExpression(types.memberExpression(types.identifier('res'), types.identifier('json')), [])),
     ]), types.identifier('then')), [
         types.arrowFunctionExpression([types.identifier('data')], types.blockStatement([
+            buildStaleCountGuard(options.countSeqRefVar),
             types.ifStatement(types.logicalExpression('&&', types.identifier('data'), types.binaryExpression('in', types.stringLiteral('count'), types.identifier('data'))), types.blockStatement([
                 types.expressionStatement(types.callExpression(types.identifier(options.setMaxPagesVar), [
                     buildMaxPagesExpression(options.perPage),
@@ -73,7 +98,10 @@ exports.buildCountFetchStatement = buildCountFetchStatement;
  */
 var buildCountFetchEffect = function (options) {
     return types.expressionStatement(types.callExpression(types.identifier('useEffect'), [
-        types.arrowFunctionExpression([], types.blockStatement([(0, exports.buildCountFetchStatement)(options)])),
+        types.arrowFunctionExpression([], types.blockStatement([
+            buildCountSeqCapture(options.countSeqRefVar),
+            (0, exports.buildCountFetchStatement)(options),
+        ])),
         types.arrayExpression(options.deps),
     ]));
 };

package/dist/cjs/count-effect.js.map

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

package/dist/cjs/fetchers/airtable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"airtable.d.ts","sourceRoot":"","sources":["../../../src/fetchers/airtable.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,sBAAsB,WACzB,OAAO,MAAM,EAAE,OAAO,CAAC,KAC9B;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAcpC,CAAA;AAQD,eAAO,MAAM,uBAAuB,WAC1B,OAAO,MAAM,EAAE,OAAO,CAAC,aACpB,MAAM,KAChB,MAqNF,CAAA"}
+{"version":3,"file":"airtable.d.ts","sourceRoot":"","sources":["../../../src/fetchers/airtable.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,sBAAsB,WACzB,OAAO,MAAM,EAAE,OAAO,CAAC,KAC9B;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAcpC,CAAA;AAQD,eAAO,MAAM,uBAAuB,WAC1B,OAAO,MAAM,EAAE,OAAO,CAAC,aACpB,MAAM,KAChB,MAuNF,CAAA"}

package/dist/cjs/fetchers/airtable.js

@@ -19,7 +19,7 @@ var generateAirtableFetcher = function (config, tableName) {
     var airtableConfig = config;
     var baseId = airtableConfig.baseId;
     var personalAccessToken = airtableConfig.personalAccessToken;
-    return "import fetch from 'node-fetch'\n\n".concat((0, utils_1.generateSafeJSONParseCode)(), "\n\n").concat((0, utils_1.generateFilterTreeHelpersCode)(), "\n\n").concat((0, utils_1.generateDateFormatterCode)(), "\n\n// Escape a string literal for Airtable formula grammar. Strings use\n// single quotes; embedded single-quote must be backslash-escaped.\n// Backslash itself also escapes.\nconst escapeAirtableString = (s) => {\n  return \"'\" + String(s).replace(/\\\\/g, '\\\\\\\\').replace(/'/g, \"\\\\'\") + \"'\"\n}\n\n// Escape an Airtable field reference name for use inside curly braces.\n// Only close-brace and backslash are special inside the braces.\nconst escapeAirtableFieldRef = (name) => {\n  return String(name).replace(/\\\\/g, '\\\\\\\\').replace(/}/g, '\\\\}')\n}\n\nconst buildAirtableSearchFormula = (rawQuery, rawQueryColumns) => {\n  if (typeof rawQuery !== 'string' || rawQuery.trim() === '') return ''\n  let cols = []\n  if (rawQueryColumns) {\n    const parsed = safeJSONParse(rawQueryColumns)\n    cols = Array.isArray(parsed) ? parsed : (parsed ? [parsed] : [])\n  }\n  const validCols = cols.filter((c) => typeof c === 'string' && c.length > 0)\n  if (validCols.length === 0) return ''\n  const literal = escapeAirtableString(rawQuery)\n  const parts = validCols.map(\n    (col) => 'SEARCH(' + literal + ', {' + escapeAirtableFieldRef(col) + '})'\n  )\n  return parts.length === 1 ? parts[0] : 'OR(' + parts.join(',') + ')'\n}\n\nexport default async function handler(req, res) {\n  try {\n    const { query, queryColumns, view, limit, page, perPage, sortBy, sortOrder, filters, sorts, offset: offsetParam } = req.query\n\n    const queryParams = new URLSearchParams()\n    const formulaParts = []\n\n    if (view) {\n      queryParams.append('view', view)\n    }\n    \n    // Handle sorts - new array format\n    if (sorts) {\n      const parsedSorts = safeJSONParse(sorts)\n      if (Array.isArray(parsedSorts) && parsedSorts.length > 0) {\n        parsedSorts.forEach((sort, index) => {\n          if (!sort.field) return\n          queryParams.append(`sort[${index}][field]`, sort.field)\n          queryParams.append(`sort[${index}][direction]`, (sort.order || '').toLowerCase().startsWith('desc') ? 'desc' : 'asc')\n        })\n      }\n    } else if (sortBy) {\n      queryParams.append('sort[0][field]', sortBy)\n      queryParams.append('sort[0][direction]', (sortOrder || '').toLowerCase().startsWith('desc') ? 'desc' : 'asc')\n    }\n    \n    const perPageValue = limit || perPage || 100\n    queryParams.append('pageSize', Math.min(parseInt(perPageValue), 100).toString())\n    \n    const formatAirtableValue = (value) => {\n      if (typeof value === 'string') {\n        return `'${value.replace(/'/g, \"\\\\'\")}'`\n      } else if (typeof value === 'number') {\n        return String(value)\n      } else if (typeof value === 'boolean') {\n        return value ? 'TRUE()' : 'FALSE()'\n      }\n      return `'${String(value)}'`\n    }\n    \n    if (filters) {\n      const filterTree = normalizeFilterTree(safeJSONParse(filters))\n      \n      if (filterTree) {\n        const buildCondition = (condition) => {\n          const field = condition.source\n          const value = condition.destination\n          const operand = condition.operand\n          \n          if (Array.isArray(value)) {\n            if (value.length === 0) return null\n            const arrayConditions = value.map((v) => `{${field}}=${formatAirtableValue(v)}`)\n            return arrayConditions.length > 1\n              ? `OR(${arrayConditions.join(',')})`\n              : arrayConditions[0]\n          }\n          \n          const operatorMap = {\n            '=': '=',\n            '!=': '!=',\n            '>': '>',\n            '<': '<',\n            '>=': '>=',\n            '<=': '<=',\n          }\n          const airtableOp = operatorMap[operand] || '='\n          return `{${field}}${airtableOp}${formatAirtableValue(value)}`\n        }\n        \n        // Airtable spells its logic as AND(a,b) / OR(a,b) rather than infix, so\n        // the tree is walked here instead of with buildFilterTreeClause.\n        const buildNode = (node) => {\n          if (node.type === 'group') {\n            const parts = node.children.map(buildNode).filter(Boolean)\n            if (parts.length === 0) return null\n            if (parts.length === 1) return parts[0]\n            return node.operator === 'or'\n              ? `OR(${parts.join(',')})`\n              : `AND(${parts.join(',')})`\n          }\n          return buildCondition(node)\n        }\n        \n        const filterFormula = buildNode(filterTree)\n        if (filterFormula) {\n          formulaParts.push(filterFormula)\n        }\n      }\n    }\n\n    // Apply the { query, queryColumns } search contract via the\n    // Airtable SEARCH() function. Search-term string literal escaping\n    // protects against single-quote injection; field-ref escaping\n    // protects against close-brace or backslash breaking out of the\n    // {field} reference.\n    const searchFormula = buildAirtableSearchFormula(query, queryColumns)\n    if (searchFormula) {\n      formulaParts.push(searchFormula)\n    }\n\n    if (formulaParts.length === 1) {\n      queryParams.append('filterByFormula', formulaParts[0])\n    } else if (formulaParts.length > 1) {\n      queryParams.append('filterByFormula', 'AND(' + formulaParts.join(',') + ')')\n    }\n    \n    let url = `https://api.airtable.com/v0/").concat(baseId, "/${encodeURIComponent('").concat(tableName, "')}`\n    if (queryParams.toString()) {\n      url += `?${queryParams.toString()}`\n    }\n    \n    const allRecords = []\n    let airtableOffset\n    const skipValue = offsetParam !== undefined ? parseInt(offsetParam) : (page ? (parseInt(page) - 1) * parseInt(perPageValue) : 0)\n    const totalRecordsNeeded = skipValue + parseInt(perPageValue)\n    \n    do {\n      const fetchUrl = airtableOffset ? `${url}&offset=${airtableOffset}` : url\n      const response = await fetch(fetchUrl, {\n        method: 'GET',\n        headers: {\n          Authorization: `Bearer ").concat((0, utils_1.replaceSecretReference)(personalAccessToken, {
+    return "import fetch from 'node-fetch'\n\n".concat((0, utils_1.generateSafeJSONParseCode)(), "\n\n").concat((0, utils_1.generateFilterTreeHelpersCode)(), "\n\n").concat((0, utils_1.generateDateFormatterCode)(), "\n\n// Escape a string literal for Airtable formula grammar. Strings use\n// single quotes; embedded single-quote must be backslash-escaped.\n// Backslash itself also escapes.\nconst escapeAirtableString = (s) => {\n  return \"'\" + String(s).replace(/\\\\/g, '\\\\\\\\').replace(/'/g, \"\\\\'\") + \"'\"\n}\n\n// Escape an Airtable field reference name for use inside curly braces.\n// Only close-brace and backslash are special inside the braces.\nconst escapeAirtableFieldRef = (name) => {\n  return String(name).replace(/\\\\/g, '\\\\\\\\').replace(/}/g, '\\\\}')\n}\n\nconst buildAirtableSearchFormula = (rawQuery, rawQueryColumns) => {\n  if (typeof rawQuery !== 'string' || rawQuery.trim() === '') return ''\n  let cols = []\n  if (rawQueryColumns) {\n    const parsed = safeJSONParse(rawQueryColumns)\n    cols = Array.isArray(parsed) ? parsed : (parsed ? [parsed] : [])\n  }\n  const validCols = cols.filter((c) => typeof c === 'string' && c.length > 0)\n  if (validCols.length === 0) return ''\n  const literal = escapeAirtableString(rawQuery)\n  const parts = validCols.map(\n    (col) => 'SEARCH(' + literal + ', {' + escapeAirtableFieldRef(col) + '})'\n  )\n  return parts.length === 1 ? parts[0] : 'OR(' + parts.join(',') + ')'\n}\n\nexport default async function handler(req, res) {\n  try {\n    const { query, queryColumns, view, limit, page, perPage, sortBy, sortOrder, filters, sorts, offset: offsetParam } = req.query\n\n    const queryParams = new URLSearchParams()\n    const formulaParts = []\n\n    if (view) {\n      queryParams.append('view', view)\n    }\n    \n    // Handle sorts - new array format\n    if (sorts) {\n      const parsedSorts = safeJSONParse(sorts)\n      if (Array.isArray(parsedSorts) && parsedSorts.length > 0) {\n        parsedSorts.forEach((sort, index) => {\n          if (!sort.field) return\n          queryParams.append(`sort[${index}][field]`, sort.field)\n          queryParams.append(`sort[${index}][direction]`, (sort.order || '').toLowerCase().startsWith('desc') ? 'desc' : 'asc')\n        })\n      }\n    } else if (sortBy) {\n      queryParams.append('sort[0][field]', sortBy)\n      queryParams.append('sort[0][direction]', (sortOrder || '').toLowerCase().startsWith('desc') ? 'desc' : 'asc')\n    }\n    \n    const perPageValue = limit || perPage || 100\n    queryParams.append('pageSize', Math.min(parseInt(perPageValue), 100).toString())\n    \n    const formatAirtableValue = (value) => {\n      if (typeof value === 'string') {\n        return `'${value.replace(/'/g, \"\\\\'\")}'`\n      } else if (typeof value === 'number') {\n        return String(value)\n      } else if (typeof value === 'boolean') {\n        return value ? 'TRUE()' : 'FALSE()'\n      }\n      return `'${String(value)}'`\n    }\n    \n    if (filters) {\n      const filterTree = normalizeFilterTree(safeJSONParse(filters))\n      \n      if (filterTree) {\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          if (Array.isArray(value)) {\n            if (value.length === 0) return null\n            const arrayConditions = value.map((v) => `{${field}}=${formatAirtableValue(v)}`)\n            return arrayConditions.length > 1\n              ? `OR(${arrayConditions.join(',')})`\n              : arrayConditions[0]\n          }\n          \n          const operatorMap = {\n            '=': '=',\n            '!=': '!=',\n            '>': '>',\n            '<': '<',\n            '>=': '>=',\n            '<=': '<=',\n          }\n          const airtableOp = operatorMap[operand] || '='\n          return `{${field}}${airtableOp}${formatAirtableValue(value)}`\n        }\n        \n        // Airtable spells its logic as AND(a,b) / OR(a,b) rather than infix, so\n        // the tree is walked here instead of with buildFilterTreeClause.\n        const buildNode = (node) => {\n          if (node.type === 'group') {\n            const parts = node.children.map(buildNode).filter(Boolean)\n            if (parts.length === 0) return null\n            if (parts.length === 1) return parts[0]\n            return node.operator === 'or'\n              ? `OR(${parts.join(',')})`\n              : `AND(${parts.join(',')})`\n          }\n          return buildCondition(node)\n        }\n        \n        const filterFormula = buildNode(filterTree)\n        if (filterFormula) {\n          formulaParts.push(filterFormula)\n        }\n      }\n    }\n\n    // Apply the { query, queryColumns } search contract via the\n    // Airtable SEARCH() function. Search-term string literal escaping\n    // protects against single-quote injection; field-ref escaping\n    // protects against close-brace or backslash breaking out of the\n    // {field} reference.\n    const searchFormula = buildAirtableSearchFormula(query, queryColumns)\n    if (searchFormula) {\n      formulaParts.push(searchFormula)\n    }\n\n    if (formulaParts.length === 1) {\n      queryParams.append('filterByFormula', formulaParts[0])\n    } else if (formulaParts.length > 1) {\n      queryParams.append('filterByFormula', 'AND(' + formulaParts.join(',') + ')')\n    }\n    \n    let url = `https://api.airtable.com/v0/").concat(baseId, "/${encodeURIComponent('").concat(tableName, "')}`\n    if (queryParams.toString()) {\n      url += `?${queryParams.toString()}`\n    }\n    \n    const allRecords = []\n    let airtableOffset\n    const skipValue = offsetParam !== undefined ? parseInt(offsetParam) : (page ? (parseInt(page) - 1) * parseInt(perPageValue) : 0)\n    const totalRecordsNeeded = skipValue + parseInt(perPageValue)\n    \n    do {\n      const fetchUrl = airtableOffset ? `${url}&offset=${airtableOffset}` : url\n      const response = await fetch(fetchUrl, {\n        method: 'GET',\n        headers: {\n          Authorization: `Bearer ").concat((0, utils_1.replaceSecretReference)(personalAccessToken, {
         templateLiteral: true,
     }), "`,\n          'Content-Type': 'application/json'\n        }\n      })\n      \n      if (!response.ok) {\n        const errorData = await response.json().catch(() => ({}))\n        return res.status(response.status).json({\n          success: false,\n          error: errorData.error?.message || `HTTP ${response.status}: ${response.statusText}`,\n          timestamp: Date.now()\n        })\n      }\n      \n      const data = await response.json()\n      allRecords.push(...data.records)\n      airtableOffset = data.offset\n      \n      if (allRecords.length >= totalRecordsNeeded || !airtableOffset) {\n        break\n      }\n    } while (airtableOffset)\n    \n    const paginatedRecords = allRecords.slice(skipValue, skipValue + parseInt(perPageValue))\n    \n    const formattedRecords = paginatedRecords.map((record) => ({\n      id: record.id,\n      ...record.fields,\n      createdTime: record.createdTime\n    }))\n    \n    const safeData = JSON.parse(JSON.stringify(formattedRecords, dateReplacer))\n    \n    return res.status(200).json({\n      success: true,\n      data: safeData,\n      timestamp: Date.now()\n    })\n  } catch (error) {\n    console.error('Airtable fetch error:', error)\n    return res.status(500).json({\n      success: false,\n      error: error.message || 'Failed to fetch data',\n      timestamp: Date.now()\n    })\n  }\n}\n");
 };

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

@@ -1 +1 @@
-{"version":3,"file":"airtable.js","sourceRoot":"","sources":["../../../src/fetchers/airtable.ts"],"names":[],"mappings":";;;AAAA,kCAKiB;AAEV,IAAM,sBAAsB,GAAG,UACpC,MAA+B;IAE/B,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QACzC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,+BAA+B,EAAE,CAAA;KAClE;IAED,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACtF,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,8BAA8B,EAAE,CAAA;KACjE;IAED,IAAI,CAAC,MAAM,CAAC,mBAAmB,IAAI,OAAO,MAAM,CAAC,mBAAmB,KAAK,QAAQ,EAAE;QACjF,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,4CAA4C,EAAE,CAAA;KAC/E;IAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;AAC1B,CAAC,CAAA;AAhBY,QAAA,sBAAsB,0BAgBlC;AAQM,IAAM,uBAAuB,GAAG,UACrC,MAA+B,EAC/B,SAAiB;IAEjB,IAAM,cAAc,GAAG,MAAwB,CAAA;IAC/C,IAAM,MAAM,GAAG,cAAc,CAAC,MAAM,CAAA;IACpC,IAAM,mBAAmB,GAAG,cAAc,CAAC,mBAAmB,CAAA;IAE9D,OAAO,4CAEP,IAAA,iCAAyB,GAAE,iBAE3B,IAAA,qCAA6B,GAAE,iBAE/B,IAAA,iCAAyB,GAAE,irKAyIiB,MAAM,oCAA2B,SAAS,wkBAepD,IAAA,8BAAsB,EAAC,mBAAmB,EAAE;QACpE,eAAe,EAAE,IAAI;KACtB,CAAC,+1CA+CX,CAAA;AACD,CAAC,CAAA;AAxNY,QAAA,uBAAuB,2BAwNnC"}
+{"version":3,"file":"airtable.js","sourceRoot":"","sources":["../../../src/fetchers/airtable.ts"],"names":[],"mappings":";;;AAAA,kCAKiB;AAEV,IAAM,sBAAsB,GAAG,UACpC,MAA+B;IAE/B,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QACzC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,+BAA+B,EAAE,CAAA;KAClE;IAED,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACtF,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,8BAA8B,EAAE,CAAA;KACjE;IAED,IAAI,CAAC,MAAM,CAAC,mBAAmB,IAAI,OAAO,MAAM,CAAC,mBAAmB,KAAK,QAAQ,EAAE;QACjF,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,4CAA4C,EAAE,CAAA;KAC/E;IAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;AAC1B,CAAC,CAAA;AAhBY,QAAA,sBAAsB,0BAgBlC;AAQM,IAAM,uBAAuB,GAAG,UACrC,MAA+B,EAC/B,SAAiB;IAEjB,IAAM,cAAc,GAAG,MAAwB,CAAA;IAC/C,IAAM,MAAM,GAAG,cAAc,CAAC,MAAM,CAAA;IACpC,IAAM,mBAAmB,GAAG,cAAc,CAAC,mBAAmB,CAAA;IAE9D,OAAO,4CAEP,IAAA,iCAAyB,GAAE,iBAE3B,IAAA,qCAA6B,GAAE,iBAE/B,IAAA,iCAAyB,GAAE,41KA2IiB,MAAM,oCAA2B,SAAS,wkBAepD,IAAA,8BAAsB,EAAC,mBAAmB,EAAE;QACpE,eAAe,EAAE,IAAI;KACtB,CAAC,+1CA+CX,CAAA;AACD,CAAC,CAAA;AA1NY,QAAA,uBAAuB,2BA0NnC"}