@tanstack/svelte-table 8.0.0-alpha.84 → 8.0.0-alpha.85

package/build/cjs/svelte-table/src/index.js

@@ -150,7 +150,6 @@ exports.getSortedRowModel = index.getSortedRowModel;
 exports.isFunction = index.isFunction;
 exports.isRowSelected = index.isRowSelected;
 exports.makeStateUpdater = index.makeStateUpdater;
-exports.mean = index.mean;
 exports.memo = index.memo;
 exports.noop = index.noop;
 exports.orderColumns = index.orderColumns;

package/build/cjs/svelte-table/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../src/index.ts"],"sourcesContent":["import {\n  createTableFactory,\n  createTableInstance as coreCreateTableInstance,\n  PartialKeys,\n  Table,\n  TableGenerics,\n  TableOptions,\n  TableOptionsResolved,\n} from '@tanstack/table-core'\nimport Placeholder from './placeholder.svelte'\nimport { SvelteComponent } from 'svelte/internal'\nimport { readable, writable, derived, Readable, get } from 'svelte/store'\nimport { renderComponent } from './render-component'\n\nexport { renderComponent } from './render-component'\n\nexport * from '@tanstack/table-core'\n\nfunction isSvelteServerComponent(component: any) {\n  return (\n    typeof component === 'object' &&\n    typeof component.$$render === 'function' &&\n    typeof component.render === 'function'\n  )\n}\n\nfunction isSvelteClientComponent(component: any) {\n  return component.prototype instanceof SvelteComponent\n}\n\nfunction isSvelteComponent(component: any) {\n  if (typeof document === 'undefined') {\n    return isSvelteServerComponent(component)\n  } else {\n    return isSvelteClientComponent(component)\n  }\n}\n\nfunction wrapInPlaceholder(content: any) {\n  return renderComponent(Placeholder, { content })\n}\n\nexport function render(component: any, props: any) {\n  if (!component) return null\n\n  if (isSvelteComponent(component)) {\n    return renderComponent(component, props)\n  }\n\n  if (typeof component === 'function') {\n    const result = component(props)\n\n    if (isSvelteComponent(result)) {\n      return result\n    }\n\n    return wrapInPlaceholder(result)\n  }\n\n  return wrapInPlaceholder(component)\n}\n\nexport const createTable = createTableFactory({ render })\n\ntype ReadableOrVal<T> = T | Readable<T>\n\nexport function createTableInstance<TGenerics extends TableGenerics>(\n  table: Table<TGenerics>,\n  options: ReadableOrVal<TableOptions<TGenerics>>\n) {\n  let optionsStore: Readable<TableOptions<TGenerics>>\n\n  if ('subscribe' in options) {\n    optionsStore = options\n  } else {\n    optionsStore = readable(options)\n  }\n\n  let resolvedOptions: TableOptionsResolved<TGenerics> = {\n    ...table.options,\n    state: {}, // Dummy state\n    onStateChange: () => {}, // noop\n    render,\n    ...get(optionsStore),\n  }\n\n  let instance = coreCreateTableInstance(resolvedOptions)\n\n  let stateStore = writable(/** @type {number} */ instance.initialState)\n  // combine stores\n  let stateOptionsStore = derived([stateStore, optionsStore], s => s)\n  const instanceReadable = readable(instance, function start(set) {\n    const unsubscribe = stateOptionsStore.subscribe(([state, options]) => {\n      instance.setOptions(prev => {\n        return {\n          ...prev,\n          ...options,\n          state: { ...state, ...options.state },\n          // Similarly, we'll maintain both our internal state and any user-provided\n          // state.\n          onStateChange: updater => {\n            if (updater instanceof Function) {\n              stateStore.update(updater)\n            } else {\n              stateStore.set(updater)\n            }\n\n            resolvedOptions.onStateChange?.(updater)\n          },\n        }\n      })\n\n      // it didn't seem to rerender without setting the instance\n      set(instance)\n    })\n\n    return function stop() {\n      unsubscribe()\n    }\n  })\n\n  return instanceReadable\n}\n"],"names":["isSvelteServerComponent","component","$$render","render","isSvelteClientComponent","prototype","SvelteComponent","isSvelteComponent","document","wrapInPlaceholder","content","renderComponent","Placeholder","props","result","createTable","createTableFactory","createTableInstance","table","options","optionsStore","readable","resolvedOptions","state","onStateChange","get","instance","coreCreateTableInstance","stateStore","writable","initialState","stateOptionsStore","derived","s","instanceReadable","start","set","unsubscribe","subscribe","setOptions","prev","updater","Function","update","stop"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../../../src/index.ts"],"sourcesContent":["import {\n  createTableFactory,\n  createTableInstance as coreCreateTableInstance,\n  PartialKeys,\n  Table,\n  TableGenerics,\n  TableOptions,\n  TableOptionsResolved,\n} from '@tanstack/table-core'\nimport Placeholder from './placeholder.svelte'\nimport { SvelteComponent } from 'svelte/internal'\nimport { readable, writable, derived, Readable, get } from 'svelte/store'\nimport { renderComponent } from './render-component'\n\nexport { renderComponent } from './render-component'\n\nexport * from '@tanstack/table-core'\n\nfunction isSvelteServerComponent(component: any) {\n  return (\n    typeof component === 'object' &&\n    typeof component.$$render === 'function' &&\n    typeof component.render === 'function'\n  )\n}\n\nfunction isSvelteClientComponent(component: any) {\n  return component.prototype instanceof SvelteComponent\n}\n\nfunction isSvelteComponent(component: any) {\n  if (typeof document === 'undefined') {\n    return isSvelteServerComponent(component)\n  } else {\n    return isSvelteClientComponent(component)\n  }\n}\n\nfunction wrapInPlaceholder(content: any) {\n  return renderComponent(Placeholder, { content })\n}\n\nexport function render(component: any, props: any) {\n  if (!component) return null\n\n  if (isSvelteComponent(component)) {\n    return renderComponent(component, props)\n  }\n\n  if (typeof component === 'function') {\n    const result = component(props)\n\n    if (isSvelteComponent(result)) {\n      return result\n    }\n\n    return wrapInPlaceholder(result)\n  }\n\n  return wrapInPlaceholder(component)\n}\n\nexport const createTable = createTableFactory({ render })\n\ntype ReadableOrVal<T> = T | Readable<T>\n\nexport function createTableInstance<TGenerics extends TableGenerics>(\n  table: Table<TGenerics>,\n  options: ReadableOrVal<TableOptions<TGenerics>>\n) {\n  let optionsStore: Readable<TableOptions<TGenerics>>\n\n  if ('subscribe' in options) {\n    optionsStore = options\n  } else {\n    optionsStore = readable(options)\n  }\n\n  let resolvedOptions: TableOptionsResolved<TGenerics> = {\n    ...table.options,\n    state: {}, // Dummy state\n    onStateChange: () => {}, // noop\n    render,\n    ...get(optionsStore),\n  }\n\n  let instance = coreCreateTableInstance(resolvedOptions)\n\n  let stateStore = writable(/** @type {number} */ instance.initialState)\n  // combine stores\n  let stateOptionsStore = derived([stateStore, optionsStore], s => s)\n  const instanceReadable = readable(instance, function start(set) {\n    const unsubscribe = stateOptionsStore.subscribe(([state, options]) => {\n      instance.setOptions(prev => {\n        return {\n          ...prev,\n          ...options,\n          state: { ...state, ...options.state },\n          // Similarly, we'll maintain both our internal state and any user-provided\n          // state.\n          onStateChange: updater => {\n            if (updater instanceof Function) {\n              stateStore.update(updater)\n            } else {\n              stateStore.set(updater)\n            }\n\n            resolvedOptions.onStateChange?.(updater)\n          },\n        }\n      })\n\n      // it didn't seem to rerender without setting the instance\n      set(instance)\n    })\n\n    return function stop() {\n      unsubscribe()\n    }\n  })\n\n  return instanceReadable\n}\n"],"names":["isSvelteServerComponent","component","$$render","render","isSvelteClientComponent","prototype","SvelteComponent","isSvelteComponent","document","wrapInPlaceholder","content","renderComponent","Placeholder","props","result","createTable","createTableFactory","createTableInstance","table","options","optionsStore","readable","resolvedOptions","state","onStateChange","get","instance","coreCreateTableInstance","stateStore","writable","initialState","stateOptionsStore","derived","s","instanceReadable","start","set","unsubscribe","subscribe","setOptions","prev","updater","Function","update","stop"],"mappings":"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"}

package/build/cjs/table-core/build/esm/index.js

@@ -1226,8 +1226,7 @@ const Filters = {
   createRow: (row, instance) => {
     return {
       columnFilters: {},
-      columnFiltersMeta: {},
-      subRowsByFacetId: {}
+      columnFiltersMeta: {}
     };
   },
   createInstance: instance => {
@@ -1318,53 +1317,42 @@ function shouldAutoRemoveFilter(filterFn, value, column) {
   return (filterFn && filterFn.autoRemove ? filterFn.autoRemove(value, column) : false) || typeof value === 'undefined' || typeof value === 'string' && !value;
 }
 
-const aggregationFns = {
-  sum,
-  min,
-  max,
-  extent,
-  mean,
-  median,
-  unique,
-  uniqueCount,
-  count
-};
-
-function sum(_getLeafValues, getChildValues) {
+const sum = (columnId, _leafRows, childRows) => {
   // It's faster to just add the aggregations together instead of
   // process leaf nodes individually
-  return getChildValues().reduce((sum, next) => sum + (typeof next === 'number' ? next : 0), 0);
-}
+  return childRows.reduce((sum, next) => sum + (typeof next === 'number' ? next : 0), 0);
+};
 
-function min(_getLeafValues, getChildValues) {
+const min = (columnId, _leafRows, childRows) => {
   let min;
+  childRows.forEach(row => {
+    const value = row.getValue(columnId);
 
-  for (const value of getChildValues()) {
     if (value != null && (min > value || min === undefined && value >= value)) {
       min = value;
     }
-  }
-
+  });
   return min;
-}
+};
 
-function max(_getLeafValues, getChildValues) {
+const max = (columnId, _leafRows, childRows) => {
   let max;
+  childRows.forEach(row => {
+    const value = row.getValue(columnId);
 
-  for (const value of getChildValues()) {
     if (value != null && (max < value || max === undefined && value >= value)) {
       max = value;
     }
-  }
-
+  });
   return max;
-}
+};
 
-function extent(_getLeafValues, getChildValues) {
+const extent = (columnId, _leafRows, childRows) => {
   let min;
   let max;
+  childRows.forEach(row => {
+    const value = row.getValue(columnId);
 
-  for (const value of getChildValues()) {
     if (value != null) {
       if (min === undefined) {
         if (value >= value) min = max = value;
@@ -1373,54 +1361,65 @@ function extent(_getLeafValues, getChildValues) {
         if (max < value) max = value;
       }
     }
-  }
-
+  });
   return [min, max];
-}
+};
 
-function mean(getLeafValues) {
+const mean = (columnId, leafRows) => {
   let count = 0;
   let sum = 0;
+  leafRows.forEach(row => {
+    let value = row.getValue(columnId);
 
-  for (let value of getLeafValues()) {
     if (value != null && (value = +value) >= value) {
       ++count, sum += value;
     }
-  }
-
+  });
   if (count) return sum / count;
   return;
-}
-
-function median(getLeafValues) {
-  const leafValues = getLeafValues();
+};
 
-  if (!leafValues.length) {
+const median = (columnId, leafRows) => {
+  if (!leafRows.length) {
     return;
   }
 
   let min = 0;
   let max = 0;
-  leafValues.forEach(value => {
+  leafRows.forEach(row => {
+    let value = row.getValue(columnId);
+
     if (typeof value === 'number') {
       min = Math.min(min, value);
       max = Math.max(max, value);
     }
   });
   return (min + max) / 2;
-}
+};
 
-function unique(getLeafValues) {
-  return Array.from(new Set(getLeafValues()).values());
-}
+const unique = (columnId, leafRows) => {
+  return Array.from(new Set(leafRows.map(d => d.getValue(columnId))).values());
+};
 
-function uniqueCount(getLeafValues) {
-  return new Set(getLeafValues()).size;
-}
+const uniqueCount = (columnId, leafRows) => {
+  return new Set(leafRows.map(d => d.getValue(columnId))).size;
+};
 
-function count(getLeafValues) {
-  return getLeafValues().length;
-}
+const count = (_columnId, leafRows) => {
+  return leafRows.length;
+};
+
+const aggregationFns = {
+  sum,
+  min,
+  max,
+  extent,
+  mean,
+  median,
+  unique,
+  uniqueCount,
+  count
+};
 
 //
 const Grouping = {
@@ -1475,7 +1474,7 @@ const Grouping = {
           column.toggleGrouping();
         };
       },
-      getColumnAutoAggregationFn: () => {
+      getAutoAggregationFn: () => {
         const firstRow = instance.getCoreRowModel().flatRows[0];
         const value = firstRow == null ? void 0 : firstRow.getValue(column.id);
 
@@ -1489,7 +1488,7 @@ const Grouping = {
 
         return aggregationFns.count;
       },
-      getColumnAggregationFn: () => {
+      getAggregationFn: () => {
         var _ref4;
 
         const userAggregationFns = instance.options.aggregationFns;
@@ -1498,7 +1497,7 @@ const Grouping = {
           throw new Error();
         }
 
-        return isFunction(column.aggregationFn) ? column.aggregationFn : column.aggregationFn === 'auto' ? column.getColumnAutoAggregationFn() : (_ref4 = userAggregationFns == null ? void 0 : userAggregationFns[column.aggregationFn]) != null ? _ref4 : aggregationFns[column.aggregationFn];
+        return isFunction(column.aggregationFn) ? column.aggregationFn : column.aggregationFn === 'auto' ? column.getAutoAggregationFn() : (_ref4 = userAggregationFns == null ? void 0 : userAggregationFns[column.aggregationFn]) != null ? _ref4 : aggregationFns[column.aggregationFn];
       }
     };
   },
@@ -1524,10 +1523,10 @@ const Grouping = {
       }
     };
   },
-  createRow: (row, instance) => {
+  createRow: row => {
     return {
       getIsGrouped: () => !!row.groupingColumnId,
-      groupingValuesCache: {}
+      _groupingValuesCache: {}
     };
   },
   createCell: (cell, column, row, instance) => {
@@ -3662,25 +3661,17 @@ function getGroupedRowModel() {
               return row._valuesCache[columnId];
             }
 
-            if (row.groupingValuesCache.hasOwnProperty(columnId)) {
-              return row.groupingValuesCache[columnId];
+            if (row._groupingValuesCache.hasOwnProperty(columnId)) {
+              return row._groupingValuesCache[columnId];
             } // Aggregate the values
 
 
             const column = instance.getColumn(columnId);
-            const aggregateFn = column.getColumnAggregationFn();
+            const aggregateFn = column.getAggregationFn();
 
             if (aggregateFn) {
-              row.groupingValuesCache[columnId] = aggregateFn(() => leafRows.map(row => {
-                let columnValue = row.getValue(columnId);
-
-                if (!depth && column.columnDef.aggregateValue) {
-                  columnValue = column.columnDef.aggregateValue(columnValue);
-                }
-
-                return columnValue;
-              }), () => groupedRows.map(row => row.getValue(columnId)));
-              return row.groupingValuesCache[columnId];
+              row._groupingValuesCache[columnId] = aggregateFn(columnId, leafRows, groupedRows);
+              return row._groupingValuesCache[columnId];
             } else if (column.aggregationFn) {
               console.info({
                 column
@@ -3867,7 +3858,6 @@ exports.getSortedRowModel = getSortedRowModel;
 exports.isFunction = isFunction;
 exports.isRowSelected = isRowSelected;
 exports.makeStateUpdater = makeStateUpdater;
-exports.mean = mean;
 exports.memo = memo;
 exports.noop = noop;
 exports.orderColumns = orderColumns;