@apollo-annotation/shared 0.3.7 → 0.3.9
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/AddAssemblyAndFeaturesFromFileChange.d.ts +3 -0
- package/dist/Changes/AddAssemblyAndFeaturesFromFileChange.js +6 -5
- package/dist/Changes/AddAssemblyAndFeaturesFromFileChange.js.map +1 -1
- package/dist/Changes/AddAssemblyFromFileChange.js +1 -1
- package/dist/Changes/AddAssemblyFromFileChange.js.map +1 -1
- package/dist/Changes/AddFeatureChange.js +14 -2
- package/dist/Changes/AddFeatureChange.js.map +1 -1
- package/dist/Changes/AddFeaturesFromFileChange.d.ts +3 -0
- package/dist/Changes/AddFeaturesFromFileChange.js +5 -2
- package/dist/Changes/AddFeaturesFromFileChange.js.map +1 -1
- package/dist/Changes/AddRefSeqAliasesChange.js +2 -7
- package/dist/Changes/AddRefSeqAliasesChange.js.map +1 -1
- package/dist/Changes/FromFileBaseChange.js +6 -6
- package/dist/Changes/FromFileBaseChange.js.map +1 -1
- package/dist/Changes/ImportJBrowseConfigChange.js +1 -1
- package/dist/Changes/ImportJBrowseConfigChange.js.map +1 -1
- package/dist/Changes/MergeExonsChange.d.ts +0 -1
- package/dist/Changes/MergeExonsChange.js +14 -30
- package/dist/Changes/MergeExonsChange.js.map +1 -1
- package/dist/Changes/MergeTranscriptsChange.d.ts +1 -3
- package/dist/Changes/MergeTranscriptsChange.js +55 -56
- package/dist/Changes/MergeTranscriptsChange.js.map +1 -1
- package/dist/Checks/CDSCheck.d.ts +1 -1
- package/dist/Checks/CDSCheck.js +12 -12
- package/dist/Checks/CDSCheck.js.map +1 -1
- package/dist/Checks/TranscriptCheck.d.ts +9 -0
- package/dist/Checks/TranscriptCheck.js +109 -0
- package/dist/Checks/TranscriptCheck.js.map +1 -0
- package/dist/Checks/index.d.ts +1 -0
- package/dist/Checks/index.js +1 -0
- package/dist/Checks/index.js.map +1 -1
- package/dist/Checks/util.d.ts +2 -0
- package/dist/Checks/util.js +15 -0
- package/dist/Checks/util.js.map +1 -0
- package/dist/GFF3/annotationFeatureToGFF3.js +3 -1
- package/dist/GFF3/annotationFeatureToGFF3.js.map +1 -1
- package/dist/GFF3/gff3ToAnnotationFeature.js +1 -1
- package/dist/GFF3/gff3ToAnnotationFeature.js.map +1 -1
- package/dist/GFF3/gff3ToAnnotationFeature.test.js +4 -4
- package/dist/GFF3/gff3ToAnnotationFeature.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/util.d.ts +3 -0
- package/dist/util.js +33 -0
- package/dist/util.js.map +1 -1
- package/package.json +9 -9
- package/src/Changes/AddAssemblyAndFeaturesFromFileChange.ts +8 -6
- package/src/Changes/AddAssemblyFromFileChange.ts +1 -1
- package/src/Changes/AddFeatureChange.ts +16 -2
- package/src/Changes/AddFeaturesFromFileChange.ts +6 -1
- package/src/Changes/AddRefSeqAliasesChange.ts +2 -8
- package/src/Changes/FromFileBaseChange.ts +6 -6
- package/src/Changes/ImportJBrowseConfigChange.ts +1 -1
- package/src/Changes/MergeExonsChange.ts +52 -36
- package/src/Changes/MergeTranscriptsChange.ts +82 -67
- package/src/Checks/CDSCheck.ts +15 -13
- package/src/Checks/TranscriptCheck.ts +138 -0
- package/src/Checks/index.ts +1 -0
- package/src/Checks/util.ts +13 -0
- package/src/GFF3/annotationFeatureToGFF3.ts +4 -1
- package/src/GFF3/gff3ToAnnotationFeature.test.ts +4 -4
- package/src/GFF3/gff3ToAnnotationFeature.ts +1 -1
- package/src/util.ts +37 -0
- package/test_data/example01.json +20 -20
- package/test_data/example02.json +38 -38
- package/test_data/example04.json +57 -57
- package/test_data/gene_representations.gff3 +1054 -276
|
@@ -8,6 +8,9 @@ export interface AddAssemblyAndFeaturesFromFileChangeDetails {
|
|
|
8
8
|
fileIds: {
|
|
9
9
|
fa: string;
|
|
10
10
|
};
|
|
11
|
+
parseOptions?: {
|
|
12
|
+
bufferSize: number;
|
|
13
|
+
};
|
|
11
14
|
}
|
|
12
15
|
export interface SerializedAddAssemblyAndFeaturesFromFileChangeSingle extends SerializedAddAssemblyAndFeaturesFromFileChangeBase, AddAssemblyAndFeaturesFromFileChangeDetails {
|
|
13
16
|
}
|
|
@@ -30,7 +30,7 @@ class AddAssemblyAndFeaturesFromFileChange extends FromFileBaseChange_1.FromFile
|
|
|
30
30
|
const { assemblyModel, checkModel, fileModel, filesService, user } = backend;
|
|
31
31
|
const { assembly, changes, logger } = this;
|
|
32
32
|
for (const change of changes) {
|
|
33
|
-
const { assemblyName, fileIds } = change;
|
|
33
|
+
const { assemblyName, fileIds, parseOptions } = change;
|
|
34
34
|
const fileId = fileIds.fa;
|
|
35
35
|
const { FILE_UPLOAD_FOLDER } = process.env;
|
|
36
36
|
if (!FILE_UPLOAD_FOLDER) {
|
|
@@ -50,7 +50,7 @@ class AddAssemblyAndFeaturesFromFileChange extends FromFileBaseChange_1.FromFile
|
|
|
50
50
|
throw new Error(`Assembly "${assemblyName}" already exists`);
|
|
51
51
|
}
|
|
52
52
|
// get checks
|
|
53
|
-
const checkDocs = await checkModel.find({
|
|
53
|
+
const checkDocs = await checkModel.find({ isDefault: true }).exec();
|
|
54
54
|
const checks = checkDocs.map((checkDoc) => checkDoc._id.toHexString());
|
|
55
55
|
// Add assembly
|
|
56
56
|
const [newAssemblyDoc] = await assemblyModel.create([
|
|
@@ -61,9 +61,10 @@ class AddAssemblyAndFeaturesFromFileChange extends FromFileBaseChange_1.FromFile
|
|
|
61
61
|
// Add refSeqs
|
|
62
62
|
// We cannot use Mongo 'session' / transaction here because Mongo has 16 MB limit for transaction
|
|
63
63
|
await this.addRefSeqIntoDb(fileDoc, newAssemblyDoc._id.toString(), backend);
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
64
|
+
const { bufferSize = 10_000 } = parseOptions ?? {};
|
|
65
|
+
const featureStream = filesService.parseGFF3(filesService.getFileStream(fileDoc), { bufferSize });
|
|
66
|
+
// @ts-expect-error type is wrong here
|
|
67
|
+
// eslint-disable-next-line @typescript-eslint/await-thenable
|
|
67
68
|
for await (const f of featureStream) {
|
|
68
69
|
const gff3Feature = f;
|
|
69
70
|
logger.verbose?.(`ENTRY=${JSON.stringify(gff3Feature)}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddAssemblyAndFeaturesFromFileChange.js","sourceRoot":"","sources":["../../src/Changes/AddAssemblyAndFeaturesFromFileChange.ts"],"names":[],"mappings":";AAAA,qDAAqD;;;AAWrD,6DAAyD;
|
|
1
|
+
{"version":3,"file":"AddAssemblyAndFeaturesFromFileChange.js","sourceRoot":"","sources":["../../src/Changes/AddAssemblyAndFeaturesFromFileChange.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,7 +71,7 @@ class AddAssemblyFromFileChange extends FromFileBaseChange_1.FromFileBaseChange
|
|
|
71
71
|
if (assemblyDoc) {
|
|
72
72
|
throw new Error(`Assembly "${assemblyName}" already exists`);
|
|
73
73
|
}
|
|
74
|
-
const checkDocs = await checkModel.find({
|
|
74
|
+
const checkDocs = await checkModel.find({ isDefault: true }).exec();
|
|
75
75
|
const checks = checkDocs.map((checkDoc) => checkDoc._id.toHexString());
|
|
76
76
|
const [newAssemblyDoc] = await assemblyModel.create([
|
|
77
77
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddAssemblyFromFileChange.js","sourceRoot":"","sources":["../../src/Changes/AddAssemblyFromFileChange.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AddAssemblyFromFileChange.js","sourceRoot":"","sources":["../../src/Changes/AddAssemblyFromFileChange.ts"],"names":[],"mappings":"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"}
|
|
@@ -113,9 +113,21 @@ class AddFeatureChange extends common_1.FeatureChange {
|
|
|
113
113
|
for (const change of changes) {
|
|
114
114
|
const { addedFeature, parentFeatureId } = change;
|
|
115
115
|
if (parentFeatureId) {
|
|
116
|
-
|
|
116
|
+
let parentFeature = dataStore.getFeature(parentFeatureId);
|
|
117
|
+
// maybe the parent feature hasn't been loaded yet
|
|
117
118
|
if (!parentFeature) {
|
|
118
|
-
|
|
119
|
+
await dataStore.loadFeatures([
|
|
120
|
+
{
|
|
121
|
+
assemblyName: assembly,
|
|
122
|
+
refName: addedFeature.refSeq,
|
|
123
|
+
start: addedFeature.min,
|
|
124
|
+
end: addedFeature.max,
|
|
125
|
+
},
|
|
126
|
+
]);
|
|
127
|
+
parentFeature = dataStore.getFeature(parentFeatureId);
|
|
128
|
+
if (!parentFeature) {
|
|
129
|
+
throw new Error(`Could not find parent feature "${parentFeatureId}"`);
|
|
130
|
+
}
|
|
119
131
|
}
|
|
120
132
|
// create an ID for the parent feature if it does not have one
|
|
121
133
|
if (!parentFeature.attributes.get('_id')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddFeatureChange.js","sourceRoot":"","sources":["../../src/Changes/AddFeatureChange.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"AddFeatureChange.js","sourceRoot":"","sources":["../../src/Changes/AddFeatureChange.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,9 @@ export interface SerializedAddFeaturesFromFileChangeBase extends SerializedAssem
|
|
|
6
6
|
}
|
|
7
7
|
export interface AddFeaturesFromFileChangeDetails {
|
|
8
8
|
fileId: string;
|
|
9
|
+
parseOptions?: {
|
|
10
|
+
bufferSize: number;
|
|
11
|
+
};
|
|
9
12
|
}
|
|
10
13
|
export interface SerializedAddFeaturesFromFileChangeSingle extends SerializedAddFeaturesFromFileChangeBase, AddFeaturesFromFileChangeDetails {
|
|
11
14
|
}
|
|
@@ -35,7 +35,7 @@ class AddFeaturesFromFileChange extends FromFileBaseChange_1.FromFileBaseChange
|
|
|
35
35
|
await this.removeExistingFeatures(backend);
|
|
36
36
|
}
|
|
37
37
|
for (const change of changes) {
|
|
38
|
-
const { fileId } = change;
|
|
38
|
+
const { fileId, parseOptions } = change;
|
|
39
39
|
const { FILE_UPLOAD_FOLDER } = process.env;
|
|
40
40
|
if (!FILE_UPLOAD_FOLDER) {
|
|
41
41
|
throw new Error('No FILE_UPLOAD_FOLDER found in .env file');
|
|
@@ -47,8 +47,11 @@ class AddFeaturesFromFileChange extends FromFileBaseChange_1.FromFileBaseChange
|
|
|
47
47
|
}
|
|
48
48
|
logger.debug?.(`FileId "${fileId}", checksum "${fileDoc.checksum}"`);
|
|
49
49
|
// Read data from compressed file and parse the content
|
|
50
|
-
const
|
|
50
|
+
const { bufferSize = 10_000 } = parseOptions ?? {};
|
|
51
|
+
const featureStream = filesService.parseGFF3(filesService.getFileStream(fileDoc), { bufferSize });
|
|
51
52
|
let featureCount = 0;
|
|
53
|
+
// @ts-expect-error type is wrong here
|
|
54
|
+
// eslint-disable-next-line @typescript-eslint/await-thenable
|
|
52
55
|
for await (const f of featureStream) {
|
|
53
56
|
const gff3Feature = f;
|
|
54
57
|
// Add new feature into database
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddFeaturesFromFileChange.js","sourceRoot":"","sources":["../../src/Changes/AddFeaturesFromFileChange.ts"],"names":[],"mappings":";;;AAUA,6DAAyD;
|
|
1
|
+
{"version":3,"file":"AddFeaturesFromFileChange.js","sourceRoot":"","sources":["../../src/Changes/AddFeaturesFromFileChange.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,19 +16,14 @@ class AddRefSeqAliasesChange extends common_1.AssemblySpecificChange {
|
|
|
16
16
|
if (!assembly) {
|
|
17
17
|
throw new Error(`assembly ${this.assembly} not found`);
|
|
18
18
|
}
|
|
19
|
-
const sessionAliases = assembly.refNameAliases;
|
|
20
|
-
const sessionLCAliases = assembly.lowerCaseRefNameAliases;
|
|
21
|
-
if (!sessionAliases || !sessionLCAliases) {
|
|
22
|
-
throw new Error('Session refNameAliases not found in assembly');
|
|
23
|
-
}
|
|
19
|
+
const sessionAliases = assembly.refNameAliases ?? {};
|
|
24
20
|
for (const refSeqAlias of this.refSeqAliases) {
|
|
25
21
|
const { aliases, refName } = refSeqAlias;
|
|
26
22
|
for (const alias of aliases) {
|
|
27
23
|
sessionAliases[alias] = refName;
|
|
28
|
-
sessionLCAliases[alias.toLowerCase()] = refName;
|
|
29
24
|
}
|
|
30
25
|
}
|
|
31
|
-
assembly.setRefNameAliases(sessionAliases
|
|
26
|
+
assembly.setRefNameAliases(sessionAliases);
|
|
32
27
|
return Promise.resolve();
|
|
33
28
|
}
|
|
34
29
|
getInverse() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddRefSeqAliasesChange.js","sourceRoot":"","sources":["../../src/Changes/AddRefSeqAliasesChange.ts"],"names":[],"mappings":";;;AAAA,sDAQkC;AAClC,6CAA+C;AAa/C,MAAa,sBAAuB,SAAQ,+BAAsB;IAChE,QAAQ,GAAG,wBAAiC,CAAA;IAC5C,aAAa,CAA2B;IAExC,YAAY,IAAmC,EAAE,OAAuB;QACtE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QACpB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAA;IACzC,CAAC;IAED,eAAe,CAAC,eAAgC;QAC9C,MAAM,EAAE,eAAe,EAAE,GAAG,IAAA,iBAAU,EAAC,eAAe,CAAC,CAAA;QACvD,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACnD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,YAAY,IAAI,CAAC,QAAQ,YAAY,CAAC,CAAA;QACxD,CAAC;QACD,MAAM,cAAc,GAAG,QAAQ,CAAC,cAAc,
|
|
1
|
+
{"version":3,"file":"AddRefSeqAliasesChange.js","sourceRoot":"","sources":["../../src/Changes/AddRefSeqAliasesChange.ts"],"names":[],"mappings":";;;AAAA,sDAQkC;AAClC,6CAA+C;AAa/C,MAAa,sBAAuB,SAAQ,+BAAsB;IAChE,QAAQ,GAAG,wBAAiC,CAAA;IAC5C,aAAa,CAA2B;IAExC,YAAY,IAAmC,EAAE,OAAuB;QACtE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QACpB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAA;IACzC,CAAC;IAED,eAAe,CAAC,eAAgC;QAC9C,MAAM,EAAE,eAAe,EAAE,GAAG,IAAA,iBAAU,EAAC,eAAe,CAAC,CAAA;QACvD,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACnD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,YAAY,IAAI,CAAC,QAAQ,YAAY,CAAC,CAAA;QACxD,CAAC;QACD,MAAM,cAAc,GAAG,QAAQ,CAAC,cAAc,IAAI,EAAE,CAAA;QAEpD,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YAC7C,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;YACxC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC5B,cAAc,CAAC,KAAK,CAAC,GAAG,OAAO,CAAA;YACjC,CAAC;QACH,CAAC;QACD,QAAQ,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAA;QAC1C,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;IAC1B,CAAC;IAED,UAAU;QACR,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAED,MAAM;QACJ,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;QAClD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAA;IAC9C,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,OAAwB;QAC5C,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,OAAO,CAAA;QACxC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAA;QAEhD,KAAK,MAAM,WAAW,IAAI,aAAa,EAAE,CAAC;YACxC,MAAM,CAAC,KAAK,EAAE,CACZ,wCAAwC,QAAQ,kBAAkB,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAChG,CAAA;YACD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;YACxC,MAAM,WAAW;iBACd,SAAS,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC;iBAC7D,OAAO,CAAC,OAAO,CAAC,CAAA;QACrB,CAAC;IACH,CAAC;IAED,kBAAkB,CAAC,QAA4B;QAC7C,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAED,2EAA2E;IAC3E,IAAI,YAAY;QACd,OAAO,iCAAiC,CAAA;IAC1C,CAAC;CACF;AA3DD,wDA2DC"}
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.FromFileBaseChange = void 0;
|
|
4
|
-
/* eslint-disable @typescript-eslint/restrict-plus-operands */
|
|
5
4
|
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
|
|
6
|
-
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
|
|
7
|
-
/* eslint-disable @typescript-eslint/no-unsafe-call */
|
|
8
5
|
/* eslint-disable @typescript-eslint/no-unsafe-argument */
|
|
9
6
|
const common_1 = require("@apollo-annotation/common");
|
|
10
7
|
const GFF3_1 = require("../GFF3");
|
|
@@ -26,8 +23,11 @@ class FromFileBaseChange extends common_1.AssemblySpecificChange {
|
|
|
26
23
|
let parsingStarted = false;
|
|
27
24
|
logger.debug?.('starting sequence stream');
|
|
28
25
|
let lineCount = 0;
|
|
26
|
+
const decoder = new TextDecoder();
|
|
27
|
+
// @ts-expect-error type is wrong here
|
|
28
|
+
// eslint-disable-next-line @typescript-eslint/await-thenable
|
|
29
29
|
for await (const data of sequenceStream) {
|
|
30
|
-
const chunk =
|
|
30
|
+
const chunk = decoder.decode(data);
|
|
31
31
|
lastLineIsIncomplete = !chunk.endsWith('\n');
|
|
32
32
|
// chunk is small enough that you can split the whole thing into lines without having to make it into smaller chunks first.
|
|
33
33
|
const lines = chunk.split(/\r?\n/);
|
|
@@ -36,9 +36,9 @@ class FromFileBaseChange extends common_1.AssemblySpecificChange {
|
|
|
36
36
|
incompleteLine = '';
|
|
37
37
|
}
|
|
38
38
|
if (lastLineIsIncomplete) {
|
|
39
|
-
incompleteLine = lines.pop()
|
|
39
|
+
incompleteLine = lines.pop() ?? '';
|
|
40
40
|
}
|
|
41
|
-
for
|
|
41
|
+
for (const line of lines) {
|
|
42
42
|
lineCount++;
|
|
43
43
|
if (lineCount % 1_000_000 === 0) {
|
|
44
44
|
logger.debug?.(`Processed ${lineCount} lines`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FromFileBaseChange.js","sourceRoot":"","sources":["../../src/Changes/FromFileBaseChange.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"FromFileBaseChange.js","sourceRoot":"","sources":["../../src/Changes/FromFileBaseChange.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ function filterJBrowseConfig(config) {
|
|
|
25
25
|
filteredConfig.plugins = plugins.filter((p) => p.name !== 'Apollo');
|
|
26
26
|
}
|
|
27
27
|
if (tracks) {
|
|
28
|
-
filteredConfig.
|
|
28
|
+
filteredConfig.tracks = tracks.filter((t) => t.type !== 'ApolloTrack');
|
|
29
29
|
}
|
|
30
30
|
return filteredConfig;
|
|
31
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImportJBrowseConfigChange.js","sourceRoot":"","sources":["../../src/Changes/ImportJBrowseConfigChange.ts"],"names":[],"mappings":";;;AA2CA,kDAqCC;AAhFD,qDAAqD;AACrD,sDAMkC;AAoClC,SAAgB,mBAAmB,CAAC,MAAqB;IACvD,MAAM,EACJ,GAAG,EACH,GAAG,EACH,UAAU,EACV,aAAa,EACb,gBAAgB,EAChB,OAAO,EACP,MAAM,EACN,GAAG,IAAI,EACR,GAAG,MAAM,CAAA;IACV,sEAAsE;IACtE,MAAM,cAAc,GAAG,IAAqB,CAAA;IAC5C,IAAI,UAAU,EAAE,CAAC;QACf,cAAc,CAAC,UAAU,GAAG,UAAU,CAAC,MAAM,CAC3C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,uBAAuB,CAC3D,CAAA;IACH,CAAC;IACD,IAAI,aAAa,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC;QACzC,MAAM,EAAE,OAAO,EAAE,GAAG,gBAAgB,EAAE,GAAG,aAAa,CAAC,YAAY,CAAA;QACnE,cAAc,CAAC,aAAa,GAAG;YAC7B,GAAG,aAAa;YAChB,YAAY,EAAE,gBAAgB;SAC/B,CAAA;IACH,CAAC;IACD,IAAI,gBAAgB,EAAE,CAAC;QACrB,cAAc,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,MAAM,CACvD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,uBAAuB,CAC1C,CAAA;IACH,CAAC;IACD,IAAI,OAAO,EAAE,CAAC;QACZ,cAAc,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;IACrE,CAAC;IACD,IAAI,MAAM,EAAE,CAAC;QACX,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"ImportJBrowseConfigChange.js","sourceRoot":"","sources":["../../src/Changes/ImportJBrowseConfigChange.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,5 @@ export declare class MergeExonsChange extends FeatureChange {
|
|
|
25
25
|
executeOnLocalGFF3(_backend: LocalGFF3DataStore): Promise<void>;
|
|
26
26
|
executeOnClient(dataStore: ClientDataStore): Promise<void>;
|
|
27
27
|
getInverse(): UndoMergeExonsChange;
|
|
28
|
-
mergeAttributes(firstExon: AnnotationFeatureSnapshot, secondExon: AnnotationFeatureSnapshot): Record<string, string[]>;
|
|
29
28
|
}
|
|
30
29
|
export {};
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
/* eslint-disable unicorn/prefer-structured-clone */
|
|
2
3
|
/* eslint-disable @typescript-eslint/require-await */
|
|
3
4
|
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
|
|
4
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
6
|
exports.MergeExonsChange = void 0;
|
|
6
7
|
const common_1 = require("@apollo-annotation/common");
|
|
8
|
+
const util_1 = require("../util");
|
|
7
9
|
const DeleteFeatureChange_1 = require("./DeleteFeatureChange");
|
|
8
10
|
const UndoMergeExonsChange_1 = require("./UndoMergeExonsChange");
|
|
9
11
|
class MergeExonsChange extends common_1.FeatureChange {
|
|
@@ -54,7 +56,13 @@ class MergeExonsChange extends common_1.FeatureChange {
|
|
|
54
56
|
}
|
|
55
57
|
mergedExon.min = Math.min(firstExon.min, secondExon.min);
|
|
56
58
|
mergedExon.max = Math.max(firstExon.max, secondExon.max);
|
|
57
|
-
|
|
59
|
+
const mergedAttributes = mergedExon.attributes
|
|
60
|
+
? JSON.parse(JSON.stringify(mergedExon.attributes))
|
|
61
|
+
: {};
|
|
62
|
+
mergedAttributes.merged_with = [
|
|
63
|
+
(0, util_1.stringifyAttributes)((0, util_1.attributesToRecords)(secondExon.attributes)),
|
|
64
|
+
];
|
|
65
|
+
mergedExon.attributes = mergedAttributes;
|
|
58
66
|
const deletedIds = (0, DeleteFeatureChange_1.findAndDeleteChildFeature)(topLevelFeature, secondExon._id, this);
|
|
59
67
|
deletedIds.push(secondExon._id);
|
|
60
68
|
topLevelFeature.allIds = topLevelFeature.allIds.filter((id) => !deletedIds.includes(id));
|
|
@@ -77,11 +85,12 @@ class MergeExonsChange extends common_1.FeatureChange {
|
|
|
77
85
|
}
|
|
78
86
|
mergedExon.setMin(Math.min(firstExon.min, secondExon.min));
|
|
79
87
|
mergedExon.setMax(Math.max(firstExon.max, secondExon.max));
|
|
80
|
-
const
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
88
|
+
const mrg = mergedExon.attributes.get('merged_with')?.slice() ?? [];
|
|
89
|
+
const mergedWith = (0, util_1.stringifyAttributes)((0, util_1.attributesToRecords)(secondExon.attributes));
|
|
90
|
+
if (!mrg.includes(mergedWith)) {
|
|
91
|
+
mrg.push(mergedWith);
|
|
84
92
|
}
|
|
93
|
+
mergedExon.setAttribute('merged_with', mrg);
|
|
85
94
|
mergedExon.parent?.deleteChild(secondExon._id);
|
|
86
95
|
}
|
|
87
96
|
}
|
|
@@ -100,31 +109,6 @@ class MergeExonsChange extends common_1.FeatureChange {
|
|
|
100
109
|
assembly,
|
|
101
110
|
}, { logger });
|
|
102
111
|
}
|
|
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
112
|
}
|
|
129
113
|
exports.MergeExonsChange = MergeExonsChange;
|
|
130
114
|
//# sourceMappingURL=MergeExonsChange.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MergeExonsChange.js","sourceRoot":"","sources":["../../src/Changes/MergeExonsChange.ts"],"names":[],"mappings":";AAAA,qDAAqD;AACrD,4DAA4D;;;AAE5D,sDAOkC;AAGlC,+DAAiE;AACjE,iEAA6D;AAyB7D,MAAa,gBAAiB,SAAQ,sBAAa;IACjD,QAAQ,GAAG,kBAA2B,CAAA;IACtC,OAAO,CAA2B;IAElC,YAAY,IAAgC,EAAE,OAAuB;QACnE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QACpB,IAAI,CAAC,OAAO,GAAG,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IAC1D,CAAC;IACD,2EAA2E;IAC3E,IAAI,YAAY;QACd,OAAO,2BAA2B,CAAA;IACpC,CAAC;IAED,MAAM;QACJ,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;QACxD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,eAAe,EAAE,CAAC,GAAG,OAAO,CAAA;YAE5D,OAAO;gBACL,QAAQ;gBACR,UAAU;gBACV,QAAQ;gBACR,SAAS;gBACT,UAAU;gBACV,eAAe;aAChB,CAAA;QACH,CAAC;QACD,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAA;IACpD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,OAAwB;QAC5C,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,OAAO,CAAA;QACzC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;QAChC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,MAAM,CAAA;YACxC,MAAM,eAAe,GAAG,MAAM,YAAY;iBACvC,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,GAAG,EAAE,CAAC;iBAClC,OAAO,CAAC,OAAO,CAAC;iBAChB,IAAI,EAAE,CAAA;YACT,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,MAAM,MAAM,GAAG,kEAAkE,SAAS,CAAC,GAAG,GAAG,CAAA;gBACjG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;gBACpB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAA;YACzB,CAAC;YACD,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,eAAe,EAAE,SAAS,CAAC,GAAG,CAAC,CAAA;YACxE,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,MAAM,GAAG,2CAA2C,CAAA;gBAC1D,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;gBACpB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAA;YACzB,CAAC;YACD,UAAU,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC,GAAG,CAAC,CAAA;YACxD,UAAU,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC,GAAG,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"MergeExonsChange.js","sourceRoot":"","sources":["../../src/Changes/MergeExonsChange.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,7 @@ export declare class MergeTranscriptsChange extends FeatureChange {
|
|
|
20
20
|
typeName: "MergeTranscriptsChange";
|
|
21
21
|
changes: MergeTranscriptsChangeDetails[];
|
|
22
22
|
constructor(json: SerializedMergeTranscriptsChange, options?: ChangeOptions);
|
|
23
|
+
get notification(): string;
|
|
23
24
|
toJSON(): SerializedMergeTranscriptsChange;
|
|
24
25
|
executeOnServer(backend: ServerDataStore): Promise<void>;
|
|
25
26
|
mergeTranscriptsOnServer(firstTranscript: Feature, secondTranscript: AnnotationFeatureSnapshot): void;
|
|
@@ -27,10 +28,7 @@ export declare class MergeTranscriptsChange extends FeatureChange {
|
|
|
27
28
|
executeOnClient(dataStore: ClientDataStore): Promise<void>;
|
|
28
29
|
mergeTranscriptsOnClient(firstTranscript: AnnotationFeature, secondTranscript: AnnotationFeatureSnapshot): void;
|
|
29
30
|
mergeFeatureIntoTranscriptOnClient(secondFeatureChild: AnnotationFeatureSnapshot, firstTranscript: AnnotationFeature): void;
|
|
30
|
-
isAnnotationFeature(obj: any): obj is AnnotationFeature;
|
|
31
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
32
|
getInverse(): UndoMergeTranscriptsChange;
|
|
35
33
|
}
|
|
36
34
|
export {};
|