nmr-processing 9.0.3 → 9.0.4-pre.1660646769

package/lib/peaks/peakToXY.js

@@ -1,9 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.peakToXY = void 0;
+const ml_gsd_1 = require("ml-gsd");
+const ml_peak_shape_generator_1 = require("ml-peak-shape-generator");
 const peaksToXY_1 = require("./peaksToXY");
 function peakToXY(peak, options) {
-    return (0, peaksToXY_1.peaksToXY)([peak], options);
+    const newPeak = (0, ml_gsd_1.addMissingShape)([peak])[0];
+    const factor = (0, ml_peak_shape_generator_1.getShape1D)(newPeak.shape).getFactor();
+    const { from = newPeak.x - peak.width * factor, to = newPeak.x + peak.width * factor, } = options;
+    return (0, peaksToXY_1.peaksToXY)([peak], { ...options, from, to });
 }
 exports.peakToXY = peakToXY;
 //# sourceMappingURL=peakToXY.js.map

package/lib/peaks/peakToXY.js.map

@@ -1 +1 @@
-{"version":3,"file":"peakToXY.js","sourceRoot":"","sources":["../../src/peaks/peakToXY.ts"],"names":[],"mappings":";;;AACA,2CAA0D;AAE1D,SAAgB,QAAQ,CAAC,IAAe,EAAE,OAAyB;IACjE,OAAO,IAAA,qBAAS,EAAC,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;AACpC,CAAC;AAFD,4BAEC"}
+{"version":3,"file":"peakToXY.js","sourceRoot":"","sources":["../../src/peaks/peakToXY.ts"],"names":[],"mappings":";;;AAAA,mCAAyC;AACzC,qEAAqD;AAGrD,2CAA0D;AAE1D,SAAgB,QAAQ,CAAC,IAAe,EAAE,OAAyB;IACjE,MAAM,OAAO,GAAG,IAAA,wBAAe,EAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,IAAA,oCAAU,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC;IAErD,MAAM,EACJ,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,GAAG,MAAM,EACtC,EAAE,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,GAAG,MAAM,GACrC,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,qBAAS,EAAC,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;AACrD,CAAC;AAVD,4BAUC"}

package/lib/peaks/peaksToXY.js

@@ -5,6 +5,9 @@ const spectrum_generator_1 = require("spectrum-generator");
 const convertWidthToPPM_1 = require("./util/convertWidthToPPM");
 function peaksToXY(peaks, options) {
     const { frequency, nbPoints = 1024, shape } = options;
+    if (!frequency) {
+        throw new Error('frequency is mandatory');
+    }
     const newPeaks = (0, convertWidthToPPM_1.convertWidthToPPM)(peaks, { frequency });
     return (0, spectrum_generator_1.generateSpectrum)(newPeaks, {
         generator: {

package/lib/peaks/peaksToXY.js.map

@@ -1 +1 @@
-{"version":3,"file":"peaksToXY.js","sourceRoot":"","sources":["../../src/peaks/peaksToXY.ts"],"names":[],"mappings":";;;AAAA,2DAAmE;AAGnE,gEAA6D;AAuB7D,SAAgB,SAAS,CAAC,KAAkB,EAAE,OAAyB;IACrE,MAAM,EAAE,SAAS,EAAE,QAAQ,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IACtD,MAAM,QAAQ,GAAG,IAAA,qCAAiB,EAAC,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;IAEzD,OAAO,IAAA,qCAAgB,EAAC,QAAQ,EAAE;QAChC,SAAS,EAAE;YACT,GAAG,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC;YAC/B,QAAQ;YACR,KAAK;SACN;KACF,CAAC,CAAC;AACL,CAAC;AAXD,8BAWC;AAED,SAAS,SAAS,CAAC,QAAqB,EAAE,OAAyB;IACjE,IAAI,IAAI,IAAI,OAAO,IAAI,MAAM,IAAI,OAAO,EAAE;QACxC,OAAO;YACL,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,EAAE,EAAE,OAAO,CAAC,EAAE;SACf,CAAC;KACH;IAED,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC9B,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAE/C,MAAM,EACJ,IAAI,GAAG,SAAS,CAAC,CAAC,GAAG,SAAS,CAAC,KAAK,GAAG,CAAC,EACxC,EAAE,GAAG,QAAQ,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,GAAG,CAAC,GACrC,GAAG,OAAO,CAAC;IAEZ,OAAO;QACL,IAAI;QACJ,EAAE;KACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"peaksToXY.js","sourceRoot":"","sources":["../../src/peaks/peaksToXY.ts"],"names":[],"mappings":";;;AAAA,2DAAmE;AAGnE,gEAA6D;AAuB7D,SAAgB,SAAS,CAAC,KAAkB,EAAE,OAAyB;IACrE,MAAM,EAAE,SAAS,EAAE,QAAQ,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAEtD,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;KAC3C;IACD,MAAM,QAAQ,GAAG,IAAA,qCAAiB,EAAC,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;IACzD,OAAO,IAAA,qCAAgB,EAAC,QAAQ,EAAE;QAChC,SAAS,EAAE;YACT,GAAG,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC;YAC/B,QAAQ;YACR,KAAK;SACN;KACF,CAAC,CAAC;AACL,CAAC;AAdD,8BAcC;AAED,SAAS,SAAS,CAAC,QAAqB,EAAE,OAAyB;IACjE,IAAI,IAAI,IAAI,OAAO,IAAI,MAAM,IAAI,OAAO,EAAE;QACxC,OAAO;YACL,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,EAAE,EAAE,OAAO,CAAC,EAAE;SACf,CAAC;KACH;IAED,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC9B,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAE/C,MAAM,EACJ,IAAI,GAAG,SAAS,CAAC,CAAC,GAAG,SAAS,CAAC,KAAK,GAAG,CAAC,EACxC,EAAE,GAAG,QAAQ,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,GAAG,CAAC,GACrC,GAAG,OAAO,CAAC;IAEZ,OAAO;QACL,IAAI;QACJ,EAAE;KACH,CAAC;AACJ,CAAC"}

package/lib/peaks/util/convertWidth.d.ts

@@ -11,4 +11,4 @@ export interface ConvertWidthOptions {
 /**
  * convert width and fwhm to ppm
  */
-export declare function convertWidth(peaks: NMRPeak1D[], options: ConvertWidthOptions): any;
+export declare function convertWidth(peaks: NMRPeak1D[], options: ConvertWidthOptions): NMRPeak1D[];

package/lib/peaks/util/convertWidth.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertWidth = void 0;
+const hasProperty_1 = require("../../utilities/hasProperty");
 /**
  * convert width and fwhm to ppm
  */
@@ -9,7 +10,7 @@ function convertWidth(peaks, options) {
     const convert = getConverter(convertTo, frequency);
     for (const peak of output) {
         peak.width = convert(peak.width);
-        if (hasShape(peak)) {
+        if ((0, hasProperty_1.hasProperty)(peak, 'shape')) {
             if (peak.shape.fwhm) {
                 peak.shape.fwhm = convert(peak.shape.fwhm);
             }
@@ -18,9 +19,6 @@ function convertWidth(peaks, options) {
     return output;
 }
 exports.convertWidth = convertWidth;
-function hasShape(peak) {
-    return 'shape' in peak;
-}
 function getConverter(convertTo, frequency) {
     switch (convertTo) {
         case 'ppm':

package/lib/peaks/util/convertWidth.js.map

@@ -1 +1 @@
-{"version":3,"file":"convertWidth.js","sourceRoot":"","sources":["../../../src/peaks/util/convertWidth.ts"],"names":[],"mappings":";;;AAUA;;GAEG;AACH,SAAgB,YAAY,CAAC,KAAkB,EAAE,OAA4B;IAC3E,MAAM,EACJ,SAAS,EACT,SAAS,EACT,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,GAC3C,GAAG,OAAO,CAAC;IAEZ,MAAM,OAAO,GAAG,YAAY,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAEnD,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE;QACzB,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE;YAClB,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;gBACnB,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC5C;SACF;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAlBD,oCAkBC;AAED,SAAS,QAAQ,CAAC,IAAe;IAC/B,OAAO,OAAO,IAAI,IAAI,CAAC;AACzB,CAAC;AAED,SAAS,YAAY,CAAC,SAAiB,EAAE,SAAiB;IACxD,QAAQ,SAAS,EAAE;QACjB,KAAK,KAAK;YACR,OAAO,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;QACtC,KAAK,IAAI;YACP,OAAO,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;QACtC;YACE,MAAM,IAAI,KAAK,CAAC,+BAA+B,SAAS,EAAE,CAAC,CAAC;KAC/D;AACH,CAAC"}
+{"version":3,"file":"convertWidth.js","sourceRoot":"","sources":["../../../src/peaks/util/convertWidth.ts"],"names":[],"mappings":";;;AACA,6DAA0D;AAU1D;;GAEG;AACH,SAAgB,YAAY,CAAC,KAAkB,EAAE,OAA4B;IAC3E,MAAM,EACJ,SAAS,EACT,SAAS,EACT,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAgB,GAC1D,GAAG,OAAO,CAAC;IAEZ,MAAM,OAAO,GAAG,YAAY,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAEnD,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE;QACzB,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,IAAA,yBAAW,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE;YAC9B,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;gBACnB,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC5C;SACF;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAlBD,oCAkBC;AAED,SAAS,YAAY,CAAC,SAAiB,EAAE,SAAiB;IACxD,QAAQ,SAAS,EAAE;QACjB,KAAK,KAAK;YACR,OAAO,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;QACtC,KAAK,IAAI;YACP,OAAO,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;QACtC;YACE,MAAM,IAAI,KAAK,CAAC,+BAA+B,SAAS,EAAE,CAAC,CAAC;KAC/D;AACH,CAAC"}

package/lib/peaks/util/convertWidthToHz.d.ts

@@ -1,4 +1,4 @@
 import { NMRPeak1D } from '../NMRPeak1D';
 import { ConvertWidthOptions } from './convertWidth';
 export declare type ConvertWidthTo = Omit<ConvertWidthOptions, 'convertTo'>;
-export declare function convertWidthToHz(peaks: NMRPeak1D[], options: ConvertWidthTo): any;
+export declare function convertWidthToHz(peaks: NMRPeak1D[], options: ConvertWidthTo): NMRPeak1D[];

package/lib/peaks/util/convertWidthToPPM.d.ts

@@ -1,3 +1,3 @@
 import { NMRPeak1D } from '../NMRPeak1D';
 import { ConvertWidthTo } from './convertWidthToHz';
-export declare function convertWidthToPPM(peaks: NMRPeak1D[], options: ConvertWidthTo): any;
+export declare function convertWidthToPPM(peaks: NMRPeak1D[], options: ConvertWidthTo): NMRPeak1D[];

package/lib/utilities/hasProperty.d.ts

@@ -0,0 +1,3 @@
+export declare function hasProperty<T, K extends keyof T>(data: T, key: K): data is T & {
+    [P in K]-?: T[P];
+};

package/lib/utilities/hasProperty.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasProperty = void 0;
+function hasProperty(data, key) {
+    return key in data;
+}
+exports.hasProperty = hasProperty;
+//# sourceMappingURL=hasProperty.js.map

package/lib/utilities/hasProperty.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hasProperty.js","sourceRoot":"","sources":["../../src/utilities/hasProperty.ts"],"names":[],"mappings":";;;AAAA,SAAgB,WAAW,CACzB,IAAO,EACP,GAAM;IAEN,OAAO,GAAG,IAAI,IAAI,CAAC;AACrB,CAAC;AALD,kCAKC"}

package/lib/xy/xyPeaksOptimization.d.ts

@@ -6,4 +6,4 @@ export interface XYPeaksOptimizationOptions extends OptimizePeaksOptions {
      */
     frequency: number;
 }
-export declare function xyPeaksOptimization(data: DataXY, peaks: PeakXYWidth[], options: XYPeaksOptimizationOptions): any;
+export declare function xyPeaksOptimization(data: DataXY, peaks: PeakXYWidth[], options: XYPeaksOptimizationOptions): import("..").NMRPeak1D[];

package/lib-esm/peaks/peakToXY.js

@@ -1,5 +1,10 @@
+import { addMissingShape } from 'ml-gsd';
+import { getShape1D } from 'ml-peak-shape-generator';
 import { peaksToXY } from './peaksToXY';
 export function peakToXY(peak, options) {
-    return peaksToXY([peak], options);
+    const newPeak = addMissingShape([peak])[0];
+    const factor = getShape1D(newPeak.shape).getFactor();
+    const { from = newPeak.x - peak.width * factor, to = newPeak.x + peak.width * factor, } = options;
+    return peaksToXY([peak], { ...options, from, to });
 }
 //# sourceMappingURL=peakToXY.js.map

package/lib-esm/peaks/peakToXY.js.map

@@ -1 +1 @@
-{"version":3,"file":"peakToXY.js","sourceRoot":"","sources":["../../src/peaks/peakToXY.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAoB,MAAM,aAAa,CAAC;AAE1D,MAAM,UAAU,QAAQ,CAAC,IAAe,EAAE,OAAyB;IACjE,OAAO,SAAS,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"peakToXY.js","sourceRoot":"","sources":["../../src/peaks/peakToXY.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGrD,OAAO,EAAE,SAAS,EAAoB,MAAM,aAAa,CAAC;AAE1D,MAAM,UAAU,QAAQ,CAAC,IAAe,EAAE,OAAyB;IACjE,MAAM,OAAO,GAAG,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC;IAErD,MAAM,EACJ,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,GAAG,MAAM,EACtC,EAAE,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,GAAG,MAAM,GACrC,GAAG,OAAO,CAAC;IAEZ,OAAO,SAAS,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;AACrD,CAAC"}

package/lib-esm/peaks/peaksToXY.js

@@ -2,6 +2,9 @@ import { generateSpectrum } from 'spectrum-generator';
 import { convertWidthToPPM } from './util/convertWidthToPPM';
 export function peaksToXY(peaks, options) {
     const { frequency, nbPoints = 1024, shape } = options;
+    if (!frequency) {
+        throw new Error('frequency is mandatory');
+    }
     const newPeaks = convertWidthToPPM(peaks, { frequency });
     return generateSpectrum(newPeaks, {
         generator: {

package/lib-esm/peaks/peaksToXY.js.map

@@ -1 +1 @@
-{"version":3,"file":"peaksToXY.js","sourceRoot":"","sources":["../../src/peaks/peaksToXY.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,MAAM,oBAAoB,CAAC;AAGnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAuB7D,MAAM,UAAU,SAAS,CAAC,KAAkB,EAAE,OAAyB;IACrE,MAAM,EAAE,SAAS,EAAE,QAAQ,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IACtD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;IAEzD,OAAO,gBAAgB,CAAC,QAAQ,EAAE;QAChC,SAAS,EAAE;YACT,GAAG,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC;YAC/B,QAAQ;YACR,KAAK;SACN;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,SAAS,CAAC,QAAqB,EAAE,OAAyB;IACjE,IAAI,IAAI,IAAI,OAAO,IAAI,MAAM,IAAI,OAAO,EAAE;QACxC,OAAO;YACL,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,EAAE,EAAE,OAAO,CAAC,EAAE;SACf,CAAC;KACH;IAED,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC9B,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAE/C,MAAM,EACJ,IAAI,GAAG,SAAS,CAAC,CAAC,GAAG,SAAS,CAAC,KAAK,GAAG,CAAC,EACxC,EAAE,GAAG,QAAQ,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,GAAG,CAAC,GACrC,GAAG,OAAO,CAAC;IAEZ,OAAO;QACL,IAAI;QACJ,EAAE;KACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"peaksToXY.js","sourceRoot":"","sources":["../../src/peaks/peaksToXY.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,MAAM,oBAAoB,CAAC;AAGnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAuB7D,MAAM,UAAU,SAAS,CAAC,KAAkB,EAAE,OAAyB;IACrE,MAAM,EAAE,SAAS,EAAE,QAAQ,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAEtD,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;KAC3C;IACD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;IACzD,OAAO,gBAAgB,CAAC,QAAQ,EAAE;QAChC,SAAS,EAAE;YACT,GAAG,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC;YAC/B,QAAQ;YACR,KAAK;SACN;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,SAAS,CAAC,QAAqB,EAAE,OAAyB;IACjE,IAAI,IAAI,IAAI,OAAO,IAAI,MAAM,IAAI,OAAO,EAAE;QACxC,OAAO;YACL,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,EAAE,EAAE,OAAO,CAAC,EAAE;SACf,CAAC;KACH;IAED,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC9B,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAE/C,MAAM,EACJ,IAAI,GAAG,SAAS,CAAC,CAAC,GAAG,SAAS,CAAC,KAAK,GAAG,CAAC,EACxC,EAAE,GAAG,QAAQ,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,GAAG,CAAC,GACrC,GAAG,OAAO,CAAC;IAEZ,OAAO;QACL,IAAI;QACJ,EAAE;KACH,CAAC;AACJ,CAAC"}

package/lib-esm/peaks/util/convertWidth.js

@@ -1,3 +1,4 @@
+import { hasProperty } from '../../utilities/hasProperty';
 /**
  * convert width and fwhm to ppm
  */
@@ -6,7 +7,7 @@ export function convertWidth(peaks, options) {
     const convert = getConverter(convertTo, frequency);
     for (const peak of output) {
         peak.width = convert(peak.width);
-        if (hasShape(peak)) {
+        if (hasProperty(peak, 'shape')) {
             if (peak.shape.fwhm) {
                 peak.shape.fwhm = convert(peak.shape.fwhm);
             }
@@ -14,9 +15,6 @@ export function convertWidth(peaks, options) {
     }
     return output;
 }
-function hasShape(peak) {
-    return 'shape' in peak;
-}
 function getConverter(convertTo, frequency) {
     switch (convertTo) {
         case 'ppm':

package/lib-esm/peaks/util/convertWidth.js.map

@@ -1 +1 @@
-{"version":3,"file":"convertWidth.js","sourceRoot":"","sources":["../../../src/peaks/util/convertWidth.ts"],"names":[],"mappings":"AAUA;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,KAAkB,EAAE,OAA4B;IAC3E,MAAM,EACJ,SAAS,EACT,SAAS,EACT,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,GAC3C,GAAG,OAAO,CAAC;IAEZ,MAAM,OAAO,GAAG,YAAY,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAEnD,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE;QACzB,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE;YAClB,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;gBACnB,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC5C;SACF;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,QAAQ,CAAC,IAAe;IAC/B,OAAO,OAAO,IAAI,IAAI,CAAC;AACzB,CAAC;AAED,SAAS,YAAY,CAAC,SAAiB,EAAE,SAAiB;IACxD,QAAQ,SAAS,EAAE;QACjB,KAAK,KAAK;YACR,OAAO,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;QACtC,KAAK,IAAI;YACP,OAAO,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;QACtC;YACE,MAAM,IAAI,KAAK,CAAC,+BAA+B,SAAS,EAAE,CAAC,CAAC;KAC/D;AACH,CAAC"}
+{"version":3,"file":"convertWidth.js","sourceRoot":"","sources":["../../../src/peaks/util/convertWidth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAU1D;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,KAAkB,EAAE,OAA4B;IAC3E,MAAM,EACJ,SAAS,EACT,SAAS,EACT,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAgB,GAC1D,GAAG,OAAO,CAAC;IAEZ,MAAM,OAAO,GAAG,YAAY,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAEnD,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE;QACzB,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE;YAC9B,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;gBACnB,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC5C;SACF;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,YAAY,CAAC,SAAiB,EAAE,SAAiB;IACxD,QAAQ,SAAS,EAAE;QACjB,KAAK,KAAK;YACR,OAAO,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;QACtC,KAAK,IAAI;YACP,OAAO,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;QACtC;YACE,MAAM,IAAI,KAAK,CAAC,+BAA+B,SAAS,EAAE,CAAC,CAAC;KAC/D;AACH,CAAC"}

package/lib-esm/utilities/hasProperty.js

@@ -0,0 +1,4 @@
+export function hasProperty(data, key) {
+    return key in data;
+}
+//# sourceMappingURL=hasProperty.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"hasProperty.js","sourceRoot":"","sources":["../../src/utilities/hasProperty.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,WAAW,CACzB,IAAO,EACP,GAAM;IAEN,OAAO,GAAG,IAAI,IAAI,CAAC;AACrB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nmr-processing",
-  "version": "9.0.3",
+  "version": "9.0.4-pre.1660646769",
   "description": "Pure functions allowing to process NMR spectra.",
   "main": "./lib/index.js",
   "module": "./lib-esm/index.js",
@@ -78,4 +78,4 @@
     "openchemlib-utils": "^2.0.0",
     "spectrum-generator": "^8.0.4"
   }
-}
+}

package/src/peaks/peakToXY.ts

@@ -1,6 +1,17 @@
+import { addMissingShape } from 'ml-gsd';
+import { getShape1D } from 'ml-peak-shape-generator';
+
 import { NMRPeak1D } from './NMRPeak1D';
 import { peaksToXY, PeaksToXYOptions } from './peaksToXY';
 
 export function peakToXY(peak: NMRPeak1D, options: PeaksToXYOptions) {
-  return peaksToXY([peak], options);
+  const newPeak = addMissingShape([peak])[0];
+  const factor = getShape1D(newPeak.shape).getFactor();
+
+  const {
+    from = newPeak.x - peak.width * factor,
+    to = newPeak.x + peak.width * factor,
+  } = options;
+
+  return peaksToXY([peak], { ...options, from, to });
 }

package/src/peaks/peaksToXY.ts

@@ -26,8 +26,11 @@ export interface PeaksToXYOptions extends OptionsSG1D {
 
 export function peaksToXY(peaks: NMRPeak1D[], options: PeaksToXYOptions) {
   const { frequency, nbPoints = 1024, shape } = options;
-  const newPeaks = convertWidthToPPM(peaks, { frequency });
 
+  if (!frequency) {
+    throw new Error('frequency is mandatory');
+  }
+  const newPeaks = convertWidthToPPM(peaks, { frequency });
   return generateSpectrum(newPeaks, {
     generator: {
       ...getFromTo(newPeaks, options),

package/src/peaks/util/convertWidth.ts

@@ -1,4 +1,5 @@
 import { MakeMandatory } from '../../utilities/MakeMandatory';
+import { hasProperty } from '../../utilities/hasProperty';
 import { NMRPeak1D } from '../NMRPeak1D';
 
 export type NMRPeak1DWithShape = MakeMandatory<NMRPeak1D, 'shape'>;
@@ -15,14 +16,14 @@ export function convertWidth(peaks: NMRPeak1D[], options: ConvertWidthOptions) {
   const {
     frequency,
     convertTo,
-    output = JSON.parse(JSON.stringify(peaks)),
+    output = JSON.parse(JSON.stringify(peaks)) as NMRPeak1D[],
   } = options;
 
   const convert = getConverter(convertTo, frequency);
 
   for (const peak of output) {
     peak.width = convert(peak.width);
-    if (hasShape(peak)) {
+    if (hasProperty(peak, 'shape')) {
       if (peak.shape.fwhm) {
         peak.shape.fwhm = convert(peak.shape.fwhm);
       }
@@ -31,10 +32,6 @@ export function convertWidth(peaks: NMRPeak1D[], options: ConvertWidthOptions) {
   return output;
 }
 
-function hasShape(peak: NMRPeak1D): peak is NMRPeak1DWithShape {
-  return 'shape' in peak;
-}
-
 function getConverter(convertTo: string, frequency: number) {
   switch (convertTo) {
     case 'ppm':

package/src/utilities/hasProperty.ts

@@ -0,0 +1,6 @@
+export function hasProperty<T, K extends keyof T>(
+  data: T,
+  key: K,
+): data is T & { [P in K]-?: T[P] } {
+  return key in data;
+}