@aglyn/aglyn 1.0.0-beta.232 → 1.0.0-beta.234

package/src/lib/app-utils/artifact-list-queries.js

@@ -58,7 +58,32 @@
  *     with the search anyway.
  *   - `Created` ranges: a second range order would double the composites for
  *     a question `Updated` answers nearly as well; one range per list.
- *   - Column sorting: the only declared order is the walk.
+ *
+ * ## The header sorts (AGL-3680)
+ *
+ * Every column sorts on the QUERY, by a stored value every writer stamps:
+ *
+ *   Display name  `nameLower` (above; a starter page's is its starter's
+ *                 name, which is the name its library row shows);
+ *   ID            the walk itself, either way;
+ *   Updated,      `updatedAt` / `createdAt` — stamped by every create, and by
+ *   Created       `backfill-artifacts-list-keys.mjs` on a document that
+ *                 predates either;
+ *   Used in, Kind the stored `kind`; Source the stored `source.type`;
+ *   Description   a layout's or component's `description`, stored as `null`
+ *                 when it has none (`artifactCreateListKeys` + the backfill),
+ *                 because an `orderBy` DROPS a document that lacks the field.
+ *                 A template row's description is its starter's when it
+ *                 leads one, which is no stored field: it sorts the page.
+ *
+ * Each is `alone` — served only while no filter or search is on, falling
+ * back to the list's default header order with a notice — so on the layouts
+ * and components subcollections it costs no composite. Updated newest-first
+ * is not `alone`: it is the order
+ * the Updated range already imposes, so it pairs with every equality and
+ * its composites are the ones the range needed anyway. The templates
+ * library's `libraryRow` scope is an equality every order pairs with, so
+ * each of its orders has one `(libraryRow, order)` composite.
  */ /** The walk every artifact list keeps: the document name, ascending. */ export const ARTIFACT_LIST_ORDER = {
     path: LIST_QUERY_ID_PATH,
     direction: 'asc'
@@ -94,6 +119,79 @@
 /** The quick search every artifact list and gallery shelf offers: the name's word prefixes. */ export const ARTIFACT_NAME_SEARCH = {
     tokensPath: 'nameTokens'
 };
+/** One header's two orders, `alone` (see "The header sorts"). */ const headerSorts = (column, path, label)=>[
+        {
+            path,
+            direction: 'asc',
+            column,
+            label,
+            alone: true
+        },
+        {
+            path,
+            direction: 'desc',
+            column,
+            label,
+            alone: true
+        }
+    ];
+/**
+ * The ID header: the walk ascending — the list's default, served under every
+ * filter — and descending, `alone`.
+ */ const ID_SORTS = [
+    {
+        path: LIST_QUERY_ID_PATH,
+        direction: 'asc',
+        column: '$id',
+        label: 'ID'
+    },
+    {
+        path: LIST_QUERY_ID_PATH,
+        direction: 'desc',
+        column: '$id',
+        label: 'ID',
+        alone: true
+    }
+];
+/**
+ * Updated newest first FIRST: it is the order the Updated range imposes
+ * (`planListQuery` takes the first declared order on the range's field), so
+ * it is not `alone` — the range's composites already serve it.
+ */ const TIME_SORTS = [
+    {
+        path: 'updatedAt',
+        direction: 'desc',
+        column: 'updatedAt',
+        label: 'Updated'
+    },
+    {
+        path: 'updatedAt',
+        direction: 'asc',
+        column: 'updatedAt',
+        label: 'Updated',
+        alone: true
+    },
+    ...headerSorts('createdAt', 'createdAt', 'Created')
+];
+const NAME_SORTS = headerSorts('displayName', 'nameLower', 'Display name');
+const DESCRIPTION_SORTS = headerSorts('description', 'description', 'Description');
+/** The layouts page's header sorts; the ID ascending one is the default. */ export const LAYOUT_LIST_SORTS = [
+    ...ID_SORTS,
+    ...NAME_SORTS,
+    ...DESCRIPTION_SORTS,
+    ...TIME_SORTS
+];
+/**
+ * The layouts list's scope: live layouts. Every create stores `deletedAt: null`
+ * (`artifactCreateListKeys`) and a delete stamps the time, so the query leaves
+ * tombstones out instead of the page dropping them after the read (AGL-3680).
+ */ export const LAYOUT_LIST_BASE = [
+    {
+        path: 'deletedAt',
+        op: '==',
+        value: null
+    }
+];
 /** `hosts/{hostId}/layouts`. */ export const LAYOUT_LIST_QUERY = {
     fields: [
         NAME_FIELD,
@@ -101,7 +199,8 @@
         UPDATED_FIELD
     ],
     sorts: [
-        ARTIFACT_LIST_ORDER
+        ARTIFACT_LIST_ORDER,
+        ...LAYOUT_LIST_SORTS
     ],
     search: ARTIFACT_NAME_SEARCH
 };
@@ -110,6 +209,13 @@ export const LAYOUT_LIST_HEADERS = {
     $id: 'ID',
     updatedAt: 'Updated'
 };
+/** The components card's header sorts; the ID ascending one is the default. */ export const COMPONENT_LIST_SORTS = [
+    ...ID_SORTS,
+    ...NAME_SORTS,
+    ...headerSorts('kind', 'kind', 'Used in'),
+    ...DESCRIPTION_SORTS,
+    ...TIME_SORTS
+];
 /** `hosts/{hostId}/components`. */ export const COMPONENT_LIST_QUERY = {
     fields: [
         NAME_FIELD,
@@ -126,7 +232,8 @@ export const LAYOUT_LIST_HEADERS = {
         UPDATED_FIELD
     ],
     sorts: [
-        ARTIFACT_LIST_ORDER
+        ARTIFACT_LIST_ORDER,
+        ...COMPONENT_LIST_SORTS
     ],
     search: ARTIFACT_NAME_SEARCH
 };
@@ -151,6 +258,16 @@ export const COMPONENT_LIST_HEADERS = {
         value: true
     }
 ];
+/**
+ * The templates library's header sorts. It shows no ID column, so the walk
+ * stays the unlabelled default; Description sorts the page (see "The header
+ * sorts").
+ */ export const TEMPLATE_LIST_SORTS = [
+    ...NAME_SORTS,
+    ...headerSorts('kind', 'kind', 'Kind'),
+    ...headerSorts('source', 'source.type', 'Source'),
+    ...TIME_SORTS
+];
 export const TEMPLATE_LIST_QUERY = {
     fields: [
         NAME_FIELD,
@@ -175,7 +292,8 @@ export const TEMPLATE_LIST_QUERY = {
         UPDATED_FIELD
     ],
     sorts: [
-        ARTIFACT_LIST_ORDER
+        ARTIFACT_LIST_ORDER,
+        ...TEMPLATE_LIST_SORTS
     ],
     search: ARTIFACT_NAME_SEARCH
 };

package/src/lib/app-utils/artifact-list-queries.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../libs/aglyn/src/lib/app-utils/artifact-list-queries.ts"],"sourcesContent":["/**\n * @license\n * Copyright 2026 Aglyn LLC\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *   http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type { ListFilterField } from '@aglyn/shared-util-tools/list-query/list-filter'\nimport type { ListFilterOption } from '@aglyn/shared-util-tools/list-query/list-filter-codecs'\nimport {\n  LIST_QUERY_ID_PATH,\n  type ListQueryDeclaration,\n  type ListQueryFilter,\n  type ListQuerySort,\n} from '@aglyn/shared-util-tools/list-query/list-query-plan'\n\n/*\n * WHAT THE SITE ARTIFACT LISTS ASK FIRESTORE (AGL-3321).\n *\n * The layouts page, the components card and the templates library put every\n * clause their Filters panel accepts, and the quick-search word, on the query\n * — composed by `planListQuery` — and page what it answers. Nothing is matched\n * over the rows a page happened to read. The template gallery's shelves ask\n * the same keys (`template-gallery-dialog.component.tsx`), and so does the\n * email plugin's templates list, from its own declaration.\n *\n * ## The keys are WRITTEN\n *\n * A query finds a document by a stored value, so each list reads keys every\n * writer stamps (`artifactCreateListKeys`/`artifactRenameListKeys` in\n * `@aglyn/aglyn/app-utils/artifact-list-keys`) and\n * `tools/scripts/backfill-artifacts-list-keys.mjs` stamps on the documents\n * written before them:\n *\n *   nameTokens   the name's word prefixes — the search box and `contains`;\n *   nameLower    the normalized name — `equals`;\n *   kind         a component's `site`/`email`, a template's page/component/\n *                layout, stored even where a reader used to infer it;\n *   source.type  a template's provenance, `authored` where there was none;\n *   libraryRow   a template that is its own library row (below).\n *\n * ## The order is the document NAME, and that is what keeps it cheap\n *\n * `hostArtifactQuery` explains why these lists walk the document id: it is\n * the one order no writer can omit, so the walk is total. It is also the\n * order index merging serves with Firestore's automatic single-field\n * indexes: any mix of the equalities and the one array clause above, ordered\n * by `__name__`, needs no composite at all. The composites below exist only\n * for the one range each list offers — `Updated` — which must lead the order\n * it ranges over, so it pairs with each equality once.\n *\n * ## What is not offered, and why\n *\n *   - `startsWith`/`endsWith` on the name: a prefix range must lead the order,\n *     and these lists are not sorted by name.\n *   - `description` (a filter and a search target before): no token field,\n *     and a second token array could not share the query's one array clause\n *     with the search anyway.\n *   - `Created` ranges: a second range order would double the composites for\n *     a question `Updated` answers nearly as well; one range per list.\n *   - Column sorting: the only declared order is the walk.\n */\n\n/** The walk every artifact list keeps: the document name, ascending. */\nexport const ARTIFACT_LIST_ORDER: ListQuerySort = {\n  path: LIST_QUERY_ID_PATH,\n  direction: 'asc',\n}\n\n/** The name, by word prefix (`contains`) or whole (`equals`). */\nconst NAME_FIELD: ListFilterField = {\n  column: 'displayName',\n  kind: 'text',\n  path: 'displayName',\n  lowerPath: 'nameLower',\n  tokensPath: 'nameTokens',\n  operators: ['contains', 'equals'],\n}\n\n/** The document id, which the walk already orders by. */\nconst ID_FIELD: ListFilterField = {\n  column: '$id',\n  kind: 'id',\n  path: LIST_QUERY_ID_PATH,\n}\n\n/** The one range: `updatedAt`, which every writer stamps. */\nconst UPDATED_FIELD: ListFilterField = {\n  column: 'updatedAt',\n  kind: 'date',\n  path: 'updatedAt',\n  operators: ['is', 'after', 'onOrAfter', 'before', 'onOrBefore'],\n}\n\n/** The quick search every artifact list and gallery shelf offers: the name's word prefixes. */\nexport const ARTIFACT_NAME_SEARCH = { tokensPath: 'nameTokens' }\n\n/** `hosts/{hostId}/layouts`. */\nexport const LAYOUT_LIST_QUERY: ListQueryDeclaration = {\n  fields: [NAME_FIELD, ID_FIELD, UPDATED_FIELD],\n  sorts: [ARTIFACT_LIST_ORDER],\n  search: ARTIFACT_NAME_SEARCH,\n}\n\nexport const LAYOUT_LIST_HEADERS: Readonly<Record<string, string>> = {\n  displayName: 'Display name',\n  $id: 'ID',\n  updatedAt: 'Updated',\n}\n\n/** `hosts/{hostId}/components`. */\nexport const COMPONENT_LIST_QUERY: ListQueryDeclaration = {\n  fields: [\n    NAME_FIELD,\n    { column: 'kind', kind: 'exact', path: 'kind', operators: ['equals', 'isAnyOf'] },\n    ID_FIELD,\n    UPDATED_FIELD,\n  ],\n  sorts: [ARTIFACT_LIST_ORDER],\n  search: ARTIFACT_NAME_SEARCH,\n}\n\nexport const COMPONENT_LIST_HEADERS: Readonly<Record<string, string>> = {\n  displayName: 'Display name',\n  kind: 'Used in',\n  $id: 'ID',\n  updatedAt: 'Updated',\n}\n\n/*\n * `hosts/{hostId}/templates`, as the library lists it: one row per template,\n * except that a multi-page STARTER is one row (AGL-696) — its first live page\n * carries `libraryRow: true` and the rest `false`, and a deleted template\n * `false`, so the base clause below is both \"one row per starter\" and \"no\n * tombstones\" without a single row being dropped after the read. Every page\n * of a starter carries the starter's name keys, so a search for it finds the\n * row whichever page leads it.\n */\nexport const TEMPLATE_LIST_BASE: readonly ListQueryFilter[] = [\n  { path: 'libraryRow', op: '==', value: true },\n]\n\nexport const TEMPLATE_LIST_QUERY: ListQueryDeclaration = {\n  fields: [\n    NAME_FIELD,\n    { column: 'kind', kind: 'exact', path: 'kind', operators: ['equals', 'isAnyOf'] },\n    {\n      column: 'source',\n      kind: 'exact',\n      path: 'source.type',\n      operators: ['equals', 'isAnyOf'],\n    },\n    UPDATED_FIELD,\n  ],\n  sorts: [ARTIFACT_LIST_ORDER],\n  search: ARTIFACT_NAME_SEARCH,\n}\n\nexport const TEMPLATE_LIST_HEADERS: Readonly<Record<string, string>> = {\n  displayName: 'Display name',\n  kind: 'Kind',\n  source: 'Source',\n  updatedAt: 'Updated',\n}\n\n/** The template kinds, by the stored `kind`. */\nexport const TEMPLATE_KIND_OPTIONS: readonly ListFilterOption[] = [\n  { value: 'page', label: 'Page' },\n  { value: 'component', label: 'Component' },\n  { value: 'layout', label: 'Layout' },\n]\n"],"names":["LIST_QUERY_ID_PATH","ARTIFACT_LIST_ORDER","path","direction","NAME_FIELD","column","kind","lowerPath","tokensPath","operators","ID_FIELD","UPDATED_FIELD","ARTIFACT_NAME_SEARCH","LAYOUT_LIST_QUERY","fields","sorts","search","LAYOUT_LIST_HEADERS","displayName","$id","updatedAt","COMPONENT_LIST_QUERY","COMPONENT_LIST_HEADERS","TEMPLATE_LIST_BASE","op","value","TEMPLATE_LIST_QUERY","TEMPLATE_LIST_HEADERS","source","TEMPLATE_KIND_OPTIONS","label"],"mappings":"AAAA;;;;;;;;;;;;;;;CAeC,GAID,SACEA,kBAAkB,QAIb,sDAAqD;AAE5D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6CC,GAED,sEAAsE,GACtE,OAAO,MAAMC,sBAAqC;IAChDC,MAAMF;IACNG,WAAW;AACb,EAAC;AAED,+DAA+D,GAC/D,MAAMC,aAA8B;IAClCC,QAAQ;IACRC,MAAM;IACNJ,MAAM;IACNK,WAAW;IACXC,YAAY;IACZC,WAAW;QAAC;QAAY;KAAS;AACnC;AAEA,uDAAuD,GACvD,MAAMC,WAA4B;IAChCL,QAAQ;IACRC,MAAM;IACNJ,MAAMF;AACR;AAEA,2DAA2D,GAC3D,MAAMW,gBAAiC;IACrCN,QAAQ;IACRC,MAAM;IACNJ,MAAM;IACNO,WAAW;QAAC;QAAM;QAAS;QAAa;QAAU;KAAa;AACjE;AAEA,6FAA6F,GAC7F,OAAO,MAAMG,uBAAuB;IAAEJ,YAAY;AAAa,EAAC;AAEhE,8BAA8B,GAC9B,OAAO,MAAMK,oBAA0C;IACrDC,QAAQ;QAACV;QAAYM;QAAUC;KAAc;IAC7CI,OAAO;QAACd;KAAoB;IAC5Be,QAAQJ;AACV,EAAC;AAED,OAAO,MAAMK,sBAAwD;IACnEC,aAAa;IACbC,KAAK;IACLC,WAAW;AACb,EAAC;AAED,iCAAiC,GACjC,OAAO,MAAMC,uBAA6C;IACxDP,QAAQ;QACNV;QACA;YAAEC,QAAQ;YAAQC,MAAM;YAASJ,MAAM;YAAQO,WAAW;gBAAC;gBAAU;aAAU;QAAC;QAChFC;QACAC;KACD;IACDI,OAAO;QAACd;KAAoB;IAC5Be,QAAQJ;AACV,EAAC;AAED,OAAO,MAAMU,yBAA2D;IACtEJ,aAAa;IACbZ,MAAM;IACNa,KAAK;IACLC,WAAW;AACb,EAAC;AAED;;;;;;;;CAQC,GACD,OAAO,MAAMG,qBAAiD;IAC5D;QAAErB,MAAM;QAAcsB,IAAI;QAAMC,OAAO;IAAK;CAC7C,CAAA;AAED,OAAO,MAAMC,sBAA4C;IACvDZ,QAAQ;QACNV;QACA;YAAEC,QAAQ;YAAQC,MAAM;YAASJ,MAAM;YAAQO,WAAW;gBAAC;gBAAU;aAAU;QAAC;QAChF;YACEJ,QAAQ;YACRC,MAAM;YACNJ,MAAM;YACNO,WAAW;gBAAC;gBAAU;aAAU;QAClC;QACAE;KACD;IACDI,OAAO;QAACd;KAAoB;IAC5Be,QAAQJ;AACV,EAAC;AAED,OAAO,MAAMe,wBAA0D;IACrET,aAAa;IACbZ,MAAM;IACNsB,QAAQ;IACRR,WAAW;AACb,EAAC;AAED,8CAA8C,GAC9C,OAAO,MAAMS,wBAAqD;IAChE;QAAEJ,OAAO;QAAQK,OAAO;IAAO;IAC/B;QAAEL,OAAO;QAAaK,OAAO;IAAY;IACzC;QAAEL,OAAO;QAAUK,OAAO;IAAS;CACpC,CAAA"}
+{"version":3,"sources":["../../../../../../libs/aglyn/src/lib/app-utils/artifact-list-queries.ts"],"sourcesContent":["/**\n * @license\n * Copyright 2026 Aglyn LLC\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *   http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type { ListFilterField } from '@aglyn/shared-util-tools/list-query/list-filter'\nimport type { ListFilterOption } from '@aglyn/shared-util-tools/list-query/list-filter-codecs'\nimport {\n  LIST_QUERY_ID_PATH,\n  type ListQueryDeclaration,\n  type ListQueryFilter,\n  type ListQuerySort,\n} from '@aglyn/shared-util-tools/list-query/list-query-plan'\n\n/*\n * WHAT THE SITE ARTIFACT LISTS ASK FIRESTORE (AGL-3321).\n *\n * The layouts page, the components card and the templates library put every\n * clause their Filters panel accepts, and the quick-search word, on the query\n * — composed by `planListQuery` — and page what it answers. Nothing is matched\n * over the rows a page happened to read. The template gallery's shelves ask\n * the same keys (`template-gallery-dialog.component.tsx`), and so does the\n * email plugin's templates list, from its own declaration.\n *\n * ## The keys are WRITTEN\n *\n * A query finds a document by a stored value, so each list reads keys every\n * writer stamps (`artifactCreateListKeys`/`artifactRenameListKeys` in\n * `@aglyn/aglyn/app-utils/artifact-list-keys`) and\n * `tools/scripts/backfill-artifacts-list-keys.mjs` stamps on the documents\n * written before them:\n *\n *   nameTokens   the name's word prefixes — the search box and `contains`;\n *   nameLower    the normalized name — `equals`;\n *   kind         a component's `site`/`email`, a template's page/component/\n *                layout, stored even where a reader used to infer it;\n *   source.type  a template's provenance, `authored` where there was none;\n *   libraryRow   a template that is its own library row (below).\n *\n * ## The order is the document NAME, and that is what keeps it cheap\n *\n * `hostArtifactQuery` explains why these lists walk the document id: it is\n * the one order no writer can omit, so the walk is total. It is also the\n * order index merging serves with Firestore's automatic single-field\n * indexes: any mix of the equalities and the one array clause above, ordered\n * by `__name__`, needs no composite at all. The composites below exist only\n * for the one range each list offers — `Updated` — which must lead the order\n * it ranges over, so it pairs with each equality once.\n *\n * ## What is not offered, and why\n *\n *   - `startsWith`/`endsWith` on the name: a prefix range must lead the order,\n *     and these lists are not sorted by name.\n *   - `description` (a filter and a search target before): no token field,\n *     and a second token array could not share the query's one array clause\n *     with the search anyway.\n *   - `Created` ranges: a second range order would double the composites for\n *     a question `Updated` answers nearly as well; one range per list.\n *\n * ## The header sorts (AGL-3680)\n *\n * Every column sorts on the QUERY, by a stored value every writer stamps:\n *\n *   Display name  `nameLower` (above; a starter page's is its starter's\n *                 name, which is the name its library row shows);\n *   ID            the walk itself, either way;\n *   Updated,      `updatedAt` / `createdAt` — stamped by every create, and by\n *   Created       `backfill-artifacts-list-keys.mjs` on a document that\n *                 predates either;\n *   Used in, Kind the stored `kind`; Source the stored `source.type`;\n *   Description   a layout's or component's `description`, stored as `null`\n *                 when it has none (`artifactCreateListKeys` + the backfill),\n *                 because an `orderBy` DROPS a document that lacks the field.\n *                 A template row's description is its starter's when it\n *                 leads one, which is no stored field: it sorts the page.\n *\n * Each is `alone` — served only while no filter or search is on, falling\n * back to the list's default header order with a notice — so on the layouts\n * and components subcollections it costs no composite. Updated newest-first\n * is not `alone`: it is the order\n * the Updated range already imposes, so it pairs with every equality and\n * its composites are the ones the range needed anyway. The templates\n * library's `libraryRow` scope is an equality every order pairs with, so\n * each of its orders has one `(libraryRow, order)` composite.\n */\n\n/** The walk every artifact list keeps: the document name, ascending. */\nexport const ARTIFACT_LIST_ORDER: ListQuerySort = {\n  path: LIST_QUERY_ID_PATH,\n  direction: 'asc',\n}\n\n/** The name, by word prefix (`contains`) or whole (`equals`). */\nconst NAME_FIELD: ListFilterField = {\n  column: 'displayName',\n  kind: 'text',\n  path: 'displayName',\n  lowerPath: 'nameLower',\n  tokensPath: 'nameTokens',\n  operators: ['contains', 'equals'],\n}\n\n/** The document id, which the walk already orders by. */\nconst ID_FIELD: ListFilterField = {\n  column: '$id',\n  kind: 'id',\n  path: LIST_QUERY_ID_PATH,\n}\n\n/** The one range: `updatedAt`, which every writer stamps. */\nconst UPDATED_FIELD: ListFilterField = {\n  column: 'updatedAt',\n  kind: 'date',\n  path: 'updatedAt',\n  operators: ['is', 'after', 'onOrAfter', 'before', 'onOrBefore'],\n}\n\n/** The quick search every artifact list and gallery shelf offers: the name's word prefixes. */\nexport const ARTIFACT_NAME_SEARCH = { tokensPath: 'nameTokens' }\n\n/** One header's two orders, `alone` (see \"The header sorts\"). */\nconst headerSorts = (column: string, path: string, label: string): ListQuerySort[] => [\n  { path, direction: 'asc', column, label, alone: true },\n  { path, direction: 'desc', column, label, alone: true },\n]\n\n/**\n * The ID header: the walk ascending — the list's default, served under every\n * filter — and descending, `alone`.\n */\nconst ID_SORTS: readonly ListQuerySort[] = [\n  { path: LIST_QUERY_ID_PATH, direction: 'asc', column: '$id', label: 'ID' },\n  { path: LIST_QUERY_ID_PATH, direction: 'desc', column: '$id', label: 'ID', alone: true },\n]\n\n/**\n * Updated newest first FIRST: it is the order the Updated range imposes\n * (`planListQuery` takes the first declared order on the range's field), so\n * it is not `alone` — the range's composites already serve it.\n */\nconst TIME_SORTS: readonly ListQuerySort[] = [\n  { path: 'updatedAt', direction: 'desc', column: 'updatedAt', label: 'Updated' },\n  { path: 'updatedAt', direction: 'asc', column: 'updatedAt', label: 'Updated', alone: true },\n  ...headerSorts('createdAt', 'createdAt', 'Created'),\n]\n\nconst NAME_SORTS = headerSorts('displayName', 'nameLower', 'Display name')\nconst DESCRIPTION_SORTS = headerSorts('description', 'description', 'Description')\n\n/** The layouts page's header sorts; the ID ascending one is the default. */\nexport const LAYOUT_LIST_SORTS: readonly ListQuerySort[] = [\n  ...ID_SORTS,\n  ...NAME_SORTS,\n  ...DESCRIPTION_SORTS,\n  ...TIME_SORTS,\n]\n\n/**\n * The layouts list's scope: live layouts. Every create stores `deletedAt: null`\n * (`artifactCreateListKeys`) and a delete stamps the time, so the query leaves\n * tombstones out instead of the page dropping them after the read (AGL-3680).\n */\nexport const LAYOUT_LIST_BASE: readonly ListQueryFilter[] = [\n  { path: 'deletedAt', op: '==', value: null },\n]\n\n/** `hosts/{hostId}/layouts`. */\nexport const LAYOUT_LIST_QUERY: ListQueryDeclaration = {\n  fields: [NAME_FIELD, ID_FIELD, UPDATED_FIELD],\n  sorts: [ARTIFACT_LIST_ORDER, ...LAYOUT_LIST_SORTS],\n  search: ARTIFACT_NAME_SEARCH,\n}\n\nexport const LAYOUT_LIST_HEADERS: Readonly<Record<string, string>> = {\n  displayName: 'Display name',\n  $id: 'ID',\n  updatedAt: 'Updated',\n}\n\n/** The components card's header sorts; the ID ascending one is the default. */\nexport const COMPONENT_LIST_SORTS: readonly ListQuerySort[] = [\n  ...ID_SORTS,\n  ...NAME_SORTS,\n  ...headerSorts('kind', 'kind', 'Used in'),\n  ...DESCRIPTION_SORTS,\n  ...TIME_SORTS,\n]\n\n/** `hosts/{hostId}/components`. */\nexport const COMPONENT_LIST_QUERY: ListQueryDeclaration = {\n  fields: [\n    NAME_FIELD,\n    { column: 'kind', kind: 'exact', path: 'kind', operators: ['equals', 'isAnyOf'] },\n    ID_FIELD,\n    UPDATED_FIELD,\n  ],\n  sorts: [ARTIFACT_LIST_ORDER, ...COMPONENT_LIST_SORTS],\n  search: ARTIFACT_NAME_SEARCH,\n}\n\nexport const COMPONENT_LIST_HEADERS: Readonly<Record<string, string>> = {\n  displayName: 'Display name',\n  kind: 'Used in',\n  $id: 'ID',\n  updatedAt: 'Updated',\n}\n\n/*\n * `hosts/{hostId}/templates`, as the library lists it: one row per template,\n * except that a multi-page STARTER is one row (AGL-696) — its first live page\n * carries `libraryRow: true` and the rest `false`, and a deleted template\n * `false`, so the base clause below is both \"one row per starter\" and \"no\n * tombstones\" without a single row being dropped after the read. Every page\n * of a starter carries the starter's name keys, so a search for it finds the\n * row whichever page leads it.\n */\nexport const TEMPLATE_LIST_BASE: readonly ListQueryFilter[] = [\n  { path: 'libraryRow', op: '==', value: true },\n]\n\n/**\n * The templates library's header sorts. It shows no ID column, so the walk\n * stays the unlabelled default; Description sorts the page (see \"The header\n * sorts\").\n */\nexport const TEMPLATE_LIST_SORTS: readonly ListQuerySort[] = [\n  ...NAME_SORTS,\n  ...headerSorts('kind', 'kind', 'Kind'),\n  ...headerSorts('source', 'source.type', 'Source'),\n  ...TIME_SORTS,\n]\n\nexport const TEMPLATE_LIST_QUERY: ListQueryDeclaration = {\n  fields: [\n    NAME_FIELD,\n    { column: 'kind', kind: 'exact', path: 'kind', operators: ['equals', 'isAnyOf'] },\n    {\n      column: 'source',\n      kind: 'exact',\n      path: 'source.type',\n      operators: ['equals', 'isAnyOf'],\n    },\n    UPDATED_FIELD,\n  ],\n  sorts: [ARTIFACT_LIST_ORDER, ...TEMPLATE_LIST_SORTS],\n  search: ARTIFACT_NAME_SEARCH,\n}\n\nexport const TEMPLATE_LIST_HEADERS: Readonly<Record<string, string>> = {\n  displayName: 'Display name',\n  kind: 'Kind',\n  source: 'Source',\n  updatedAt: 'Updated',\n}\n\n/** The template kinds, by the stored `kind`. */\nexport const TEMPLATE_KIND_OPTIONS: readonly ListFilterOption[] = [\n  { value: 'page', label: 'Page' },\n  { value: 'component', label: 'Component' },\n  { value: 'layout', label: 'Layout' },\n]\n"],"names":["LIST_QUERY_ID_PATH","ARTIFACT_LIST_ORDER","path","direction","NAME_FIELD","column","kind","lowerPath","tokensPath","operators","ID_FIELD","UPDATED_FIELD","ARTIFACT_NAME_SEARCH","headerSorts","label","alone","ID_SORTS","TIME_SORTS","NAME_SORTS","DESCRIPTION_SORTS","LAYOUT_LIST_SORTS","LAYOUT_LIST_BASE","op","value","LAYOUT_LIST_QUERY","fields","sorts","search","LAYOUT_LIST_HEADERS","displayName","$id","updatedAt","COMPONENT_LIST_SORTS","COMPONENT_LIST_QUERY","COMPONENT_LIST_HEADERS","TEMPLATE_LIST_BASE","TEMPLATE_LIST_SORTS","TEMPLATE_LIST_QUERY","TEMPLATE_LIST_HEADERS","source","TEMPLATE_KIND_OPTIONS"],"mappings":"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"}

package/src/lib/app-utils/crm.d.ts

@@ -43,7 +43,8 @@
  * Pure data module: types, constants and the small helpers every surface
  * would otherwise write for itself. No Firestore, no React.
  */
-import { type AglynPostalAddress, type OrgCrmAssignmentRule } from '../foundation';
+import { type AglynPostalAddress } from '../foundation/definitions/contact.types';
+import type { OrgCrmAssignmentRule } from '../foundation/definitions/org-billing.types';
 import { type ConsentGroup } from './consent-groups';
 import { type ContactLifecycleStage, type CrmActivityKind, type CrmTaskKind } from './crm-kinds';
 import { type ContactInteraction, type ContactSegment, type ContactSource } from './contacts';
@@ -2986,6 +2987,17 @@ export interface CrmListFieldsContext {
      */
     leadSources?: PicklistValueSet | null;
 }
+/** A text value as a header sort compares it: its key, `null` for none. */
+export declare function crmSortKey(value: unknown): string | null;
+/** A number as a header sort reads it: itself when finite, `null` for none. */
+export declare function crmSortNumber(value: unknown): number | null;
+/**
+ * The key a person's row sorts by under its Name header: the name, or the
+ * address the row shows in its place when there is none.
+ */
+export declare function crmPersonSortKey(record: Record<string, unknown>): string | null;
+/** The field a lead's and a contact's Name header sorts by. */
+export declare const CRM_NAME_SORT_FIELD = "nameSortKey";
 /** What a lead's search box reads (AGL-3246). */
 export declare const CRM_LEAD_SEARCH_SOURCES: readonly ["name", "email", "company", "jobTitle", "tags"];
 /**
@@ -3013,6 +3025,9 @@ export declare function crmLeadListFields(record: object, context?: CrmListField
     emailStatus: string;
     industryKey: string | null;
     ratingKey: string | null;
+    nameSortKey: string | null;
+    companyLower: string | null;
+    jobTitleLower: string | null;
 };
 /** What a company's search box reads: its name and its domain. */
 export declare const CRM_COMPANY_SEARCH_SOURCES: readonly ["name", "domain"];
@@ -3045,6 +3060,8 @@ export declare function crmDealListFields(record: object): {
     contactRoleContactIds: string[];
     scopedContactRoleContactIds: string[];
     contactRoleKeys: string[];
+    amountSortCents: number | null;
+    expectedCloseSortAtMs: number | null;
 };
 /**
  * The arrays a deal's contact roles are found by (AGL-3521): every contact
@@ -3059,10 +3076,20 @@ export declare function crmDealContactRoleListFields(deal: Record<string, unknow
     scopedContactRoleContactIds: string[];
     contactRoleKeys: string[];
 };
-/** What a task's search box reads: its title. */
+/** A task's priorities, lowest first: the rank its Priority header sorts by (AGL-3680). */
+export declare const CRM_TASK_PRIORITY_RANK: readonly CrmTaskPriority[];
+/** A task's priority rank — `normal`'s for one that names none. */
+export declare function crmTaskPriorityRank(priority: unknown): number;
+/**
+ * What a task's search box reads — its title — and what its Task and
+ * Priority headers sort by (AGL-3680): the title's key and the priority's
+ * rank.
+ */
 export declare function crmTaskListFields(record: object): {
     searchTokens: string[];
     scopedSearchTokens: string[];
+    titleLower: string | null;
+    priorityRank: number;
 };
 export declare const CRM_CONTACT_FACET_KEYS_FIELD = "facetKeys";
 /** The group a key names at the organization level: any holder. */
@@ -3096,6 +3123,7 @@ export declare function crmContactListFields(record: object): {
     scopedSearchTokens: string[];
     facetKeys: string[];
     emailStatus: string;
+    nameSortKey: string | null;
 };
 /**
  * The stored fields each collection's list fields are computed from. A

package/src/lib/app-utils/crm.js

@@ -42,7 +42,7 @@ import { _ as _extends } from "@swc/helpers/_/_extends";
  *
  * Pure data module: types, constants and the small helpers every surface
  * would otherwise write for itself. No Firestore, no React.
- */ import { normalizeAddress, normalizePhone } from "../foundation/index.js";
+ */ import { normalizeAddress, normalizePhone } from "../foundation/definitions/contact.types.js";
 import { consentGroupScope } from "./consent-groups.js";
 import { CONTACT_LIFECYCLE_STAGES, CRM_TASK_KINDS, isContactLifecycleStage } from "./crm-kinds.js";
 import { CONTACT_ALTERNATE_EMAILS_FIELD, CONTACT_FACETS_FIELD, CONTACT_SOURCE_LABELS, composeContactName, normalizeContactEmail, readContactFacet } from "./contacts.js";
@@ -1472,8 +1472,8 @@ const blank = (value)=>value === null || typeof value === 'string' && value.trim
  */ export const COMPANY_CONTACTS_COUNT_FIELD = 'contactsCount';
 /** The link state of a stored contact, read for one holder. */ export function readContactCompanyLink(contact, groupId) {
     var _readContactFacet_companyId;
-    const document = contact != null ? contact : {};
-    const facets = document[CONTACT_FACETS_FIELD];
+    const stored = contact != null ? contact : {};
+    const facets = stored[CONTACT_FACETS_FIELD];
     const heldElsewhere = new Set();
     if (facets && typeof facets === 'object' && !Array.isArray(facets)) {
         for (const [holder, facet] of Object.entries(facets)){
@@ -1482,9 +1482,9 @@ const blank = (value)=>value === null || typeof value === 'string' && value.trim
             if (typeof named === 'string' && named) heldElsewhere.add(named);
         }
     }
-    const mirror = document[CONTACT_COMPANY_IDS_FIELD];
+    const mirror = stored[CONTACT_COMPANY_IDS_FIELD];
     return {
-        companyId: (_readContactFacet_companyId = readContactFacet(document, groupId).companyId) != null ? _readContactFacet_companyId : null,
+        companyId: (_readContactFacet_companyId = readContactFacet(stored, groupId).companyId) != null ? _readContactFacet_companyId : null,
         companyIds: Array.isArray(mirror) ? mirror.filter((id)=>typeof id === 'string' && !!id) : [],
         heldElsewhere: [
             ...heldElsewhere
@@ -3880,10 +3880,14 @@ const SEARCH_KEY = nameSearchKey;
  */ export function crmSearchTokens(values) {
     const tokens = new Set();
     const addWord = (word)=>{
-        const capped = word.slice(0, NAME_TOKEN_MAX_PREFIX);
+        // By codepoint, as `nameSearchTokens` cuts: a UTF-16 slice leaves a lone
+        // surrogate of an emoji, and Firestore refuses the write.
+        const capped = [
+            ...word
+        ].slice(0, NAME_TOKEN_MAX_PREFIX);
         for(let end = 1; end <= capped.length; end += 1){
             if (tokens.size >= CRM_SEARCH_TOKENS_MAX) return;
-            tokens.add(capped.slice(0, end));
+            tokens.add(capped.slice(0, end).join(''));
         }
     };
     const addText = (text)=>{
@@ -3982,6 +3986,33 @@ export function isCrmLeadSourceDirection(value) {
         leadSourceDirection: crmLeadSourceDirection(context.leadSources, lead['leadSource'])
     } : {};
 }
+/*------------------------------------------
+ * THE HEADER SORT KEYS (AGL-3680).
+ *
+ * Every CRM table sorts by its column headers, and a header backed by a
+ * stored field sorts on the QUERY — but Firestore orders text by its bytes
+ * (every capital before every lower-case letter) and leaves a document
+ * WITHOUT the ordered field out of the answer. So a text column sorts by a
+ * key stored beside it on every record: the value as a reader compares it
+ * (lower-cased, single-spaced — `nameSearchKey`), `null` for none, never
+ * absent. A meaning with an order of its own (a task's priority) sorts by
+ * its rank. Computed from the record like every other list field, so each
+ * writer that stamps `crmListFields` stamps these, and the restamp after a
+ * patch keeps them level.
+ *-----------------------------------------*/ /** A text value as a header sort compares it: its key, `null` for none. */ export function crmSortKey(value) {
+    return typeof value === 'string' && SEARCH_KEY(value) || null;
+}
+/** A number as a header sort reads it: itself when finite, `null` for none. */ export function crmSortNumber(value) {
+    return typeof value === 'number' && Number.isFinite(value) ? value : null;
+}
+/**
+ * The key a person's row sorts by under its Name header: the name, or the
+ * address the row shows in its place when there is none.
+ */ export function crmPersonSortKey(record) {
+    var _crmSortKey;
+    return (_crmSortKey = crmSortKey(record['name'])) != null ? _crmSortKey : crmSortKey(record['email']);
+}
+/** The field a lead's and a contact's Name header sorts by. */ export const CRM_NAME_SORT_FIELD = 'nameSortKey';
 /** What a lead's search box reads (AGL-3246). */ export const CRM_LEAD_SEARCH_SOURCES = [
     'name',
     'email',
@@ -4015,7 +4046,11 @@ function leadCampaignIds(lead) {
         emailStatus: crmEmailStatusKey(lead),
         // The Industry and Rating the Leads list filters by (AGL-3513).
         industryKey: crmPicklistKey(lead['industry']),
-        ratingKey: crmPicklistKey(lead['rating'])
+        ratingKey: crmPicklistKey(lead['rating']),
+        // The Lead, Company and Title headers' sort keys (AGL-3680).
+        nameSortKey: crmPersonSortKey(lead),
+        companyLower: crmSortKey(lead['company']),
+        jobTitleLower: crmSortKey(lead['jobTitle'])
     });
 }
 /** What a company's search box reads: its name and its domain. */ export const CRM_COMPANY_SEARCH_SOURCES = [
@@ -4049,7 +4084,12 @@ function leadCampaignIds(lead) {
         titleLower: SEARCH_KEY(typeof deal['title'] === 'string' ? deal['title'] : ''),
         typeKey: crmPicklistKey(deal['type']),
         leadSourceKey: crmPicklistKey(deal['leadSource'])
-    }, crmDealContactRoleListFields(deal));
+    }, crmDealContactRoleListFields(deal), {
+        // The Amount and Expected close headers' sort keys (AGL-3680): both
+        // optional on a deal, so stored beside them as `null` for none.
+        amountSortCents: crmSortNumber(deal['amountCents']),
+        expectedCloseSortAtMs: crmSortNumber(deal['expectedCloseAtMs'])
+    });
 }
 /**
  * The arrays a deal's contact roles are found by (AGL-3521): every contact
@@ -4074,11 +4114,27 @@ function leadCampaignIds(lead) {
         ]
     };
 }
-/** What a task's search box reads: its title. */ export function crmTaskListFields(record) {
+/** A task's priorities, lowest first: the rank its Priority header sorts by (AGL-3680). */ export const CRM_TASK_PRIORITY_RANK = [
+    'low',
+    'normal',
+    'high'
+];
+/** A task's priority rank — `normal`'s for one that names none. */ export function crmTaskPriorityRank(priority) {
+    const at = CRM_TASK_PRIORITY_RANK.indexOf(priority);
+    return at === -1 ? CRM_TASK_PRIORITY_RANK.indexOf('normal') : at;
+}
+/**
+ * What a task's search box reads — its title — and what its Task and
+ * Priority headers sort by (AGL-3680): the title's key and the priority's
+ * rank.
+ */ export function crmTaskListFields(record) {
     const task = record;
-    return crmSearchFields(task['visibleTo'], [
+    return _extends({}, crmSearchFields(task['visibleTo'], [
         task['title']
-    ]);
+    ]), {
+        titleLower: crmSortKey(task['title']),
+        priorityRank: crmTaskPriorityRank(task['priority'])
+    });
 }
 /*------------------------------------------
  * A CONTACT'S FACET KEYS.
@@ -4200,7 +4256,9 @@ export function crmContactListFields(record) {
         crmPhoneSearchWords(contact['phone'])
     ]), {
         facetKeys: crmContactFacetKeys(contact),
-        emailStatus: crmEmailStatusKey(contact)
+        emailStatus: crmEmailStatusKey(contact),
+        // The Contact header's sort key (AGL-3680): the canonical name, or the address.
+        nameSortKey: crmPersonSortKey(contact)
     });
 }
 /**
@@ -4240,11 +4298,15 @@ export function crmContactListFields(record) {
         'type',
         'leadSource',
         'contactRoles',
-        'contactId'
+        'contactId',
+        // The header sort keys (AGL-3680).
+        'amountCents',
+        'expectedCloseAtMs'
     ],
     crmTasks: [
         'visibleTo',
-        'title'
+        'title',
+        'priority'
     ]
 };
 /**