use named imports with inflection

marmelab · May 1, 2024 · 99a55ae · 99a55ae
1 parent dd1c079
commit 99a55ae
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 64 deletions.
diff --git a/examples/demo/src/categories/CategoryList.tsx b/examples/demo/src/categories/CategoryList.tsx
@@ -5,7 +5,6 @@ import {
     RecordContextProvider,
     useListContext,
 } from 'react-admin';
-import * as inflection from 'inflection';
 import {
     Grid,
     Card,
@@ -14,6 +13,7 @@ import {
     CardActions,
     Typography,
 } from '@mui/material';
+import { humanize } from 'inflection';
 
 import LinkToRelatedProducts from './LinkToRelatedProducts';
 import { Category } from '../types';
@@ -62,7 +62,7 @@ const CategoryGrid = () => {
                                     component="h2"
                                     align="center"
                                 >
-                                    {inflection.humanize(record.name)}
+                                    {humanize(record.name)}
                                 </Typography>
                             </CardContent>
                             <CardActions

diff --git a/examples/demo/src/products/Aside.tsx b/examples/demo/src/products/Aside.tsx
@@ -1,5 +1,4 @@
 import * as React from 'react';
-import * as inflection from 'inflection';
 import { Card, CardContent } from '@mui/material';
 import LocalOfferIcon from '@mui/icons-material/LocalOfferOutlined';
 import BarChartIcon from '@mui/icons-material/BarChart';
@@ -13,6 +12,7 @@ import {
 } from 'react-admin';
 
 import { Category } from '../types';
+import { humanize } from 'inflection';
 
 const Aside = () => {
     const { data } = useGetList<Category>('categories', {
@@ -118,7 +118,7 @@ const Aside = () => {
                     {data &&
                         data.map((record: any) => (
                             <FilterListItem
-                                label={inflection.humanize(record.name)}
+                                label={humanize(record.name)}
                                 key={record.id}
                                 value={{ category_id: record.id }}
                             />

diff --git a/packages/ra-core/src/core/useGetResourceLabel.ts b/packages/ra-core/src/core/useGetResourceLabel.ts
@@ -1,7 +1,6 @@
-import * as inflection from 'inflection';
-
 import { useResourceDefinitions } from './useResourceDefinitions';
 import { useTranslate } from '../i18n';
+import { humanize, pluralize, singularize } from 'inflection';
 
 /**
  * A hook which returns function to get a translated resource name. It will use the label option of the `Resource` component if it was provided.
@@ -40,10 +39,10 @@ export const useGetResourceLabel = (): GetResourceLabel => {
                           smart_count: count,
                           _: resourceDefinition.options.label,
                       })
-                    : inflection.humanize(
+                    : humanize(
                           count > 1
-                              ? inflection.pluralize(resource)
-                              : inflection.singularize(resource)
+                              ? pluralize(resource)
+                              : singularize(resource)
                       ),
         });
 

diff --git a/packages/ra-core/src/inference/inferElementFromValues.tsx b/packages/ra-core/src/inference/inferElementFromValues.tsx
@@ -1,5 +1,4 @@
 import * as React from 'react';
-import * as inflection from 'inflection';
 
 import getValuesFromRecords from './getValuesFromRecords';
 import InferredElement from './InferredElement';
@@ -17,6 +16,7 @@ import {
     valuesAreString,
 } from './assertions';
 import { InferredTypeMap } from './types';
+import { pluralize } from 'inflection';
 
 const DefaultComponent = () => <span>;</span>;
 const defaultType = {
@@ -86,7 +86,7 @@ const inferElementFromValues = (
         return new InferredElement(types.id, { source: name });
     }
     if (name.substr(name.length - 3) === '_id' && hasType('reference', types)) {
-        const reference = inflection.pluralize(name.substr(0, name.length - 3));
+        const reference = pluralize(name.substr(0, name.length - 3));
         return (
             types.reference &&
             new InferredElement(types.reference, {
@@ -96,7 +96,7 @@ const inferElementFromValues = (
         );
     }
     if (name.substr(name.length - 2) === 'Id' && hasType('reference', types)) {
-        const reference = inflection.pluralize(name.substr(0, name.length - 2));
+        const reference = pluralize(name.substr(0, name.length - 2));
         return (
             types.reference &&
             new InferredElement(types.reference, {
@@ -109,7 +109,7 @@ const inferElementFromValues = (
         name.substr(name.length - 4) === '_ids' &&
         hasType('referenceArray', types)
     ) {
-        const reference = inflection.pluralize(name.substr(0, name.length - 4));
+        const reference = pluralize(name.substr(0, name.length - 4));
         return (
             types.referenceArray &&
             new InferredElement(types.referenceArray, {
@@ -122,7 +122,7 @@ const inferElementFromValues = (
         name.substr(name.length - 3) === 'Ids' &&
         hasType('referenceArray', types)
     ) {
-        const reference = inflection.pluralize(name.substr(0, name.length - 3));
+        const reference = pluralize(name.substr(0, name.length - 3));
         return (
             types.referenceArray &&
             new InferredElement(types.referenceArray, {

diff --git a/packages/ra-core/src/inference/inferTypeFromValues.ts b/packages/ra-core/src/inference/inferTypeFromValues.ts
@@ -1,5 +1,3 @@
-import * as inflection from 'inflection';
-
 import getValuesFromRecords from './getValuesFromRecords';
 
 import {
@@ -17,6 +15,7 @@ import {
     valuesAreImageUrl,
     valuesAreEmail,
 } from './assertions';
+import { pluralize } from 'inflection';
 
 export const InferenceTypes = [
     'array',
@@ -69,9 +68,7 @@ export const inferTypeFromValues = (
             type: 'reference',
             props: {
                 source: name,
-                reference: inflection.pluralize(
-                    name.substr(0, name.length - 3)
-                ),
+                reference: pluralize(name.substr(0, name.length - 3)),
             },
             children: { type: 'referenceChild' },
         };
@@ -81,9 +78,7 @@ export const inferTypeFromValues = (
             type: 'reference',
             props: {
                 source: name,
-                reference: inflection.pluralize(
-                    name.substr(0, name.length - 2)
-                ),
+                reference: pluralize(name.substr(0, name.length - 2)),
             },
             children: { type: 'referenceChild' },
         };
@@ -93,9 +88,7 @@ export const inferTypeFromValues = (
             type: 'referenceArray',
             props: {
                 source: name,
-                reference: inflection.pluralize(
-                    name.substr(0, name.length - 4)
-                ),
+                reference: pluralize(name.substr(0, name.length - 4)),
             },
             children: { type: 'referenceArrayChild' },
         };
@@ -105,9 +98,7 @@ export const inferTypeFromValues = (
             type: 'referenceArray',
             props: {
                 source: name,
-                reference: inflection.pluralize(
-                    name.substr(0, name.length - 3)
-                ),
+                reference: pluralize(name.substr(0, name.length - 3)),
             },
             children: { type: 'referenceArrayChild' },
         };

diff --git a/packages/ra-core/src/util/getFieldLabelTranslationArgs.ts b/packages/ra-core/src/util/getFieldLabelTranslationArgs.ts
@@ -1,4 +1,4 @@
-import * as inflection from 'inflection';
+import { transform } from 'inflection';
 
 interface Args {
     label?: string;
@@ -39,7 +39,7 @@ export const getFieldLabelTranslationArgs = (
 
     const { sourceWithoutDigits, sourceSuffix } = getSourceParts(source);
 
-    const defaultLabelTranslation = inflection.transform(
+    const defaultLabelTranslation = transform(
         sourceSuffix.replace(/\./g, ' '),
         ['underscore', 'humanize']
     );

diff --git a/packages/ra-ui-materialui/src/button/BulkDeleteWithConfirmButton.tsx b/packages/ra-ui-materialui/src/button/BulkDeleteWithConfirmButton.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Fragment, ReactElement } from 'react';
 import PropTypes from 'prop-types';
 import ActionDelete from '@mui/icons-material/Delete';
-import * as inflection from 'inflection';
+
 import { alpha, styled } from '@mui/material/styles';
 import {
     MutationMode,
@@ -21,6 +21,7 @@ import { Confirm } from '../layout';
 import { Button, ButtonProps } from './Button';
 import { BulkActionProps } from '../types';
 import { UseMutationOptions } from '@tanstack/react-query';
+import { humanize, inflect } from 'inflection';
 
 export const BulkDeleteWithConfirmButton = (
     props: BulkDeleteWithConfirmButtonProps
@@ -117,14 +118,11 @@ export const BulkDeleteWithConfirmButton = (
                     smart_count: selectedIds.length,
                     name: translate(`resources.${resource}.forcedCaseName`, {
                         smart_count: selectedIds.length,
-                        _: inflection.humanize(
+                        _: humanize(
                             translate(`resources.${resource}.name`, {
                                 smart_count: selectedIds.length,
                                 _: resource
-                                    ? inflection.inflect(
-                                          resource,
-                                          selectedIds.length
-                                      )
+                                    ? inflect(resource, selectedIds.length)
                                     : undefined,
                             }),
                             true

diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Fragment, useState, ReactElement } from 'react';
 import PropTypes from 'prop-types';
 import ActionUpdate from '@mui/icons-material/Update';
-import * as inflection from 'inflection';
+
 import { alpha, styled } from '@mui/material/styles';
 import {
     useListContext,
@@ -20,6 +20,7 @@ import { Confirm } from '../layout';
 import { Button, ButtonProps } from './Button';
 import { BulkActionProps } from '../types';
 import { UseMutationOptions } from '@tanstack/react-query';
+import { humanize, inflect } from 'inflection';
 
 export const BulkUpdateWithConfirmButton = (
     props: BulkUpdateWithConfirmButtonProps
@@ -118,14 +119,11 @@ export const BulkUpdateWithConfirmButton = (
                     smart_count: selectedIds.length,
                     name: translate(`resources.${resource}.forcedCaseName`, {
                         smart_count: selectedIds.length,
-                        _: inflection.humanize(
+                        _: humanize(
                             translate(`resources.${resource}.name`, {
                                 smart_count: selectedIds.length,
                                 _: resource
-                                    ? inflection.inflect(
-                                          resource,
-                                          selectedIds.length
-                                      )
+                                    ? inflect(resource, selectedIds.length)
                                     : undefined,
                             }),
                             true

diff --git a/packages/ra-ui-materialui/src/button/DeleteWithConfirmButton.tsx b/packages/ra-ui-materialui/src/button/DeleteWithConfirmButton.tsx
@@ -2,7 +2,7 @@ import React, { Fragment, ReactEventHandler, ReactElement } from 'react';
 import PropTypes from 'prop-types';
 import ActionDelete from '@mui/icons-material/Delete';
 import clsx from 'clsx';
-import * as inflection from 'inflection';
+
 import { UseMutationOptions } from '@tanstack/react-query';
 import {
     MutationMode,
@@ -17,6 +17,7 @@ import {
 
 import { Confirm } from '../layout';
 import { Button, ButtonProps } from './Button';
+import { humanize, singularize } from 'inflection';
 
 export const DeleteWithConfirmButton = <RecordType extends RaRecord = any>(
     props: DeleteWithConfirmButtonProps<RecordType>
@@ -76,12 +77,10 @@ export const DeleteWithConfirmButton = <RecordType extends RaRecord = any>(
                 translateOptions={{
                     name: translate(`resources.${resource}.forcedCaseName`, {
                         smart_count: 1,
-                        _: inflection.humanize(
+                        _: humanize(
                             translate(`resources.${resource}.name`, {
                                 smart_count: 1,
-                                _: resource
-                                    ? inflection.singularize(resource)
-                                    : undefined,
+                                _: resource ? singularize(resource) : undefined,
                             }),
                             true
                         ),

diff --git a/packages/ra-ui-materialui/src/button/UpdateWithConfirmButton.tsx b/packages/ra-ui-materialui/src/button/UpdateWithConfirmButton.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Fragment, useState, ReactElement } from 'react';
 import PropTypes from 'prop-types';
 import ActionUpdate from '@mui/icons-material/Update';
-import * as inflection from 'inflection';
+
 import { alpha, styled } from '@mui/material/styles';
 import {
     useTranslate,
@@ -19,6 +19,7 @@ import { Confirm } from '../layout';
 import { Button, ButtonProps } from './Button';
 import { BulkActionProps } from '../types';
 import { UseMutationOptions } from '@tanstack/react-query';
+import { humanize, inflect } from 'inflection';
 
 export const UpdateWithConfirmButton = (
     props: UpdateWithConfirmButtonProps
@@ -125,12 +126,10 @@ export const UpdateWithConfirmButton = (
                     smart_count: 1,
                     name: translate(`resources.${resource}.forcedCaseName`, {
                         smart_count: 1,
-                        _: inflection.humanize(
+                        _: humanize(
                             translate(`resources.${resource}.name`, {
                                 smart_count: 1,
-                                _: resource
-                                    ? inflection.inflect(resource, 1)
-                                    : undefined,
+                                _: resource ? inflect(resource, 1) : undefined,
                             }),
                             true
                         ),

diff --git a/packages/ra-ui-materialui/src/detail/EditGuesser.tsx b/packages/ra-ui-materialui/src/detail/EditGuesser.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { useEffect, useState } from 'react';
-import * as inflection from 'inflection';
+
 import {
     EditBase,
     InferredElement,
@@ -13,6 +13,7 @@ import {
 import { EditProps } from '../types';
 import { EditView } from './EditView';
 import { editFieldTypes } from './editFieldTypes';
+import { capitalize, singularize } from 'inflection';
 
 export const EditGuesser = <RecordType extends RaRecord = RaRecord>(
     props: EditProps<RecordType> & { enableLog?: boolean }
@@ -94,9 +95,7 @@ const EditViewGuesser = (
 
 import { ${components.join(', ')} } from 'react-admin';
 
-export const ${inflection.capitalize(
-                    inflection.singularize(resource)
-                )}Edit = () => (
+export const ${capitalize(singularize(resource))}Edit = () => (
     <Edit>
 ${representation}
     </Edit>

diff --git a/packages/ra-ui-materialui/src/detail/ShowGuesser.tsx b/packages/ra-ui-materialui/src/detail/ShowGuesser.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { useEffect, useState } from 'react';
-import * as inflection from 'inflection';
+
 import {
     ShowBase,
     InferredElement,
@@ -13,6 +13,8 @@ import { ShowProps } from '../types';
 import { ShowView } from './ShowView';
 import { showFieldTypes } from './showFieldTypes';
 
+import { capitalize, singularize } from 'inflection';
+
 export const ShowGuesser = ({
     id,
     queryOptions,
@@ -73,9 +75,7 @@ const ShowViewGuesser = (
 
 import { ${components.join(', ')} } from 'react-admin';
 
-export const ${inflection.capitalize(
-                    inflection.singularize(resource)
-                )}Show = () => (
+export const ${capitalize(singularize(resource))}Show = () => (
     <Show>
 ${inferredChild.getRepresentation()}
     </Show>