@mui/x-data-grid-generator 6.0.0-alpha.8 → 6.0.0-beta.0

package/columns/commodities.columns.js

@@ -171,7 +171,6 @@ export const getCommodityColumns = (editable = false) => [{
     if (typeof value === 'string') {
       return COUNTRY_ISO_OPTIONS_SORTED.find(country => country.value === value);
     }
-
     return value;
   },
   valueFormatter: ({

package/columns/employees.columns.js

@@ -130,7 +130,6 @@ export const getEmployeeColumns = () => [{
     if (!value || typeof value !== 'number') {
       return value;
     }
-
     return `${value.toLocaleString()}$`;
   }
 }];

package/hooks/useDemoData.d.ts

@@ -1,13 +1,13 @@
 import { GridColumnVisibilityModel } from '@mui/x-data-grid-premium';
 import { GridColDefGenerator } from '../services/gridColDefGenerator';
 import { AddPathToDemoDataOptions, DemoTreeDataValue } from '../services/tree-data-generator';
-export declare type DemoDataReturnType = {
+export type DemoDataReturnType = {
     data: DemoTreeDataValue;
     loading: boolean;
     setRowLength: (count: number) => void;
     loadNewData: () => void;
 };
-declare type DataSet = 'Commodity' | 'Employee';
+type DataSet = 'Commodity' | 'Employee';
 export interface UseDemoDataOptions {
     dataSet: DataSet;
     rowLength: number;

package/hooks/useDemoData.js

@@ -9,7 +9,6 @@ import { addTreeDataOptionsToDemoData } from '../services/tree-data-generator';
 const dataCache = new LRUCache({
   max: 10,
   ttl: 60 * 5 * 1e3 // 5 minutes
-
 });
 
 // Generate fake data from a seed.
@@ -21,25 +20,20 @@ async function extrapolateSeed(rowLength, data) {
     const tasks = {
       current: rowLength - seed.length
     };
-
     function work() {
       const row = {};
-
       for (let j = 0; j < data.columns.length; j += 1) {
         const column = data.columns[j];
         const index = Math.round(Math.random() * (seed.length - 1));
-
         if (column.field === 'id') {
           row.id = `id-${tasks.current + seed.length}`;
         } else {
           row[column.field] = seed[index][column.field];
         }
       }
-
       rows.push(row);
       tasks.current -= 1;
     }
-
     asyncWorker({
       work,
       done: () => resolve(_extends({}, data, {
@@ -49,45 +43,38 @@ async function extrapolateSeed(rowLength, data) {
     });
   });
 }
-
 const deepFreeze = object => {
   // Retrieve the property names defined on object
-  const propNames = Object.getOwnPropertyNames(object); // Freeze properties before freezing self
-  // eslint-disable-next-line no-restricted-syntax
+  const propNames = Object.getOwnPropertyNames(object);
 
+  // Freeze properties before freezing self
+
+  // eslint-disable-next-line no-restricted-syntax
   for (const name of propNames) {
     const value = object[name];
-
     if (value && typeof value === 'object') {
       deepFreeze(value);
     }
   }
-
   return Object.freeze(object);
 };
-
 export const getColumnsFromOptions = options => {
   let columns = options.dataSet === 'Commodity' ? getCommodityColumns(options.editable) : getEmployeeColumns();
-
   if (options.visibleFields) {
     columns = columns.map(col => {
       var _options$visibleField;
-
       return (_options$visibleField = options.visibleFields) != null && _options$visibleField.includes(col.field) ? col : _extends({}, col, {
         hide: true
       });
     });
   }
-
   if (options.maxColumns) {
     columns = columns.slice(0, options.maxColumns);
   }
-
   return columns;
 };
 export const getInitialState = (options, columns) => {
   var _options$treeData;
-
   const columnVisibilityModel = {};
   columns.forEach(col => {
     if (col.hide) {
@@ -95,11 +82,9 @@ export const getInitialState = (options, columns) => {
     }
   });
   const groupingField = (_options$treeData = options.treeData) == null ? void 0 : _options$treeData.groupingField;
-
   if (groupingField) {
     columnVisibilityModel[groupingField] = false;
   }
-
   return {
     columns: {
       columnVisibilityModel
@@ -108,7 +93,6 @@ export const getInitialState = (options, columns) => {
 };
 export const useDemoData = options => {
   var _options$treeData5, _options$treeData6, _options$treeData7;
-
   const [rowLength, setRowLength] = React.useState(options.rowLength);
   const [index, setIndex] = React.useState(0);
   const [loading, setLoading] = React.useState(true);
@@ -128,50 +112,44 @@ export const useDemoData = options => {
     }, options.treeData);
   });
   React.useEffect(() => {
-    const cacheKey = `${options.dataSet}-${rowLength}-${index}-${options.maxColumns}`; // Cache to allow fast switch between the JavaScript and TypeScript version
-    // of the demos.
+    const cacheKey = `${options.dataSet}-${rowLength}-${index}-${options.maxColumns}`;
 
+    // Cache to allow fast switch between the JavaScript and TypeScript version
+    // of the demos.
     if (dataCache.has(cacheKey)) {
       const newData = dataCache.get(cacheKey);
       setData(newData);
       setLoading(false);
       return undefined;
     }
-
     let active = true;
-
     (async () => {
       var _options$treeData2, _options$treeData3, _options$treeData4;
-
       setLoading(true);
       let newData;
-
       if (rowLength > 1000) {
         newData = await getRealGridData(1000, columns);
         newData = await extrapolateSeed(rowLength, newData);
       } else {
         newData = await getRealGridData(rowLength, columns);
       }
-
       if (!active) {
         return;
       }
-
       newData = addTreeDataOptionsToDemoData(newData, {
         maxDepth: (_options$treeData2 = options.treeData) == null ? void 0 : _options$treeData2.maxDepth,
         groupingField: (_options$treeData3 = options.treeData) == null ? void 0 : _options$treeData3.groupingField,
         averageChildren: (_options$treeData4 = options.treeData) == null ? void 0 : _options$treeData4.averageChildren
-      }); // It's quite slow. No need for it in production.
+      });
 
+      // It's quite slow. No need for it in production.
       if (process.env.NODE_ENV !== 'production') {
         deepFreeze(newData);
       }
-
       dataCache.set(cacheKey, newData);
       setData(newData);
       setLoading(false);
     })();
-
     return () => {
       active = false;
     };

package/hooks/useMovieData.d.ts

@@ -1,5 +1,5 @@
-import { GridColumns } from '@mui/x-data-grid-premium';
-export declare type Movie = {
+import { GridColDef } from '@mui/x-data-grid-premium';
+export type Movie = {
     id: number;
     title: string;
     gross: number;
@@ -15,5 +15,5 @@ export declare type Movie = {
 };
 export declare const useMovieData: () => {
     rows: Movie[];
-    columns: GridColumns<any>;
+    columns: GridColDef<any, any, any>[];
 };

package/hooks/useMovieData.js

@@ -21,7 +21,6 @@ const COLUMNS = [{
     if (!value) {
       return '';
     }
-
     return currencyFormatter.format(value);
   }
 }, {

package/hooks/useQuery.d.ts

@@ -20,7 +20,7 @@ interface DefaultServerOptions {
     maxDelay: number;
     useCursorPagination?: boolean;
 }
-declare type ServerOptions = Partial<DefaultServerOptions>;
+type ServerOptions = Partial<DefaultServerOptions>;
 export interface QueryOptions {
     cursor?: GridRowId;
     page?: number;
@@ -52,30 +52,30 @@ export declare const createFakeServer: (dataSetOptions?: Partial<UseDemoDataOpti
         pinnable?: boolean | undefined;
         sortComparator?: import("@mui/x-data-grid-pro").GridComparatorFn<any> | undefined;
         type?: string | undefined;
-        valueOptions?: import("@mui/x-data-grid-pro").ValueOptions[] | ((params: import("@mui/x-data-grid-pro").GridValueOptionsParams<any>) => import("@mui/x-data-grid-pro").ValueOptions[]) | undefined;
+        valueOptions?: import("@mui/x-data-grid-pro").ValueOptions[] | ((params: import("@mui/x-data-grid-pro").GridValueOptionsParams<import("@mui/x-data-grid-pro").GridValidRowModel>) => import("@mui/x-data-grid-pro").ValueOptions[]) | undefined;
         align?: import("@mui/x-data-grid-pro").GridAlignment | undefined;
-        valueGetter?: ((params: import("@mui/x-data-grid-pro").GridValueGetterParams<any, any, import("@mui/x-data-grid-pro").GridTreeNodeWithRender>) => any) | undefined;
-        valueSetter?: ((params: import("@mui/x-data-grid-pro").GridValueSetterParams<any, any>) => any) | undefined;
+        valueGetter?: ((params: import("@mui/x-data-grid-pro").GridValueGetterParams<import("@mui/x-data-grid-pro").GridValidRowModel, any, import("@mui/x-data-grid-pro").GridTreeNodeWithRender>) => any) | undefined;
+        valueSetter?: ((params: import("@mui/x-data-grid-pro").GridValueSetterParams<any, any>) => any) | ((params: import("@mui/x-data-grid-pro").GridValueSetterParams<import("@mui/x-data-grid-pro").GridValidRowModel, any>) => import("@mui/x-data-grid-pro").GridValidRowModel) | undefined;
         valueFormatter?: ((params: import("@mui/x-data-grid-pro").GridValueFormatterParams<any>) => any) | undefined;
-        valueParser?: ((value: any, params?: import("@mui/x-data-grid-pro").GridCellParams<any, any, any, import("@mui/x-data-grid-pro").GridTreeNode> | undefined) => any) | undefined;
-        cellClassName?: import("@mui/x-data-grid-pro").GridCellClassNamePropType | undefined;
-        renderCell?: ((params: import("@mui/x-data-grid-pro").GridRenderCellParams<any, any, any, import("@mui/x-data-grid-pro").GridTreeNodeWithRender>) => React.ReactNode) | undefined;
-        renderEditCell?: ((params: import("@mui/x-data-grid-pro").GridRenderEditCellParams<any, any, any, import("@mui/x-data-grid-pro").GridTreeNodeWithRender>) => React.ReactNode) | undefined;
+        valueParser?: ((value: any, params?: import("@mui/x-data-grid-pro").GridCellParams<import("@mui/x-data-grid-pro").GridValidRowModel, any, any, import("@mui/x-data-grid-pro").GridTreeNode> | undefined) => any) | undefined;
+        cellClassName?: string | import("@mui/x-data-grid-pro").GridCellClassFn<import("@mui/x-data-grid-pro").GridValidRowModel, any> | undefined;
+        renderCell?: ((params: import("@mui/x-data-grid-pro").GridRenderCellParams<import("@mui/x-data-grid-pro").GridValidRowModel, any, any, import("@mui/x-data-grid-pro").GridTreeNodeWithRender>) => React.ReactNode) | undefined;
+        renderEditCell?: ((params: import("@mui/x-data-grid-pro").GridRenderEditCellParams<import("@mui/x-data-grid-pro").GridValidRowModel, any, any, import("@mui/x-data-grid-pro").GridTreeNodeWithRender>) => React.ReactNode) | undefined;
         preProcessEditCellProps?: ((params: import("@mui/x-data-grid-pro").GridPreProcessEditCellProps<any, any>) => import("@mui/x-data-grid-pro").GridEditCellProps<any> | Promise<import("@mui/x-data-grid-pro").GridEditCellProps<any>>) | undefined;
         headerClassName?: import("@mui/x-data-grid-pro").GridColumnHeaderClassNamePropType | undefined;
-        renderHeader?: ((params: import("@mui/x-data-grid-pro").GridColumnHeaderParams<any, any, any>) => React.ReactNode) | undefined;
+        renderHeader?: ((params: import("@mui/x-data-grid-pro").GridColumnHeaderParams<any, any, any>) => React.ReactNode) | ((params: import("@mui/x-data-grid-pro").GridColumnHeaderParams<import("@mui/x-data-grid-pro").GridValidRowModel, any, any>) => React.ReactNode) | undefined;
         headerAlign?: import("@mui/x-data-grid-pro").GridAlignment | undefined;
         hideSortIcons?: boolean | undefined;
         disableColumnMenu?: boolean | undefined;
         filterable?: boolean | undefined;
-        filterOperators?: GridFilterOperator<any, any, any>[] | undefined;
-        getApplyQuickFilterFn?: ((value: any, colDef: import("@mui/x-data-grid-pro").GridStateColDef<any, any, any>, apiRef: React.MutableRefObject<import("@mui/x-data-grid/internals").GridApiCommunity>) => ((params: import("@mui/x-data-grid-pro").GridCellParams<any, any, any, import("@mui/x-data-grid-pro").GridTreeNode>) => boolean) | null) | undefined;
+        filterOperators?: GridFilterOperator<any, any, any>[] | GridFilterOperator<import("@mui/x-data-grid-pro").GridValidRowModel, any, any>[] | undefined;
+        getApplyQuickFilterFn?: ((value: any, colDef: import("@mui/x-data-grid/internals").GridStateColDef<any, any, any>, apiRef: React.MutableRefObject<import("@mui/x-data-grid/internals").GridApiCommunity>) => ((params: import("@mui/x-data-grid-pro").GridCellParams<import("@mui/x-data-grid-pro").GridValidRowModel, any, any, import("@mui/x-data-grid-pro").GridTreeNode>) => boolean) | null) | undefined;
         disableReorder?: boolean | undefined;
         disableExport?: boolean | undefined;
-        colSpan?: number | ((params: import("@mui/x-data-grid-pro").GridCellParams<any, any, any, import("@mui/x-data-grid-pro").GridTreeNode>) => number | undefined) | undefined;
+        colSpan?: number | ((params: import("@mui/x-data-grid-pro").GridCellParams<import("@mui/x-data-grid-pro").GridValidRowModel, any, any, import("@mui/x-data-grid-pro").GridTreeNode>) => number | undefined) | undefined;
         aggregable?: boolean | undefined;
         availableAggregationFunctions?: string[] | undefined;
-        groupingValueGetter?: ((params: import("@mui/x-data-grid-premium").GridGroupingValueGetterParams<any, any>) => import("@mui/x-data-grid-pro").GridKeyValue | null | undefined) | undefined;
+        groupingValueGetter?: ((params: import("@mui/x-data-grid-premium").GridGroupingValueGetterParams<any, any>) => import("@mui/x-data-grid-pro").GridKeyValue | null | undefined) | ((params: import("@mui/x-data-grid-premium").GridGroupingValueGetterParams<import("@mui/x-data-grid-pro").GridValidRowModel, any>) => import("@mui/x-data-grid-pro").GridKeyValue | null | undefined) | undefined;
         extendType?: import("@mui/x-data-grid-pro").GridNativeColTypes | undefined;
     }[];
     initialState: {

package/hooks/useQuery.js

@@ -1,29 +1,24 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
-import { getGridDefaultColumnTypes, GridLinkOperator } from '@mui/x-data-grid-pro';
+import { getGridDefaultColumnTypes, GridLogicOperator } from '@mui/x-data-grid-pro';
 import { isDeepEqual } from '@mui/x-data-grid/internals';
 import { useDemoData, getColumnsFromOptions, getInitialState } from './useDemoData';
-
 const simplifiedValueGetter = (field, colDef) => row => {
   var _colDef$valueGetter;
-
   const params = {
     id: row.id,
     row,
     field,
     rowNode: {}
-  }; // @ts-ignore
-
+  };
+  // @ts-ignore
   return ((_colDef$valueGetter = colDef.valueGetter) == null ? void 0 : _colDef$valueGetter.call(colDef, params)) || row[field];
 };
-
 const getRowComparator = (sortModel, columnsWithDefaultColDef) => {
   if (!sortModel) {
     const comparator = () => 0;
-
     return comparator;
   }
-
   const sortOperators = sortModel.map(sortItem => {
     const columnField = sortItem.field;
     const colDef = columnsWithDefaultColDef.find(({
@@ -34,7 +29,6 @@ const getRowComparator = (sortModel, columnsWithDefaultColDef) => {
       sortComparator: colDef.sortComparator
     });
   });
-
   const comparator = (row1, row2) => sortOperators.reduce((acc, {
     valueGetter,
     sort,
@@ -43,52 +37,40 @@ const getRowComparator = (sortModel, columnsWithDefaultColDef) => {
     if (acc !== 0) {
       return acc;
     }
-
     const v1 = valueGetter(row1);
     const v2 = valueGetter(row2);
     return sort === 'desc' ? -1 * sortComparator(v1, v2) : sortComparator(v1, v2);
   }, 0);
-
   return comparator;
 };
-
 const getFilteredRows = (rows, filterModel, columnsWithDefaultColDef) => {
   if (filterModel === undefined || filterModel.items.length === 0) {
     return rows;
   }
-
   const valueGetters = filterModel.items.map(({
-    columnField
-  }) => simplifiedValueGetter(columnField, columnsWithDefaultColDef.find(({
     field
-  }) => field === columnField)));
+  }) => simplifiedValueGetter(field, columnsWithDefaultColDef.find(column => column.field === field)));
   const filterFunctions = filterModel.items.map(filterItem => {
     const {
-      columnField,
-      operatorValue
+      field,
+      operator
     } = filterItem;
-    const colDef = columnsWithDefaultColDef.find(({
-      field
-    }) => field === columnField);
+    const colDef = columnsWithDefaultColDef.find(column => column.field === field);
     const filterOperator = colDef.filterOperators.find(({
       value
-    }) => operatorValue === value);
+    }) => operator === value);
     let parsedValue = filterItem.value;
-
     if (colDef.valueParser) {
       var _filterItem$value;
-
       const parser = colDef.valueParser;
       parsedValue = Array.isArray(filterItem.value) ? (_filterItem$value = filterItem.value) == null ? void 0 : _filterItem$value.map(x => parser(x)) : parser(filterItem.value);
     }
-
     return filterOperator == null ? void 0 : filterOperator.getApplyFilterFn({
       filterItem,
       value: parsedValue
     }, colDef);
   });
-
-  if (filterModel.linkOperator === GridLinkOperator.Or) {
+  if (filterModel.logicOperator === GridLogicOperator.Or) {
     return rows.filter(row => filterModel.items.some((_, index) => {
       const value = valueGetters[index](row);
       return filterFunctions[index] === null ? true : filterFunctions[index]({
@@ -96,7 +78,6 @@ const getFilteredRows = (rows, filterModel, columnsWithDefaultColDef) => {
       });
     }));
   }
-
   return rows.filter(row => filterModel.items.every((_, index) => {
     const value = valueGetters[index](row);
     return filterFunctions[index] === null ? true : filterFunctions[index]({
@@ -104,22 +85,19 @@ const getFilteredRows = (rows, filterModel, columnsWithDefaultColDef) => {
     });
   }));
 };
+
 /**
  * Simulates server data loading
  */
-
-
 export const loadServerRows = (rows, queryOptions, serverOptions, columnsWithDefaultColDef) => {
   const {
     minDelay = 100,
     maxDelay = 300,
     useCursorPagination
   } = serverOptions;
-
   if (maxDelay < minDelay) {
     throw new Error('serverOptions.minDelay is larger than serverOptions.maxDelay ');
   }
-
   const delay = Math.random() * (maxDelay - minDelay) + minDelay;
   const {
     cursor,
@@ -133,7 +111,6 @@ export const loadServerRows = (rows, queryOptions, serverOptions, columnsWithDef
   const rowComparator = getRowComparator(queryOptions.sortModel, columnsWithDefaultColDef);
   filteredRows = [...filteredRows].sort(rowComparator);
   const totalRowCount = filteredRows.length;
-
   if (!pageSize) {
     firstRowIndex = 0;
     lastRowIndex = filteredRows.length;
@@ -142,14 +119,12 @@ export const loadServerRows = (rows, queryOptions, serverOptions, columnsWithDef
       id
     }) => id === cursor) : 0;
     firstRowIndex = Math.max(firstRowIndex, 0); // if cursor not found return 0
-
     lastRowIndex = firstRowIndex + pageSize;
     nextCursor = lastRowIndex >= filteredRows.length ? undefined : filteredRows[lastRowIndex].id;
   } else {
     firstRowIndex = page * pageSize;
     lastRowIndex = (page + 1) * pageSize;
   }
-
   const response = {
     returnedRows: filteredRows.slice(firstRowIndex, lastRowIndex),
     nextCursor,
@@ -161,6 +136,7 @@ export const loadServerRows = (rows, queryOptions, serverOptions, columnsWithDef
     }, delay); // simulate network latency
   });
 };
+
 const DEFAULT_DATASET_OPTIONS = {
   dataSet: 'Commodity',
   rowLength: 100,
@@ -174,14 +150,11 @@ const DEFAULT_SERVER_OPTIONS = {
 };
 export const createFakeServer = (dataSetOptions, serverOptions) => {
   const dataSetOptionsWithDefault = _extends({}, DEFAULT_DATASET_OPTIONS, dataSetOptions);
-
   const serverOptionsWithDefault = _extends({}, DEFAULT_SERVER_OPTIONS, serverOptions);
-
   const columns = getColumnsFromOptions(dataSetOptionsWithDefault);
   const initialState = getInitialState(dataSetOptionsWithDefault, columns);
   const defaultColDef = getGridDefaultColumnTypes();
   const columnsWithDefaultColDef = columns.map(column => _extends({}, defaultColDef[column.type || 'string'], column));
-
   const useQuery = queryOptions => {
     const {
       data: {
@@ -200,25 +173,21 @@ export const createFakeServer = (dataSetOptions, serverOptions) => {
         // dataset is not ready
         return () => {};
       }
-
       queryOptionsRef.current = queryOptions;
       let active = true;
       setIsLoading(true);
       setResponse(prev => Object.keys(prev.pageInfo).length === 0 ? prev : _extends({}, prev, {
         pageInfo: {}
       }));
-
       (async function fetchData() {
         const {
           returnedRows,
           nextCursor,
           totalRowCount
         } = await loadServerRows(rows, queryOptions, serverOptionsWithDefault, columnsWithDefaultColDef);
-
         if (!active) {
           return;
         }
-
         const newRep = {
           rows: returnedRows,
           pageInfo: {
@@ -230,18 +199,17 @@ export const createFakeServer = (dataSetOptions, serverOptions) => {
         setResponse(prev => isDeepEqual(prev, newRep) ? prev : newRep);
         setIsLoading(false);
       })();
-
       return () => {
         active = false;
       };
-    }, [dataGenerationIsLoading, queryOptions, rows]); // We use queryOptions pointer to be sure that isLoading===true as soon as the options change
+    }, [dataGenerationIsLoading, queryOptions, rows]);
 
+    // We use queryOptions pointer to be sure that isLoading===true as soon as the options change
     const effectShouldStart = queryOptionsRef.current !== queryOptions;
     return _extends({
       isLoading: isLoading || effectShouldStart
     }, response);
   };
-
   return {
     columns,
     columnsWithDefaultColDef,

package/index.js

@@ -1,6 +1,8 @@
-/** @license MUI v6.0.0-alpha.8
+/**
+ * @mui/x-data-grid-generator v6.0.0-beta.0
  *
- * This source code is licensed under the MIT license found in the
+ * @license MUI X Commercial
+ * This source code is licensed under the commercial license found in the
  * LICENSE file in the root directory of this source tree.
  */
 export * from './renderer';

package/legacy/columns/commodities.columns.js

@@ -184,7 +184,6 @@ export var getCommodityColumns = function getCommodityColumns() {
           return country.value === value;
         });
       }
-
       return value;
     },
     valueFormatter: function valueFormatter(_ref4) {

package/legacy/columns/employees.columns.js

@@ -134,11 +134,9 @@ export var getEmployeeColumns = function getEmployeeColumns() {
     type: 'number',
     valueFormatter: function valueFormatter(_ref2) {
       var value = _ref2.value;
-
       if (!value || typeof value !== 'number') {
         return value;
       }
-
       return "".concat(value.toLocaleString(), "$");
     }
   }];

package/legacy/hooks/useBasicDemoData.js

@@ -3,13 +3,12 @@ import * as React from 'react';
 import { getBasicGridData } from '../services';
 export var useBasicDemoData = function useBasicDemoData(nbRows, nbCols) {
   var _React$useState = React.useState({
-    rows: [],
-    columns: []
-  }),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      data = _React$useState2[0],
-      setData = _React$useState2[1];
-
+      rows: [],
+      columns: []
+    }),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    data = _React$useState2[0],
+    setData = _React$useState2[1];
   React.useEffect(function () {
     var newData = getBasicGridData(nbRows, nbCols);
     setData(newData);