oncoprintjs 6.0.1 → 6.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oncoprintjs",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "A data visualization for cancer genomic data.",
   "types": "./dist/js/oncoprint.d.ts",
   "main": "dist/index.js",
@@ -60,5 +60,5 @@
     "tayden-clusterfck": "^0.7.0",
     "typescript": "4.0.3"
   },
-  "gitHead": "f4d4f999c480f95b907d4c37947f421f16edb4f5"
+  "gitHead": "015e5bda995b7f5db563416c53b9320e0c9da3a8"
 }

package/rules/geneticrules.ts

@@ -15,7 +15,9 @@ export const MUT_COLOR_TRUNC = '#000000';
 export const MUT_COLOR_TRUNC_PASSENGER = '#708090';
 export const MUT_COLOR_FUSION = '#8B00C9';
 export const MUT_COLOR_PROMOTER = '#00B7CE';
+export const MUT_COLOR_PROMOTER_PASSENGER = '#8cedf9';
 export const MUT_COLOR_OTHER = '#cf58bc'; //'#cfb537';
+export const MUT_COLOR_OTHER_PASSENGER = '#f96ae3';
 
 export const MRNA_COLOR_HIGH = '#ff9999';
 export const MRNA_COLOR_LOW = '#6699cc';
@@ -63,8 +65,10 @@ enum ShapeId {
 
     missenseMutationDriverRectangle = 'missenseMutationDriverRectangle',
     missenseMutationVUSRectangle = 'missenseMutationVUSRectangle',
-    otherMutationRectangle = 'otherMutationRectangle',
-    promoterMutationRectangle = 'promoterMutationRectangle',
+    otherMutationDriverRectangle = 'otherMutationDriverRectangle',
+    otherMutationVUSRectangle = 'otherMutationVUSRectangle',
+    promoterMutationDriverRectangle = 'promoterMutationDriverRectangle',
+    promoterMutationVUSRectangle = 'promoterMutationVUSRectangle',
     truncatingMutationDriverRectangle = 'truncatingMutationDriverRectangle',
     truncatingMutationVUSRectangle = 'truncatingMutationVUSRectangle',
     inframeMutationDriverRectangle = 'inframeMutationDriverRectangle',
@@ -189,7 +193,7 @@ const shapeBank = {
         height: 33.33,
         z: 6,
     },
-    [ShapeId.otherMutationRectangle]: {
+    [ShapeId.otherMutationDriverRectangle]: {
         type: 'rectangle',
         fill: MUT_COLOR_OTHER,
         x: 0,
@@ -198,7 +202,16 @@ const shapeBank = {
         height: 33.33,
         z: 6,
     },
-    [ShapeId.promoterMutationRectangle]: {
+    [ShapeId.otherMutationVUSRectangle]: {
+        type: 'rectangle',
+        fill: MUT_COLOR_OTHER_PASSENGER,
+        x: 0,
+        y: 33.33,
+        width: 100,
+        height: 33.33,
+        z: 6,
+    },
+    [ShapeId.promoterMutationDriverRectangle]: {
         type: 'rectangle',
         fill: MUT_COLOR_PROMOTER,
         x: 0,
@@ -207,6 +220,15 @@ const shapeBank = {
         height: 33.33,
         z: 6,
     },
+    [ShapeId.promoterMutationVUSRectangle]: {
+        type: 'rectangle',
+        fill: MUT_COLOR_PROMOTER_PASSENGER,
+        x: 0,
+        y: 33.33,
+        width: 100,
+        height: 33.33,
+        z: 6,
+    },
     [ShapeId.truncatingMutationDriverRectangle]: {
         type: 'rectangle',
         fill: MUT_COLOR_TRUNC,
@@ -406,12 +428,16 @@ export const genetic_rule_set_different_colors_no_recurrence: IGeneticAlteration
             conditional: shallowExtend(non_mutation_rule_params.conditional, {
                 disp_mut: {
                     'other,other_rec': {
-                        shapes: [shapeBank[ShapeId.otherMutationRectangle]],
+                        shapes: [
+                            shapeBank[ShapeId.otherMutationDriverRectangle],
+                        ],
                         legend_label: 'Other Mutation',
                         legend_order: MUTATION_LEGEND_ORDER,
                     },
                     'promoter,promoter_rec': {
-                        shapes: [shapeBank[ShapeId.promoterMutationRectangle]],
+                        shapes: [
+                            shapeBank[ShapeId.promoterMutationDriverRectangle],
+                        ],
                         legend_label: 'Promoter Mutation',
                         legend_order: MUTATION_LEGEND_ORDER,
                     },
@@ -451,14 +477,31 @@ export const genetic_rule_set_different_colors_recurrence: IGeneticAlterationRul
             always: non_mutation_rule_params.always,
             conditional: shallowExtend(non_mutation_rule_params.conditional, {
                 disp_mut: {
-                    'other,other_rec': {
-                        shapes: [shapeBank[ShapeId.otherMutationRectangle]],
-                        legend_label: 'Other Mutation',
+                    other_rec: {
+                        shapes: [
+                            shapeBank[ShapeId.otherMutationDriverRectangle],
+                        ],
+                        legend_label: 'Other Mutation (putative driver)',
                         legend_order: MUTATION_LEGEND_ORDER,
                     },
-                    'promoter,promoter_rec': {
-                        shapes: [shapeBank[ShapeId.promoterMutationRectangle]],
-                        legend_label: 'Promoter Mutation',
+                    other: {
+                        shapes: [shapeBank[ShapeId.otherMutationVUSRectangle]],
+                        legend_label: 'Other Mutation (unknown significance)',
+                        legend_order: MUTATION_LEGEND_ORDER,
+                    },
+                    promoter_rec: {
+                        shapes: [
+                            shapeBank[ShapeId.promoterMutationDriverRectangle],
+                        ],
+                        legend_label: 'Promoter Mutation (putative driver)',
+                        legend_order: MUTATION_LEGEND_ORDER,
+                    },
+                    promoter: {
+                        shapes: [
+                            shapeBank[ShapeId.promoterMutationVUSRectangle],
+                        ],
+                        legend_label:
+                            'Promoter Mutation (unknown significance)',
                         legend_order: MUTATION_LEGEND_ORDER,
                     },
                     trunc_rec: {