refactor: replaced lodash clonedeep by structuredclone

InseeFr · Dec 16, 2024 · 21f4ff8 · 21f4ff8
1 parent f001d11
commit 21f4ff8
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 53 deletions.
diff --git a/src/actions/component-insert.jsx b/src/actions/component-insert.jsx
@@ -1,4 +1,3 @@
-import cloneDeep from 'lodash/clonedeep';
 import sortBy from 'lodash/sortby';
 
 import { COMPONENT_TYPE } from '../constants/pogues-constants';
@@ -291,7 +290,7 @@ export function duplicate(activesComponents, idComponent) {
   const id = uuid();
   const component = {
     [id]: {
-      ...cloneDeep(activesComponents[idComponent]),
+      ...structuredClone(activesComponents[idComponent]),
       id,
       weight: activesComponents[idComponent].weight + 1,
     },
@@ -326,7 +325,7 @@ export function duplicateComponentAndVars(
     activesComponents[idComponent].responseFormat.type;
 
   const duplicatedComponent = {
-    ...cloneDeep(activesComponents[idComponent]),
+    ...structuredClone(activesComponents[idComponent]),
     id: uuid(),
     weight: activesComponents[idComponent].weight + 1,
     redirections: {},

diff --git a/src/forms/validation-rules.jsx b/src/forms/validation-rules.jsx
@@ -1,5 +1,3 @@
-import cloneDeep from 'lodash/clonedeep';
-
 import {
   CODES_LIST_INPUT_ENUM,
   DATATYPE_NAME,
@@ -307,7 +305,7 @@ export function validateDuplicatesCalculated(
   value,
   { form: { calculatedVariables: values }, state: { selectedItemIndex } },
 ) {
-  const listItems = cloneDeep(values.calculatedVariables);
+  const listItems = structuredClone(values.calculatedVariables);
 
   // We need to remove the element from the list
   if (selectedItemIndex !== undefined) {
@@ -327,7 +325,7 @@ export function validateDuplicatesExternal(
   value,
   { form: { externalVariables: values }, state: { selectedItemIndex } },
 ) {
-  const listItems = cloneDeep(values.externalVariables);
+  const listItems = structuredClone(values.externalVariables);
 
   // We need to remove the element from the list
   if (selectedItemIndex !== undefined) {
@@ -341,7 +339,7 @@ export function validateDuplicatesCollected(
   value,
   { form: { collectedVariables: values }, state: { selectedItemIndex } },
 ) {
-  const listItems = cloneDeep(values.collectedVariables);
+  const listItems = structuredClone(values.collectedVariables);
 
   // We need to remove the element from the list
   if (selectedItemIndex !== undefined) {

diff --git a/src/model/formToState/codes-lists/codes-list.jsx b/src/model/formToState/codes-lists/codes-list.jsx
@@ -1,4 +1,3 @@
-import cloneDeep from 'lodash/clonedeep';
 import merge from 'lodash/merge';
 
 import { uuid } from '../../../utils/utils';
@@ -65,7 +64,7 @@ export function stateComponentToForm({
         urn,
         suggesterParameters,
       }
-    : merge(cloneDeep(defaultForm), {
+    : merge(structuredClone(defaultForm), {
         id,
         label,
         codes: Object.keys(codes).map((key) => codes[key]),
@@ -75,11 +74,11 @@ export function stateComponentToForm({
 export const Factory = (currentState = {}, codesListsStore) => {
   if (codesListsStore && currentState.id) {
     currentState = merge(
-      cloneDeep(defaultState),
+      structuredClone(defaultState),
       codesListsStore[currentState.id],
     );
   } else {
-    currentState = merge(cloneDeep(defaultState), { id: uuid() });
+    currentState = merge(structuredClone(defaultState), { id: uuid() });
   }
 
   return {

diff --git a/src/model/formToState/component-new-edit/response-format-multiple.jsx b/src/model/formToState/component-new-edit/response-format-multiple.jsx
@@ -1,4 +1,3 @@
-import cloneDeep from 'lodash/clonedeep';
 import merge from 'lodash/merge';
 
 import { Factory as CodesListFactory } from '../..';
@@ -15,27 +14,27 @@ const { CHECKBOX } = DATATYPE_VIS_HINT;
 
 export const defaultState = {
   [PRIMARY]: {
-    // [DEFAULT_CODES_LIST_SELECTOR_PATH]: cloneDeep(CodesListDefaultState),
+    // [DEFAULT_CODES_LIST_SELECTOR_PATH]: structuredClone(CodesListDefaultState),
   },
   [MEASURE]: {
     type: BOOL,
     [BOOL]: {},
     [CODES_LIST]: {
-      // [DEFAULT_CODES_LIST_SELECTOR_PATH]: cloneDeep(CodesListDefaultState),
+      // [DEFAULT_CODES_LIST_SELECTOR_PATH]: structuredClone(CodesListDefaultState),
       visHint: CHECKBOX,
     },
   },
 };
 
 export const defaultForm = {
   [PRIMARY]: {
-    // [DEFAULT_CODES_LIST_SELECTOR_PATH]: cloneDeep(CodesListDefaultForm),
+    // [DEFAULT_CODES_LIST_SELECTOR_PATH]: structuredClone(CodesListDefaultForm),
   },
   [MEASURE]: {
     type: BOOL,
     [BOOL]: {},
     [CODES_LIST]: {
-      // [DEFAULT_CODES_LIST_SELECTOR_PATH]: cloneDeep(CodesListDefaultForm),
+      // [DEFAULT_CODES_LIST_SELECTOR_PATH]: structuredClone(CodesListDefaultForm),
       visHint: CHECKBOX,
     },
   },
@@ -102,14 +101,14 @@ export function stateToForm(currentState, transformers) {
 }
 
 const Factory = (initialState = {}, codesListsStore) => {
-  let currentState = merge(cloneDeep(defaultState), initialState);
+  let currentState = merge(structuredClone(defaultState), initialState);
   const transformers = {
     codesListPrimary: CodesListFactory(
-      cloneDeep(currentState[PRIMARY][DEFAULT_CODES_LIST_SELECTOR_PATH]),
+      structuredClone(currentState[PRIMARY][DEFAULT_CODES_LIST_SELECTOR_PATH]),
       codesListsStore,
     ),
     codesListMeasure: CodesListFactory(
-      cloneDeep(
+      structuredClone(
         currentState[MEASURE][CODES_LIST][DEFAULT_CODES_LIST_SELECTOR_PATH],
       ),
       codesListsStore,

diff --git a/src/model/formToState/component-new-edit/response-format-pairing.jsx b/src/model/formToState/component-new-edit/response-format-pairing.jsx
@@ -1,4 +1,3 @@
-import cloneDeep from 'lodash/clonedeep';
 import merge from 'lodash/merge';
 
 import { Factory as CodesListFactory } from '../..';
@@ -19,7 +18,7 @@ export const defaultState = {
   specialUiBehaviour: UI_BEHAVIOUR.FIRST_INTENTION,
   specialFollowUpMessage: '',
   visHint: DROPDOWN,
-  // [DEFAULT_CODES_LIST_SELECTOR_PATH]: cloneDeep(CodesListDefaultState),
+  // [DEFAULT_CODES_LIST_SELECTOR_PATH]: structuredClone(CodesListDefaultState),
 };
 
 export const defaultForm = {
@@ -31,7 +30,7 @@ export const defaultForm = {
   specialUiBehaviour: UI_BEHAVIOUR.FIRST_INTENTION,
   specialFollowUpMessage: '',
   visHint: DROPDOWN,
-  // [DEFAULT_CODES_LIST_SELECTOR_PATH]: cloneDeep(CodesListDefaultForm),
+  // [DEFAULT_CODES_LIST_SELECTOR_PATH]: structuredClone(CodesListDefaultForm),
 };
 
 export function formToState(form, transformers) {
@@ -94,17 +93,17 @@ export function stateToForm(currentState, transformers) {
 }
 
 export const Factory = (initialState = {}, codesListsStore) => {
-  let currentState = merge(cloneDeep(defaultState), initialState);
+  let currentState = merge(structuredClone(defaultState), initialState);
   const transformers = {
     codesList: CodesListFactory(
-      cloneDeep(currentState[DEFAULT_CODES_LIST_SELECTOR_PATH]),
+      structuredClone(currentState[DEFAULT_CODES_LIST_SELECTOR_PATH]),
       codesListsStore,
     ),
   };
   return {
     formToState: (form) => {
       const state = formToState(form, transformers);
-      currentState = merge(cloneDeep(currentState), state);
+      currentState = merge(structuredClone(currentState), state);
       return state;
     },
     stateToForm: () => {

diff --git a/src/model/formToState/component-new-edit/response-format-simple.jsx b/src/model/formToState/component-new-edit/response-format-simple.jsx
@@ -1,4 +1,3 @@
-import cloneDeep from 'lodash/clonedeep';
 import merge from 'lodash/merge';
 
 import { DATATYPE_NAME } from '../../../constants/pogues-constants';
@@ -56,7 +55,7 @@ export function formToState(form) {
 export function stateToForm(currentState) {
   const { mandatory, type, [type]: simpleState, id } = currentState;
 
-  return merge(cloneDeep(defaultForm), {
+  return merge(structuredClone(defaultForm), {
     id,
     mandatory,
     type,
@@ -67,12 +66,12 @@ export function stateToForm(currentState) {
 }
 
 const Factory = (initialState = {}) => {
-  let currentState = merge(cloneDeep(defaultForm), initialState);
+  let currentState = merge(structuredClone(defaultForm), initialState);
 
   return {
     formToState: (form) => {
       const state = formToState(form);
-      currentState = merge(cloneDeep(currentState), state);
+      currentState = merge(structuredClone(currentState), state);
       return state;
     },
     stateToForm: () => {

diff --git a/src/model/formToState/component-new-edit/response-format-single.jsx b/src/model/formToState/component-new-edit/response-format-single.jsx
@@ -1,4 +1,3 @@
-import cloneDeep from 'lodash/clonedeep';
 import merge from 'lodash/merge';
 
 import { Factory as CodesListFactory } from '../..';
@@ -18,7 +17,7 @@ export const defaultState = {
   specialUiBehaviour: UI_BEHAVIOUR.FIRST_INTENTION,
   specialFollowUpMessage: '',
   visHint: RADIO,
-  // [DEFAULT_CODES_LIST_SELECTOR_PATH]: cloneDeep(CodesListDefaultState),
+  // [DEFAULT_CODES_LIST_SELECTOR_PATH]: structuredClone(CodesListDefaultState),
 };
 
 export const defaultForm = {
@@ -29,7 +28,7 @@ export const defaultForm = {
   specialUiBehaviour: UI_BEHAVIOUR.FIRST_INTENTION,
   specialFollowUpMessage: '',
   visHint: RADIO,
-  // [DEFAULT_CODES_LIST_SELECTOR_PATH]: cloneDeep(CodesListDefaultForm),
+  // [DEFAULT_CODES_LIST_SELECTOR_PATH]: structuredClone(CodesListDefaultForm),
 };
 
 export function formToState(form, transformers) {
@@ -88,17 +87,17 @@ export function stateToForm(currentState, transformers) {
 }
 
 export const Factory = (initialState = {}, codesListsStore) => {
-  let currentState = merge(cloneDeep(defaultState), initialState);
+  let currentState = merge(structuredClone(defaultState), initialState);
   const transformers = {
     codesList: CodesListFactory(
-      cloneDeep(currentState[DEFAULT_CODES_LIST_SELECTOR_PATH]),
+      structuredClone(currentState[DEFAULT_CODES_LIST_SELECTOR_PATH]),
       codesListsStore,
     ),
   };
   return {
     formToState: (form) => {
       const state = formToState(form, transformers);
-      currentState = merge(cloneDeep(currentState), state);
+      currentState = merge(structuredClone(currentState), state);
       return state;
     },
     stateToForm: () => {

diff --git a/src/model/formToState/component-new-edit/response-format-table.jsx b/src/model/formToState/component-new-edit/response-format-table.jsx
@@ -1,4 +1,3 @@
-import cloneDeep from 'lodash/clonedeep';
 import merge from 'lodash/merge';
 
 import {
@@ -64,7 +63,7 @@ export const defaultMeasureState = {
   [SIMPLE]: defaultMeasureSimpleState,
   [SINGLE_CHOICE]: {
     [DEFAULT_CODES_LIST_SELECTOR_PATH]: merge(
-      cloneDeep(CodesListDefaultState),
+      structuredClone(CodesListDefaultState),
       { id: uuid() },
     ),
     visHint: RADIO,
@@ -81,7 +80,7 @@ export const defaultMeasureForm = {
     specialCode: '',
     specialUiBehaviour: UI_BEHAVIOUR.FIRST_INTENTION,
     specialFollowUpMessage: '',
-    [DEFAULT_CODES_LIST_SELECTOR_PATH]: cloneDeep(CodesListDefaultForm),
+    [DEFAULT_CODES_LIST_SELECTOR_PATH]: structuredClone(CodesListDefaultForm),
     visHint: RADIO,
   },
 };
@@ -102,11 +101,13 @@ export const defaultState = {
     type: LIST,
     [LIST]: defaultPrimaryListState,
     [CODES_LIST]: {
-      [DEFAULT_CODES_LIST_SELECTOR_PATH]: cloneDeep(CodesListDefaultState),
+      [DEFAULT_CODES_LIST_SELECTOR_PATH]: structuredClone(
+        CodesListDefaultState,
+      ),
     },
   },
   [SECONDARY]: {
-    [DEFAULT_CODES_LIST_SELECTOR_PATH]: cloneDeep(CodesListDefaultState),
+    [DEFAULT_CODES_LIST_SELECTOR_PATH]: structuredClone(CodesListDefaultState),
     showSecondaryAxis: false,
   },
   [LIST_MEASURE]: {
@@ -361,7 +362,7 @@ export function getNormalizedMeasureValues(measure) {
 
 const Factory = (initialState = {}, codesListsStore) => {
   const { [LIST_MEASURE]: measures, ...otherState } = initialState;
-  let currentState = merge(cloneDeep(defaultState), {
+  let currentState = merge(structuredClone(defaultState), {
     ...otherState,
     [LIST_MEASURE]: { measures },
   });
@@ -383,7 +384,7 @@ const Factory = (initialState = {}, codesListsStore) => {
         state[SIMPLE] = measureState;
       }
 
-      return merge(cloneDeep(defaultState[MEASURE]), state);
+      return merge(structuredClone(defaultState[MEASURE]), state);
     },
   );
 

diff --git a/src/model/formToState/component-new-edit/response-format.jsx b/src/model/formToState/component-new-edit/response-format.jsx
@@ -1,4 +1,3 @@
-import cloneDeep from 'lodash/clonedeep';
 import merge from 'lodash/merge';
 
 import { QUESTION_TYPE_ENUM } from '../../../constants/pogues-constants';
@@ -52,7 +51,7 @@ export function formToState(form, transformers) {
 export function stateToForm(currentState, transformers) {
   const { type } = currentState;
 
-  return merge({}, cloneDeep(defaultForm), {
+  return merge({}, structuredClone(defaultForm), {
     type,
     [SIMPLE]: transformers.simple.stateToForm(),
     [SINGLE_CHOICE]: transformers.single.stateToForm(),
@@ -63,7 +62,7 @@ export function stateToForm(currentState, transformers) {
 }
 
 const Factory = (initialState = {}, codesListsStore) => {
-  let currentState = merge(cloneDeep(defaultForm), initialState);
+  let currentState = merge(structuredClone(defaultForm), initialState);
 
   const transformers = {
     simple: Simple(currentState[SIMPLE]),
@@ -77,7 +76,7 @@ const Factory = (initialState = {}, codesListsStore) => {
     formToState: (form) => {
       if (form) {
         const state = formToState(form, transformers);
-        currentState = merge(cloneDeep(currentState), state);
+        currentState = merge(structuredClone(currentState), state);
         return state;
       }
       return currentState;

diff --git a/src/utils/integrity/combine-checkers.jsx b/src/utils/integrity/combine-checkers.jsx
@@ -1,4 +1,3 @@
-import cloneDeep from 'lodash/clonedeep';
 import merge from 'lodash/merge';
 
 /**
@@ -17,7 +16,7 @@ import merge from 'lodash/merge';
 export default function combineCheckers(...checkers) {
   return function (state) {
     return checkers.reduce((errorsByComponent, checker) => {
-      return merge(cloneDeep(errorsByComponent), checker(state) || {});
+      return merge(structuredClone(errorsByComponent), checker(state) || {});
     }, {});
   };
 }
diff --git a/src/utils/integrity/integrity-checker.jsx b/src/utils/integrity/integrity-checker.jsx
@@ -1,4 +1,3 @@
-import cloneDeep from 'lodash/clonedeep';
 import uniq from 'lodash/uniq';
 
 /**
@@ -20,7 +19,9 @@ function integrityChecker(reducer, checkers) {
     if (!checker) return newState;
 
     const checkerResult = checker(newState);
-    const currentErrorsIntegrity = cloneDeep(newState.errors.errorsIntegrity);
+    const currentErrorsIntegrity = structuredClone(
+      newState.errors.errorsIntegrity,
+    );
     const componentsIds = uniq([
       ...Object.keys(currentErrorsIntegrity),
       ...Object.keys(checkerResult),

diff --git a/src/widgets/list-with-input-panel/components/list-with-input-panel.jsx b/src/widgets/list-with-input-panel/components/list-with-input-panel.jsx
@@ -1,6 +1,5 @@
 import React, { Children, cloneElement, useEffect, useState } from 'react';
 
-import cloneDeep from 'lodash/clonedeep';
 import PropTypes from 'prop-types';
 import ReactModal from 'react-modal';
 import { FieldArray } from 'redux-form';
@@ -27,7 +26,7 @@ const {
 // Utils
 
 function getFormValuesToValidate(formValues, item, selectorPath, name) {
-  const formValuesToValidate = cloneDeep(formValues);
+  const formValuesToValidate = structuredClone(formValues);
   let pointer = formValuesToValidate;
   const pathStack = selectorPath.split('.');