@apollo-annotation/shared 0.3.5 → 0.3.7
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/dist/Changes/AddAssemblyAliasesChange.d.ts +16 -0
- package/dist/Changes/AddAssemblyAliasesChange.js +50 -0
- package/dist/Changes/AddAssemblyAliasesChange.js.map +1 -0
- package/dist/Changes/AddAssemblyAndFeaturesFromFileChange.d.ts +1 -1
- package/dist/Changes/AddAssemblyFromExternalChange.d.ts +1 -1
- package/dist/Changes/AddAssemblyFromFileChange.d.ts +1 -1
- package/dist/Changes/AddFeatureChange.d.ts +3 -2
- package/dist/Changes/AddFeatureChange.js +5 -25
- package/dist/Changes/AddFeatureChange.js.map +1 -1
- package/dist/Changes/AddFeaturesFromFileChange.d.ts +1 -1
- package/dist/Changes/AddRefSeqAliasesChange.d.ts +1 -1
- package/dist/Changes/DeleteAssemblyChange.d.ts +1 -1
- package/dist/Changes/DeleteFeatureChange.d.ts +12 -11
- package/dist/Changes/DeleteFeatureChange.js +37 -32
- package/dist/Changes/DeleteFeatureChange.js.map +1 -1
- package/dist/Changes/DeleteUserChange.d.ts +1 -1
- package/dist/Changes/FeatureAttributeChange.d.ts +3 -2
- package/dist/Changes/FeatureAttributeChange.js +14 -6
- package/dist/Changes/FeatureAttributeChange.js.map +1 -1
- package/dist/Changes/FromFileBaseChange.d.ts +3 -3
- package/dist/Changes/FromFileBaseChange.js.map +1 -1
- package/dist/Changes/ImportJBrowseConfigChange.d.ts +4 -1
- package/dist/Changes/ImportJBrowseConfigChange.js +17 -13
- package/dist/Changes/ImportJBrowseConfigChange.js.map +1 -1
- package/dist/Changes/LocationEndChange.d.ts +1 -1
- package/dist/Changes/LocationEndChange.js +40 -37
- package/dist/Changes/LocationEndChange.js.map +1 -1
- package/dist/Changes/LocationStartChange.d.ts +1 -1
- package/dist/Changes/LocationStartChange.js +40 -37
- package/dist/Changes/LocationStartChange.js.map +1 -1
- package/dist/Changes/MergeExonsChange.d.ts +30 -0
- package/dist/Changes/MergeExonsChange.js +130 -0
- package/dist/Changes/MergeExonsChange.js.map +1 -0
- package/dist/Changes/MergeTranscriptsChange.d.ts +36 -0
- package/dist/Changes/MergeTranscriptsChange.js +246 -0
- package/dist/Changes/MergeTranscriptsChange.js.map +1 -0
- package/dist/Changes/SplitExonChange.d.ts +33 -0
- package/dist/Changes/SplitExonChange.js +142 -0
- package/dist/Changes/SplitExonChange.js.map +1 -0
- package/dist/Changes/StrandChange.d.ts +1 -1
- package/dist/Changes/TypeChange.d.ts +1 -1
- package/dist/Changes/UndoMergeExonsChange.d.ts +27 -0
- package/dist/Changes/UndoMergeExonsChange.js +104 -0
- package/dist/Changes/UndoMergeExonsChange.js.map +1 -0
- package/dist/Changes/UndoMergeTranscriptsChange.d.ts +27 -0
- package/dist/Changes/UndoMergeTranscriptsChange.js +104 -0
- package/dist/Changes/UndoMergeTranscriptsChange.js.map +1 -0
- package/dist/Changes/UndoSplitExonChange.d.ts +32 -0
- package/dist/Changes/UndoSplitExonChange.js +111 -0
- package/dist/Changes/UndoSplitExonChange.js.map +1 -0
- package/dist/Changes/UserChange.d.ts +1 -1
- package/dist/Changes/index.d.ts +21 -0
- package/dist/Changes/index.js +21 -0
- package/dist/Changes/index.js.map +1 -1
- package/dist/Checks/CDSCheck.d.ts +1 -1
- package/dist/GFF3/annotationFeatureToGFF3.d.ts +2 -2
- package/dist/GFF3/annotationFeatureToGFF3.js +7 -1
- package/dist/GFF3/annotationFeatureToGFF3.js.map +1 -1
- package/dist/GFF3/annotationFeatureToGFF3.test.js +1 -1
- package/dist/GFF3/annotationFeatureToGFF3.test.js.map +1 -1
- package/dist/GFF3/gff3ToAnnotationFeature.d.ts +2 -2
- package/dist/GFF3/gff3ToAnnotationFeature.test.d.ts +1 -1
- package/dist/GFF3/gff3ToAnnotationFeature.test.js +1 -1
- package/dist/GFF3/gff3ToAnnotationFeature.test.js.map +1 -1
- package/dist/GFF3/gffReservedKeys.d.ts +7 -0
- package/dist/GFF3/gffReservedKeys.js +21 -1
- package/dist/GFF3/gffReservedKeys.js.map +1 -1
- package/dist/Messages.d.ts +2 -2
- package/dist/Operations/GetAssembliesOperation.d.ts +1 -1
- package/dist/Operations/GetFeaturesOperation.d.ts +1 -1
- package/dist/Validations/CoreValidation.d.ts +2 -2
- package/dist/Validations/CoreValidation.js +1 -1
- package/dist/Validations/CoreValidation.js.map +1 -1
- package/dist/Validations/ParentChildValidation.d.ts +5 -5
- package/dist/Validations/ParentChildValidation.js +3 -1
- package/dist/Validations/ParentChildValidation.js.map +1 -1
- package/dist/Validations/Validation.d.ts +5 -5
- package/dist/Validations/ValidationSet.d.ts +4 -4
- package/dist/Validations/ValidationSet.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/util.d.ts +2 -0
- package/dist/util.js +13 -0
- package/dist/util.js.map +1 -1
- package/package.json +4 -4
- package/src/Changes/AddAssemblyAliasesChange.ts +69 -0
- package/src/Changes/AddAssemblyAndFeaturesFromFileChange.ts +6 -6
- package/src/Changes/AddAssemblyFromExternalChange.ts +5 -5
- package/src/Changes/AddAssemblyFromFileChange.ts +5 -5
- package/src/Changes/AddFeatureChange.ts +11 -35
- package/src/Changes/AddFeaturesFromFileChange.ts +6 -6
- package/src/Changes/AddRefSeqAliasesChange.ts +6 -6
- package/src/Changes/DeleteAssemblyChange.ts +4 -4
- package/src/Changes/DeleteFeatureChange.ts +49 -43
- package/src/Changes/DeleteUserChange.ts +5 -5
- package/src/Changes/FeatureAttributeChange.ts +22 -13
- package/src/Changes/FromFileBaseChange.ts +6 -3
- package/src/Changes/ImportJBrowseConfigChange.ts +37 -22
- package/src/Changes/LocationEndChange.ts +47 -56
- package/src/Changes/LocationStartChange.ts +47 -56
- package/src/Changes/MergeExonsChange.ts +185 -0
- package/src/Changes/MergeTranscriptsChange.ts +379 -0
- package/src/Changes/SplitExonChange.ts +249 -0
- package/src/Changes/StrandChange.ts +6 -6
- package/src/Changes/TypeChange.ts +6 -6
- package/src/Changes/UndoMergeExonsChange.ts +149 -0
- package/src/Changes/UndoMergeTranscriptsChange.ts +153 -0
- package/src/Changes/UndoSplitExonChange.ts +174 -0
- package/src/Changes/UserChange.ts +5 -5
- package/src/Changes/index.ts +21 -0
- package/src/Checks/CDSCheck.ts +2 -2
- package/src/GFF3/annotationFeatureToGFF3.test.ts +4 -2
- package/src/GFF3/annotationFeatureToGFF3.ts +11 -5
- package/src/GFF3/gff3ToAnnotationFeature.test.ts +3 -3
- package/src/GFF3/gff3ToAnnotationFeature.ts +2 -2
- package/src/GFF3/gffReservedKeys.ts +25 -0
- package/src/Messages.ts +2 -2
- package/src/Operations/GetAssembliesOperation.ts +3 -3
- package/src/Operations/GetFeaturesOperation.ts +4 -4
- package/src/Validations/CoreValidation.ts +4 -3
- package/src/Validations/ParentChildValidation.ts +10 -8
- package/src/Validations/Validation.ts +5 -5
- package/src/Validations/ValidationSet.ts +8 -4
- package/src/util.ts +16 -0
- package/test_data/example01.json +3 -3
- package/test_data/example02.json +3 -3
- package/test_data/example04.json +3 -3
- package/test_data/gene_representations.gff3 +686 -1686
|
@@ -29,15 +29,31 @@ class LocationEndChange extends common_1.FeatureChange {
|
|
|
29
29
|
async executeOnServer(backend) {
|
|
30
30
|
const { featureModel, session } = backend;
|
|
31
31
|
const { changes, logger } = this;
|
|
32
|
-
const featuresForChanges = [];
|
|
33
32
|
// Let's first check that all features are found and those old values match with expected ones. We do this just to be sure that all changes can be done.
|
|
33
|
+
const topLevelFeatures = [];
|
|
34
34
|
for (const change of changes) {
|
|
35
|
-
const { featureId, oldEnd } = change;
|
|
36
|
-
//
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
.
|
|
35
|
+
const { featureId, oldEnd, newEnd } = change;
|
|
36
|
+
// See if we already have top-level feature for this feature
|
|
37
|
+
let topLevelFeature;
|
|
38
|
+
let feature;
|
|
39
|
+
for (const tlv of topLevelFeatures) {
|
|
40
|
+
const childFeature = this.getFeatureFromId(tlv, featureId);
|
|
41
|
+
if (childFeature) {
|
|
42
|
+
topLevelFeature = tlv;
|
|
43
|
+
feature = childFeature;
|
|
44
|
+
break;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
if (!topLevelFeature) {
|
|
48
|
+
// Don't already have top-level feature, so let's query it
|
|
49
|
+
topLevelFeature = await featureModel
|
|
50
|
+
.findOne({ allIds: featureId })
|
|
51
|
+
.session(session)
|
|
52
|
+
.exec();
|
|
53
|
+
if (topLevelFeature) {
|
|
54
|
+
topLevelFeatures.push(topLevelFeature);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
41
57
|
if (!topLevelFeature) {
|
|
42
58
|
const errMsg = `*** ERROR: The following featureId was not found in database ='${featureId}'`;
|
|
43
59
|
logger.error(errMsg);
|
|
@@ -45,35 +61,20 @@ class LocationEndChange extends common_1.FeatureChange {
|
|
|
45
61
|
// throw new NotFoundException(errMsg) -- This is causing runtime error because Exception comes from @nestjs/common!!!
|
|
46
62
|
}
|
|
47
63
|
logger.debug?.(`*** TOP level feature found: ${JSON.stringify(topLevelFeature)}`);
|
|
48
|
-
|
|
49
|
-
|
|
64
|
+
if (!feature) {
|
|
65
|
+
feature = this.getFeatureFromId(topLevelFeature, featureId);
|
|
66
|
+
}
|
|
67
|
+
if (!feature) {
|
|
50
68
|
const errMsg = 'ERROR when searching feature by featureId';
|
|
51
69
|
logger.error(errMsg);
|
|
52
70
|
throw new Error(errMsg);
|
|
53
71
|
}
|
|
54
|
-
logger.debug?.(`*** Found feature: ${JSON.stringify(
|
|
55
|
-
if (
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
if (foundFeature.children) {
|
|
60
|
-
for (const [, childFeature] of foundFeature.children) {
|
|
61
|
-
if (childFeature.max === oldEnd) {
|
|
62
|
-
logger.debug?.(`*************** UPDATE CHILD FEATURE ID= ${featureId}, CHILD: ${JSON.stringify(childFeature)}`);
|
|
63
|
-
featuresForChanges.push({
|
|
64
|
-
feature: childFeature,
|
|
65
|
-
topLevelFeature,
|
|
66
|
-
});
|
|
67
|
-
break;
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
}
|
|
72
|
+
logger.debug?.(`*** Found feature: ${JSON.stringify(feature)}`);
|
|
73
|
+
if (feature.max !== oldEnd) {
|
|
74
|
+
const errMsg = 'Expected previous max does not match';
|
|
75
|
+
logger.error(errMsg);
|
|
76
|
+
throw new Error(errMsg);
|
|
71
77
|
}
|
|
72
|
-
}
|
|
73
|
-
// Let's update objects.
|
|
74
|
-
for (const [idx, change] of changes.entries()) {
|
|
75
|
-
const { newEnd } = change;
|
|
76
|
-
const { feature, topLevelFeature } = featuresForChanges[idx];
|
|
77
78
|
feature.max = newEnd;
|
|
78
79
|
if (topLevelFeature._id.equals(feature._id)) {
|
|
79
80
|
topLevelFeature.markModified('end'); // Mark as modified. Without this save() -method is not updating data in database
|
|
@@ -81,14 +82,15 @@ class LocationEndChange extends common_1.FeatureChange {
|
|
|
81
82
|
else {
|
|
82
83
|
topLevelFeature.markModified('children'); // Mark as modified. Without this save() -method is not updating data in database
|
|
83
84
|
}
|
|
85
|
+
}
|
|
86
|
+
for (const tlv of topLevelFeatures) {
|
|
84
87
|
try {
|
|
85
|
-
await
|
|
88
|
+
await tlv.save();
|
|
86
89
|
}
|
|
87
90
|
catch (error) {
|
|
88
91
|
logger.debug?.(`*** FAILED: ${error}`);
|
|
89
92
|
throw error;
|
|
90
93
|
}
|
|
91
|
-
logger.debug?.(`*** Object updated in Mongo. New object: ${JSON.stringify(topLevelFeature)}`);
|
|
92
94
|
}
|
|
93
95
|
}
|
|
94
96
|
async executeOnLocalGFF3(_backend) {
|
|
@@ -98,12 +100,13 @@ class LocationEndChange extends common_1.FeatureChange {
|
|
|
98
100
|
if (!dataStore) {
|
|
99
101
|
throw new Error('No data store');
|
|
100
102
|
}
|
|
101
|
-
for (const
|
|
102
|
-
const
|
|
103
|
+
for (const change of this.changes) {
|
|
104
|
+
const { featureId, newEnd } = change;
|
|
105
|
+
const feature = dataStore.getFeature(featureId);
|
|
103
106
|
if (!feature) {
|
|
104
|
-
throw new Error(`Could not find feature with identifier "${
|
|
107
|
+
throw new Error(`Could not find feature with identifier "${featureId}"`);
|
|
105
108
|
}
|
|
106
|
-
feature.setMax(
|
|
109
|
+
feature.setMax(newEnd);
|
|
107
110
|
}
|
|
108
111
|
}
|
|
109
112
|
getInverse() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocationEndChange.js","sourceRoot":"","sources":["../../src/Changes/LocationEndChange.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"LocationEndChange.js","sourceRoot":"","sources":["../../src/Changes/LocationEndChange.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ChangeOptions, ClientDataStore, FeatureChange, LocalGFF3DataStore, SerializedFeatureChange, ServerDataStore } from '@apollo-annotation/common';
|
|
1
|
+
import { type ChangeOptions, type ClientDataStore, FeatureChange, type LocalGFF3DataStore, type SerializedFeatureChange, type ServerDataStore } from '@apollo-annotation/common';
|
|
2
2
|
interface SerializedLocationStartChangeBase extends SerializedFeatureChange {
|
|
3
3
|
typeName: 'LocationStartChange';
|
|
4
4
|
}
|
|
@@ -29,15 +29,31 @@ class LocationStartChange extends common_1.FeatureChange {
|
|
|
29
29
|
async executeOnServer(backend) {
|
|
30
30
|
const { featureModel, session } = backend;
|
|
31
31
|
const { changes, logger } = this;
|
|
32
|
-
const featuresForChanges = [];
|
|
33
32
|
// Let's first check that all features are found and those old values match with expected ones. We do this just to be sure that all changes can be done.
|
|
33
|
+
const topLevelFeatures = [];
|
|
34
34
|
for (const change of changes) {
|
|
35
|
-
const { featureId, oldStart } = change;
|
|
36
|
-
//
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
.
|
|
35
|
+
const { featureId, oldStart, newStart } = change;
|
|
36
|
+
// See if we already have top-level feature for this feature
|
|
37
|
+
let topLevelFeature;
|
|
38
|
+
let feature;
|
|
39
|
+
for (const tlv of topLevelFeatures) {
|
|
40
|
+
const childFeature = this.getFeatureFromId(tlv, featureId);
|
|
41
|
+
if (childFeature) {
|
|
42
|
+
topLevelFeature = tlv;
|
|
43
|
+
feature = childFeature;
|
|
44
|
+
break;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
if (!topLevelFeature) {
|
|
48
|
+
// Don't already have top-level feature, so let's query it
|
|
49
|
+
topLevelFeature = await featureModel
|
|
50
|
+
.findOne({ allIds: featureId })
|
|
51
|
+
.session(session)
|
|
52
|
+
.exec();
|
|
53
|
+
if (topLevelFeature) {
|
|
54
|
+
topLevelFeatures.push(topLevelFeature);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
41
57
|
if (!topLevelFeature) {
|
|
42
58
|
const errMsg = `*** ERROR: The following featureId was not found in database ='${featureId}'`;
|
|
43
59
|
logger.error(errMsg);
|
|
@@ -45,35 +61,20 @@ class LocationStartChange extends common_1.FeatureChange {
|
|
|
45
61
|
// throw new NotFoundException(errMsg) -- This is causing runtime error because Exception comes from @nestjs/common!!!
|
|
46
62
|
}
|
|
47
63
|
logger.debug?.(`*** TOP level feature found: ${JSON.stringify(topLevelFeature)}`);
|
|
48
|
-
|
|
49
|
-
|
|
64
|
+
if (!feature) {
|
|
65
|
+
feature = this.getFeatureFromId(topLevelFeature, featureId);
|
|
66
|
+
}
|
|
67
|
+
if (!feature) {
|
|
50
68
|
const errMsg = 'ERROR when searching feature by featureId';
|
|
51
69
|
logger.error(errMsg);
|
|
52
70
|
throw new Error(errMsg);
|
|
53
71
|
}
|
|
54
|
-
logger.debug?.(`*** Found feature: ${JSON.stringify(
|
|
55
|
-
if (
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
if (foundFeature.children) {
|
|
60
|
-
for (const [, childFeature] of foundFeature.children) {
|
|
61
|
-
if (childFeature.min === oldStart) {
|
|
62
|
-
logger.debug?.(`*** UPDATE CHILD FEATURE ID= ${featureId}, CHILD: ${JSON.stringify(childFeature)}`);
|
|
63
|
-
featuresForChanges.push({
|
|
64
|
-
feature: childFeature,
|
|
65
|
-
topLevelFeature,
|
|
66
|
-
});
|
|
67
|
-
break;
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
}
|
|
72
|
+
logger.debug?.(`*** Found feature: ${JSON.stringify(feature)}`);
|
|
73
|
+
if (feature.min !== oldStart) {
|
|
74
|
+
const errMsg = 'Expected previous max does not match';
|
|
75
|
+
logger.error(errMsg);
|
|
76
|
+
throw new Error(errMsg);
|
|
71
77
|
}
|
|
72
|
-
}
|
|
73
|
-
// Let's update objects.
|
|
74
|
-
for (const [idx, change] of changes.entries()) {
|
|
75
|
-
const { newStart } = change;
|
|
76
|
-
const { feature, topLevelFeature } = featuresForChanges[idx];
|
|
77
78
|
feature.min = newStart;
|
|
78
79
|
if (topLevelFeature._id.equals(feature._id)) {
|
|
79
80
|
topLevelFeature.markModified('start'); // Mark as modified. Without this save() -method is not updating data in database
|
|
@@ -81,14 +82,15 @@ class LocationStartChange extends common_1.FeatureChange {
|
|
|
81
82
|
else {
|
|
82
83
|
topLevelFeature.markModified('children'); // Mark as modified. Without this save() -method is not updating data in database
|
|
83
84
|
}
|
|
85
|
+
}
|
|
86
|
+
for (const tlv of topLevelFeatures) {
|
|
84
87
|
try {
|
|
85
|
-
await
|
|
88
|
+
await tlv.save();
|
|
86
89
|
}
|
|
87
90
|
catch (error) {
|
|
88
91
|
logger.debug?.(`*** FAILED: ${error}`);
|
|
89
92
|
throw error;
|
|
90
93
|
}
|
|
91
|
-
logger.debug?.(`*** Object updated in Mongo. New object: ${JSON.stringify(topLevelFeature)}`);
|
|
92
94
|
}
|
|
93
95
|
}
|
|
94
96
|
async executeOnLocalGFF3(_backend) {
|
|
@@ -98,12 +100,13 @@ class LocationStartChange extends common_1.FeatureChange {
|
|
|
98
100
|
if (!dataStore) {
|
|
99
101
|
throw new Error('No data store');
|
|
100
102
|
}
|
|
101
|
-
for (const
|
|
102
|
-
const
|
|
103
|
+
for (const change of this.changes) {
|
|
104
|
+
const { featureId, newStart } = change;
|
|
105
|
+
const feature = dataStore.getFeature(featureId);
|
|
103
106
|
if (!feature) {
|
|
104
|
-
throw new Error(`Could not find feature with identifier "${
|
|
107
|
+
throw new Error(`Could not find feature with identifier "${featureId}"`);
|
|
105
108
|
}
|
|
106
|
-
feature.setMin(
|
|
109
|
+
feature.setMin(newStart);
|
|
107
110
|
}
|
|
108
111
|
}
|
|
109
112
|
getInverse() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocationStartChange.js","sourceRoot":"","sources":["../../src/Changes/LocationStartChange.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"LocationStartChange.js","sourceRoot":"","sources":["../../src/Changes/LocationStartChange.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { type ChangeOptions, type ClientDataStore, FeatureChange, type LocalGFF3DataStore, type SerializedFeatureChange, type ServerDataStore } from '@apollo-annotation/common';
|
|
2
|
+
import { type AnnotationFeatureSnapshot } from '@apollo-annotation/mst';
|
|
3
|
+
import { UndoMergeExonsChange } from './UndoMergeExonsChange';
|
|
4
|
+
interface SerializedMergeExonsChangeBase extends SerializedFeatureChange {
|
|
5
|
+
typeName: 'MergeExonsChange';
|
|
6
|
+
}
|
|
7
|
+
export interface MergeExonsChangeDetails {
|
|
8
|
+
firstExon: AnnotationFeatureSnapshot;
|
|
9
|
+
secondExon: AnnotationFeatureSnapshot;
|
|
10
|
+
parentFeatureId: string;
|
|
11
|
+
}
|
|
12
|
+
interface SerializedMergeExonsChangeSingle extends SerializedMergeExonsChangeBase, MergeExonsChangeDetails {
|
|
13
|
+
}
|
|
14
|
+
interface SerializedMergeExonsChangeMultiple extends SerializedMergeExonsChangeBase {
|
|
15
|
+
changes: MergeExonsChangeDetails[];
|
|
16
|
+
}
|
|
17
|
+
export type SerializedMergeExonsChange = SerializedMergeExonsChangeSingle | SerializedMergeExonsChangeMultiple;
|
|
18
|
+
export declare class MergeExonsChange extends FeatureChange {
|
|
19
|
+
typeName: "MergeExonsChange";
|
|
20
|
+
changes: MergeExonsChangeDetails[];
|
|
21
|
+
constructor(json: SerializedMergeExonsChange, options?: ChangeOptions);
|
|
22
|
+
get notification(): string;
|
|
23
|
+
toJSON(): SerializedMergeExonsChange;
|
|
24
|
+
executeOnServer(backend: ServerDataStore): Promise<void>;
|
|
25
|
+
executeOnLocalGFF3(_backend: LocalGFF3DataStore): Promise<void>;
|
|
26
|
+
executeOnClient(dataStore: ClientDataStore): Promise<void>;
|
|
27
|
+
getInverse(): UndoMergeExonsChange;
|
|
28
|
+
mergeAttributes(firstExon: AnnotationFeatureSnapshot, secondExon: AnnotationFeatureSnapshot): Record<string, string[]>;
|
|
29
|
+
}
|
|
30
|
+
export {};
|
|
@@ -0,0 +1,130 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/* eslint-disable @typescript-eslint/require-await */
|
|
3
|
+
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.MergeExonsChange = void 0;
|
|
6
|
+
const common_1 = require("@apollo-annotation/common");
|
|
7
|
+
const DeleteFeatureChange_1 = require("./DeleteFeatureChange");
|
|
8
|
+
const UndoMergeExonsChange_1 = require("./UndoMergeExonsChange");
|
|
9
|
+
class MergeExonsChange extends common_1.FeatureChange {
|
|
10
|
+
typeName = 'MergeExonsChange';
|
|
11
|
+
changes;
|
|
12
|
+
constructor(json, options) {
|
|
13
|
+
super(json, options);
|
|
14
|
+
this.changes = 'changes' in json ? json.changes : [json];
|
|
15
|
+
}
|
|
16
|
+
// eslint-disable-next-line @typescript-eslint/class-literal-property-style
|
|
17
|
+
get notification() {
|
|
18
|
+
return 'Exons successfully merged';
|
|
19
|
+
}
|
|
20
|
+
toJSON() {
|
|
21
|
+
const { assembly, changedIds, changes, typeName } = this;
|
|
22
|
+
if (changes.length === 1) {
|
|
23
|
+
const [{ firstExon, secondExon, parentFeatureId }] = changes;
|
|
24
|
+
return {
|
|
25
|
+
typeName,
|
|
26
|
+
changedIds,
|
|
27
|
+
assembly,
|
|
28
|
+
firstExon,
|
|
29
|
+
secondExon,
|
|
30
|
+
parentFeatureId,
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
return { typeName, changedIds, assembly, changes };
|
|
34
|
+
}
|
|
35
|
+
async executeOnServer(backend) {
|
|
36
|
+
const { featureModel, session } = backend;
|
|
37
|
+
const { changes, logger } = this;
|
|
38
|
+
for (const change of changes) {
|
|
39
|
+
const { firstExon, secondExon } = change;
|
|
40
|
+
const topLevelFeature = await featureModel
|
|
41
|
+
.findOne({ allIds: firstExon._id })
|
|
42
|
+
.session(session)
|
|
43
|
+
.exec();
|
|
44
|
+
if (!topLevelFeature) {
|
|
45
|
+
const errMsg = `*** ERROR: The following featureId was not found in database ='${firstExon._id}'`;
|
|
46
|
+
logger.error(errMsg);
|
|
47
|
+
throw new Error(errMsg);
|
|
48
|
+
}
|
|
49
|
+
const mergedExon = this.getFeatureFromId(topLevelFeature, firstExon._id);
|
|
50
|
+
if (!mergedExon) {
|
|
51
|
+
const errMsg = 'ERROR when searching feature by featureId';
|
|
52
|
+
logger.error(errMsg);
|
|
53
|
+
throw new Error(errMsg);
|
|
54
|
+
}
|
|
55
|
+
mergedExon.min = Math.min(firstExon.min, secondExon.min);
|
|
56
|
+
mergedExon.max = Math.max(firstExon.max, secondExon.max);
|
|
57
|
+
mergedExon.attributes = this.mergeAttributes(firstExon, secondExon);
|
|
58
|
+
const deletedIds = (0, DeleteFeatureChange_1.findAndDeleteChildFeature)(topLevelFeature, secondExon._id, this);
|
|
59
|
+
deletedIds.push(secondExon._id);
|
|
60
|
+
topLevelFeature.allIds = topLevelFeature.allIds.filter((id) => !deletedIds.includes(id));
|
|
61
|
+
await topLevelFeature.save();
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
async executeOnLocalGFF3(_backend) {
|
|
65
|
+
throw new Error('executeOnLocalGFF3 not implemented');
|
|
66
|
+
}
|
|
67
|
+
async executeOnClient(dataStore) {
|
|
68
|
+
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
69
|
+
if (!dataStore) {
|
|
70
|
+
throw new Error('No data store');
|
|
71
|
+
}
|
|
72
|
+
for (const change of this.changes) {
|
|
73
|
+
const { firstExon, secondExon } = change;
|
|
74
|
+
const mergedExon = dataStore.getFeature(firstExon._id);
|
|
75
|
+
if (!mergedExon) {
|
|
76
|
+
throw new Error(`Could not find feature with identifier "${firstExon._id}"`);
|
|
77
|
+
}
|
|
78
|
+
mergedExon.setMin(Math.min(firstExon.min, secondExon.min));
|
|
79
|
+
mergedExon.setMax(Math.max(firstExon.max, secondExon.max));
|
|
80
|
+
const mergedAttrs = this.mergeAttributes(firstExon, secondExon);
|
|
81
|
+
mergedExon.setAttributes(new Map());
|
|
82
|
+
for (const key of Object.keys(mergedAttrs)) {
|
|
83
|
+
mergedExon.setAttribute(key, mergedAttrs[key]);
|
|
84
|
+
}
|
|
85
|
+
mergedExon.parent?.deleteChild(secondExon._id);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
getInverse() {
|
|
89
|
+
const { assembly, changedIds, changes, logger } = this;
|
|
90
|
+
const inverseChangedIds = [...changedIds].reverse();
|
|
91
|
+
const inverseChanges = [...changes].reverse().map((mergeExonChange) => ({
|
|
92
|
+
exonsToRestore: [mergeExonChange.firstExon, mergeExonChange.secondExon],
|
|
93
|
+
parentFeatureId: mergeExonChange.parentFeatureId,
|
|
94
|
+
}));
|
|
95
|
+
logger.debug?.(`INVERSE CHANGE '${JSON.stringify(inverseChanges)}'`);
|
|
96
|
+
return new UndoMergeExonsChange_1.UndoMergeExonsChange({
|
|
97
|
+
changedIds: inverseChangedIds,
|
|
98
|
+
typeName: 'UndoMergeExonsChange',
|
|
99
|
+
changes: inverseChanges,
|
|
100
|
+
assembly,
|
|
101
|
+
}, { logger });
|
|
102
|
+
}
|
|
103
|
+
mergeAttributes(firstExon, secondExon) {
|
|
104
|
+
let mergedAttrs = {};
|
|
105
|
+
if (firstExon.attributes) {
|
|
106
|
+
// eslint-disable-next-line unicorn/prefer-structured-clone
|
|
107
|
+
mergedAttrs = JSON.parse(JSON.stringify(firstExon.attributes));
|
|
108
|
+
}
|
|
109
|
+
if (secondExon.attributes) {
|
|
110
|
+
// eslint-disable-next-line unicorn/prefer-structured-clone
|
|
111
|
+
const attrs = JSON.parse(JSON.stringify(secondExon.attributes));
|
|
112
|
+
for (const key of Object.keys(attrs)) {
|
|
113
|
+
if (key === '_id' || key === 'gff_id') {
|
|
114
|
+
continue;
|
|
115
|
+
}
|
|
116
|
+
if (!Object.keys(mergedAttrs).includes(key)) {
|
|
117
|
+
mergedAttrs[key] = [];
|
|
118
|
+
}
|
|
119
|
+
attrs[key].map((x) => {
|
|
120
|
+
if (!mergedAttrs[key].includes(x)) {
|
|
121
|
+
mergedAttrs[key].push(x);
|
|
122
|
+
}
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
return mergedAttrs;
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
exports.MergeExonsChange = MergeExonsChange;
|
|
130
|
+
//# sourceMappingURL=MergeExonsChange.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MergeExonsChange.js","sourceRoot":"","sources":["../../src/Changes/MergeExonsChange.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { type ChangeOptions, type ClientDataStore, FeatureChange, type LocalGFF3DataStore, type SerializedFeatureChange, type ServerDataStore } from '@apollo-annotation/common';
|
|
2
|
+
import { type AnnotationFeature, type AnnotationFeatureSnapshot } from '@apollo-annotation/mst';
|
|
3
|
+
import { type Feature } from '@apollo-annotation/schemas';
|
|
4
|
+
import { UndoMergeTranscriptsChange } from './UndoMergeTranscriptsChange';
|
|
5
|
+
interface SerializedMergeTranscriptsChangeBase extends SerializedFeatureChange {
|
|
6
|
+
typeName: 'MergeTranscriptsChange';
|
|
7
|
+
}
|
|
8
|
+
export interface MergeTranscriptsChangeDetails {
|
|
9
|
+
firstTranscript: AnnotationFeatureSnapshot;
|
|
10
|
+
secondTranscript: AnnotationFeatureSnapshot;
|
|
11
|
+
parentFeatureId: string;
|
|
12
|
+
}
|
|
13
|
+
interface SerializedMergeTranscriptsChangeSingle extends SerializedMergeTranscriptsChangeBase, MergeTranscriptsChangeDetails {
|
|
14
|
+
}
|
|
15
|
+
interface SerializedMergeTranscriptsChangeMultiple extends SerializedMergeTranscriptsChangeBase {
|
|
16
|
+
changes: MergeTranscriptsChangeDetails[];
|
|
17
|
+
}
|
|
18
|
+
export type SerializedMergeTranscriptsChange = SerializedMergeTranscriptsChangeSingle | SerializedMergeTranscriptsChangeMultiple;
|
|
19
|
+
export declare class MergeTranscriptsChange extends FeatureChange {
|
|
20
|
+
typeName: "MergeTranscriptsChange";
|
|
21
|
+
changes: MergeTranscriptsChangeDetails[];
|
|
22
|
+
constructor(json: SerializedMergeTranscriptsChange, options?: ChangeOptions);
|
|
23
|
+
toJSON(): SerializedMergeTranscriptsChange;
|
|
24
|
+
executeOnServer(backend: ServerDataStore): Promise<void>;
|
|
25
|
+
mergeTranscriptsOnServer(firstTranscript: Feature, secondTranscript: AnnotationFeatureSnapshot): void;
|
|
26
|
+
mergeFeatureIntoTranscriptOnServer(secondFeatureChild: AnnotationFeatureSnapshot, firstTranscript: Feature): void;
|
|
27
|
+
executeOnClient(dataStore: ClientDataStore): Promise<void>;
|
|
28
|
+
mergeTranscriptsOnClient(firstTranscript: AnnotationFeature, secondTranscript: AnnotationFeatureSnapshot): void;
|
|
29
|
+
mergeFeatureIntoTranscriptOnClient(secondFeatureChild: AnnotationFeatureSnapshot, firstTranscript: AnnotationFeature): void;
|
|
30
|
+
isAnnotationFeature(obj: any): obj is AnnotationFeature;
|
|
31
|
+
executeOnLocalGFF3(_backend: LocalGFF3DataStore): Promise<void>;
|
|
32
|
+
mergeAttributes(destination: Feature | AnnotationFeature, source: AnnotationFeatureSnapshot): Record<string, string[]>;
|
|
33
|
+
mergeTranscriptAttributes(firstTranscript: Feature | AnnotationFeature, secondTranscript: AnnotationFeatureSnapshot): void;
|
|
34
|
+
getInverse(): UndoMergeTranscriptsChange;
|
|
35
|
+
}
|
|
36
|
+
export {};
|