nmr-processing 9.9.2 → 10.0.0

package/lib/assignment/get13CAssignments.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.get13CAssignments = void 0;
 const uuid_1 = require("@lukeed/uuid");
-const openchemlib_utils_1 = require("openchemlib-utils");
-const predictCarbon_1 = require("../prediction/predictCarbon");
+const __1 = require("..");
 const buildAssignments_1 = require("./utils/oneDimensionalAssignment/buildAssignments");
 function checkAtomsAndDiaIDs(signals) {
     for (const signal of signals) {
@@ -27,8 +26,12 @@ async function get13CAssignments(ranges, molecule, options = {}) {
     if (!molecule) {
         throw new Error('It is needed a OCL molecule instance to assign');
     }
-    (0, openchemlib_utils_1.ensureHeterotopicChiralBonds)(molecule);
-    const { joinedSignals } = await (0, predictCarbon_1.predictCarbon)(molecule, predictionOptions);
+    const { spectra } = await (0, __1.predict)(molecule, {
+        predictOptions: {
+            C: predictionOptions,
+        },
+    });
+    const joinedSignals = spectra.carbon?.joinedSignals || [];
     checkAtomsAndDiaIDs(joinedSignals);
     const copyRanges = checkIntegration(ranges);
     const targets = {};

package/lib/assignment/get13CAssignments.js.map

@@ -1 +1 @@
-{"version":3,"file":"get13CAssignments.js","sourceRoot":"","sources":["../../src/assignment/get13CAssignments.ts"],"names":[],"mappings":";;;AAAA,uCAAgD;AAEhD,yDAAiE;AAGjE,+DAGqC;AAOrC,wFAG2D;AAE3D,SAAS,mBAAmB,CAC1B,OAAsB;IAEtB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,CAAC,MAAM,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACtE,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACzE;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAkB;IAC1C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS;YAAE,KAAK,CAAC,WAAW,GAAG,CAAC,CAAC;KAC5D;IACD,OAAO,MAAmC,CAAC;AAC7C,CAAC;AA8BM,KAAK,UAAU,iBAAiB,CACrC,MAAkB,EAClB,QAAkB,EAClB,UAAoC,EAAE;IAEtC,MAAM,EACJ,eAAe,GAAG,EAAE,EACpB,QAAQ,GAAG,CAAC,EACZ,YAAY,GAAG,EAAE,EACjB,mBAAmB,GAAG,CAAC,EACvB,OAAO,GAAG,IAAI,EACd,iBAAiB,GAAG,EAAE,GACvB,GAAG,OAAO,CAAC;IAEZ,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;KACnE;IAED,IAAA,gDAA4B,EAAC,QAAQ,CAAC,CAAC;IACvC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,IAAA,6BAAa,EAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAE3E,mBAAmB,CAAC,aAAa,CAAC,CAAC;IACnC,MAAM,UAAU,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAE5C,MAAM,OAAO,GAAY,EAAE,CAAC;IAC5B,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE;QAC9B,MAAM,EAAE,EAAE,GAAG,IAAA,SAAU,GAAE,EAAE,GAAG,KAAK,CAAC;QACpC,OAAO,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;KACjD;IAED,OAAO,IAAA,mCAAgB,EAAC;QACtB,eAAe;QACf,OAAO;QACP,QAAQ;QACR,mBAAmB;QACnB,YAAY;QACZ,OAAO;QACP,aAAa;QACb,yBAAyB,EAAE,KAAK;KACjC,CAAC,CAAC;AACL,CAAC;AAxCD,8CAwCC"}
+{"version":3,"file":"get13CAssignments.js","sourceRoot":"","sources":["../../src/assignment/get13CAssignments.ts"],"names":[],"mappings":";;;AAAA,uCAAgD;AAGhD,0BAAgE;AAQhE,wFAG2D;AAE3D,SAAS,mBAAmB,CAC1B,OAAsB;IAEtB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,CAAC,MAAM,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACtE,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACzE;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAkB;IAC1C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS;YAAE,KAAK,CAAC,WAAW,GAAG,CAAC,CAAC;KAC5D;IACD,OAAO,MAAmC,CAAC;AAC7C,CAAC;AA8BM,KAAK,UAAU,iBAAiB,CACrC,MAAkB,EAClB,QAAkB,EAClB,UAAoC,EAAE;IAEtC,MAAM,EACJ,eAAe,GAAG,EAAE,EACpB,QAAQ,GAAG,CAAC,EACZ,YAAY,GAAG,EAAE,EACjB,mBAAmB,GAAG,CAAC,EACvB,OAAO,GAAG,IAAI,EACd,iBAAiB,GAAG,EAAE,GACvB,GAAG,OAAO,CAAC;IAEZ,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;KACnE;IAED,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,WAAO,EAAC,QAAQ,EAAE;QAC1C,cAAc,EAAE;YACd,CAAC,EAAE,iBAAiB;SACrB;KACF,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,aAAa,IAAI,EAAE,CAAC;IAE1D,mBAAmB,CAAC,aAAa,CAAC,CAAC;IACnC,MAAM,UAAU,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAE5C,MAAM,OAAO,GAAY,EAAE,CAAC;IAC5B,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE;QAC9B,MAAM,EAAE,EAAE,GAAG,IAAA,SAAU,GAAE,EAAE,GAAG,KAAK,CAAC;QACpC,OAAO,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;KACjD;IAED,OAAO,IAAA,mCAAgB,EAAC;QACtB,eAAe;QACf,OAAO;QACP,QAAQ;QACR,mBAAmB;QACnB,YAAY;QACZ,OAAO;QACP,aAAa;QACb,yBAAyB,EAAE,KAAK;KACjC,CAAC,CAAC;AACL,CAAC;AA7CD,8CA6CC"}

package/lib/assignment/get1HAssignments.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.get1HAssignments = void 0;
 const uuid_1 = require("@lukeed/uuid");
-const openchemlib_utils_1 = require("openchemlib-utils");
-const predictProton_1 = require("../prediction/predictProton");
+const __1 = require("..");
 const buildAssignments_1 = require("./utils/oneDimensionalAssignment/buildAssignments");
 function checkAtomsAndDiaIDs(signals) {
     for (const signal of signals) {
@@ -27,9 +26,12 @@ async function get1HAssignments(ranges, molecule, options = {}) {
     if (!molecule) {
         throw new Error('It is needed a OCL molecule instance to assign');
     }
-    molecule.addImplicitHydrogens();
-    (0, openchemlib_utils_1.ensureHeterotopicChiralBonds)(molecule);
-    const { joinedSignals } = await (0, predictProton_1.predictProton)(molecule, predictionOptions);
+    const { spectra } = await (0, __1.predict)(molecule, {
+        predictOptions: {
+            H: predictionOptions,
+        },
+    });
+    const joinedSignals = spectra.proton?.joinedSignals || [];
     checkForIntegration(ranges);
     checkAtomsAndDiaIDs(joinedSignals);
     const targets = {};

package/lib/assignment/get1HAssignments.js.map

@@ -1 +1 @@
-{"version":3,"file":"get1HAssignments.js","sourceRoot":"","sources":["../../src/assignment/get1HAssignments.ts"],"names":[],"mappings":";;;AAAA,uCAAgD;AAEhD,yDAAiE;AAGjE,+DAGqC;AAIrC,wFAG2D;AAO3D,SAAS,mBAAmB,CAC1B,OAAsB;IAEtB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,CAAC,MAAM,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACtE,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACzE;AACH,CAAC;AAID,SAAS,mBAAmB,CAC1B,MAAkB;IAElB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS,EAAE;YACnC,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;SACxD;KACF;AACH,CAAC;AAgCM,KAAK,UAAU,gBAAgB,CACpC,MAAkB,EAClB,QAAkB,EAClB,UAAmC,EAAE;IAErC,MAAM,EACJ,eAAe,EACf,QAAQ,GAAG,CAAC,EACZ,YAAY,GAAG,EAAE,EACjB,mBAAmB,GAAG,CAAC,EACvB,OAAO,GAAG,IAAI,EACd,iBAAiB,GAAG,EAAE,GACvB,GAAG,OAAO,CAAC;IAEZ,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;KACnE;IAED,QAAQ,CAAC,oBAAoB,EAAE,CAAC;IAChC,IAAA,gDAA4B,EAAC,QAAQ,CAAC,CAAC;IAEvC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,IAAA,6BAAa,EAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAE3E,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC5B,mBAAmB,CAAC,aAAa,CAAC,CAAC;IAEnC,MAAM,OAAO,GAAY,EAAE,CAAC;IAC5B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,MAAM,EAAE,EAAE,GAAG,IAAA,SAAU,GAAE,EAAE,GAAG,KAAK,CAAC;QACpC,OAAO,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;KACjD;IAED,OAAO,IAAA,mCAAgB,EAAC;QACtB,eAAe;QACf,OAAO;QACP,QAAQ;QACR,mBAAmB;QACnB,YAAY;QACZ,OAAO;QACP,aAAa;QACb,yBAAyB,EAAE,IAAI;KAChC,CAAC,CAAC;AACL,CAAC;AA1CD,4CA0CC"}
+{"version":3,"file":"get1HAssignments.js","sourceRoot":"","sources":["../../src/assignment/get1HAssignments.ts"],"names":[],"mappings":";;;AAAA,uCAAgD;AAGhD,0BAAuC;AAKvC,wFAG2D;AAO3D,SAAS,mBAAmB,CAC1B,OAAsB;IAEtB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,CAAC,MAAM,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACtE,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACzE;AACH,CAAC;AAID,SAAS,mBAAmB,CAC1B,MAAkB;IAElB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS,EAAE;YACnC,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;SACxD;KACF;AACH,CAAC;AAgCM,KAAK,UAAU,gBAAgB,CACpC,MAAkB,EAClB,QAAkB,EAClB,UAAmC,EAAE;IAErC,MAAM,EACJ,eAAe,EACf,QAAQ,GAAG,CAAC,EACZ,YAAY,GAAG,EAAE,EACjB,mBAAmB,GAAG,CAAC,EACvB,OAAO,GAAG,IAAI,EACd,iBAAiB,GAAG,EAAE,GACvB,GAAG,OAAO,CAAC;IAEZ,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;KACnE;IAED,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,WAAO,EAAC,QAAQ,EAAE;QAC1C,cAAc,EAAE;YACd,CAAC,EAAE,iBAAiB;SACrB;KACF,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,aAAa,IAAI,EAAE,CAAC;IAE1D,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC5B,mBAAmB,CAAC,aAAa,CAAC,CAAC;IAEnC,MAAM,OAAO,GAAY,EAAE,CAAC;IAC5B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,MAAM,EAAE,EAAE,GAAG,IAAA,SAAU,GAAE,EAAE,GAAG,KAAK,CAAC;QACpC,OAAO,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;KACjD;IAED,OAAO,IAAA,mCAAgB,EAAC;QACtB,eAAe;QACf,OAAO;QACP,QAAQ;QACR,mBAAmB;QACnB,YAAY;QACZ,OAAO;QACP,aAAa;QACb,yBAAyB,EAAE,IAAI;KAChC,CAAC,CAAC;AACL,CAAC;AA7CD,4CA6CC"}

package/lib/assignment/utils/generalAssignment/buildAssignments.d.ts

@@ -1,6 +1,8 @@
 import { Values } from 'nmr-correlation';
 import type { Molecule } from 'openchemlib/full';
-import { NMRSignal1D, PredictCarbonOptions, PredictProtonOptions } from '../../..';
+import { PredictCarbonOptions } from '../../../prediction/predictCarbon';
+import { PredictProtonOptions } from '../../../prediction/predictProton';
+import { NMRSignal1D } from '../../../signals/NMRSignal1D';
 import { MakeMandatory } from '../../../utilities/MakeMandatory';
 import { SpectraDataWithIds } from '../../nmrAssigment';
 import { TargetsByAtomType } from './getTargetsAndCorrelations';

package/lib/assignment/utils/generalAssignment/buildAssignments.js

@@ -6,8 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildAssignments = exports.getAllHydrogens = void 0;
 const ml_tree_set_1 = __importDefault(require("ml-tree-set"));
 const openchemlib_utils_1 = require("openchemlib-utils");
-const predictCarbon_1 = require("../../../prediction/predictCarbon");
-const predictProton_1 = require("../../../prediction/predictProton");
+const predict_1 = require("../../../prediction/predict");
 const createMapPossibleAssignment_1 = require("./createMapPossibleAssignment");
 const exploreTree_1 = require("./exploreTree");
 const isSpectraData1D_1 = require("./isSpectraData1D");
@@ -15,7 +14,6 @@ const searchIndices_1 = require("./searchIndices");
 const comparator = (a, b) => {
     return b.score - a.score;
 };
-const predictor = { H: predictProton_1.predictProton, C: predictCarbon_1.predictCarbon };
 function checkNMRSignal1D(signals) {
     const keys = [
         'nbAtoms',
@@ -49,11 +47,15 @@ async function buildAssignments(props) {
     let diaIDPeerPossibleAssignment = {};
     for (const atomTypesToPredict of assignmentOrder) {
         for (const atomType of atomTypesToPredict) {
-            const options = predictionOptions[atomType];
+            const options = {};
+            options[atomType] = predictionOptions[atomType];
             const predictedSignals = inputPrediction[atomType];
-            const { joinedSignals } = predictedSignals
-                ? { joinedSignals: predictedSignals }
-                : await predictor[atomType](molecule, options);
+            const joinedSignals = await getJoinedSignals({
+                molecule,
+                predictedSignals,
+                options,
+                atomType,
+            });
             checkNMRSignal1D(joinedSignals);
             if (!predictions[atomType])
                 predictions[atomType] = {};
@@ -209,4 +211,13 @@ function fillPartial(nSources, value = null) {
     }
     return partial;
 }
+async function getJoinedSignals(input) {
+    const { molecule, predictedSignals, options, atomType } = input;
+    if (predictedSignals)
+        return predictedSignals;
+    const { spectra } = await (0, predict_1.predict)(molecule, {
+        predictOptions: options,
+    });
+    return spectra[atomType === 'C' ? 'carbon' : 'proton']?.joinedSignals || [];
+}
 //# sourceMappingURL=buildAssignments.js.map

package/lib/assignment/utils/generalAssignment/buildAssignments.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildAssignments.js","sourceRoot":"","sources":["../../../../src/assignment/utils/generalAssignment/buildAssignments.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAkC;AAGlC,yDAA0D;AAO1D,qEAAkE;AAClE,qEAAkE;AAKlE,+EAGuC;AACvC,+CAAgE;AAEhE,uDAAoD;AACpD,mDAAgD;AAEhD,MAAM,UAAU,GAAG,CAAC,CAAqB,EAAE,CAAqB,EAAE,EAAE;IAClE,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,EAAE,CAAC,EAAE,6BAAa,EAAE,CAAC,EAAE,6BAAa,EAAE,CAAC;AAwCzD,SAAS,gBAAgB,CACvB,OAAsB;IAEtB,MAAM,IAAI,GAA0C;QAClD,SAAS;QACT,QAAQ;QACR,OAAO;KACR,CAAC;IACF,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,YAAY,GAAG,iBAAiB,CAAC,CAAC;SACrE;KACF;AACH,CAAC;AAsBY,QAAA,eAAe,GAAG;IAC7B,CAAC,EAAE,CAAC,CAAW,EAAE,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC;IACnD,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;CACX,CAAC;AAEK,KAAK,UAAU,gBAAgB,CAAC,KAA2B;IAChE,MAAM,EACJ,OAAO,EACP,QAAQ,EACR,eAAe,EACf,OAAO,EACP,QAAQ,EACR,mBAAmB,GAAG,EAAE,EACxB,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,iBAAiB,EACjB,WAAW,EAAE,eAAe,GAAG,EAAE,EACjC,OAAO,GACR,GAAG,KAAK,CAAC;IAEV,MAAM,eAAe,GAAG,QAAQ,CAAC;IAEjC,IAAI,KAAK,GAAqB;QAC5B,SAAS,EAAE,IAAI,qBAAO,CAAC,UAAU,CAAC;QAClC,UAAU,EAAE,CAAC;KACd,CAAC;IAEF,MAAM,gBAAgB,GAAG,IAAA,yCAAqB,EAAC,QAAQ,EAAE;QACvD,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IAEH,MAAM,cAAc,GAAmB,EAAE,CAAC;IAC1C,MAAM,WAAW,GAA0B,EAAE,CAAC;IAC9C,IAAI,qBAAqB,GAA2B,EAAE,CAAC;IACvD,IAAI,2BAA2B,GAAgC,EAAE,CAAC;IAElE,KAAK,MAAM,kBAAkB,IAAI,eAAe,EAAE;QAChD,KAAK,MAAM,QAAQ,IAAI,kBAAkB,EAAE;YACzC,MAAM,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YAC5C,MAAM,gBAAgB,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;YACnD,MAAM,EAAE,aAAa,EAAE,GAAG,gBAAgB;gBACxC,CAAC,CAAC,EAAE,aAAa,EAAE,gBAAgB,EAAE;gBACrC,CAAC,CAAC,MAAM,SAAS,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAEjD,gBAAgB,CAAC,aAAa,CAAC,CAAC;YAEhC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;gBAAE,WAAW,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YAEvD,IAAI,cAAc,GAAG,CAAC,CAAC;YACvB,KAAK,MAAM,UAAU,IAAI,aAAa,EAAE;gBACtC,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACnC,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAClC,MAAM,YAAY,GAAG,uBAAe,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;gBAChE,cAAc,IAAI,UAAU,CAAC,OAAO,GAAG,YAAY,CAAC;gBACpD,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG;oBAC7B,GAAG,UAAU;oBACb,UAAU,EAAE,KAAK;oBACjB,YAAY,EAAE,UAAU,CAAC,OAAO,GAAG,YAAY;oBAC/C,YAAY,EAAE,YAAY;oBAC1B,UAAU,EAAE,gBAAgB,CAAC,KAAK,CAAa;iBAChD,CAAC;aACH;YACD,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,QAAQ,CAAC,EAAE;gBACzC,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,YAAY,IAAI,GAAG,GAAG,cAAc,CAAC;aACnE;YACD,cAAc,CAAC,QAAQ,CAAC,GAAG;gBACzB,QAAQ,EAAE,aAAa,CAAC,MAAM;gBAC9B,YAAY,EAAE,CAAC;gBACf,mBAAmB,EAAE,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC;aACxD,CAAC;SACH;QAED,qBAAqB,GAAG,IAAA,yDAA2B,EAAC,qBAAqB,EAAE;YACzE,eAAe;YACf,WAAW;YACX,OAAO;SACR,CAAC,CAAC;QAEH,2BAA2B,GAAG,EAAE,CAAC;QACjC,KAAK,MAAM,QAAQ,IAAI,qBAAqB,EAAE;YAC5C,2BAA2B,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,IAAI,CACjD,qBAAqB,CAAC,QAAQ,CAAC,CAChC,CAAC;SACH;QAED,MAAM,gBAAgB,GAAG,mBAAmB,CAC1C,KAAK,EACL,cAAc,EACd,kBAAkB,CACnB,CAAC;QAEF,KAAK,GAAG;YACN,SAAS,EAAE,IAAI,qBAAO,CAAC,UAAU,CAAC;YAClC,UAAU,EAAE,CAAC;SACd,CAAC;QAEF,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAE7B,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE;YACtC,IAAA,yBAAW,EACT;gBACE,gBAAgB,EAAE,kBAAkB;gBACpC,eAAe;gBACf,OAAO;gBACP,SAAS;gBACT,OAAO;gBACP,WAAW;gBACX,YAAY;gBACZ,YAAY;gBACZ,eAAe;gBACf,qBAAqB;gBACrB,2BAA2B;aAC5B,EACD,cAAc,EACd,OAAO,EACP,KAAK,CACN,CAAC;SACH;KACF;IACD,OAAO,mBAAmB,CAAC;QACzB,KAAK;QACL,OAAO;QACP,2BAA2B;QAC3B,OAAO;KACR,CAAC,CAAC;AACL,CAAC;AAzHD,4CAyHC;AASD,SAAS,mBAAmB,CAAC,KAA+B;IAC1D,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,2BAA2B,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACvE,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,MAAM,WAAW,GAAQ,EAAE,CAAC;IAC5B,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAgB,CAAC;IACtD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,MAAM,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC3C,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE;YACvC,MAAM,MAAM,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YAC1C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE;gBAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBAChC,IAAI,WAAW,CAAC,QAAQ,CAAC;oBAAE,SAAS;gBACpC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,IAAA,6BAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;aAChE;SACF;KACF;IAED,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,QAAQ,EAAE;QACzC,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAC9B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CACA,CAAC;QAC1B,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC;QACvC,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAgB,CAAC;QACzD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,MAAM,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC3C,MAAM,sBAAsB,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;YACpD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,sBAAsB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;gBAClE,MAAM,QAAQ,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;gBAE/C,IAAI,QAAQ,KAAK,GAAG,IAAI,CAAC,QAAQ;oBAAE,SAAS;gBAE5C,MAAM,MAAM,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;gBAC1C,MAAM,KAAK,GAAG,2BAA2B,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC;gBAE3D,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE;oBAC9B,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,WAAW,EAAE,GAChD,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBAC9B,MAAM,QAAQ,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;oBAE9C,IAAI,IAAA,iCAAe,EAAC,QAAQ,CAAC,EAAE;wBAC7B,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;wBAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;wBACnC,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;wBAC1C,IAAI,CAAC,MAAM,CAAC,MAAM;4BAAE,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC;wBACvC,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;4BAAE,SAAS;wBAC5C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;qBAC3B;yBAAM;wBACL,MAAM,IAAI,GAAG,IAAI,CAAC,IAAiB,CAAC;wBACpC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;wBACjE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM;4BAAE,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,EAAE,CAAC;wBACnD,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC;4BAAE,SAAS;wBACnD,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;qBAClC;iBACF;aACF;SACF;QACD,MAAM,CAAC,IAAI,CAAC;YACV,KAAK;YACL,UAAU,EAAE,aAAa;SAC1B,CAAC,CAAC;KACJ;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,mBAAmB,CAC1B,KAAuB,EACvB,cAA8B,EAC9B,YAA0B;IAE1B,OAAO,KAAK,CAAC,UAAU,GAAG,CAAC;QACzB,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACjC,MAAM,iBAAiB,GAAG,CAAC,CAAC,UAAU,CAAC;YACvC,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE;gBAC/B,iBAAiB,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC;aACtE;YACD,OAAO,iBAAiB,CAAC;QAC3B,CAAC,CAAC;QACJ,CAAC,CAAC,kBAAkB,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;AACvD,CAAC;AAED,SAAS,kBAAkB,CACzB,cAA8B,EAC9B,YAA0B;IAE1B,MAAM,OAAO,GAAY,EAAE,CAAC;IAC5B,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAiB,CAAC;IAC9D,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE;QAC5B,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;QACvD,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;KACnE;IACD,OAAO,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC;AAED,SAAS,WAAW,CAAC,QAAgB,EAAE,QAAuB,IAAI;IAChE,MAAM,OAAO,GAAG,IAAI,KAAK,CAAgB,QAAQ,CAAC,CAAC;IACnD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE;QACjC,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;KACpB;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"buildAssignments.js","sourceRoot":"","sources":["../../../../src/assignment/utils/generalAssignment/buildAssignments.ts"],"names":[],"mappings":"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"}

package/lib/index.d.ts

@@ -5,13 +5,6 @@ export * from './constants/couplingPatterns';
 export * from './peaks/peaksFilterImpurities';
 export * from './peaks/peaksToXY';
 export * from './peaks/peakToXY';
-export * from './prediction/predictProton';
-export * from './prediction/predictCarbon';
-export * from './prediction/predictCOSY';
-export * from './prediction/predictHSQC';
-export * from './prediction/predictHMBC';
-export * from './prediction/predictAll';
-export * from './prediction/predictAllSpectra';
 export * from './assignment/get1HAssignments';
 export * from './assignment/get13CAssignments';
 export * from './assignment/getAssignments';
@@ -25,6 +18,8 @@ export * from './signals/signalsToFID';
 export * from './signals/simulation/simulate1D';
 export * from './signal/signalJoinCouplings';
 export * from './signal/signalMultiplicityPattern';
+export * from './prediction/predict';
+export * from './prediction/predictSpectra';
 export * from './utilities/resurrect';
 export * from './utilities/rangeFromSignal';
 export * from './utilities/getFrequency';

package/lib/index.js

@@ -34,13 +34,6 @@ __exportStar(require("./constants/couplingPatterns"), exports);
 __exportStar(require("./peaks/peaksFilterImpurities"), exports);
 __exportStar(require("./peaks/peaksToXY"), exports);
 __exportStar(require("./peaks/peakToXY"), exports);
-__exportStar(require("./prediction/predictProton"), exports);
-__exportStar(require("./prediction/predictCarbon"), exports);
-__exportStar(require("./prediction/predictCOSY"), exports);
-__exportStar(require("./prediction/predictHSQC"), exports);
-__exportStar(require("./prediction/predictHMBC"), exports);
-__exportStar(require("./prediction/predictAll"), exports);
-__exportStar(require("./prediction/predictAllSpectra"), exports);
 __exportStar(require("./assignment/get1HAssignments"), exports);
 __exportStar(require("./assignment/get13CAssignments"), exports);
 __exportStar(require("./assignment/getAssignments"), exports);
@@ -54,6 +47,8 @@ __exportStar(require("./signals/signalsToFID"), exports);
 __exportStar(require("./signals/simulation/simulate1D"), exports);
 __exportStar(require("./signal/signalJoinCouplings"), exports);
 __exportStar(require("./signal/signalMultiplicityPattern"), exports);
+__exportStar(require("./prediction/predict"), exports);
+__exportStar(require("./prediction/predictSpectra"), exports);
 __exportStar(require("./utilities/resurrect"), exports);
 __exportStar(require("./utilities/rangeFromSignal"), exports);
 __exportStar(require("./utilities/getFrequency"), exports);

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,yDAAuC;AACvC,2DAAyC;AACzC,+DAA6C;AAE7C,gEAA8C;AAC9C,oDAAkC;AAClC,mDAAiC;AAEjC,6DAA2C;AAC3C,6DAA2C;AAC3C,2DAAyC;AACzC,2DAAyC;AACzC,2DAAyC;AACzC,0DAAwC;AACxC,iEAA+C;AAE/C,gEAA8C;AAC9C,iEAA+C;AAC/C,8DAA4C;AAE5C,uDAAqC;AACrC,sDAAoC;AAEpC,4DAA0C;AAC1C,wDAAsC;AACtC,yDAAuC;AACvC,4DAA0C;AAC1C,yDAAuC;AACvC,kEAAgD;AAChD,+DAA6C;AAC7C,qEAAmD;AAEnD,wDAAsC;AACtC,8DAA4C;AAC5C,2DAAyC;AACzC,+DAA6C;AAE7C,0DAAwC;AACxC,2DAAyC;AACzC,2DAAyC;AAEzC,4DAA0C;AAC1C,8DAA4C;AAC5C,wDAAsC;AACtC,4DAA0C;AAE1C,0DAAwC;AACxC,+DAA6C;AAC7C,+DAA6C;AAE7C,6DAA2C;AAC3C,6DAA2C;AAE3C,4DAA0C;AAE1C,mEAAiD;AAEjD,+DAA6C;AAC7C,+DAA6C;AAC7C,gEAA8C;AAC9C,mEAAiD;AACjD,oEAAkD;AAElD,kDAAgC;AAChC,yEAAyD;AACzD,iEAA+C;AAC/C,6EAA2D;AAC3D,gEAA8C;AAC9C,iEAA+C;AAC/C,oEAAkD;AAClD,oEAAkD;AAClD,yEAAuD;AACvD,kFAAgE;AAChE,qFAAmE;AACnE,sFAAsE"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,yDAAuC;AACvC,2DAAyC;AACzC,+DAA6C;AAE7C,gEAA8C;AAC9C,oDAAkC;AAClC,mDAAiC;AAEjC,gEAA8C;AAC9C,iEAA+C;AAC/C,8DAA4C;AAE5C,uDAAqC;AACrC,sDAAoC;AAEpC,4DAA0C;AAC1C,wDAAsC;AACtC,yDAAuC;AACvC,4DAA0C;AAC1C,yDAAuC;AACvC,kEAAgD;AAChD,+DAA6C;AAC7C,qEAAmD;AAEnD,uDAAqC;AACrC,8DAA4C;AAE5C,wDAAsC;AACtC,8DAA4C;AAC5C,2DAAyC;AACzC,+DAA6C;AAE7C,0DAAwC;AACxC,2DAAyC;AACzC,2DAAyC;AAEzC,4DAA0C;AAC1C,8DAA4C;AAC5C,wDAAsC;AACtC,4DAA0C;AAE1C,0DAAwC;AACxC,+DAA6C;AAC7C,+DAA6C;AAE7C,6DAA2C;AAC3C,6DAA2C;AAE3C,4DAA0C;AAE1C,mEAAiD;AAEjD,+DAA6C;AAC7C,+DAA6C;AAC7C,gEAA8C;AAC9C,mEAAiD;AACjD,oEAAkD;AAElD,kDAAgC;AAChC,yEAAyD;AACzD,iEAA+C;AAC/C,6EAA2D;AAC3D,gEAA8C;AAC9C,iEAA+C;AAC/C,oEAAkD;AAClD,oEAAkD;AAClD,yEAAuD;AACvD,kFAAgE;AAChE,qFAAmE;AACnE,sFAAsE"}

package/lib/prediction/GroupDiastereotopicAtomIDs.d.ts

@@ -0,0 +1,6 @@
+export interface GroupDiastereotopicAtomIDs {
+    counter: number;
+    atoms: number[];
+    oclID: string;
+    atomLabel: string;
+}

package/lib/prediction/GroupDiastereotopicAtomIDs.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=GroupDiastereotopicAtomIDs.js.map

package/lib/prediction/GroupDiastereotopicAtomIDs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GroupDiastereotopicAtomIDs.js","sourceRoot":"","sources":["../../src/prediction/GroupDiastereotopicAtomIDs.ts"],"names":[],"mappings":""}

package/lib/prediction/Prediction1D.d.ts

@@ -1,12 +1,7 @@
 import type { Molecule } from 'openchemlib/full';
-import type { NMRSignal1D } from '../signals/NMRSignal1D';
-import type { NMRRange } from '../xy/NMRRange';
-export interface Prediction1D {
+import type { PredictionBase1D } from './PredictionBase1D';
+export interface Prediction1D extends PredictionBase1D {
     molfile: string;
     diaIDs: string[];
-    nucleus: string;
-    joinedSignals: NMRSignal1D[];
-    signals: NMRSignal1D[];
-    ranges: NMRRange[];
     molecule: Molecule;
 }

package/lib/prediction/Prediction2D.d.ts

@@ -1,12 +1,7 @@
 import type { Molecule } from 'openchemlib/full';
-import { NMRSignal2D } from '../xyz/NMRSignal2D';
-import { NMRZone } from '../xyz/NMRZone';
-export interface Prediction2D {
+import { PredictionBase2D } from './PredictionBase2D';
+export interface Prediction2D extends PredictionBase2D {
     molfile: string;
     diaIDs: string[];
-    nuclei: string[];
-    joinedSignals: NMRSignal2D[];
-    signals: NMRSignal2D[];
-    zones: NMRZone[];
     molecule: Molecule;
 }

package/lib/prediction/PredictionBase1D.d.ts

@@ -0,0 +1,8 @@
+import type { NMRSignal1D } from '../signals/NMRSignal1D';
+import type { NMRRange } from '../xy/NMRRange';
+export interface PredictionBase1D {
+    nucleus: string;
+    joinedSignals: NMRSignal1D[];
+    signals: NMRSignal1D[];
+    ranges: NMRRange[];
+}

package/lib/prediction/PredictionBase1D.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=PredictionBase1D.js.map

package/lib/prediction/PredictionBase1D.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PredictionBase1D.js","sourceRoot":"","sources":["../../src/prediction/PredictionBase1D.ts"],"names":[],"mappings":""}

package/lib/prediction/PredictionBase2D.d.ts

@@ -0,0 +1,8 @@
+import { NMRSignal2D } from '../xyz/NMRSignal2D';
+import { NMRZone } from '../xyz/NMRZone';
+export interface PredictionBase2D {
+    nuclei: string[];
+    joinedSignals: NMRSignal2D[];
+    signals: NMRSignal2D[];
+    zones: NMRZone[];
+}

package/lib/prediction/PredictionBase2D.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=PredictionBase2D.js.map

package/lib/prediction/PredictionBase2D.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PredictionBase2D.js","sourceRoot":"","sources":["../../src/prediction/PredictionBase2D.ts"],"names":[],"mappings":""}

package/lib/prediction/predict.d.ts

@@ -0,0 +1,55 @@
+import type { Logger } from 'cheminfo-types';
+import type { Molecule } from 'openchemlib/full';
+import { PredictionBase1D } from './PredictionBase1D';
+import { PredictionBase2D } from './PredictionBase2D';
+import { PredictCOSYOptions } from './predictCOSY';
+import { PredictCarbonOptions } from './predictCarbon';
+import { PredictHMBCOptions } from './predictHMBC';
+import { PredictHSQCOptions } from './predictHSQC';
+import { PredictProtonOptions } from './predictProton';
+export interface PredictionOptionsByExperiment {
+    H?: Partial<PredictProtonOptions>;
+    C?: Partial<PredictCarbonOptions>;
+    hsqc?: Partial<PredictHSQCOptions>;
+    cosy?: Partial<PredictCOSYOptions>;
+    hmbc?: Partial<PredictHMBCOptions>;
+}
+export interface PredictAllOptions {
+    /**
+     *  mono dimensional signal to generate the bidimenionals cross peaks.
+     * The object should has properties with name equal to "H" and "C".
+     */
+    predictOptions?: PredictionOptionsByExperiment;
+    /**
+     * signals with euclidean distance in ppm less than this it will
+     * joined into a zone.
+     * @default {H:0.05,C:0.5}
+     */
+    joinDistance?: {
+        H: number;
+        C: number;
+    };
+    logger?: Logger;
+}
+export interface PredictedSpectra {
+    proton?: PredictionBase1D;
+    carbon?: PredictionBase1D;
+    cosy?: PredictionBase2D;
+    hsqc?: PredictionBase2D;
+    hmbc?: PredictionBase2D;
+}
+export interface Predicted {
+    molfile: string;
+    molfileWithH: string;
+    hoses: any[];
+    diaIDs: any[] | undefined;
+    groupedDiaIDs: any[];
+    moleculeWithHydrogens: Molecule;
+    distanceMatrix: any[];
+    spectra: PredictedSpectra;
+}
+/**
+ * Generate the correlation bidimensional nmr peaks based on the number of bonds between a pair of atoms
+ * @returns {Promise<object>} - object with molfile, diaIDs, 1D and 2D signals, joined signals, ranges and zones.
+ */
+export declare function predict(molecule: Molecule, options?: PredictAllOptions): Promise<Predicted>;

package/lib/prediction/predict.js

@@ -0,0 +1,113 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.predict = void 0;
+const openchemlib_utils_1 = require("openchemlib-utils");
+const predictCOSY_1 = require("./predictCOSY");
+const predictCarbon_1 = require("./predictCarbon");
+const predictHMBC_1 = require("./predictHMBC");
+const predictHSQC_1 = require("./predictHSQC");
+const predictProton_1 = require("./predictProton");
+const shouldPredict_1 = require("./utils/shouldPredict");
+const toPredict = {
+    cosy: {
+        predictor: predictCOSY_1.predictCOSY,
+        required: ['H'],
+        message: 'Proton prediction is missing so COSY could not be generated.',
+    },
+    hsqc: {
+        predictor: predictHSQC_1.predictHSQC,
+        required: ['H', 'C'],
+        message: 'Carbon and / or proton prediction is missing so HSQC could not be generated.',
+    },
+    hmbc: {
+        predictor: predictHMBC_1.predictHMBC,
+        required: ['H', 'C'],
+        message: 'Carbon and / or proton prediction is missing so HMBC could not be generated.',
+    },
+};
+/**
+ * Generate the correlation bidimensional nmr peaks based on the number of bonds between a pair of atoms
+ * @returns {Promise<object>} - object with molfile, diaIDs, 1D and 2D signals, joined signals, ranges and zones.
+ */
+async function predict(molecule, options = {}) {
+    const { logger, joinDistance = { H: 0.05, C: 0.5 }, predictOptions = {
+        H: {},
+        C: {},
+        hsqc: {},
+        hmbc: {},
+        cosy: {},
+    }, } = options;
+    const hoseCodesAndInfo = (0, openchemlib_utils_1.getHoseCodesAndInfo)(molecule, {
+        maxSphereSize: predictOptions?.C?.maxSphereSize,
+    });
+    const { diaIDs = [], moleculeWithHydrogens, hoses, molfileWithH, distanceMatrix, } = hoseCodesAndInfo;
+    const groupedDiaIDs = (0, openchemlib_utils_1.groupDiastereotopicAtomIDs)(diaIDs, moleculeWithHydrogens);
+    const protonPrediction = (0, shouldPredict_1.shouldPredict)('H', predictOptions)
+        ? await (0, predictProton_1.predictProton)(molfileWithH, {
+            ...predictOptions?.H,
+            diaIDs,
+            distanceMatrix,
+        })
+        : undefined;
+    const carbonPrediction = (0, shouldPredict_1.shouldPredict)('C', predictOptions)
+        ? await (0, predictCarbon_1.predictCarbon)({
+            ...predictOptions?.C,
+            molfile: molfileWithH,
+            groupedDiaIDs,
+            hoses,
+        })
+        : undefined;
+    const spectra = {};
+    const predictions = {};
+    if (check1DPrediction(protonPrediction, diaIDs)) {
+        predictions.H = protonPrediction;
+        if ('H' in predictOptions)
+            spectra.proton = protonPrediction;
+    }
+    if (check1DPrediction(carbonPrediction, diaIDs)) {
+        predictions.C = carbonPrediction;
+        if ('C' in predictOptions)
+            spectra.carbon = carbonPrediction;
+    }
+    const optionsTwoD = {
+        predictions,
+        joinDistance,
+        distanceMatrix,
+        groupedDiaIDs,
+        diaIDs,
+    };
+    for (const key in predictOptions) {
+        if (key === 'H' || key === 'C')
+            continue;
+        const { predictor, required, message } = toPredict[key];
+        if (required.every((key) => key in predictions)) {
+            spectra[key] = await predictor(molecule, {
+                ...optionsTwoD,
+                ...predictOptions[key],
+            });
+        }
+        else if (logger) {
+            logger.warn(message);
+        }
+    }
+    return {
+        ...hoseCodesAndInfo,
+        groupedDiaIDs,
+        spectra,
+    };
+}
+exports.predict = predict;
+function check1DPrediction(prediction, diaIDs = []) {
+    if (!prediction)
+        return false;
+    if (prediction.ranges.length === 0)
+        return false;
+    const { signals } = prediction;
+    for (const signal of signals) {
+        const isCorrect = signal.diaIDs?.every((diaID) => diaIDs.includes(diaID));
+        if (!isCorrect)
+            return false;
+    }
+    return true;
+}
+//# sourceMappingURL=predict.js.map

package/lib/prediction/predict.js.map

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

package/lib/prediction/predictCOSY.d.ts

@@ -1,7 +1,7 @@
 import type { Molecule } from 'openchemlib/full';
-import type { Prediction1D } from './Prediction1D';
+import { GroupDiastereotopicAtomIDs } from './GroupDiastereotopicAtomIDs';
+import type { PredictionBase1D } from './PredictionBase1D';
 import { PredictProtonOptions } from './predictProton';
-import { Predictor } from './utils/predict2D';
 export interface PredictCOSYOptions {
     /**
      * maximum number of bonds to take into account.
@@ -13,13 +13,6 @@ export interface PredictCOSYOptions {
      * @default 2
      */
     minLength?: number;
-    /**
-     * mono dimensional predictors. The object should has properties with name
-     * equal to "H" and "C".
-     */
-    predictor?: {
-        H?: Predictor;
-    };
     /**
      *  mono dimensional signal to generate the bidimenionals cross peaks.
      * The object should has properties with name equal to "H" and "C".
@@ -41,18 +34,27 @@ export interface PredictCOSYOptions {
      * The object should has properties with name equal to "H" and "C".
      * the value of each prediction should be similar that predictProton and predictCarbon.
      */
-    predictions?: {
-        [key: string]: Prediction1D | undefined;
-        H?: Prediction1D;
+    predictions: {
+        [key: string]: PredictionBase1D | undefined;
+        H?: PredictionBase1D;
     };
     /**
      * if true, the self correlation signal will be add to the prediction.
      * @default true
      */
     includeDiagonal?: boolean;
+    /**
+     * diastereotopic atom ids of the molecule.
+     */
+    diaIDs: string[];
+    /**
+     * grouped diastereotopic atom ids of the molecule.
+     */
+    groupedDiaIDs: GroupDiastereotopicAtomIDs[];
+    distanceMatrix: number[][];
 }
 /**
  * Generate the correlation bidimensional nmr peaks based on the number of bonds between a pair of atoms
  * @returns {Promise<object>} - object with molfile, diaIDs, 2D signals joined signals and zones.
  */
-export declare function predictCOSY(molecule: Molecule, options?: PredictCOSYOptions): Promise<import("./Prediction2D").Prediction2D>;
+export declare function predictCOSY(molecule: Molecule, options: PredictCOSYOptions): Promise<import("./PredictionBase2D").PredictionBase2D>;

package/lib/prediction/predictCOSY.js

@@ -1,24 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.predictCOSY = void 0;
-const predictProton_1 = require("./predictProton");
 const predict2D_1 = require("./utils/predict2D");
 /**
  * Generate the correlation bidimensional nmr peaks based on the number of bonds between a pair of atoms
  * @returns {Promise<object>} - object with molfile, diaIDs, 2D signals joined signals and zones.
  */
-async function predictCOSY(molecule, options = {}) {
-    const { minLength = 2, maxLength = 3, predictions, predictor = { H: predictProton_1.predictProton }, predictOptions, joinDistance = { H: 0.05, C: 0.5 }, includeDiagonal = true, } = options;
+async function predictCOSY(molecule, options) {
+    const { minLength = 2, maxLength = 3, joinDistance = { H: 0.05, C: 0.5 }, includeDiagonal = true, } = options;
     return (0, predict2D_1.predict2D)(molecule, {
+        ...options,
         from: 'H',
         to: 'H',
-        predictor,
         minLength,
         maxLength,
         joinDistance,
-        predictions,
         includeDiagonal,
-        predictOptions,
     });
 }
 exports.predictCOSY = predictCOSY;

package/lib/prediction/predictCOSY.js.map

@@ -1 +1 @@
-{"version":3,"file":"predictCOSY.js","sourceRoot":"","sources":["../../src/prediction/predictCOSY.ts"],"names":[],"mappings":";;;AAGA,mDAAsE;AACtE,iDAAyD;AA4CzD;;;GAGG;AAEI,KAAK,UAAU,WAAW,CAC/B,QAAkB,EAClB,UAA8B,EAAE;IAEhC,MAAM,EACJ,SAAS,GAAG,CAAC,EACb,SAAS,GAAG,CAAC,EACb,WAAW,EACX,SAAS,GAAG,EAAE,CAAC,EAAE,6BAAa,EAAE,EAChC,cAAc,EACd,YAAY,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,EAClC,eAAe,GAAG,IAAI,GACvB,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,qBAAS,EAAC,QAAQ,EAAE;QACzB,IAAI,EAAE,GAAG;QACT,EAAE,EAAE,GAAG;QACP,SAAS;QACT,SAAS;QACT,SAAS;QACT,YAAY;QACZ,WAAW;QACX,eAAe;QACf,cAAc;KACf,CAAC,CAAC;AACL,CAAC;AAzBD,kCAyBC"}
+{"version":3,"file":"predictCOSY.js","sourceRoot":"","sources":["../../src/prediction/predictCOSY.ts"],"names":[],"mappings":";;;AAKA,iDAA8C;AAgD9C;;;GAGG;AAEI,KAAK,UAAU,WAAW,CAC/B,QAAkB,EAClB,OAA2B;IAE3B,MAAM,EACJ,SAAS,GAAG,CAAC,EACb,SAAS,GAAG,CAAC,EACb,YAAY,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,EAClC,eAAe,GAAG,IAAI,GACvB,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,qBAAS,EAAC,QAAQ,EAAE;QACzB,GAAG,OAAO;QACV,IAAI,EAAE,GAAG;QACT,EAAE,EAAE,GAAG;QACP,SAAS;QACT,SAAS;QACT,YAAY;QACZ,eAAe;KAChB,CAAC,CAAC;AACL,CAAC;AApBD,kCAoBC"}

package/lib/prediction/predictCarbon.d.ts

@@ -1,5 +1,4 @@
-import type { Molecule } from 'openchemlib/full';
-import type { Prediction1D } from './Prediction1D';
+import { PredictionBase1D } from './PredictionBase1D';
 import type { DataBaseStructure } from './dataStructure';
 export interface PredictCarbonOptions {
     /**
@@ -20,11 +19,20 @@ export interface PredictCarbonOptions {
     /**
      * diastereotopic atom ids.
      */
-    diaIDs?: string[];
+    groupedDiaIDs: string[];
+    /**
+     * hoses code of the molecule.
+     */
+    hoses: Array<any[] | undefined>;
+    /**
+     * molfile of the molecule, it could be used if there is not a database provided.
+     * so the prediction will be fetched to the web service (webserviceURL)
+     */
+    molfile?: string;
 }
 export type PredictCarbon = typeof predictCarbon;
 /**
  * Make a query to a hose code based database to predict carbon chemical shift
  * @returns {Promise<object>} - object with molfile, diaIDs, signals, joined signals by diaIDs and ranges.
  */
-export declare function predictCarbon(molecule: Molecule, options?: PredictCarbonOptions): Promise<Prediction1D>;
+export declare function predictCarbon(options: PredictCarbonOptions): Promise<PredictionBase1D>;