pgkiln 0.55.0 → 0.56.0

package/examples/gallery/samples/sample-maps.sql

@@ -0,0 +1,175 @@
+-- =====================================================================
+-- Sample app "Sample Maps" (App Gallery → Sample Apps)
+--
+-- Map regions on Dutch museums, without PostGIS: markers with popups and
+-- clustering; several layers (markers, a route and an area as GeoJSON, a
+-- heat map that starts hidden); a map that filters the report beside it by
+-- distance; and a form with a location item ("Use my location") whose
+-- places show on a map.
+--
+-- Installed by an administrator from the App Gallery, or with
+--   psql "$DATABASE_URL" -1 -f examples/gallery/samples/sample-maps.sql
+-- then open /a/sample-maps and sign in as demo / demo.
+-- =====================================================================
+
+create or replace function pg_temp.page_id(p_alias text, p_page int) returns int language sql stable as
+  $$ select p.id from meta.page p join meta.app a on a.id = p.app_id where a.alias = p_alias and p.page_no = p_page $$;
+create or replace function pg_temp.region_id(p_alias text, p_page int, p_static text) returns int language sql stable as
+  $$ select r.id from meta.region r where r.page_id = pg_temp.page_id(p_alias, p_page) and r.static_id = p_static $$;
+
+-- 1. Schema and data ---------------------------------------------------------
+create schema sample_maps;
+
+create table sample_maps.museum (
+  id       int generated always as identity primary key,
+  name     text not null unique,
+  city     text not null,
+  kind     text not null check (kind in ('Art', 'History', 'Science', 'Maritime', 'Nature')),
+  visitors int not null,
+  lat      numeric(8, 5) not null,
+  lng      numeric(8, 5) not null
+);
+
+insert into sample_maps.museum (name, city, kind, visitors, lat, lng) values
+  ('Rijksmuseum', 'Amsterdam', 'Art', 2500000, 52.36000, 4.88520),
+  ('Van Gogh Museum', 'Amsterdam', 'Art', 2100000, 52.35840, 4.88110),
+  ('Stedelijk Museum', 'Amsterdam', 'Art', 700000, 52.35800, 4.87970),
+  ('Anne Frank House', 'Amsterdam', 'History', 1300000, 52.37520, 4.88400),
+  ('NEMO Science Museum', 'Amsterdam', 'Science', 650000, 52.37380, 4.91230),
+  ('National Maritime Museum', 'Amsterdam', 'Maritime', 400000, 52.37140, 4.91490),
+  ('Mauritshuis', 'The Hague', 'Art', 450000, 52.08040, 4.31430),
+  ('Kunstmuseum Den Haag', 'The Hague', 'Art', 400000, 52.08970, 4.28060),
+  ('Kunsthal', 'Rotterdam', 'Art', 280000, 51.91070, 4.47330),
+  ('Maritime Museum Rotterdam', 'Rotterdam', 'Maritime', 300000, 51.91740, 4.48230),
+  ('Centraal Museum', 'Utrecht', 'Art', 200000, 52.08360, 5.12590),
+  ('Rijksmuseum van Oudheden', 'Leiden', 'History', 230000, 52.15840, 4.48590),
+  ('Naturalis', 'Leiden', 'Nature', 400000, 52.16520, 4.47370),
+  ('Frans Hals Museum', 'Haarlem', 'Art', 200000, 52.37720, 4.63660),
+  ('Teylers Museum', 'Haarlem', 'Science', 150000, 52.38010, 4.64030),
+  ('Kröller-Müller Museum', 'Otterlo', 'Art', 350000, 52.09550, 5.81700),
+  ('Van Abbemuseum', 'Eindhoven', 'Art', 120000, 51.43420, 5.48180),
+  ('Groninger Museum', 'Groningen', 'Art', 250000, 53.21240, 6.56600),
+  ('Bonnefanten', 'Maastricht', 'Art', 120000, 50.84220, 5.70200),
+  ('Zuiderzeemuseum', 'Enkhuizen', 'History', 250000, 52.70360, 5.29410);
+
+-- lines and areas as GeoJSON text (with PostGIS a geometry column works the same way)
+create table sample_maps.shape (
+  id      int generated always as identity primary key,
+  name    text not null,
+  geojson text not null
+);
+
+insert into sample_maps.shape (name, geojson) values
+  ('Museum walk: Anne Frank House to the Rijksmuseum',
+   '{"type": "LineString", "coordinates": [[4.8840, 52.3752], [4.8851, 52.3700], [4.8868, 52.3650], [4.8852, 52.3600], [4.8811, 52.3584]]}'),
+  ('Museumplein',
+   '{"type": "Polygon", "coordinates": [[[4.8790, 52.3590], [4.8850, 52.3590], [4.8855, 52.3565], [4.8795, 52.3560], [4.8790, 52.3590]]]}');
+
+create table sample_maps.place (
+  id       int generated always as identity primary key,
+  name     text not null,
+  note     text,
+  location text check (location ~ '^-?\d{1,2}(\.\d+)?,-?\d{1,3}(\.\d+)?$')
+);
+
+insert into sample_maps.place (name, note, location) values
+  ('Amsterdam Centraal', 'Trains every few minutes', '52.37890,4.90040'),
+  ('Vondelpark', 'Lunch in the park', '52.35800,4.86860');
+
+-- 2. The application's database role ----------------------------------------
+do $$ begin
+  if not exists (select 1 from pg_roles where rolname = 'app_sample_maps') then create role app_sample_maps nologin; end if;
+end $$;
+grant app_sample_maps to pgkiln_runtime;
+grant usage on schema sample_maps to app_sample_maps;
+grant select on sample_maps.museum, sample_maps.shape to app_sample_maps;
+grant select, insert, update, delete on sample_maps.place to app_sample_maps;
+
+-- 3. The application ----------------------------------------------------------
+insert into meta.app (alias, name, home_page, authentication, db_role)
+values ('sample-maps', 'Sample Maps', 1, 'app_users', 'app_sample_maps');
+
+insert into meta.app_user (app_id, username, password_hash, roles)
+select id, 'demo', meta.hash_password('demo'), '{}' from meta.app where alias = 'sample-maps';
+
+insert into meta.page (app_id, page_no, name, title, parent_page)
+select a.id, p.no, p.name, p.name, p.parent
+  from meta.app a, (values (1, 'Sample Maps', null), (2, 'Museums', 1), (3, 'Layers', 1), (4, 'Map and list', 1)) as p (no, name, parent)
+ where a.alias = 'sample-maps';
+
+-- page 5 and its form, page 6: the Report and form wizard on the places
+select meta.generate_page('sample-maps', 'report_form', 'sample_maps.place', 5, '{"label": "My places", "form_page": 6, "nav": false}');
+update meta.page set parent_page = 1 where app_id = (select id from meta.app where alias = 'sample-maps') and page_no = 5;
+update meta.item set type = 'location', help = 'Latitude,longitude; Use my location fills it in from the device.'
+ where page_id = pg_temp.page_id('sample-maps', 6) and name = 'P6_LOCATION';
+
+insert into meta.nav_entry (app_id, seq, label, icon, target_page)
+select a.id, n.seq, n.label, n.icon, n.page
+  from meta.app a, (values
+  (10, 'Home', 'home', 1), (20, 'Museums', 'map', 2), (30, 'Layers', 'layers', 3),
+  (40, 'Map and list', 'list', 4), (50, 'My places', 'map', 5)
+  ) as n (seq, label, icon, page)
+ where a.alias = 'sample-maps';
+
+insert into meta.list (app_id, name, type, description)
+select id, 'MAP_TOPICS', 'static', 'The pages of Sample Maps' from meta.app where alias = 'sample-maps';
+
+insert into meta.list_entry (app_id, list_name, seq, label, icon, target_page, description)
+select a.id, 'MAP_TOPICS', e.seq, e.label, e.icon, e.page, e.description
+  from meta.app a, (values
+  (10, 'Museums', 'map', 2, 'Markers from latitude and longitude columns, popups, and clusters that open as you zoom in.'),
+  (20, 'Layers', 'layers', 3, 'Several queries on one map: markers, a route and an area as GeoJSON, a heat map you switch on.'),
+  (30, 'Map and list', 'list', 4, 'Move the map, then show only the museums within that distance in the list beside it.'),
+  (40, 'My places', 'map', 5, 'A form with a location item: Use my location stores latitude,longitude, the map shows them.')
+  ) as e (seq, label, icon, page, description)
+ where a.alias = 'sample-maps';
+
+insert into meta.region (page_id, seq, title, type, columns, template, source, config, static_id)
+select pg_temp.page_id('sample-maps', r.page), r.seq, r.title, r.type, r.cols, r.template, r.source, r.config::jsonb, r.sid
+  from (values
+  -- 1 Home
+  (1, 10, 'Sample Maps', 'static', 12, 'hero',
+   '<p>A map region draws the rows of a SELECT: a place per row from <code>lat</code> and <code>lng</code> columns (or a <code>location</code> column holding <code>latitude,longitude</code>), lines and areas from a <code>geojson</code> column. No GIS extension is needed; with PostGIS a <code>geometry</code> column works too, and filtering by area runs on the server.</p>',
+   '{"icon": "map"}', null),
+  (1, 20, 'Topics', 'list', 12, 'plain', null, '{"list": "MAP_TOPICS", "template": "cards"}', null),
+
+  -- 2 Museums
+  (2, 5, 'About this page', 'static', 12, 'plain',
+   '<p class="lead">One query, one marker per museum: <code>title</code> and <code>body</code> fill the popup. With <code>"cluster": true</code> markers that are close together become one round marker with their number; click it, or zoom in, and they come apart. Below the map the same places are listed, which is also what you get without JavaScript.</p>',
+   '{}', null),
+  (2, 10, 'Museums in the Netherlands', 'map', 12, 'standard',
+   E'select name as title, city || '' · '' || kind || '' · '' || to_char(visitors, ''FM9G999G999'') || '' visitors a year'' as body, lat, lng\n  from sample_maps.museum order by name',
+   '{"cluster": true, "height": "large", "name": "Museums"}', 'museums'),
+
+  -- 3 Layers
+  (3, 5, 'About this page', 'static', 12, 'plain',
+   '<p class="lead">The region''s query is the first layer; <code>layers</code> adds more, each with its own query and settings. The walk and Museumplein come from a <code>geojson</code> column; the visitor heat map (<code>"layer": "heat"</code>, weighted by a <code>weight</code> column) starts hidden: switch it on in the <strong>Layers</strong> legend.</p>',
+   '{}', null),
+  (3, 10, 'Amsterdam', 'map', 12, 'standard',
+   E'select name as title, kind as body, lat, lng from sample_maps.museum where city = ''Amsterdam''',
+   '{"name": "Museums", "height": "large",
+     "layers": [{"name": "Walk and square", "source": "select name as title, geojson from sample_maps.shape"},
+                {"name": "Visitors", "layer": "heat", "hidden": true,
+                 "source": "select lat, lng, visitors / 100000 as weight from sample_maps.museum"}]}', 'layers'),
+
+  -- 4 Map and list
+  (4, 5, 'About this page', 'static', 12, 'plain',
+   '<p class="lead">The map has <code>"report"</code>: the id of the report beside it, and <code>"filter": "distance"</code>. Move or zoom the map and press <strong>Show places within … km of the centre</strong>: the report keeps only the museums within that distance (a removable chip), filtered in its SQL on the server. The report needs position columns like the map''s.</p>',
+   '{}', null),
+  (4, 10, 'Map', 'map', 6, 'standard',
+   'select name as title, city as body, lat, lng from sample_maps.museum', '{"filter": "distance", "zoom": 8}', 'filter-map'),
+  (4, 20, 'Museums', 'report', 6, 'standard',
+   'select name, city, kind, visitors, lat, lng from sample_maps.museum order by visitors desc',
+   '{"hidden": ["lat", "lng"], "page_size": 20, "formats": {"visitors": "999G999G999"}}', 'filter-list'),
+
+  -- 5 My places (the wizard's report follows at seq 10)
+  (5, 5, 'About this page', 'static', 12, 'plain',
+   '<p class="lead">The form''s <strong>Location</strong> is a location item: <em>Use my location</em> asks the browser for the device''s position and stores it as <code>latitude,longitude</code> text, which a check constraint on the column keeps in shape. The map reads the same column.</p>',
+   '{}', null),
+  (5, 20, 'On the map', 'map', 12, 'standard',
+   'select id, name as title, note as body, location from sample_maps.place where location is not null',
+   '{"link": {"page": 6, "items": {"P6_ID": "#id#"}}, "empty": "No place has a location yet."}', null)
+  ) as r (page, seq, title, type, cols, template, source, config, sid);
+
+update meta.region set config = config || jsonb_build_object('report', pg_temp.region_id('sample-maps', 4, 'filter-list'))
+ where id = pg_temp.region_id('sample-maps', 4, 'filter-map');

package/examples/gallery/samples/sample-reporting.sql

@@ -122,7 +122,7 @@ select pg_temp.page_id('sample-reporting', r.page), r.seq, r.title, r.type, r.co
 
   -- 5 Smart filters
   (5, 5, 'About this page', 'static', 12, 'plain',
-   '<p class="lead">A <code>smart_filters</code> region is the compact alternative: one search field above the report, the filters in use as chips and suggestions below it. Type <em>dutch</em> or <em>crime</em> and choose a suggestion.</p>',
+   '<p class="lead">A <code>smart_filters</code> region is the compact alternative: one search field above the report, the filters in use as chips and suggestions below it. Type <em>dutch</em> or <em>crime</em> and choose a suggestion. With <code>"ask": true</code> it also reads a phrase: type <em>novels published between 1850 and 1900</em> and choose <strong>Understood as</strong>.</p>',
    '{}', null),
   (5, 10, 'Search', 'smart_filters', 12, 'plain', null, '{}', 'smart'),
   (5, 20, 'Books', 'report', 12, 'standard',
@@ -144,8 +144,9 @@ select pg_temp.page_id('sample-reporting', r.page), r.seq, r.title, r.type, r.co
 
 update meta.region set config = jsonb_build_object(
     'report', pg_temp.region_id('sample-reporting', 5, 'smart-report'),
-    'placeholder', 'Search or filter the books…',
+    'placeholder', 'Search, filter, or type e.g. novels published between 1850 and 1900',
+    'ask', true,
     'facets', '[{"column": "genre", "label": "Genre"}, {"column": "language", "label": "Language"},
-                {"column": "published", "label": "Published", "type": "range",
+                {"column": "published", "label": "Published", "type": "range", "custom": true,
                  "ranges": [{"to": 1900}, {"from": 1900, "to": 1950}, {"from": 1950}]}]'::jsonb)
  where id = pg_temp.region_id('sample-reporting', 5, 'smart');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgkiln",
-  "version": "0.55.0",
+  "version": "0.56.0",
   "description": "Open source low-code, SQL-driven application builder for PostgreSQL, inspired by Oracle APEX",
   "keywords": [
     "postgresql",

package/src/builder/region-help.ts

@@ -15,7 +15,7 @@ export const REGION_CONFIG_HELP: [string[], string][] = [
   [['grid'], '{"page_size":25,"allow":{"insert":true,"update":true,"delete":true},"readonly":["col"],"columns":{"deptno":{"lov":"LOV:DEPARTMENTS","required":true}},"aggregates":{"sal":["sum","avg"]},"layout":{"order":["col"],"hidden":["col"],"widths":{"col":160},"frozen":1},"row_actions":{"edit":{"page":3,"items":{"P3_ID":"#id#"}},"duplicate":true,"delete":true,"links":[{"label":"…","page":4,"items":{}}]},"select_row":{"column":"id","item":"P1_ID"} (a master),"master":{"item":"P1_ID","column":"parent_id"} (a detail; any region type),"actions":true,"saved_reports":true,"public_reports":"SCHEME","views":["row","group","chart"] (views besides the grid; left out: all three)}'],
   [['calendar'], '{"link":{...}}'],
   [['facets'], '{"report":<region id>,"search":true,"facets":[{"column":"job","label":"Job","exclude":true},{"column":"sal","type":"range","ranges":[{"to":1000},{"from":1000}],"custom":true},{"column":"rating","type":"star","max":5}]}'],
-  [['smart_filters'], '{"report":<region id>,"suggestions":3,"placeholder":"…","facets":[…as facets]}'],
+  [['smart_filters'], '{"report":<region id>,"suggestions":3,"placeholder":"…","ask":true,"facets":[…as facets]}'],
   [['display_selector'], '{"style":"tabs"|"select","show_all":true,"remember":true}'],
   [['list'], '{"list":"NAME","template":"links"|"badges"|"cards"|"tabs"} (lists under Shared Components → Lists)'],
   [['*'], '{"display_selector":true} puts it in the page\'s display selector'],

package/src/builder/region-settings.ts

@@ -356,6 +356,7 @@ export function mergeSmartFiltersSettings(config: Config, b: Body, a: Allowed):
   const n = Number(b.suggestions);
   set('suggestions', b.suggestions !== undefined && b.suggestions !== '' && Number.isInteger(n) && n >= 0 && n <= 10 && n !== 3 ? n : undefined);
   set('placeholder', b.placeholder?.trim().slice(0, 100) || undefined);
+  set('ask', b.ask === 'true' ? true : undefined);
   return out;
 }
 
@@ -647,7 +648,8 @@ async function facetsFields(r: RegionRow, pageId: number, appId: number, id: (n:
         ? html`<div class="field"><label class="label" for="${id('suggestions')}">Suggestions per facet (0–10)</label>
             <input id="${id('suggestions')}" name="suggestions" type="number" min="0" max="10" value="${cfg.suggestions ?? 3}"></div>
           <div class="field" data-wide><label class="label" for="${id('placeholder')}">Placeholder of the search field</label>
-            <input id="${id('placeholder')}" name="placeholder" maxlength="100" value="${cfg.placeholder ?? ''}" placeholder="Search or filter…"></div>`
+            <input id="${id('placeholder')}" name="placeholder" maxlength="100" value="${cfg.placeholder ?? ''}" placeholder="Search or filter…"></div>
+          ${check('ask', 'Read the search as a phrase ("clerks with salary between 1000 and 3000") and offer it as filters', cfg.ask === true)}`
         : html`${check('search', 'A search field (searches all columns of the report)', cfg.search === true)}`}
     </div></fieldset>
     ${cols && 'error' in cols ? columnsHint(cols) : ''}

package/src/i18n/ar.ts

@@ -406,6 +406,7 @@ export const ar: Record<MessageKey, string> = {
   'smart.suggested': "عوامل تصفية مقترحة:",
   'smart.matching': "التصفية حسب:",
   'smart.no_match': "لا يطابق أي عامل تصفية البحث؛ يُبحث عن النص في كل الأعمدة.",
+  'smart.understood': "فُهم على أنه:",
   'rds.label': "المناطق",
   'rds.region': "المنطقة",
   'rds.show_all': "إظهار الكل",

package/src/i18n/cs.ts

@@ -406,6 +406,7 @@ export const cs: Record<MessageKey, string> = {
   'smart.suggested': "Navrhované filtry:",
   'smart.matching': "Filtrovat podle:",
   'smart.no_match': "Hledání neodpovídá žádný filtr; text se hledá ve všech sloupcích.",
+  'smart.understood': "Pochopeno jako:",
   'rds.label': "Oblasti",
   'rds.region': "Oblast",
   'rds.show_all': "Zobrazit vše",

package/src/i18n/da.ts

@@ -406,6 +406,7 @@ export const da: Record<MessageKey, string> = {
   'smart.suggested': "Foreslåede filtre:",
   'smart.matching': "Filtrér på:",
   'smart.no_match': "Intet filter passer til søgningen; teksten søges i alle kolonner.",
+  'smart.understood': "Forstået som:",
   'rds.label': "Regioner",
   'rds.region': "Region",
   'rds.show_all': "Vis alle",

package/src/i18n/de.ts

@@ -406,6 +406,7 @@ export const de: Record<MessageKey, string> = {
   'smart.suggested': 'Vorgeschlagene Filter:',
   'smart.matching': 'Filtern nach:',
   'smart.no_match': 'Kein Filter passt zur Suche; der Text wird in allen Spalten gesucht.',
+  'smart.understood': 'Verstanden als:',
   'rds.label': 'Regionen',
   'rds.region': 'Region',
   'rds.show_all': 'Alle anzeigen',

package/src/i18n/el.ts

@@ -406,6 +406,7 @@ export const el: Record<MessageKey, string> = {
   'smart.suggested': "Προτεινόμενα φίλτρα:",
   'smart.matching': "Φιλτράρισμα κατά:",
   'smart.no_match': "Κανένα φίλτρο δεν ταιριάζει· το κείμενο αναζητείται σε όλες τις στήλες.",
+  'smart.understood': "Κατανοήθηκε ως:",
   'rds.label': "Περιοχές",
   'rds.region': "Περιοχή",
   'rds.show_all': "Εμφάνιση όλων",

package/src/i18n/es.ts

@@ -406,6 +406,7 @@ export const es: Record<MessageKey, string> = {
   'smart.suggested': 'Filtros sugeridos:',
   'smart.matching': 'Filtrar por:',
   'smart.no_match': 'Ningún filtro coincide con la búsqueda; el texto se busca en todas las columnas.',
+  'smart.understood': 'Entendido como:',
   'rds.label': 'Regiones',
   'rds.region': 'Región',
   'rds.show_all': 'Mostrar todo',

package/src/i18n/fi.ts

@@ -406,6 +406,7 @@ export const fi: Record<MessageKey, string> = {
   'smart.suggested': "Ehdotetut suodattimet:",
   'smart.matching': "Suodata:",
   'smart.no_match': "Mikään suodatin ei vastaa hakua; tekstiä haetaan kaikista sarakkeista.",
+  'smart.understood': "Tulkittu näin:",
   'rds.label': "Alueet",
   'rds.region': "Alue",
   'rds.show_all': "Näytä kaikki",

package/src/i18n/fr.ts

@@ -406,6 +406,7 @@ export const fr: Record<MessageKey, string> = {
   'smart.suggested': 'Filtres suggérés :',
   'smart.matching': 'Filtrer sur :',
   'smart.no_match': 'Aucun filtre ne correspond à la recherche ; le texte est recherché dans toutes les colonnes.',
+  'smart.understood': 'Compris comme :',
   'rds.label': 'Régions',
   'rds.region': 'Région',
   'rds.show_all': 'Tout afficher',

package/src/i18n/he.ts

@@ -406,6 +406,7 @@ export const he: Record<MessageKey, string> = {
   'smart.suggested': "מסננים מוצעים:",
   'smart.matching': "סינון לפי:",
   'smart.no_match': "אין מסנן שמתאים לחיפוש; הטקסט מחופש בכל העמודות.",
+  'smart.understood': "הובן כ:",
   'rds.label': "אזורים",
   'rds.region': "אזור",
   'rds.show_all': "הצגת הכול",

package/src/i18n/it.ts

@@ -406,6 +406,7 @@ export const it: Record<MessageKey, string> = {
   'smart.suggested': "Filtri suggeriti:",
   'smart.matching': "Filtra per:",
   'smart.no_match': "Nessun filtro corrisponde alla ricerca; il testo viene cercato in tutte le colonne.",
+  'smart.understood': "Interpretato come:",
   'rds.label': "Regioni",
   'rds.region': "Regione",
   'rds.show_all': "Mostra tutto",

package/src/i18n/ja.ts

@@ -406,6 +406,7 @@ export const ja: Record<MessageKey, string> = {
   'smart.suggested': "おすすめのフィルター:",
   'smart.matching': "絞り込み:",
   'smart.no_match': "検索に一致するフィルターはありません。テキストはすべての列で検索されます。",
+  'smart.understood': "次のように解釈:",
   'rds.label': "リージョン",
   'rds.region': "リージョン",
   'rds.show_all': "すべて表示",

package/src/i18n/ko.ts

@@ -406,6 +406,7 @@ export const ko: Record<MessageKey, string> = {
   'smart.suggested': "추천 필터:",
   'smart.matching': "필터 조건:",
   'smart.no_match': "검색과 일치하는 필터가 없어 모든 열에서 텍스트를 검색합니다.",
+  'smart.understood': "이렇게 이해함:",
   'rds.label': "영역",
   'rds.region': "영역",
   'rds.show_all': "모두 표시",

package/src/i18n/nb.ts

@@ -406,6 +406,7 @@ export const nb: Record<MessageKey, string> = {
   'smart.suggested': "Foreslåtte filtre:",
   'smart.matching': "Filtrer på:",
   'smart.no_match': "Ingen filtre passer til søket; teksten søkes i alle kolonner.",
+  'smart.understood': "Forstått som:",
   'rds.label': "Regioner",
   'rds.region': "Region",
   'rds.show_all': "Vis alle",

package/src/i18n/pl.ts

@@ -406,6 +406,7 @@ export const pl: Record<MessageKey, string> = {
   'smart.suggested': "Sugerowane filtry:",
   'smart.matching': "Filtruj według:",
   'smart.no_match': "Żaden filtr nie pasuje do wyszukiwania; tekst jest szukany we wszystkich kolumnach.",
+  'smart.understood': "Zrozumiano jako:",
   'rds.label': "Regiony",
   'rds.region': "Region",
   'rds.show_all': "Pokaż wszystkie",

package/src/i18n/pt.ts

@@ -406,6 +406,7 @@ export const pt: Record<MessageKey, string> = {
   'smart.suggested': "Filtros sugeridos:",
   'smart.matching': "Filtrar por:",
   'smart.no_match': "Nenhum filtro corresponde à pesquisa; o texto é procurado em todas as colunas.",
+  'smart.understood': "Entendido como:",
   'rds.label': "Regiões",
   'rds.region': "Região",
   'rds.show_all': "Mostrar tudo",

package/src/i18n/ru.ts

@@ -406,6 +406,7 @@ export const ru: Record<MessageKey, string> = {
   'smart.suggested': "Предлагаемые фильтры:",
   'smart.matching': "Фильтровать по:",
   'smart.no_match': "Ни один фильтр не подходит; текст ищется во всех столбцах.",
+  'smart.understood': "Понято как:",
   'rds.label': "Области",
   'rds.region': "Область",
   'rds.show_all': "Показать все",

package/src/i18n/sv.ts

@@ -406,6 +406,7 @@ export const sv: Record<MessageKey, string> = {
   'smart.suggested': "Föreslagna filter:",
   'smart.matching': "Filtrera på:",
   'smart.no_match': "Inget filter matchar sökningen; texten söks i alla kolumner.",
+  'smart.understood': "Tolkat som:",
   'rds.label': "Regioner",
   'rds.region': "Region",
   'rds.show_all': "Visa alla",

package/src/i18n/tr.ts

@@ -406,6 +406,7 @@ export const tr: Record<MessageKey, string> = {
   'smart.suggested': "Önerilen süzgeçler:",
   'smart.matching': "Şuna göre süz:",
   'smart.no_match': "Aramayla eşleşen süzgeç yok; metin tüm sütunlarda aranır.",
+  'smart.understood': "Şöyle anlaşıldı:",
   'rds.label': "Bölgeler",
   'rds.region': "Bölge",
   'rds.show_all': "Tümünü göster",

package/src/i18n/uk.ts

@@ -406,6 +406,7 @@ export const uk: Record<MessageKey, string> = {
   'smart.suggested': "Запропоновані фільтри:",
   'smart.matching': "Фільтрувати за:",
   'smart.no_match': "Жоден фільтр не підходить; текст шукається в усіх стовпцях.",
+  'smart.understood': "Зрозуміло як:",
   'rds.label': "Області",
   'rds.region': "Область",
   'rds.show_all': "Показати всі",

package/src/i18n/zh.ts

@@ -406,6 +406,7 @@ export const zh: Record<MessageKey, string> = {
   'smart.suggested': "建议的筛选器：",
   'smart.matching': "筛选条件：",
   'smart.no_match': "没有与搜索匹配的筛选器；将在所有列中搜索该文本。",
+  'smart.understood': "理解为：",
   'rds.label': "区域",
   'rds.region': "区域",
   'rds.show_all': "全部显示",

package/src/i18n.ts

@@ -433,6 +433,7 @@ const en = {
   'smart.suggested': 'Suggested filters:',
   'smart.matching': 'Filter on:',
   'smart.no_match': 'No filter matches the search; the text is searched in all columns.',
+  'smart.understood': 'Understood as:',
   'rds.label': 'Regions',
   'rds.region': 'Region',
   'rds.show_all': 'Show all',
@@ -1234,6 +1235,7 @@ const nl: Record<MessageKey, string> = {
   'smart.suggested': 'Voorgestelde filters:',
   'smart.matching': 'Filteren op:',
   'smart.no_match': 'Geen filter past bij de zoektekst; de tekst wordt in alle kolommen gezocht.',
+  'smart.understood': 'Begrepen als:',
   'rds.label': 'Regio\'s',
   'rds.region': 'Regio',
   'rds.show_all': 'Alles tonen',

package/src/runtime/ai-filter.ts

@@ -11,6 +11,8 @@ import { REPORT_CHART_KINDS } from './charts.ts';
 import { bindValues, dbg, publicError, stripSemicolon, type PageContext } from './context.ts';
 import { applyPlan, checkPlan, chipsOf, ChipRefused, editChip, planIsEmpty, removeChip, type Chip, type Column, type Kind, type Plan } from './ir-plan.ts';
 import { parseQuestion, type Lookup } from './ir-phrases.ts';
+import { applyFacetSettings, clearFacets, facetSettings } from './ask-facets.ts';
+import { describeFacetFilter, reportFacetDefs, type FacetFilter } from './facet-state.ts';
 import { AGGREGATES, fieldsOf, headingOf, HIGHLIGHT_COLORS, isNumeric, opLabel, OPERATORS, q, reportState, visibleColumns, withComputations } from './report.ts';
 import { resolveRestRegion } from './rest-sources.ts';
 import { loadContext, simplePage, txContext, type Req } from './routes.ts';
@@ -37,6 +39,10 @@ import { loadContext, simplePage, txContext, type Req } from './routes.ts';
 // small form) and Remove; Undo returns to the settings before the last
 // change. All are buttons of one POST form (CSRF-checked), so they work
 // without JavaScript; the undo history is kept in the session.
+//
+// (sprint 122) With a faceted search or smart filters region on the same
+// report, a condition one of its facets can hold sets that facet instead of
+// a report filter (ask-facets.ts); the facets' selections are chips too.
 
 export { type Column } from './ir-plan.ts';
 
@@ -108,7 +114,7 @@ async function askColumns(ctx: PageContext, r: Region, params: URLSearchParams)
 }
 
 /** Stored values of the report's text columns matching the candidates (a query parameter): for "only clerks". */
-function valueLookup(ctx: PageContext, columns: Column[], src: string): Lookup {
+export function valueLookup(ctx: PageContext, columns: Column[], src: string): Lookup {
   return async (column, candidates) => {
     const cols = columns.filter((c) => c.kind === 'text' && !c.computed && (column === null || c.name === column)).slice(0, MAX_LOOKUP_COLUMNS);
     const cands = [...new Set(candidates.map((x) => x.slice(0, 200).replace(/\0/g, '')).filter(Boolean))].slice(0, MAX_CANDIDATES);
@@ -234,10 +240,14 @@ export const checkAnswer = (json: unknown, columns: Column[]) => checkPlan(json,
 
 type T = PageContext['locale']['t'];
 
-function describePlan(p: Plan, t: T, label: (n: string) => string) {
+/** The page's facets on the report (their selections are chips and Ask may set them). */
+const pageFacets = (ctx: PageContext, rid: number) => reportFacetDefs(ctx.page.regions, rid);
+
+function describePlan(p: Plan, t: T, label: (n: string) => string, facets: FacetFilter[] = []) {
   return [
     ...(p.reset ? [t('report.reset')] : []),
     ...p.filters.map((f) => `${label(f.column)} ${opLabel(t, f.operator)}${f.value ? ` ${f.value}` : ''}`),
+    ...facets.map((f) => describeFacetFilter(f, label(f.column), t)),
     ...(p.search ? [`"${p.search}"`] : []),
     ...(p.sort ? [t('ai_filter.sort', { column: `${p.sort.label}${p.desc ? ' ↓' : ''}` })] : []),
     ...p.highlights.map((h) => `${t('report.highlight')}: ${label(h.column)} ${opLabel(t, h.operator)}${h.value ? ` ${h.value}` : ''}`),
@@ -268,6 +278,8 @@ function chipText(chip: Chip, t: T, label: (n: string) => string, byPos: (pos: n
     case 'chart': return `${t('report.chart')}: ${t(`chart.${chip.type}`)}, ${label(chip.label)}, ${t(`agg.${chip.fn}`)}: ${label(chip.value)}`;
     case 'hide': return `${t('report.hidden_column')}: ${label(chip.column)}`;
     case 'area': case 'near': return t('report.map_area');
+    case 'facet': return describeFacetFilter({ kind: 'values', column: chip.column, values: [chip.value], exclude: chip.exclude }, label(chip.column), t);
+    case 'facetrange': return describeFacetFilter({ kind: 'range', column: chip.column, from: chip.from, to: chip.to, custom: chip.custom }, label(chip.column), t, chip.def);
   }
 }
 
@@ -287,7 +299,7 @@ export async function renderAiFilter(ctx: PageContext, r: Region): Promise<Raw |
     <input type="hidden" name="__csrf" value="${ctx.session.csrf_token}"><input type="hidden" name="params" value="${params}"></form>`);
 
   // the chips: the report's settings in the URL, each with Edit and Remove
-  const chips = chipsOf(ctx.params, r.id);
+  const chips = chipsOf(ctx.params, r.id, pageFacets(ctx, r.id));
   let columns: Column[] = [];
   let computeErrors: Awaited<ReturnType<typeof askColumns>>['errors'] = [];
   if (chips.length && ctx.client)
@@ -444,7 +456,7 @@ export async function aiFilterRoutes(app: FastifyInstance) {
         dbg(ctx, 6, 'ai', () => `report settings from the phrases: ${JSON.stringify(plan)}; not understood: ${JSON.stringify(parsed.left)}`);
         if (planIsEmpty(plan)) throw new AiError('output', [t('ai_filter.no_match'), ...(parsed.left.length ? [t('ai_filter.not_understood', { what: parsed.left.join('; ') })] : [])].join(' '));
       } else {
-        const current = chipsOf(params, r.id).map((ch) => chipText(ch, t, label, (pos) => columns.find((c) => c.pos === pos)?.label ?? `#${pos}`)).join('; ');
+        const current = chipsOf(params, r.id, pageFacets(ctx, r.id)).map((ch) => chipText(ch, t, label, (pos) => columns.find((c) => c.pos === pos)?.label ?? `#${pos}`)).join('; ');
         const res = await generate(conf.service!, { system: planSystem(columns, new Date().toISOString().slice(0, 10), current), prompt: question, schema: planSchema(columns), maxTokens: 3000 }, {
           appId: ctx.app.id, pageNo: ctx.page.page_no, user: ctx.user, source: 'nl2ir', debug: (l, x) => dbg(ctx, l, 'ai', x),
         });
@@ -452,9 +464,13 @@ export async function aiFilterRoutes(app: FastifyInstance) {
         dbg(ctx, 6, 'ai', () => `report settings from the question: ${JSON.stringify(plan)}`);
         if (planIsEmpty(plan)) throw new AiError('output', t('ai_filter.nothing'));
       }
+      // conditions a facet on the page can hold set that facet (the facets of regions the user sees)
+      const facets = facetSettings(plan, reportFacetDefs(ctx.page.regions, r.id, ctx.vis?.regions), columns);
+      if (plan.reset) clearFacets(params, r.id);
       applyPlan(params, r.id, plan);
+      applyFacetSettings(params, r.id, facets);
       if (params.toString() !== before) pushUndo(ctx, r.id, before);
-      ctx.session.state.__FLASH = [t('ai_filter.applied', { what: describePlan(plan, t, label) }), ...(parsed?.left.length ? [t('ai_filter.not_understood', { what: parsed.left.join('; ') })] : [])].join(' ');
+      ctx.session.state.__FLASH = [t('ai_filter.applied', { what: describePlan(plan, t, label, facets) }), ...(parsed?.left.length ? [t('ai_filter.not_understood', { what: parsed.left.join('; ') })] : [])].join(' ');
     } catch (e) {
       if (e instanceof Forbidden) return refuse(`ai filter: region ${r.id} on page ${ctx.page.page_no}`);
       ctx.session.state.__FLASH_ERROR = e instanceof AiError ? e.message : await publicError(ctx, e, 'AI report filter');
@@ -476,7 +492,7 @@ export async function aiFilterRoutes(app: FastifyInstance) {
       await saveState(ctx.session);
       return back(reply, ctx, r.id, prev === null ? params : new URLSearchParams(prev));
     }
-    const chips = chipsOf(params, r.id);
+    const chips = chipsOf(params, r.id, pageFacets(ctx, r.id));
     const which = typeof body.edit === 'string' ? body.edit : typeof body.remove === 'string' ? body.remove : '';
     const i = /^\d{1,3}$/.test(which) ? Number(which) : -1;
     const chip = chips[i];

package/src/runtime/ask-facets.ts

@@ -0,0 +1,72 @@
+import type { Column, Plan } from './ir-plan.ts';
+import { CUSTOM_RANGE, facetKeys, facetParamNames, isFacetParam, rangeValue, validBound, type FacetDef, type FacetFilter } from './facet-state.ts';
+
+// (sprint 122, WS-5) "Ask in your own words" on faceted search and smart
+// filters (APEX 26.2: natural language for faceted search and smart filters).
+// A condition that a facet on the page can hold is set on that facet instead
+// of becoming a report filter, so the facet shows it (checked values, a chosen
+// range, a smart filter chip) and its counts follow:
+//
+//   job is clerk, job is analyst    a checkbox facet: its values (one or more)
+//   job is not clerk                ... excluded, when the facet allows exclude
+//   salary between 1000 and 3000    a range facet with custom ranges: from / to (at least, at most)
+//   rating at least 4               a star facet: "4 stars & up"
+//
+// Anything else (greater than, contains, a facet without custom ranges, a
+// column without a facet) stays a report filter. The facets are those of the
+// page's faceted search and smart filters regions on the report (columns
+// checked there); values and bounds become the facets' own URL parameters,
+// which facet-state.ts reads as query parameters, never SQL text.
+
+/** Take the conditions the report's facets can hold out of the plan (plan.filters keeps the rest). */
+export function facetSettings(plan: Plan, defs: Map<string, FacetDef>, columns: Column[]): FacetFilter[] {
+  const out: FacetFilter[] = [];
+  const taken = new Set<string>();
+  const byColumn = new Map<string, Plan['filters']>();
+  for (const f of plan.filters) if (defs.has(f.column)) byColumn.set(f.column, [...(byColumn.get(f.column) ?? []), f]);
+  for (const [column, list] of byColumn) {
+    const def = defs.get(column)!;
+    const ops = new Set(list.map((f) => f.operator));
+    let s: FacetFilter | null = null;
+    if (def.type === 'checkbox') {
+      const values = [...new Set(list.map((f) => f.value))].filter((v) => v !== '');
+      if (values.length === list.length && ops.size === 1 && (ops.has('eq') || (ops.has('ne') && def.exclude)))
+        s = { column, kind: 'values', values, exclude: ops.has('ne') };
+    } else if (def.type === 'star') {
+      const n = Number(list[0].value);
+      if (list.length === 1 && ops.has('ge') && Number.isInteger(n) && n >= 1 && n <= def.max) s = { column, kind: 'range', from: String(n), to: '', custom: false };
+    } else if (def.custom) {
+      const kind = columns.find((c) => c.name === column)?.kind;
+      const from = list.find((f) => f.operator === 'ge')?.value ?? '';
+      const to = list.find((f) => f.operator === 'le')?.value ?? '';
+      if ((kind === 'number' || kind === 'date') && list.length <= 2 && [...ops].every((o) => o === 'ge' || o === 'le') && ops.size === list.length && validBound(from, kind) && validBound(to, kind))
+        s = { column, kind: 'range', from, to, custom: true };
+    }
+    if (s) (out.push(s), taken.add(column));
+  }
+  plan.filters = plan.filters.filter((f) => !taken.has(f.column));
+  return out;
+}
+
+/** Set each facet as given (replacing what that facet had). */
+export function applyFacetSettings(params: URLSearchParams, rid: number, settings: FacetFilter[]) {
+  const k = facetKeys(rid);
+  for (const s of settings) {
+    for (const n of facetParamNames(rid, s.column)) params.delete(n);
+    if (s.kind === 'values') {
+      for (const v of s.values) params.append(k.values + s.column, v);
+      if (s.exclude) params.set(k.exclude + s.column, '1');
+    } else if (!s.custom) params.set(k.range + s.column, rangeValue(s));
+    else {
+      params.set(k.range + s.column, CUSTOM_RANGE);
+      if (s.from) params.set(k.from + s.column, s.from);
+      if (s.to) params.set(k.to + s.column, s.to);
+    }
+  }
+  if (settings.length) params.delete(`r${rid}_p`);
+}
+
+/** "Start over" clears the report's facets too. */
+export function clearFacets(params: URLSearchParams, rid: number) {
+  for (const n of [...new Set(params.keys())]) if (isFacetParam(rid, n)) params.delete(n);
+}