@gridkitjs/core 0.13.0 → 0.14.1

package/dist/index.js

@@ -102,6 +102,13 @@ function accessDotted(obj, path) {
   return path.split(".").reduce((value, key) => isNested(value) ? value[key] : void 0, obj);
 }
 
+// src/util/position.ts
+function renumberRows(entries) {
+  return entries.map(
+    (entry, index) => entry.rowIndex === index && entry.datasetIndex === index ? entry : { ...entry, rowIndex: index, datasetIndex: index }
+  );
+}
+
 // src/util/sorting.ts
 function isEmpty(value) {
   return value === null || value === void 0;
@@ -189,9 +196,7 @@ function sortRows(rows, sort, columns) {
     }
     return 0;
   });
-  return sorted.map(
-    (row, index) => row.rowIndex === index ? row : { ...row, rowIndex: index }
-  );
+  return renumberRows(sorted);
 }
 
 // src/util/grouping.ts
@@ -263,9 +268,7 @@ function buildLevel(rows, levels, parentPath, expansion, byId, out) {
       path,
       expanded,
       count: group.rows.length,
-      // Renumbered globally once `groupRows` has the whole flattened array —
-      // a header has no row of its own to carry a dataset position, so
-      // `datasetIndex` takes the same renumbered value `rowIndex` does.
+      // Both set by `groupRows` once it has the whole flattened array.
       rowIndex: -1,
       datasetIndex: -1,
       // Set by `withGroupAggregates`, downstream of grouping — empty here
@@ -289,12 +292,7 @@ function groupRows(rows, groupBy, expansion, columns) {
   }
   const out = [];
   buildLevel(rows, active, [], expansion, byId, out);
-  return out.map((entry, index) => {
-    if ("kind" in entry) {
-      return entry.rowIndex === index && entry.datasetIndex === index ? entry : { ...entry, rowIndex: index, datasetIndex: index };
-    }
-    return entry.rowIndex === index ? entry : { ...entry, rowIndex: index };
-  });
+  return renumberRows(out);
 }
 function toggleGroupExpansion(expansion, groupId) {
   return expansion.includes(groupId) ? expansion.filter((id) => id !== groupId) : [...expansion, groupId];
@@ -985,12 +983,7 @@ function withGroupAggregates(displayRows, flatRows, groupBy, specs, columns, dis
     display,
     out
   );
-  return out.map((entry, position) => {
-    if ("kind" in entry) {
-      return entry.rowIndex === position && entry.datasetIndex === position ? entry : { ...entry, rowIndex: position, datasetIndex: position };
-    }
-    return entry.rowIndex === position ? entry : { ...entry, rowIndex: position };
-  });
+  return renumberRows(out);
 }
 
 // src/util/filtering.ts
@@ -1151,9 +1144,7 @@ function filterRows(rows, filter, columns) {
     return rows;
   }
   const filtered = rows.filter((row) => test(row.row));
-  return filtered.map(
-    (row, index) => row.rowIndex === index ? row : { ...row, rowIndex: index }
-  );
+  return renumberRows(filtered);
 }
 
 // src/util/rows.ts
@@ -3030,21 +3021,37 @@ function resolveColumnFilterMenu(options, column) {
 }
 
 // src/messages.ts
-function columnCount(count, change) {
-  return count === 1 ? `1 column ${change}` : `${String(count)} columns ${change}`;
+function localeKey2(locale) {
+  return typeof locale === "string" ? locale : locale?.join(",") ?? "";
+}
+var countFormats = /* @__PURE__ */ new Map();
+function countFormat(locale) {
+  const key = localeKey2(locale);
+  let format = countFormats.get(key);
+  if (format === void 0) {
+    const numberFormat = new Intl.NumberFormat(locale, {
+      maximumFractionDigits: 0
+    });
+    format = (count) => numberFormat.format(count);
+    countFormats.set(key, format);
+  }
+  return format;
 }
-function searchResults(count) {
+function columnCount(n, count, change) {
+  return count === 1 ? `1 column ${change}` : `${n(count)} columns ${change}`;
+}
+function searchResults(n, count) {
   if (count === 0) {
     return "No rows found";
   }
-  return count === 1 ? "1 row found" : `${String(count)} rows found`;
+  return count === 1 ? "1 row found" : `${n(count)} rows found`;
 }
-function selectedCount(count, target) {
+function selectedCount(n, count, target) {
   const noun = target === "rows" ? "row" : "column";
   if (count === 0) {
     return `No ${noun}s selected`;
   }
-  return count === 1 ? `1 ${noun} selected` : `${String(count)} ${noun}s selected`;
+  return count === 1 ? `1 ${noun} selected` : `${n(count)} ${noun}s selected`;
 }
 var operatorLabels = {
   eq: "Equals",
@@ -3071,11 +3078,11 @@ var dateOperatorLabels = {
 function filterOperatorLabel(operator, family) {
   return (family === "date" ? dateOperatorLabels[operator] : void 0) ?? operatorLabels[operator];
 }
-function filterSearchFirst(total) {
-  return total === 1 ? "Type to search 1 value" : `Type to search ${String(total)} values`;
+function filterSearchFirst(n, total) {
+  return total === 1 ? "Type to search 1 value" : `Type to search ${n(total)} values`;
 }
-function filterResults(shown, total) {
-  return `${String(shown)} of ${String(total)} ${total === 1 ? "row" : "rows"}`;
+function filterResults(n, shown, total) {
+  return `${n(shown)} of ${n(total)} ${total === 1 ? "row" : "rows"}`;
 }
 var filterValueRequests = {
   text: "Enter a value",
@@ -3089,117 +3096,137 @@ var filterOperatorMenus = {
   date: "Date filters",
   boolean: "Boolean filters"
 };
-function copied(count, unit) {
-  return count === 1 ? `1 ${unit.slice(0, -1)} copied` : `${String(count)} ${unit} copied`;
-}
-var defaultMessages = {
-  pagerLabel: "Pagination",
-  previousPage: "Previous",
-  nextPage: "Next",
-  pageSizeLabel: "Rows per page",
-  pageButtonLabel: (page) => `Page ${String(page)}`,
-  pageStatus: (page, pageCount) => `Page ${String(page)} of ${String(pageCount)}`,
-  loadingMore: "Loading more\u2026",
-  booleanTrue: "true",
-  booleanFalse: "false",
-  blankGroupValue: "(blank)",
-  groupByBarLabel: "Grouped by",
-  groupByBarPlaceholder: "Drag a column here to group by it",
-  groupByChipLabel: (columnName2, level, levelCount) => levelCount > 1 ? `${columnName2}, level ${String(level)} of ${String(levelCount)}` : columnName2,
-  removeGroupBy: (columnName2) => `Stop grouping by ${columnName2}`,
-  columnResized: (columnName2, width) => `${columnName2}, ${String(width)} pixels wide`,
-  columnMoved: (columnName2, position, columnCount2) => `${columnName2}, column ${String(position)} of ${String(columnCount2)}`,
-  columnSorted: (columnName2, direction, key, keyCount) => {
-    const sorted = `${columnName2} sorted ${direction === "asc" ? "ascending" : "descending"}`;
-    return keyCount > 1 ? `${sorted}, key ${String(key)} of ${String(keyCount)}` : sorted;
-  },
-  sortCleared: (columnName2) => `${columnName2}, sort cleared`,
-  groupedBy: (columnName2, level, levelCount) => levelCount > 1 ? `Grouped by ${columnName2}, level ${String(level)} of ${String(levelCount)}` : `Grouped by ${columnName2}`,
-  groupingRemoved: (columnName2) => `${columnName2}, grouping removed`,
-  groupExpanded: "Group expanded",
-  groupCollapsed: "Group collapsed",
-  allGroupsExpanded: "All groups expanded",
-  allGroupsCollapsed: "All groups collapsed",
-  selectedCount,
-  cellSelected: (columnName2, rowNumber) => `${columnName2}, row ${String(rowNumber)}, selected`,
-  columnHidden: (columnName2) => `${columnName2}, column hidden`,
-  columnShown: (columnName2) => `${columnName2}, column shown`,
-  columnsHidden: (count) => columnCount(count, "hidden"),
-  columnsShown: (count) => columnCount(count, "shown"),
-  columnsAutoFitted: (count) => columnCount(count, "autofitted"),
-  headerMenuLabel: (columnName2) => `${columnName2} column menu`,
-  cellMenuLabel: "Row menu",
-  groupMenuLabel: "Group menu",
-  bodyMenuLabel: "Grid menu",
-  sortAscending: "Sort ascending",
-  sortDescending: "Sort descending",
-  clearSort: "Clear sort",
-  clearAllSorting: "Clear all sorting",
-  groupByColumn: (columnName2) => `Group by ${columnName2}`,
-  ungroupAll: "Ungroup all",
-  expandAllGroups: "Expand all groups",
-  collapseAllGroups: "Collapse all groups",
-  hideColumn: "Hide column",
-  autoFitColumn: "Autofit column",
-  autoFitAllColumns: "Autofit all columns",
-  selectAllRows: "Select all rows",
-  clearSelection: "Clear selection",
-  clearFilters: "Clear filters",
-  chooseColumns: "Choose columns",
-  toolbarLabel: "Grid toolbar",
-  searchLabel: "Search",
-  searchPlaceholder: "Search\u2026",
-  moreToolbarItems: "More",
-  searchResults,
-  columnChooserLabel: "Columns",
-  columnChooserSearchLabel: "Search columns",
-  showAllColumns: "Show all",
-  noMatchingColumns: "No matching columns",
-  filterOperatorLabel,
-  filterBlanks: "(Blanks)",
-  filterSearchFirst,
-  filterMoreValues: (count) => `${String(count)} more, refine the search`,
-  openFilter: "Filter\u2026",
-  clearColumnFilter: "Clear filter",
-  filterMenuLabel: (columnName2) => `${columnName2} filter`,
-  columnFiltered: "Filtered",
-  applyFilter: "OK",
-  cancelFilter: "Cancel",
-  customFilter: "Custom filter",
-  filterResults,
-  filterConditionLabel: (position) => `Condition ${String(position)}`,
-  filterOperatorFieldLabel: "Operator",
-  filterValueLabel: "Value",
-  filterFromLabel: "From",
-  filterToLabel: "To",
-  filterCombinatorLabel: "Combine conditions",
-  filterAnd: "And",
-  filterOr: "Or",
-  filterValueInvalid: (family) => filterValueRequests[family],
-  filterSearchLabel: "Search values",
-  filterSelectAll: "Select all",
-  filterValuesLabel: "Values",
-  filterByCondition: "Filtered by condition",
-  filterOperatorMenu: (family) => filterOperatorMenus[family],
-  filterBackToValues: "Back to values",
-  exportMenu: "Export",
-  exportCsv: "Export to CSV",
-  exportJson: "Export to JSON",
-  exportXlsx: "Export to Excel",
-  exportPdf: "Export to PDF",
-  exportSelectionCsv: "Export selection to CSV",
-  exportSelectionJson: "Export selection to JSON",
-  exportSelectionXlsx: "Export selection to Excel",
-  exportFailed: "Export failed",
-  copyCell: "Copy cell",
-  copyRow: "Copy row",
-  copySelection: "Copy selection",
-  copied,
-  copyFailed: "Copy failed",
-  print: "Print"
-};
-function resolveMessages(messages) {
-  return messages === void 0 ? defaultMessages : { ...defaultMessages, ...messages };
+function copied(n, count, unit) {
+  return count === 1 ? `1 ${unit.slice(0, -1)} copied` : `${n(count)} ${unit} copied`;
+}
+function createDefaultMessages(locale) {
+  const n = countFormat(locale);
+  return {
+    pagerLabel: "Pagination",
+    firstPage: "First",
+    previousPage: "Previous",
+    nextPage: "Next",
+    lastPage: "Last",
+    pageSizeLabel: "Rows per page",
+    pageButtonLabel: (page) => `Page ${n(page)}`,
+    pageStatus: (page, pageCount) => `Page ${n(page)} of ${n(pageCount)}`,
+    loadingMore: "Loading more\u2026",
+    booleanTrue: "true",
+    booleanFalse: "false",
+    blankGroupValue: "(blank)",
+    groupByBarLabel: "Grouped by",
+    groupByBarPlaceholder: "Drag a column here to group by it",
+    groupByChipLabel: (columnName2, level, levelCount) => levelCount > 1 ? `${columnName2}, level ${n(level)} of ${n(levelCount)}` : columnName2,
+    removeGroupBy: (columnName2) => `Stop grouping by ${columnName2}`,
+    columnResized: (columnName2, width) => `${columnName2}, ${n(width)} pixels wide`,
+    columnMoved: (columnName2, position, columnCount2) => `${columnName2}, column ${n(position)} of ${n(columnCount2)}`,
+    columnSorted: (columnName2, direction, key, keyCount) => {
+      const sorted = `${columnName2} sorted ${direction === "asc" ? "ascending" : "descending"}`;
+      return keyCount > 1 ? `${sorted}, key ${n(key)} of ${n(keyCount)}` : sorted;
+    },
+    sortCleared: (columnName2) => `${columnName2}, sort cleared`,
+    groupedBy: (columnName2, level, levelCount) => levelCount > 1 ? `Grouped by ${columnName2}, level ${n(level)} of ${n(levelCount)}` : `Grouped by ${columnName2}`,
+    groupingRemoved: (columnName2) => `${columnName2}, grouping removed`,
+    groupExpanded: "Group expanded",
+    groupCollapsed: "Group collapsed",
+    allGroupsExpanded: "All groups expanded",
+    allGroupsCollapsed: "All groups collapsed",
+    selectedCount: (count, target) => selectedCount(n, count, target),
+    cellSelected: (columnName2, rowNumber) => `${columnName2}, row ${n(rowNumber)}, selected`,
+    columnHidden: (columnName2) => `${columnName2}, column hidden`,
+    columnShown: (columnName2) => `${columnName2}, column shown`,
+    columnsHidden: (count) => columnCount(n, count, "hidden"),
+    columnsShown: (count) => columnCount(n, count, "shown"),
+    columnsAutoFitted: (count) => columnCount(n, count, "autofitted"),
+    headerMenuLabel: (columnName2) => `${columnName2} column menu`,
+    cellMenuLabel: "Row menu",
+    groupMenuLabel: "Group menu",
+    bodyMenuLabel: "Grid menu",
+    sortAscending: "Sort ascending",
+    sortDescending: "Sort descending",
+    clearSort: "Clear sort",
+    clearAllSorting: "Clear all sorting",
+    groupByColumn: (columnName2) => `Group by ${columnName2}`,
+    ungroupAll: "Ungroup all",
+    expandAllGroups: "Expand all groups",
+    collapseAllGroups: "Collapse all groups",
+    hideColumn: "Hide column",
+    autoFitColumn: "Autofit column",
+    autoFitAllColumns: "Autofit all columns",
+    selectAllRows: "Select all rows",
+    clearSelection: "Clear selection",
+    clearFilters: "Clear filters",
+    chooseColumns: "Choose columns",
+    toolbarLabel: "Grid toolbar",
+    searchLabel: "Search",
+    searchPlaceholder: "Search\u2026",
+    moreToolbarItems: "More",
+    searchResults: (count) => searchResults(n, count),
+    columnChooserLabel: "Columns",
+    columnChooserSearchLabel: "Search columns",
+    showAllColumns: "Show all",
+    noMatchingColumns: "No matching columns",
+    filterOperatorLabel,
+    filterBlanks: "(Blanks)",
+    filterSearchFirst: (total) => filterSearchFirst(n, total),
+    filterMoreValues: (count) => `${n(count)} more, refine the search`,
+    openFilter: "Filter\u2026",
+    clearColumnFilter: "Clear filter",
+    filterMenuLabel: (columnName2) => `${columnName2} filter`,
+    columnFiltered: "Filtered",
+    applyFilter: "OK",
+    cancelFilter: "Cancel",
+    customFilter: "Custom filter",
+    filterResults: (shown, total) => filterResults(n, shown, total),
+    filterConditionLabel: (position) => `Condition ${n(position)}`,
+    filterOperatorFieldLabel: "Operator",
+    filterValueLabel: "Value",
+    filterFromLabel: "From",
+    filterToLabel: "To",
+    filterCombinatorLabel: "Combine conditions",
+    filterAnd: "And",
+    filterOr: "Or",
+    filterValueInvalid: (family) => filterValueRequests[family],
+    filterSearchLabel: "Search values",
+    filterSelectAll: "Select all",
+    filterValuesLabel: "Values",
+    filterByCondition: "Filtered by condition",
+    filterOperatorMenu: (family) => filterOperatorMenus[family],
+    filterBackToValues: "Back to values",
+    exportMenu: "Export",
+    exportCsv: "Export to CSV",
+    exportJson: "Export to JSON",
+    exportXlsx: "Export to Excel",
+    exportPdf: "Export to PDF",
+    exportSelectionCsv: "Export selection to CSV",
+    exportSelectionJson: "Export selection to JSON",
+    exportSelectionXlsx: "Export selection to Excel",
+    exportFailed: "Export failed",
+    copyCell: "Copy cell",
+    copyRow: "Copy row",
+    copySelection: "Copy selection",
+    copied: (count, unit) => copied(n, count, unit),
+    copyFailed: "Copy failed",
+    print: "Print"
+  };
+}
+var defaultMessages = createDefaultMessages();
+var localeDefaults = /* @__PURE__ */ new Map();
+function defaultsFor(locale) {
+  if (locale === void 0) {
+    return defaultMessages;
+  }
+  const key = localeKey2(locale);
+  let defaults = localeDefaults.get(key);
+  if (defaults === void 0) {
+    defaults = createDefaultMessages(locale);
+    localeDefaults.set(key, defaults);
+  }
+  return defaults;
+}
+function resolveMessages(messages, locale) {
+  const defaults = defaultsFor(locale);
+  return messages === void 0 ? defaults : { ...defaults, ...messages };
 }
 
 // src/util/filterEditor.ts
@@ -3283,7 +3310,7 @@ function columnValueOptions(rows, dataColumns, filter, columnId, query = {}) {
     }
   }
   const { search = "", limit, locale } = query;
-  const messages = resolveMessages(query.messages);
+  const messages = resolveMessages(query.messages, locale);
   const options = [...buckets.values()].sort((a, b) => compareValues(a.value, b.value, column.type)).map(({ value, row, count }) => ({
     value,
     label: formatCellValue(value, column, locale, row, messages),
@@ -4342,32 +4369,31 @@ function paginationWindow(currentPage, pageCount, options) {
   if (pageCount <= 0) {
     return [];
   }
-  const boundaryCount = Math.max(0, options?.boundaryCount ?? 1);
-  const siblingCount = Math.max(0, options?.siblingCount ?? 1);
-  const current = Math.min(Math.max(currentPage, 1), pageCount);
-  const pages = /* @__PURE__ */ new Set();
-  for (let page = 1; page <= Math.min(boundaryCount, pageCount); page++) {
-    pages.add(page);
+  const boundaryCount = Math.max(0, Math.floor(options?.boundaryCount ?? 1));
+  const siblingCount = Math.max(0, Math.floor(options?.siblingCount ?? 1));
+  const slotCount = 2 * boundaryCount + 2 * siblingCount + 3;
+  if (pageCount <= slotCount) {
+    return Array.from({ length: pageCount }, (_, index) => index + 1);
   }
-  for (let page = Math.max(pageCount - boundaryCount + 1, 1); page <= pageCount; page++) {
-    pages.add(page);
+  const current = Math.min(Math.max(currentPage, 1), pageCount);
+  const runStart = Math.min(
+    Math.max(current - siblingCount, boundaryCount + 2),
+    pageCount - boundaryCount - 1 - 2 * siblingCount
+  );
+  const runEnd = runStart + 2 * siblingCount;
+  const entries = [];
+  for (let page = 1; page <= boundaryCount; page++) {
+    entries.push(page);
   }
-  for (let page = Math.max(current - siblingCount, 1); page <= Math.min(current + siblingCount, pageCount); page++) {
-    pages.add(page);
+  entries.push(runStart === boundaryCount + 2 ? boundaryCount + 1 : "ellipsis");
+  for (let page = runStart; page <= runEnd; page++) {
+    entries.push(page);
   }
-  const sorted = Array.from(pages).sort((a, b) => a - b);
-  const entries = [];
-  let previous;
-  for (const page of sorted) {
-    if (previous !== void 0) {
-      if (page - previous === 2) {
-        entries.push(previous + 1);
-      } else if (page - previous > 2) {
-        entries.push("ellipsis");
-      }
-    }
+  entries.push(
+    runEnd === pageCount - boundaryCount - 1 ? pageCount - boundaryCount : "ellipsis"
+  );
+  for (let page = pageCount - boundaryCount + 1; page <= pageCount; page++) {
     entries.push(page);
-    previous = page;
   }
   return entries;
 }
@@ -4627,6 +4653,7 @@ export {
   copyContent,
   createColumnValueOptionsCache,
   createCommandContext,
+  createDefaultMessages,
   createGridController,
   createGridViewResolver,
   csvWriter,