nmr-processing 10.0.7 → 11.0.1

package/lib-esm/datum/data1d/utils/mapRanges.js

@@ -4,6 +4,7 @@ import { DatumKind } from '../../../constants/SignalsKinds';
 import { signalMultiplicityPattern } from '../../../signal/signalMultiplicityPattern';
 import { getShiftX } from './getShiftX';
 import { getSpectrumErrorValue } from './getSpectrumErrorValue';
+import { getPeakDelta } from './mapPeaks';
 function checkRange(range, spectrum, error) {
     // check if the range is already exists
     for (const { from, to } of spectrum.ranges?.values || []) {
@@ -14,36 +15,36 @@ function checkRange(range, spectrum, error) {
     }
 }
 function getRange(range, shiftTarget, shift) {
-    const { originFrom, originTo, from, to } = range;
+    const { originalFrom, originalTo, from, to } = range;
     if (shiftTarget === 'origin') {
         return {
-            originFrom: from - shift,
-            originTo: to - shift,
+            originalFrom: from - shift,
+            originalTo: to - shift,
             from,
             to,
         };
     }
     else {
         return {
-            originFrom,
-            originTo,
-            from: (originFrom || 0) + shift,
-            to: (originTo || 0) + shift,
+            originalFrom,
+            originalTo,
+            from: (originalFrom || 0) + shift,
+            to: (originalTo || 0) + shift,
         };
     }
 }
 function getSignalDelta(signal, shiftTarget, shift) {
-    const { delta, originDelta } = signal;
+    const { delta, originalDelta } = signal;
     if (shiftTarget === 'origin') {
         return {
-            originDelta: delta - shift,
+            originalDelta: delta - shift,
             delta,
         };
     }
     else {
         return {
-            originDelta,
-            delta: (originDelta || 0) + shift,
+            originalDelta,
+            delta: (originalDelta || 0) + shift,
         };
     }
 }
@@ -80,10 +81,19 @@ export function mapRanges(ranges, spectrum, options = {}) {
         const rangeBoundary = getRange(range, shiftTarget, shiftX);
         const absolute = xyIntegration({ x, y: re }, { from: rangeBoundary.from, to: rangeBoundary.to, reverse: true });
         const signals = range.signals.map((signal) => {
-            const { kind = null, id, ...resSignal } = signal;
+            const { kind = null, id, peaks: inputPeaks = [], ...resSignal } = signal;
+            const peaks = inputPeaks.map((peak) => {
+                const peakDelta = getPeakDelta(peak, shiftTarget, shiftX);
+                return {
+                    id: peak?.id || v4(),
+                    ...peak,
+                    ...peakDelta,
+                };
+            });
             return {
                 kind: kind || 'signal',
                 id: id || v4(),
+                peaks,
                 ...resSignal,
                 ...getSignalDelta(signal, shiftTarget, shiftX),
             };

package/lib-esm/datum/data1d/utils/mapRanges.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapRanges.js","sourceRoot":"","sources":["../../../../src/datum/data1d/utils/mapRanges.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mapRanges.js","sourceRoot":"","sources":["../../../../src/datum/data1d/utils/mapRanges.ts"],"names":[],"mappings":"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"}

package/lib-esm/datum/data2d/utils/mapZones.js

@@ -10,11 +10,11 @@ function getSignal(signal, shiftTarget, shift) {
             ...signal,
             x: {
                 ...x,
-                originDelta: x.delta - shift.x,
+                originalDelta: x.delta - shift.x,
             },
             y: {
                 ...y,
-                originDelta: y.delta - shift.y,
+                originalDelta: y.delta - shift.y,
             },
         };
     }
@@ -23,15 +23,63 @@ function getSignal(signal, shiftTarget, shift) {
             ...signal,
             x: {
                 ...x,
-                delta: x.originDelta + shift.x,
+                delta: x.originalDelta + shift.x,
             },
             y: {
                 ...y,
-                delta: y.originDelta + shift.y,
+                delta: y.originalDelta + shift.y,
             },
         };
     }
 }
+function getZoneAxis(zone, shiftTarget, shift) {
+    const { x, y } = zone;
+    if (shiftTarget === 'origin') {
+        return {
+            x: {
+                ...x,
+                originalFrom: x.from - shift.x,
+                originalTo: x.to - shift.x,
+            },
+            y: {
+                ...y,
+                originalFrom: y.from - shift.y,
+                originalTo: y.to - shift.y,
+            },
+        };
+    }
+    else {
+        return {
+            x: {
+                ...x,
+                from: (x?.originalFrom || 0) + shift.x,
+                to: (x?.originalTo || 0) + shift.x,
+            },
+            y: {
+                ...y,
+                from: (y?.originalFrom || 0) + shift.y,
+                to: (y?.originalTo || 0) + shift.y,
+            },
+        };
+    }
+}
+function getPeak(peak, shiftTarget, shift) {
+    const { x, y, originalX = 0, originalY = 0 } = peak;
+    if (shiftTarget === 'origin') {
+        return {
+            ...peak,
+            originalX: x - shift.x,
+            originalY: y - shift.y,
+        };
+    }
+    else {
+        return {
+            ...peak,
+            x: originalX + shift.x,
+            y: originalY + shift.y,
+        };
+    }
+}
 export function mapZones(zones, datum, options = {}) {
     const { checkIsExisting = true, shiftTarget = 'origin' } = options;
     const shift = getShift(datum);
@@ -41,12 +89,24 @@ export function mapZones(zones, datum, options = {}) {
         _zones = zones.filter((zone) => !isZoneExists(zone, datum, error));
     }
     return _zones.map((zone) => {
-        const x = zone.x || { from: 0, to: 0 };
-        const y = zone.y || { from: 0, to: 0 };
+        zone.x = zone.x || { from: 0, to: 0 };
+        zone.y = zone.y || { from: 0, to: 0 };
         const signals = zone.signals.map((signal) => {
             const { id, kind } = signal;
+            let peaks;
+            if (signal?.peaks) {
+                peaks = (signal?.peaks || []).map((peak) => {
+                    const peakDelta = getPeak(peak, shiftTarget, shift);
+                    return {
+                        ...peak,
+                        ...peakDelta,
+                        id: peak?.id || v4(),
+                    };
+                });
+            }
             return {
                 ...getSignal(signal, shiftTarget, shift),
+                peaks,
                 id: id || v4(),
                 kind: kind || 'signal',
             };
@@ -54,8 +114,7 @@ export function mapZones(zones, datum, options = {}) {
         return {
             ...zone,
             id: zone.id || v4(),
-            x: { from: x.from, to: x.to },
-            y: { from: y.from, to: y.to },
+            ...getZoneAxis(zone, shiftTarget, shift),
             signals,
             kind: zone.kind || DatumKind.signal,
         };

package/lib-esm/datum/data2d/utils/mapZones.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapZones.js","sourceRoot":"","sources":["../../../../src/datum/data2d/utils/mapZones.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mapZones.js","sourceRoot":"","sources":["../../../../src/datum/data2d/utils/mapZones.ts"],"names":[],"mappings":"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"}

package/lib-esm/index.js

@@ -51,6 +51,7 @@ export * from './datum/data1d/utils/getShiftX';
 export * from './datum/data1d/utils/getSpectrumErrorValue';
 export * from './datum/data1d/utils/mapPeaks';
 export * from './datum/data1d/utils/mapRanges';
+export * from './datum/data2d/utils/mapZones';
 export * from './datum/data1d/utils/mapIntegrals';
 export * from './datum/data1d/utils/updateRanges';
 export * from './datum/data1d/utils/checkIntegralKind';

package/lib-esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAE7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AAEjC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6BAA6B,CAAC;AAE5C,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,iCAAiC,CAAC;AAChD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oCAAoC,CAAC;AAEnD,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oCAAoC,CAAC;AACnD,cAAc,sCAAsC,CAAC;AAErD,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAE7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AAEzC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAE1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAE7C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAE3C,cAAc,2BAA2B,CAAC;AAE1C,cAAc,kCAAkC,CAAC;AAEjD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAElD,cAAc,iBAAiB,CAAC;AAChC,OAAO,KAAK,cAAc,MAAM,wBAAwB,CAAC;AACzD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,4CAA4C,CAAC;AAC3D,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,mCAAmC,CAAC;AAClD,cAAc,mCAAmC,CAAC;AAClD,cAAc,wCAAwC,CAAC;AACvD,cAAc,iDAAiD,CAAC;AAChE,cAAc,oDAAoD,CAAC;AACnE,OAAO,KAAK,cAAc,MAAM,qCAAqC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAE7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AAEjC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6BAA6B,CAAC;AAE5C,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,iCAAiC,CAAC;AAChD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oCAAoC,CAAC;AAEnD,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oCAAoC,CAAC;AACnD,cAAc,sCAAsC,CAAC;AAErD,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAE7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AAEzC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAE1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAE7C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAE3C,cAAc,2BAA2B,CAAC;AAE1C,cAAc,kCAAkC,CAAC;AAEjD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAElD,cAAc,iBAAiB,CAAC;AAChC,OAAO,KAAK,cAAc,MAAM,wBAAwB,CAAC;AACzD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,4CAA4C,CAAC;AAC3D,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mCAAmC,CAAC;AAClD,cAAc,mCAAmC,CAAC;AAClD,cAAc,wCAAwC,CAAC;AACvD,cAAc,iDAAiD,CAAC;AAChE,cAAc,oDAAoD,CAAC;AACnE,OAAO,KAAK,cAAc,MAAM,qCAAqC,CAAC"}

package/lib-esm/utilities/getSum.js

@@ -10,7 +10,7 @@ export function getSum(values, key, check = null) {
     for (const current of values) {
         if (check?.(current)) {
             const value = current[key];
-            if (!value || isNaN(value))
+            if (!value || typeof value !== 'number')
                 continue;
             sum += Math.abs(value);
         }

package/lib-esm/utilities/getSum.js.map

@@ -1 +1 @@
-{"version":3,"file":"getSum.js","sourceRoot":"","sources":["../../src/utilities/getSum.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,UAAU,MAAM,CACpB,MAAc,EACd,GAAe,EACf,QAA2C,IAAI;IAE/C,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE;QAC5B,IAAI,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE;YACpB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;YAC3B,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC;gBAAE,SAAS;YACrC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACxB;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"getSum.js","sourceRoot":"","sources":["../../src/utilities/getSum.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,UAAU,MAAM,CACpB,MAAc,EACd,GAAe,EACf,QAA2C,IAAI;IAE/C,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE;QAC5B,IAAI,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE;YACpB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;YAC3B,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;gBAAE,SAAS;YAClD,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACxB;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nmr-processing",
-  "version": "10.0.7",
+  "version": "11.0.1",
   "description": "Pure functions allowing to process NMR spectra.",
   "main": "./lib/index.js",
   "module": "./lib-esm/index.js",
@@ -52,7 +52,7 @@
     "prettier": "^3.0.1",
     "rimraf": "^5.0.1",
     "ts-jest": "^29.1.1",
-    "typescript": "^5.1.6"
+    "typescript": "~5.1.6"
   },
   "dependencies": {
     "@lukeed/uuid": "^2.0.1",
@@ -83,4 +83,4 @@
     "openchemlib-utils": "^5.2.0",
     "spectrum-generator": "^8.0.8"
   }
-}
+}

package/src/datum/data1d/utils/mapIntegrals.ts

@@ -8,20 +8,20 @@ import { Entry1D } from '../Entry1D';
 import { getShiftX } from './getShiftX';
 
 function getRange(integral: Integral, shiftTarget: ShiftTarget, shift: number) {
-  const { originFrom, originTo, from, to } = integral;
+  const { originalFrom, originalTo, from, to } = integral;
   if (shiftTarget === 'origin') {
     return {
-      originFrom: from - shift,
-      originTo: to - shift,
+      originalFrom: from - shift,
+      originalTo: to - shift,
       from,
       to,
     };
   } else {
     return {
-      originFrom,
-      originTo,
-      from: originFrom + shift,
-      to: originTo + shift,
+      originalFrom,
+      originalTo,
+      from: originalFrom + shift,
+      to: originalTo + shift,
     };
   }
 }

package/src/datum/data1d/utils/mapPeaks.ts

@@ -6,6 +6,7 @@ import { Entry1D } from '../Entry1D';
 
 import { getShiftX } from './getShiftX';
 import { getSpectrumErrorValue } from './getSpectrumErrorValue';
+import { NMRPeak1D } from '../../..';
 
 function isExists(peak: Peak1D, spectrum: Entry1D, error: number) {
   // check if the Peak is already exists
@@ -17,7 +18,11 @@ function isExists(peak: Peak1D, spectrum: Entry1D, error: number) {
   return false;
 }
 
-function getPeakDelta(peak: Peak1D, shiftTarget: ShiftTarget, shift: number) {
+export function getPeakDelta(
+  peak: Peak1D | NMRPeak1D,
+  shiftTarget: ShiftTarget,
+  shift: number,
+) {
   const { originalX = 0, x } = peak;
   if (shiftTarget === 'origin') {
     return {

package/src/datum/data1d/utils/mapRanges.ts

@@ -11,6 +11,7 @@ import { Entry1D } from '../Entry1D';
 
 import { getShiftX } from './getShiftX';
 import { getSpectrumErrorValue } from './getSpectrumErrorValue';
+import { getPeakDelta } from './mapPeaks';
 
 function checkRange(range: Range, spectrum: Entry1D, error: number) {
   // check if the range is already exists
@@ -29,20 +30,20 @@ function getRange(
   shiftTarget: 'origin' | 'current',
   shift: number,
 ) {
-  const { originFrom, originTo, from, to } = range;
+  const { originalFrom, originalTo, from, to } = range;
   if (shiftTarget === 'origin') {
     return {
-      originFrom: from - shift,
-      originTo: to - shift,
+      originalFrom: from - shift,
+      originalTo: to - shift,
       from,
       to,
     };
   } else {
     return {
-      originFrom,
-      originTo,
-      from: (originFrom || 0) + shift,
-      to: (originTo || 0) + shift,
+      originalFrom,
+      originalTo,
+      from: (originalFrom || 0) + shift,
+      to: (originalTo || 0) + shift,
     };
   }
 }
@@ -52,16 +53,16 @@ function getSignalDelta(
   shiftTarget: ShiftTarget,
   shift: number,
 ) {
-  const { delta, originDelta } = signal;
+  const { delta, originalDelta } = signal;
   if (shiftTarget === 'origin') {
     return {
-      originDelta: delta - shift,
+      originalDelta: delta - shift,
       delta,
     };
   } else {
     return {
-      originDelta,
-      delta: (originDelta || 0) + shift,
+      originalDelta,
+      delta: (originalDelta || 0) + shift,
     };
   }
 }
@@ -112,10 +113,20 @@ export function mapRanges(
       { from: rangeBoundary.from, to: rangeBoundary.to, reverse: true },
     );
     const signals = range.signals.map((signal) => {
-      const { kind = null, id, ...resSignal } = signal;
+      const { kind = null, id, peaks: inputPeaks = [], ...resSignal } = signal;
+
+      const peaks = inputPeaks.map((peak) => {
+        const peakDelta = getPeakDelta(peak, shiftTarget, shiftX);
+        return {
+          id: peak?.id || v4(),
+          ...peak,
+          ...peakDelta,
+        };
+      });
       return {
         kind: kind || 'signal',
         id: id || v4(),
+        peaks,
         ...resSignal,
         ...getSignalDelta(signal, shiftTarget, shiftX),
       };

package/src/datum/data2d/utils/mapZones.ts

@@ -9,6 +9,7 @@ import { Entry2D } from '../Entry2D';
 import { get2DSpectrumErrorValue } from './get2DSpectrumErrorValue';
 import { getShift, Shift2D } from './getShift';
 import { isZoneExists } from './isZoneExists';
+import { Peak2D } from '../../..';
 
 function getSignal(signal: Signal2D, shiftTarget: ShiftTarget, shift: Shift2D) {
   const { x, y } = signal;
@@ -18,11 +19,11 @@ function getSignal(signal: Signal2D, shiftTarget: ShiftTarget, shift: Shift2D) {
       ...signal,
       x: {
         ...x,
-        originDelta: x.delta - shift.x,
+        originalDelta: x.delta - shift.x,
       },
       y: {
         ...y,
-        originDelta: y.delta - shift.y,
+        originalDelta: y.delta - shift.y,
       },
     };
   } else {
@@ -30,16 +31,65 @@ function getSignal(signal: Signal2D, shiftTarget: ShiftTarget, shift: Shift2D) {
       ...signal,
       x: {
         ...x,
-        delta: x.originDelta + shift.x,
+        delta: x.originalDelta + shift.x,
       },
       y: {
         ...y,
-        delta: y.originDelta + shift.y,
+        delta: y.originalDelta + shift.y,
       },
     };
   }
 }
 
+function getZoneAxis(zone: Zone, shiftTarget: ShiftTarget, shift: Shift2D) {
+  const { x, y } = zone;
+
+  if (shiftTarget === 'origin') {
+    return {
+      x: {
+        ...x,
+        originalFrom: x.from - shift.x,
+        originalTo: x.to - shift.x,
+      },
+      y: {
+        ...y,
+        originalFrom: y.from - shift.y,
+        originalTo: y.to - shift.y,
+      },
+    };
+  } else {
+    return {
+      x: {
+        ...x,
+        from: (x?.originalFrom || 0) + shift.x,
+        to: (x?.originalTo || 0) + shift.x,
+      },
+      y: {
+        ...y,
+        from: (y?.originalFrom || 0) + shift.y,
+        to: (y?.originalTo || 0) + shift.y,
+      },
+    };
+  }
+}
+function getPeak(peak: Peak2D, shiftTarget: ShiftTarget, shift: Shift2D) {
+  const { x, y, originalX = 0, originalY = 0 } = peak;
+
+  if (shiftTarget === 'origin') {
+    return {
+      ...peak,
+      originalX: x - shift.x,
+      originalY: y - shift.y,
+    };
+  } else {
+    return {
+      ...peak,
+      x: originalX + shift.x,
+      y: originalY + shift.y,
+    };
+  }
+}
+
 export function mapZones(
   zones: Zone[],
   datum: Entry2D,
@@ -56,13 +106,25 @@ export function mapZones(
   }
 
   return _zones.map((zone: Zone) => {
-    const x = zone.x || { from: 0, to: 0 };
-    const y = zone.y || { from: 0, to: 0 };
+    zone.x = zone.x || { from: 0, to: 0 };
+    zone.y = zone.y || { from: 0, to: 0 };
 
     const signals = zone.signals.map((signal) => {
       const { id, kind } = signal;
+      let peaks;
+      if (signal?.peaks) {
+        peaks = (signal?.peaks || []).map((peak) => {
+          const peakDelta = getPeak(peak, shiftTarget, shift);
+          return {
+            ...peak,
+            ...peakDelta,
+            id: peak?.id || v4(),
+          };
+        });
+      }
       return {
         ...getSignal(signal, shiftTarget, shift),
+        peaks,
         id: id || v4(),
         kind: kind || 'signal',
       };
@@ -71,8 +133,7 @@ export function mapZones(
     return {
       ...zone,
       id: zone.id || v4(),
-      x: { from: x.from, to: x.to },
-      y: { from: y.from, to: y.to },
+      ...getZoneAxis(zone, shiftTarget, shift),
       signals,
       kind: zone.kind || DatumKind.signal,
     };

package/src/index.ts

@@ -65,6 +65,7 @@ export * from './datum/data1d/utils/getShiftX';
 export * from './datum/data1d/utils/getSpectrumErrorValue';
 export * from './datum/data1d/utils/mapPeaks';
 export * from './datum/data1d/utils/mapRanges';
+export * from './datum/data2d/utils/mapZones';
 export * from './datum/data1d/utils/mapIntegrals';
 export * from './datum/data1d/utils/updateRanges';
 export * from './datum/data1d/utils/checkIntegralKind';

package/src/peaks/NMRPeak1D.ts

@@ -5,4 +5,5 @@ export interface NMRPeak1D extends PeakXYWidth {
   id?: string;
   kind?: string;
   shape?: Shape1D;
+  originalX?: number;
 }

package/src/types/Integral.ts

@@ -1,7 +1,7 @@
 export interface Integral {
   id: string;
-  originFrom: number;
-  originTo: number;
+  originalFrom: number;
+  originalTo: number;
   from: number;
   to: number;
   absolute: number;

package/src/types/Peaks/Peak2D.ts

@@ -4,8 +4,8 @@ export interface Peak2D extends BasePeak {
   x: number;
   y: number;
   z: number;
-  originX?: number;
-  originY?: number;
-  originZ?: number;
+  originalX?: number;
+  originalY?: number;
+  originalZ?: number;
   width?: number | { x: number; y: number };
 }

package/src/types/Ranges/Ranges.ts

@@ -9,8 +9,8 @@ export interface Ranges {
 
 export interface Range extends Omit<NMRRange, 'signals' | 'id'> {
   id: string;
-  originFrom?: number;
-  originTo?: number;
+  originalFrom?: number;
+  originalTo?: number;
   absolute: number;
   signals: Signal1D[];
   integration: number;

package/src/types/Signals/Signal1D.ts

@@ -4,5 +4,5 @@ type ObjectKeys = 'id' | 'multiplicity' | 'js';
 export interface Signal1D
   extends Required<Pick<NMRSignal1D, ObjectKeys>>,
     Omit<NMRSignal1D, ObjectKeys> {
-  originDelta?: number;
+  originalDelta?: number;
 }

package/src/types/Signals/Signal2D.ts

@@ -8,7 +8,7 @@ interface SignalAxis {
   delta: number;
   nbAtoms?: number;
   diaIDs?: string[];
-  originDelta: number;
+  originalDelta: number;
 }
 
 export interface Signal2D extends Signal {

package/src/types/Zones/Zone.ts

@@ -5,6 +5,8 @@ import { Signal2D } from '../Signals/Signal2D';
 interface ZoneAxis extends FromTo {
   nbAtoms?: number;
   diaIDs?: string[];
+  originalFrom?: number;
+  originalTo?: number;
 }
 
 export interface Zone {

package/src/utilities/getSum.ts

@@ -15,7 +15,7 @@ export function getSum<Type extends object>(
   for (const current of values) {
     if (check?.(current)) {
       const value = current[key];
-      if (!value || isNaN(value)) continue;
+      if (!value || typeof value !== 'number') continue;
       sum += Math.abs(value);
     }
   }