nmr-processing 8.0.0 → 8.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/apodization/apodization.d.ts +22 -0
- package/lib/apodization/apodization.js +18 -0
- package/lib/apodization/apodization.js.map +1 -0
- package/lib/apodization/applyWindow.d.ts +28 -0
- package/lib/apodization/applyWindow.js +20 -0
- package/lib/apodization/applyWindow.js.map +1 -0
- package/lib/apodization/compose.d.ts +23 -0
- package/lib/apodization/compose.js +25 -0
- package/lib/apodization/compose.js.map +1 -0
- package/lib/apodization/getFunction.d.ts +2 -0
- package/lib/apodization/getFunction.js +18 -0
- package/lib/apodization/getFunction.js.map +1 -0
- package/lib/apodization/shapes/WindowFunctions.d.ts +12 -0
- package/lib/apodization/shapes/WindowFunctions.js +3 -0
- package/lib/apodization/shapes/WindowFunctions.js.map +1 -0
- package/lib/apodization/shapes/exponential.d.ts +11 -0
- package/lib/apodization/shapes/exponential.js +10 -0
- package/lib/apodization/shapes/exponential.js.map +1 -0
- package/lib/apodization/shapes/lorentzToGauss.d.ts +26 -0
- package/lib/apodization/shapes/lorentzToGauss.js +15 -0
- package/lib/apodization/shapes/lorentzToGauss.js.map +1 -0
- package/lib/apodization/utils/getData.d.ts +4 -0
- package/lib/apodization/utils/getData.js +21 -0
- package/lib/apodization/utils/getData.js.map +1 -0
- package/lib/assignment/utils/buildAssignments.d.ts +2 -2
- package/lib/assignment/utils/exploreTreeRec.js +1 -1
- package/lib/assignment/utils/exploreTreeRec.js.map +1 -1
- package/lib/assignment/utils/getAssignment/checkIDs.d.ts +1 -1
- package/lib/assignment/utils/getAssignment/checkIDs.js.map +1 -1
- package/lib/databases/DatabaseNMREntry.d.ts +2 -0
- package/lib/index.d.ts +5 -1
- package/lib/index.js +5 -1
- package/lib/index.js.map +1 -1
- package/lib/peaks/NMRPeak1D.d.ts +0 -1
- package/lib/peaks/peaksToRanges.d.ts +16 -0
- package/lib/peaks/peaksToRanges.js +3 -2
- package/lib/peaks/peaksToRanges.js.map +1 -1
- package/lib/peaks/solventSuppression.d.ts +6 -0
- package/lib/peaks/solventSuppression.js +158 -0
- package/lib/peaks/solventSuppression.js.map +1 -0
- package/lib/peaks/util/jAnalyzer.d.ts +1 -1
- package/lib/peaks/util/jAnalyzer.js +26 -31
- package/lib/peaks/util/jAnalyzer.js.map +1 -1
- package/lib/peaks/util/peakOptimizer.js +12 -16
- package/lib/peaks/util/peakOptimizer.js.map +1 -1
- package/lib/prediction/predictAllSpectra.js +7 -9
- package/lib/prediction/predictAllSpectra.js.map +1 -1
- package/lib/prediction/predictCarbon.js +1 -1
- package/lib/prediction/predictCarbon.js.map +1 -1
- package/lib/prediction/utils/queryByHOSE.js +1 -1
- package/lib/prediction/utils/queryByHOSE.js.map +1 -1
- package/lib/ranges/markSolventSignal.d.ts +3 -0
- package/lib/ranges/markSolventSignal.js +107 -0
- package/lib/ranges/markSolventSignal.js.map +1 -0
- package/lib/ranges/rangesToACS.js +8 -4
- package/lib/ranges/rangesToACS.js.map +1 -1
- package/lib/ranges/rangesToXY.js +27 -3
- package/lib/ranges/rangesToXY.js.map +1 -1
- package/lib/signals/addDummySignals.d.ts +2 -0
- package/lib/signals/addDummySignals.js +56 -0
- package/lib/signals/addDummySignals.js.map +1 -0
- package/lib/signals/hackSignalsToXY.js +2 -48
- package/lib/signals/hackSignalsToXY.js.map +1 -1
- package/lib/signals/simulation/getPauliMatrix.js.map +1 -1
- package/lib/signals/simulation/simulate1D.d.ts +1 -39
- package/lib/signals/simulation/simulate1D.js +13 -240
- package/lib/signals/simulation/simulate1D.js.map +1 -1
- package/lib/signals/simulation/simulateXYPeaks.d.ts +47 -0
- package/lib/signals/simulation/simulateXYPeaks.js +246 -0
- package/lib/signals/simulation/simulateXYPeaks.js.map +1 -0
- package/lib/signals/simulation/splitSpinSystem.js +11 -13
- package/lib/signals/simulation/splitSpinSystem.js.map +1 -1
- package/lib/utilities/getFrequency.d.ts +1 -1
- package/lib/utilities/getFrequency.js +4 -4
- package/lib/utilities/getFrequency.js.map +1 -1
- package/lib/utilities/rangeFromSignal.d.ts +9 -5
- package/lib/utilities/rangeFromSignal.js +7 -7
- package/lib/utilities/rangeFromSignal.js.map +1 -1
- package/lib/utilities/resurrectRange.js +4 -7
- package/lib/utilities/resurrectRange.js.map +1 -1
- package/lib/xyz/util/formatZone.d.ts +3 -0
- package/lib/xyz/util/formatZone.js +38 -0
- package/lib/xyz/util/formatZone.js.map +1 -0
- package/lib/xyz/xyzAutoZonesPicking.d.ts +1 -2
- package/lib/xyz/xyzAutoZonesPicking.js +2 -34
- package/lib/xyz/xyzAutoZonesPicking.js.map +1 -1
- package/lib/xyz/xyzJResAnalyzer.d.ts +6 -1
- package/lib/xyz/xyzJResAnalyzer.js +9 -8
- package/lib/xyz/xyzJResAnalyzer.js.map +1 -1
- package/lib-esm/apodization/apodization.js +14 -0
- package/lib-esm/apodization/apodization.js.map +1 -0
- package/lib-esm/apodization/applyWindow.js +16 -0
- package/lib-esm/apodization/applyWindow.js.map +1 -0
- package/lib-esm/apodization/compose.js +21 -0
- package/lib-esm/apodization/compose.js.map +1 -0
- package/lib-esm/apodization/getFunction.js +14 -0
- package/lib-esm/apodization/getFunction.js.map +1 -0
- package/lib-esm/apodization/shapes/WindowFunctions.js +2 -0
- package/lib-esm/apodization/shapes/WindowFunctions.js.map +1 -0
- package/lib-esm/apodization/shapes/exponential.js +6 -0
- package/lib-esm/apodization/shapes/exponential.js.map +1 -0
- package/lib-esm/apodization/shapes/lorentzToGauss.js +11 -0
- package/lib-esm/apodization/shapes/lorentzToGauss.js.map +1 -0
- package/lib-esm/apodization/utils/getData.js +17 -0
- package/lib-esm/apodization/utils/getData.js.map +1 -0
- package/lib-esm/assignment/utils/buildAssignments.js +3 -3
- package/lib-esm/assignment/utils/exploreTreeRec.js +1 -1
- package/lib-esm/assignment/utils/exploreTreeRec.js.map +1 -1
- package/lib-esm/assignment/utils/getAssignment/buildAssignments.js +3 -3
- package/lib-esm/assignment/utils/getAssignment/checkIDs.js.map +1 -1
- package/lib-esm/index.js +5 -1
- package/lib-esm/index.js.map +1 -1
- package/lib-esm/peaks/peaksToRanges.js +2 -2
- package/lib-esm/peaks/peaksToRanges.js.map +1 -1
- package/lib-esm/peaks/solventSuppression.js +154 -0
- package/lib-esm/peaks/solventSuppression.js.map +1 -0
- package/lib-esm/peaks/util/jAnalyzer.js +26 -31
- package/lib-esm/peaks/util/jAnalyzer.js.map +1 -1
- package/lib-esm/peaks/util/peakOptimizer.js +12 -16
- package/lib-esm/peaks/util/peakOptimizer.js.map +1 -1
- package/lib-esm/prediction/predictAllSpectra.js +7 -9
- package/lib-esm/prediction/predictAllSpectra.js.map +1 -1
- package/lib-esm/prediction/predictCarbon.js +1 -1
- package/lib-esm/prediction/predictCarbon.js.map +1 -1
- package/lib-esm/prediction/utils/queryByHOSE.js +1 -1
- package/lib-esm/prediction/utils/queryByHOSE.js.map +1 -1
- package/lib-esm/ranges/markSolventSignal.js +100 -0
- package/lib-esm/ranges/markSolventSignal.js.map +1 -0
- package/lib-esm/ranges/rangesToACS.js +8 -4
- package/lib-esm/ranges/rangesToACS.js.map +1 -1
- package/lib-esm/ranges/rangesToXY.js +27 -3
- package/lib-esm/ranges/rangesToXY.js.map +1 -1
- package/lib-esm/signals/addDummySignals.js +52 -0
- package/lib-esm/signals/addDummySignals.js.map +1 -0
- package/lib-esm/signals/hackSignalsToXY.js +2 -48
- package/lib-esm/signals/hackSignalsToXY.js.map +1 -1
- package/lib-esm/signals/simulation/getPauliMatrix.js.map +1 -1
- package/lib-esm/signals/simulation/simulate1D.js +14 -238
- package/lib-esm/signals/simulation/simulate1D.js.map +1 -1
- package/lib-esm/signals/simulation/simulateXYPeaks.js +239 -0
- package/lib-esm/signals/simulation/simulateXYPeaks.js.map +1 -0
- package/lib-esm/signals/simulation/splitSpinSystem.js +11 -13
- package/lib-esm/signals/simulation/splitSpinSystem.js.map +1 -1
- package/lib-esm/utilities/getFrequency.js +1 -1
- package/lib-esm/utilities/getFrequency.js.map +1 -1
- package/lib-esm/utilities/rangeFromSignal.js +7 -7
- package/lib-esm/utilities/rangeFromSignal.js.map +1 -1
- package/lib-esm/utilities/resurrectRange.js +4 -7
- package/lib-esm/utilities/resurrectRange.js.map +1 -1
- package/lib-esm/xyz/util/formatZone.js +34 -0
- package/lib-esm/xyz/util/formatZone.js.map +1 -0
- package/lib-esm/xyz/xyzAutoZonesPicking.js +1 -33
- package/lib-esm/xyz/xyzAutoZonesPicking.js.map +1 -1
- package/lib-esm/xyz/xyzJResAnalyzer.js +9 -8
- package/lib-esm/xyz/xyzJResAnalyzer.js.map +1 -1
- package/package.json +16 -14
- package/src/apodization/apodization.ts +34 -0
- package/src/apodization/applyWindow.ts +51 -0
- package/src/apodization/compose.ts +47 -0
- package/src/apodization/getFunction.ts +15 -0
- package/src/apodization/shapes/WindowFunctions.ts +14 -0
- package/src/apodization/shapes/exponential.ts +16 -0
- package/src/apodization/shapes/lorentzToGauss.ts +41 -0
- package/src/apodization/utils/getData.ts +15 -0
- package/src/assignment/utils/buildAssignments.ts +4 -4
- package/src/assignment/utils/exploreTreeRec.ts +1 -1
- package/src/assignment/utils/getAssignment/buildAssignments.ts +3 -3
- package/src/assignment/utils/getAssignment/checkIDs.ts +1 -1
- package/src/databases/DatabaseNMREntry.ts +3 -0
- package/src/index.ts +7 -1
- package/src/peaks/NMRPeak1D.ts +0 -1
- package/src/peaks/peaksToRanges.ts +2 -2
- package/src/peaks/solventSuppression.ts +214 -0
- package/src/peaks/util/jAnalyzer.ts +27 -31
- package/src/peaks/util/peakOptimizer.ts +11 -15
- package/src/prediction/predictAllSpectra.ts +6 -8
- package/src/prediction/predictCarbon.ts +1 -1
- package/src/prediction/utils/queryByHOSE.ts +1 -1
- package/src/ranges/markSolventSignal.ts +121 -0
- package/src/ranges/rangesToACS.ts +9 -10
- package/src/ranges/rangesToXY.ts +33 -4
- package/src/signals/addDummySignals.ts +77 -0
- package/src/signals/hackSignalsToXY.ts +2 -72
- package/src/signals/simulation/getPauliMatrix.ts +1 -1
- package/src/signals/simulation/simulate1D.ts +14 -319
- package/src/signals/simulation/simulateXYPeaks.ts +332 -0
- package/src/signals/simulation/splitSpinSystem.ts +10 -12
- package/src/utilities/getFrequency.ts +1 -1
- package/src/utilities/rangeFromSignal.ts +19 -11
- package/src/utilities/resurrectRange.ts +4 -7
- package/src/xyz/util/formatZone.ts +36 -0
- package/src/xyz/xyzAutoZonesPicking.ts +1 -35
- package/src/xyz/xyzJResAnalyzer.ts +14 -7
- package/lib/constants/gyromagneticRatio.d.ts +0 -6
- package/lib/constants/gyromagneticRatio.js +0 -26
- package/lib/constants/gyromagneticRatio.js.map +0 -1
- package/lib-esm/constants/gyromagneticRatio.js +0 -23
- package/lib-esm/constants/gyromagneticRatio.js.map +0 -1
- package/src/constants/gyromagneticRatio.ts +0 -49
|
@@ -34,13 +34,10 @@ export function resurrectRange(part, options = {}) {
|
|
|
34
34
|
signal.multiplicity = multiplicity;
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
|
-
else {
|
|
38
|
-
//
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
signal.delta = from;
|
|
42
|
-
signal.multiplicity = multiplicity;
|
|
43
|
-
}
|
|
37
|
+
else if (!isARange) {
|
|
38
|
+
// a complex signal
|
|
39
|
+
signal.delta = from;
|
|
40
|
+
signal.multiplicity = multiplicity;
|
|
44
41
|
}
|
|
45
42
|
}
|
|
46
43
|
const jCouplings = insideParts
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resurrectRange.js","sourceRoot":"","sources":["../../src/utilities/resurrectRange.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,UAAe,EAAE;IAC5D,MAAM,EAAE,OAAO,GAAG,IAAI,EAAE,SAAS,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC;IACpD,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,CAAC,KAAK,CAAC,MAAM;QAAE,OAAO;IAE1B,MAAM,WAAW,GAAG,2CAA2C,CAAC,IAAI,CAClE,KAAK,CAAC,MAAM,CACb,CAAC;IAEF,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,MAAM;QAAE,OAAO;IAEhD,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;IAE9C,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3D,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAChD,IAAI,MAAM,GAAgB,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;IACjD,IAAI,KAAK,GAAa,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;IAEtD,MAAM,gBAAgB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE,CACxD,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CACxB,CAAC;IACF,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;QACjC,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;KAClE;IAED,MAAM,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE,CACzD,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAC1B,CAAC;IACF,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE;QAClC,MAAM,YAAY,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAI,YAAY,KAAK,GAAG,EAAE;YACxB,IAAI,QAAQ,EAAE;gBACZ,eAAe;gBACf,MAAM,CAAC,KAAK,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;gBAC/B,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;aACpC;iBAAM;gBACL,mBAAmB;gBACnB,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC;gBACpB,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;aACpC;SACF;aAAM
|
|
1
|
+
{"version":3,"file":"resurrectRange.js","sourceRoot":"","sources":["../../src/utilities/resurrectRange.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
export function formatZones(signals) {
|
|
2
|
+
let zones = [];
|
|
3
|
+
for (const signal of signals) {
|
|
4
|
+
let minMax1 = [Number.MAX_VALUE, 0];
|
|
5
|
+
let minMax2 = [Number.MAX_VALUE, 0];
|
|
6
|
+
for (const peak of signal.peaks || []) {
|
|
7
|
+
if (peak.minX < minMax1[0]) {
|
|
8
|
+
minMax1[0] = peak.minX;
|
|
9
|
+
}
|
|
10
|
+
if (peak.maxX > minMax1[1]) {
|
|
11
|
+
minMax1[1] = peak.maxX;
|
|
12
|
+
}
|
|
13
|
+
if (peak.minY < minMax2[0]) {
|
|
14
|
+
minMax2[0] = peak.minY;
|
|
15
|
+
}
|
|
16
|
+
if (peak.maxY > minMax2[1]) {
|
|
17
|
+
minMax2[1] = peak.maxY;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
zones.push({
|
|
21
|
+
x: {
|
|
22
|
+
from: minMax1[0],
|
|
23
|
+
to: minMax1[1],
|
|
24
|
+
},
|
|
25
|
+
y: {
|
|
26
|
+
from: minMax2[0],
|
|
27
|
+
to: minMax2[1],
|
|
28
|
+
},
|
|
29
|
+
signals: [signal],
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
return zones;
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=formatZone.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"formatZone.js","sourceRoot":"","sources":["../../../src/xyz/util/formatZone.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,WAAW,CAAC,OAAsB;IAChD,IAAI,KAAK,GAAc,EAAE,CAAC;IAC1B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,OAAO,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QACpC,IAAI,OAAO,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QACpC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,IAAI,EAAE,EAAE;YACrC,IAAI,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC1B,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;aACxB;YACD,IAAI,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC1B,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;aACxB;YACD,IAAI,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC1B,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;aACxB;YACD,IAAI,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC1B,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;aACxB;SACF;QACD,KAAK,CAAC,IAAI,CAAC;YACT,CAAC,EAAE;gBACD,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;gBAChB,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;aACf;YACD,CAAC,EAAE;gBACD,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;gBAChB,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;aACf;YACD,OAAO,EAAE,CAAC,MAAM,CAAC;SAClB,CAAC,CAAC;KACJ;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -5,6 +5,7 @@ import simpleClustering from 'ml-simple-clustering';
|
|
|
5
5
|
import { determineRealTop } from '../peaks/util/determineRealTop';
|
|
6
6
|
import { getKernel } from '../peaks/util/getKernel';
|
|
7
7
|
import * as PeakOptimizer from '../peaks/util/peakOptimizer';
|
|
8
|
+
import { formatZones } from './util/formatZone';
|
|
8
9
|
const smallFilter = [
|
|
9
10
|
[0, 0, 1, 2, 2, 2, 1, 0, 0],
|
|
10
11
|
[0, 1, 4, 7, 7, 7, 4, 1, 0],
|
|
@@ -80,39 +81,6 @@ export function xyzAutoZonesPicking(spectraData, options) {
|
|
|
80
81
|
}
|
|
81
82
|
return formatZones(signals);
|
|
82
83
|
}
|
|
83
|
-
function formatZones(signals) {
|
|
84
|
-
let zones = [];
|
|
85
|
-
for (const signal of signals) {
|
|
86
|
-
let minMax1 = [Number.MAX_VALUE, 0];
|
|
87
|
-
let minMax2 = [Number.MAX_VALUE, 0];
|
|
88
|
-
for (const peak of signal.peaks || []) {
|
|
89
|
-
if (peak.minX < minMax1[0]) {
|
|
90
|
-
minMax1[0] = peak.minX;
|
|
91
|
-
}
|
|
92
|
-
if (peak.maxX > minMax1[1]) {
|
|
93
|
-
minMax1[1] = peak.maxX;
|
|
94
|
-
}
|
|
95
|
-
if (peak.minY < minMax2[0]) {
|
|
96
|
-
minMax2[0] = peak.minY;
|
|
97
|
-
}
|
|
98
|
-
if (peak.maxY > minMax2[1]) {
|
|
99
|
-
minMax2[1] = peak.maxY;
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
zones.push({
|
|
103
|
-
x: {
|
|
104
|
-
from: minMax1[0],
|
|
105
|
-
to: minMax1[1],
|
|
106
|
-
},
|
|
107
|
-
y: {
|
|
108
|
-
from: minMax2[0],
|
|
109
|
-
to: minMax2[1],
|
|
110
|
-
},
|
|
111
|
-
signals: [signal],
|
|
112
|
-
});
|
|
113
|
-
}
|
|
114
|
-
return zones;
|
|
115
|
-
}
|
|
116
84
|
const createSignals2D = (peaks, options) => {
|
|
117
85
|
let { nCols, nRows, absoluteData, originalData, observedFrequencies, tolerances, nuclei, realTopDetection, minY, maxY, minX, maxX, } = options;
|
|
118
86
|
let [nucleusX, nucleusY] = nuclei;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xyzAutoZonesPicking.js","sourceRoot":"","sources":["../../src/xyz/xyzAutoZonesPicking.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,WAAW,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAC;AAE5D,OAAO,gBAAgB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"xyzAutoZonesPicking.js","sourceRoot":"","sources":["../../src/xyz/xyzAutoZonesPicking.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,24 +1,25 @@
|
|
|
1
1
|
import simpleClustering from 'ml-simple-clustering';
|
|
2
2
|
import jAnalyzer from '../peaks/util/jAnalyzer';
|
|
3
|
+
import { formatZones } from './util/formatZone';
|
|
3
4
|
export function xyzJResAnalyzer(signals, options = {}) {
|
|
4
|
-
let { reference = 0, referenceMaxShiftError = 0.08, tolerances = [10, 100], nuclei = ['1H', '1H'], observedFrequencies = [400, 400], jAnalyzer = {
|
|
5
|
+
let { reference = 0, getZones = false, referenceMaxShiftError = 0.08, tolerances = [10, 100], nuclei = ['1H', '1H'], observedFrequencies = [400, 400], jAnalyzer = {
|
|
5
6
|
jAxisKey: { jAxis: 'y', intensity: 'z' },
|
|
6
7
|
}, } = options;
|
|
7
|
-
let temporalSignals = compilePattern(signals, {
|
|
8
|
+
let temporalSignals = compilePattern([...signals], {
|
|
8
9
|
observedFrequencies,
|
|
9
10
|
tolerances,
|
|
10
11
|
nuclei,
|
|
11
12
|
jAnalyzer,
|
|
12
13
|
});
|
|
13
14
|
//check if the signal are symmetric around the reference
|
|
14
|
-
let
|
|
15
|
+
let signals2D = [];
|
|
15
16
|
for (const tempSignal of temporalSignals) {
|
|
16
17
|
let delta = tempSignal.y.delta;
|
|
17
18
|
if (Math.abs(delta - reference) > referenceMaxShiftError)
|
|
18
19
|
continue;
|
|
19
|
-
|
|
20
|
+
signals2D.push(tempSignal);
|
|
20
21
|
}
|
|
21
|
-
return
|
|
22
|
+
return getZones ? formatZones(signals2D) : signals2D;
|
|
22
23
|
}
|
|
23
24
|
function compilePattern(signals, options) {
|
|
24
25
|
let { observedFrequencies, tolerances, nuclei, jAnalyzer: jAnalyzerOptions, } = options;
|
|
@@ -67,9 +68,9 @@ function compilePattern(signals, options) {
|
|
|
67
68
|
}
|
|
68
69
|
if (peaksO.length > 0) {
|
|
69
70
|
peaksO.reverse();
|
|
70
|
-
let
|
|
71
|
-
for (const
|
|
72
|
-
newSignals.push(
|
|
71
|
+
let signals2D = createSignals2D(peaksO, signalOptions);
|
|
72
|
+
for (const signal of signals2D) {
|
|
73
|
+
newSignals.push(signal);
|
|
73
74
|
}
|
|
74
75
|
}
|
|
75
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xyzJResAnalyzer.js","sourceRoot":"","sources":["../../src/xyz/xyzJResAnalyzer.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,MAAM,sBAAsB,CAAC;AAGpD,OAAO,SAAS,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"xyzJResAnalyzer.js","sourceRoot":"","sources":["../../src/xyz/xyzJResAnalyzer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nmr-processing",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.3.0",
|
|
4
4
|
"description": "Pure functions allowing to process NMR spectra.",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"module": "./lib-esm/index.js",
|
|
@@ -38,44 +38,46 @@
|
|
|
38
38
|
},
|
|
39
39
|
"homepage": "https://github.com/cheminfo/nmr-processing#readme",
|
|
40
40
|
"devDependencies": {
|
|
41
|
-
"@types/jest": "^
|
|
41
|
+
"@types/jest": "^28.1.4",
|
|
42
42
|
"cheminfo-build": "^1.1.11",
|
|
43
|
-
"cheminfo-types": "^1.
|
|
44
|
-
"eslint": "^8.
|
|
45
|
-
"eslint-config-cheminfo-typescript": "^
|
|
46
|
-
"jest": "^28.
|
|
43
|
+
"cheminfo-types": "^1.2.0",
|
|
44
|
+
"eslint": "^8.19.0",
|
|
45
|
+
"eslint-config-cheminfo-typescript": "^11.0.1",
|
|
46
|
+
"jest": "^28.1.2",
|
|
47
47
|
"jest-matcher-deep-close-to": "^3.0.2",
|
|
48
48
|
"md5": "^2.3.0",
|
|
49
49
|
"ml-array-median": "^1.1.6",
|
|
50
50
|
"nmr-xy-testdata": "^0.5.1",
|
|
51
51
|
"openchemlib": "^7.4.3",
|
|
52
|
-
"prettier": "^2.
|
|
52
|
+
"prettier": "^2.7.1",
|
|
53
53
|
"rimraf": "^3.0.2",
|
|
54
|
-
"ts-jest": "^28.0.
|
|
55
|
-
"typescript": "^4.
|
|
54
|
+
"ts-jest": "^28.0.5",
|
|
55
|
+
"typescript": "^4.7.4"
|
|
56
56
|
},
|
|
57
57
|
"dependencies": {
|
|
58
58
|
"binary-search": "^1.3.6",
|
|
59
59
|
"cross-fetch": "^3.1.5",
|
|
60
60
|
"form-data": "^4.0.0",
|
|
61
|
+
"gyromagnetic-ratio": "^1.0.0",
|
|
61
62
|
"is-any-array": "^2.0.0",
|
|
63
|
+
"linear-sum-assignment": "^1.0.4",
|
|
62
64
|
"ml-array-mean": "^1.1.6",
|
|
63
65
|
"ml-array-rescale": "^1.3.7",
|
|
64
66
|
"ml-array-sequential-fill": "^1.1.8",
|
|
65
67
|
"ml-array-sum": "^1.1.6",
|
|
66
|
-
"ml-gsd": "^11.2.
|
|
68
|
+
"ml-gsd": "^11.2.1",
|
|
67
69
|
"ml-hclust": "^3.1.0",
|
|
68
70
|
"ml-levenberg-marquardt": "^4.1.0",
|
|
69
|
-
"ml-matrix": "^6.10.
|
|
71
|
+
"ml-matrix": "^6.10.2",
|
|
70
72
|
"ml-matrix-convolution": "^1.0.0",
|
|
71
73
|
"ml-matrix-peaks-finder": "^1.0.0",
|
|
72
74
|
"ml-peak-shape-generator": "^4.1.1",
|
|
73
75
|
"ml-simple-clustering": "^0.1.0",
|
|
74
76
|
"ml-sparse-matrix": "^2.1.0",
|
|
75
|
-
"ml-spectra-processing": "^11.
|
|
77
|
+
"ml-spectra-processing": "^11.7.0",
|
|
76
78
|
"ml-tree-set": "^0.1.1",
|
|
77
|
-
"nmr-correlation": "^2.2
|
|
79
|
+
"nmr-correlation": "^2.3.2",
|
|
78
80
|
"openchemlib-utils": "^1.11.0",
|
|
79
|
-
"spectrum-generator": "^8.0.
|
|
81
|
+
"spectrum-generator": "^8.0.2"
|
|
80
82
|
}
|
|
81
83
|
}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { DoubleArray } from 'cheminfo-types';
|
|
2
|
+
|
|
3
|
+
import { applyWindow } from './applyWindow';
|
|
4
|
+
import { compose, ShapeOptions } from './compose';
|
|
5
|
+
|
|
6
|
+
export interface DataReIm {
|
|
7
|
+
/** Array of re values */
|
|
8
|
+
re: DoubleArray;
|
|
9
|
+
/** Array of im values */
|
|
10
|
+
im: DoubleArray;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
interface ApodizationOptions {
|
|
14
|
+
/**
|
|
15
|
+
* number of points at the end of the shape to apply the window function inverted
|
|
16
|
+
* @default 0
|
|
17
|
+
*/
|
|
18
|
+
pointsToShift?: number;
|
|
19
|
+
compose: ShapeOptions;
|
|
20
|
+
}
|
|
21
|
+
export function apodization(data: DataReIm, options: ApodizationOptions) {
|
|
22
|
+
const { compose: composeOptions, pointsToShift } = options;
|
|
23
|
+
const windowData = compose(composeOptions);
|
|
24
|
+
|
|
25
|
+
const applyWindowOptions = {
|
|
26
|
+
windowData,
|
|
27
|
+
pointsToShift,
|
|
28
|
+
};
|
|
29
|
+
|
|
30
|
+
const re = applyWindow(data.re, applyWindowOptions);
|
|
31
|
+
const im = applyWindow(data.im, applyWindowOptions);
|
|
32
|
+
|
|
33
|
+
return { re, im, windowData };
|
|
34
|
+
}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { DoubleArray } from 'cheminfo-types';
|
|
2
|
+
|
|
3
|
+
export interface ApplyWindowOptions {
|
|
4
|
+
/**
|
|
5
|
+
* data of a window function it should be scaled to max = 1 to ensure compatibility with new apodizations.
|
|
6
|
+
*/
|
|
7
|
+
windowData: DoubleArray;
|
|
8
|
+
/**
|
|
9
|
+
* Start Location for Applying Apodize Window
|
|
10
|
+
*/
|
|
11
|
+
start?: number;
|
|
12
|
+
/**
|
|
13
|
+
* length of the window function
|
|
14
|
+
*/
|
|
15
|
+
length?: number;
|
|
16
|
+
/**
|
|
17
|
+
* number of points at the end of the shape to apply the window function inverted
|
|
18
|
+
* @default 0
|
|
19
|
+
*/
|
|
20
|
+
pointsToShift?: number;
|
|
21
|
+
/**
|
|
22
|
+
* output array
|
|
23
|
+
*/
|
|
24
|
+
output?: DoubleArray;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
/**
|
|
28
|
+
* pure function that applies a window function to the input data.
|
|
29
|
+
*/
|
|
30
|
+
export function applyWindow(data: DoubleArray, options: ApplyWindowOptions) {
|
|
31
|
+
const dataLength = data.length;
|
|
32
|
+
|
|
33
|
+
const {
|
|
34
|
+
windowData,
|
|
35
|
+
start = 0,
|
|
36
|
+
length = dataLength,
|
|
37
|
+
pointsToShift = 0,
|
|
38
|
+
output = new Float64Array(data),
|
|
39
|
+
} = options;
|
|
40
|
+
|
|
41
|
+
const firstEndPoint = Math.min(start + length, dataLength - pointsToShift);
|
|
42
|
+
for (let i = start, j = 0; i < firstEndPoint; i++) {
|
|
43
|
+
output[i] *= windowData[j++];
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
for (let i = dataLength - 1, j = 0; i > dataLength - pointsToShift - 1; i--) {
|
|
47
|
+
output[i] *= windowData[j++];
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
return output;
|
|
51
|
+
}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { applyWindow } from './applyWindow';
|
|
2
|
+
import { getFunction } from './getFunction';
|
|
3
|
+
import type { WindowFunctions } from './shapes/WindowFunctions';
|
|
4
|
+
import { getData } from './utils/getData';
|
|
5
|
+
|
|
6
|
+
interface ShapeToAdd {
|
|
7
|
+
/**
|
|
8
|
+
* Start Location for Applying Apodize Window
|
|
9
|
+
*/
|
|
10
|
+
start?: number;
|
|
11
|
+
/**
|
|
12
|
+
* parameters of the shape plus the kind of shape to identify
|
|
13
|
+
*/
|
|
14
|
+
shape: WindowFunctions;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
export interface ShapeOptions {
|
|
18
|
+
/**
|
|
19
|
+
* length of the window shape
|
|
20
|
+
*/
|
|
21
|
+
length: number;
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* parameters of the shape plus the kind of shape to identify
|
|
25
|
+
*/
|
|
26
|
+
shapes?: ShapeToAdd[];
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
export function compose(shapeOptions: ShapeOptions) {
|
|
30
|
+
const { length: dataLength, shapes = [] } = shapeOptions;
|
|
31
|
+
let data = new Float64Array(dataLength).fill(1);
|
|
32
|
+
shapes.forEach((options) => {
|
|
33
|
+
const { shape, start = 0 } = options;
|
|
34
|
+
const { options: shapeOptions } = shape;
|
|
35
|
+
const length =
|
|
36
|
+
'length' in shapeOptions ? shapeOptions.length : dataLength - start;
|
|
37
|
+
|
|
38
|
+
const windowData = getData(getFunction(shape), length);
|
|
39
|
+
applyWindow(data, {
|
|
40
|
+
windowData,
|
|
41
|
+
length,
|
|
42
|
+
start,
|
|
43
|
+
output: data,
|
|
44
|
+
});
|
|
45
|
+
});
|
|
46
|
+
return data;
|
|
47
|
+
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { WindowFunctions } from './shapes/WindowFunctions';
|
|
2
|
+
import { exponential } from './shapes/exponential';
|
|
3
|
+
import { lorentzToGauss } from './shapes/lorentzToGauss';
|
|
4
|
+
|
|
5
|
+
export function getFunction(shape: WindowFunctions) {
|
|
6
|
+
const { kind, options } = shape;
|
|
7
|
+
switch (kind) {
|
|
8
|
+
case 'exponential':
|
|
9
|
+
return exponential(options);
|
|
10
|
+
case 'lorentzToGauss':
|
|
11
|
+
return lorentzToGauss(options);
|
|
12
|
+
default:
|
|
13
|
+
throw Error(`Unknown distribution ${kind as string}`);
|
|
14
|
+
}
|
|
15
|
+
}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { ExponentialOptions } from './exponential';
|
|
2
|
+
import type { LorentzToGaussOptions } from './lorentzToGauss';
|
|
3
|
+
|
|
4
|
+
interface Exponential {
|
|
5
|
+
kind: 'exponential';
|
|
6
|
+
options: ExponentialOptions;
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
interface LorentToGauss {
|
|
10
|
+
kind: 'lorentzToGauss';
|
|
11
|
+
options: LorentzToGaussOptions;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export type WindowFunctions = Exponential | LorentToGauss;
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
export interface ExponentialOptions {
|
|
2
|
+
/**
|
|
3
|
+
* line broadening value in Hz, a negative value will invert the shape
|
|
4
|
+
*/
|
|
5
|
+
lb: number;
|
|
6
|
+
/**
|
|
7
|
+
* increment value in time or the independent value
|
|
8
|
+
*/
|
|
9
|
+
dw: number;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export function exponential(options: ExponentialOptions) {
|
|
13
|
+
const { lb, dw } = options;
|
|
14
|
+
const coefExp = -lb * Math.PI * dw;
|
|
15
|
+
return (i: number) => Math.exp(coefExp * i);
|
|
16
|
+
}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
export interface LorentzToGaussOptions {
|
|
2
|
+
/**
|
|
3
|
+
* size of the shape function
|
|
4
|
+
*/
|
|
5
|
+
length: number;
|
|
6
|
+
/**
|
|
7
|
+
* increment value in time or the independent value
|
|
8
|
+
*/
|
|
9
|
+
dw: number;
|
|
10
|
+
/**
|
|
11
|
+
* Gaussian Broaden Width, Hz
|
|
12
|
+
* @default 0
|
|
13
|
+
*/
|
|
14
|
+
gaussianHz?: number;
|
|
15
|
+
/**
|
|
16
|
+
* Inverse Exponential Width, Hz
|
|
17
|
+
* @default 0
|
|
18
|
+
*/
|
|
19
|
+
exponentialHz?: number;
|
|
20
|
+
/**
|
|
21
|
+
* Location of Gauss Maximum, this value should be between 0 to 1
|
|
22
|
+
* @default 0
|
|
23
|
+
*/
|
|
24
|
+
center?: number;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
export function lorentzToGauss(options: LorentzToGaussOptions) {
|
|
28
|
+
const { dw, length, gaussianHz = 0, exponentialHz = 0, center = 0 } = options;
|
|
29
|
+
|
|
30
|
+
if (center > 1 || center < 0) {
|
|
31
|
+
throw new Error(
|
|
32
|
+
'The center of gaussian shape should be inside of the window function: 0 - 1',
|
|
33
|
+
);
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
const C5 = Math.pow(0.6 * Math.PI * gaussianHz * dw, 2);
|
|
37
|
+
const C2 = center * (length - 1);
|
|
38
|
+
const C6 = Math.PI * dw * exponentialHz;
|
|
39
|
+
|
|
40
|
+
return (i: number) => Math.exp(i * C6 - Math.pow(C2 - i, 2) * C5);
|
|
41
|
+
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* generate and scale the data of a window function
|
|
3
|
+
*/
|
|
4
|
+
export function getData(func: (i: number) => number, length: number) {
|
|
5
|
+
const data = new Float64Array(length);
|
|
6
|
+
let max = Number.MIN_SAFE_INTEGER;
|
|
7
|
+
for (let i = 0; i < length; i++) {
|
|
8
|
+
const value = func(i);
|
|
9
|
+
data[i] = value;
|
|
10
|
+
if (value > max) max = value;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
for (let i = 0; i < length; i++) data[i] /= max;
|
|
14
|
+
return data;
|
|
15
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import TreeSet from 'ml-tree-set';
|
|
2
2
|
|
|
3
3
|
import { Targets, NMRSignal1DWithAtomsAndDiaIDs } from '../get1HAssignments';
|
|
4
4
|
|
|
@@ -38,7 +38,7 @@ export interface Predictions1Dassignments {
|
|
|
38
38
|
}
|
|
39
39
|
|
|
40
40
|
export interface StoreAssignments {
|
|
41
|
-
solutions:
|
|
41
|
+
solutions: TreeSet;
|
|
42
42
|
nSolutions: number;
|
|
43
43
|
}
|
|
44
44
|
|
|
@@ -64,7 +64,7 @@ export async function buildAssignments(props: BuildAssignmentsProps) {
|
|
|
64
64
|
let timeStart = date.getTime();
|
|
65
65
|
|
|
66
66
|
let store: StoreAssignments = {
|
|
67
|
-
solutions: new
|
|
67
|
+
solutions: new TreeSet(comparator),
|
|
68
68
|
nSolutions: 0,
|
|
69
69
|
};
|
|
70
70
|
|
|
@@ -97,7 +97,7 @@ export async function buildAssignments(props: BuildAssignmentsProps) {
|
|
|
97
97
|
let partial = fillPartial(nSources);
|
|
98
98
|
|
|
99
99
|
store = {
|
|
100
|
-
solutions: new
|
|
100
|
+
solutions: new TreeSet(comparator),
|
|
101
101
|
nSolutions: 0,
|
|
102
102
|
};
|
|
103
103
|
|
|
@@ -113,7 +113,7 @@ function addSolution(store: StoreAssignments, props: AddSolutionProps) {
|
|
|
113
113
|
store.nSolutions++;
|
|
114
114
|
let solution: SolutionAssignment = {
|
|
115
115
|
assignment: JSON.parse(JSON.stringify(partial)),
|
|
116
|
-
score
|
|
116
|
+
score,
|
|
117
117
|
};
|
|
118
118
|
|
|
119
119
|
if (store.nSolutions >= maxSolutions) {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import TreeSet from 'ml-tree-set';
|
|
2
2
|
import { Values } from 'nmr-correlation';
|
|
3
3
|
import { Molecule } from 'openchemlib';
|
|
4
4
|
import { getConnectivityMatrix } from 'openchemlib-utils';
|
|
@@ -135,7 +135,7 @@ export async function buildAssignments(props: BuildAssignmentInput) {
|
|
|
135
135
|
let lowerBoundScore = minScore;
|
|
136
136
|
|
|
137
137
|
let store: StoreAssignments = {
|
|
138
|
-
solutions: new
|
|
138
|
+
solutions: new TreeSet(comparator),
|
|
139
139
|
nSolutions: 0,
|
|
140
140
|
};
|
|
141
141
|
|
|
@@ -204,7 +204,7 @@ export async function buildAssignments(props: BuildAssignmentInput) {
|
|
|
204
204
|
);
|
|
205
205
|
|
|
206
206
|
store = {
|
|
207
|
-
solutions: new
|
|
207
|
+
solutions: new TreeSet(comparator),
|
|
208
208
|
nSolutions: 0,
|
|
209
209
|
};
|
|
210
210
|
|
|
@@ -42,7 +42,7 @@ export function hasIDs(
|
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
44
|
|
|
45
|
-
export function addIDs
|
|
45
|
+
export function addIDs<T extends NMRRange[] | NMRZone[]>(data: T) {
|
|
46
46
|
for (const element of data) {
|
|
47
47
|
if (!element.id) element.id = generateID();
|
|
48
48
|
for (let signal of element.signals || []) {
|